From bd311310b57e95baed55fb10f7b0f840aad6882c Mon Sep 17 00:00:00 2001
From: eblondel <emmanuel.blondel1@gmail.com>
Date: Tue, 12 Oct 2021 16:24:57 +0200
Subject: [PATCH] #58 additional codes

---
 R/ZenodoManager.R | 8 +++++---
 R/ZenodoRecord.R  | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/R/ZenodoManager.R b/R/ZenodoManager.R
index 10644fd..b847eda 100644
--- a/R/ZenodoManager.R
+++ b/R/ZenodoManager.R
@@ -594,11 +594,13 @@ ZenodoManager <-  R6Class("ZenodoManager",
       query <- sprintf("conceptdoi:%s", gsub("/", "//", conceptdoi))
       result <- self$getDepositions(q = query, exact = TRUE)
       if(length(result)>0){
-        dois <- vapply(result, function(i) i$doi, character(1))
-        if (!conceptdoi %in% dois){
+        conceptdois <- vapply(result, function(i){
+          i$getConceptDOI()
+        }, character(1))
+        if (!conceptdoi %in% conceptdois){
           result <- NULL
         }else{
-          result <- result[[which(dois == conceptdoi)[1]]]
+          result <- result[[which(conceptdois == conceptdoi)[1]]]
           self$INFO(sprintf("Successfully fetched record for concept DOI '%s'!", conceptdoi))
         }
       }else{
diff --git a/R/ZenodoRecord.R b/R/ZenodoRecord.R
index 0dc3033..4041640 100644
--- a/R/ZenodoRecord.R
+++ b/R/ZenodoRecord.R
@@ -421,7 +421,7 @@ ZenodoRecord <-  R6Class("ZenodoRecord",
         doi <- self$metadata$prereserve_doi
         if(!is.null(doi)) {
           doi_parts <- unlist(strsplit(doi$doi, "zenodo."))
-          conceptdoi <- paste0(doi_parts[1], "zenodo.", as.integer(doi_parts[2])-1)
+          conceptdoi <- paste0(doi_parts[1], "zenodo.", self$conceptrecid)
         }
       }
       return(conceptdoi)