#293 allow layername support with temp shp renaming; test uuid recycling (not working for now)

Author: eblondel

R/geoflow_entity.R

@@ -1166,11 +1166,20 @@ geoflow_entity <- R6Class("geoflow_entity",
     enrichWithIdentifiers = function(config){
       geometa_action <- NULL
       actions <- list()
+      
+      #on geometa, set uuid in case geometa is run with option use_uuid is enabled / and no uuid already set
       if(length(config$actions)>0) actions <- config$actions[sapply(config$actions, function(x){regexpr("geometa-create-iso-19115",x$id)>0})]
       if(length(actions)>0) geometa_action <- actions[[1]]
       if(!is.null(geometa_action)) if(geometa_action$getOption("use_uuid")) if(is.null(self$identifiers[["uuid"]])){
         self$identifiers[["uuid"]] <- uuid::UUIDgenerate()
       }
+      
+      #on geonode4R, set uuid in case action is run / and no uuid already set
+      if(length(config$actions)>0) actions <- config$actions[sapply(config$actions, function(x){regexpr("geonode4R-publish-ogc-services",x$id)>0})]
+      if(length(actions)>0) geonode4R_action <- actions[[1]]
+      if(!is.null(geonode4R_action)) if(is.null(self$identifiers[["uuid"]])){
+        self$identifiers[["uuid"]] <- uuid::UUIDgenerate()
+      }
     },
 
     #'@description This function that will enrich the entity with relations. At now this is essentially related to adding 

inst/actions/geonode4R_publish_ogc_services.R

@@ -43,7 +43,7 @@ function(action, entity, config){
 
     #check if resources already exists
     #-------------------------------------------------------------------------------------------------
-    resource = GEONODE$getResourceByUUID(uuid = entity$identifiers$id)
+    resource = GEONODE$getResourceByUUID(uuid = entity$identifiers[["uuid"]])
     if(!is.null(resource)){
       config$logger.warn(sprintf("Resource '%s' (id = %s) already exists! Deleting it...", resource$uuid, resource$pk))
       deleted = GEONODE$deleteResource(id = resource$pk)
@@ -67,8 +67,21 @@ function(action, entity, config){
           config$logger.info(sprintf("Upload file '%s' [%s] to GeoNode...", filepath, data_object$uploadType))
           files = list.files(path = "data", pattern = datasource_name, full.names = TRUE)
           files = files[!endsWith(files, ".zip")]
-          created = GEONODE$upload(files)
-          uploaded = created$success
+          dir.create("data/temp")
+          for(file in files){
+            file_ext = unlist(strsplit(file, "\\."))[2]
+            target = file.path(getwd(), "data/temp", paste0(layername, ".", file_ext))
+            file.copy(from = file, to = target, copy.mode = T)
+            if(file_ext == "xml"){
+              #post-process metadata identifier if existing to match entity uuid
+              md = geometa::readISO19139(target)
+              md$fileIdentifier <- entity$identifiers[["uuid"]]
+              md$save(target)
+            }
+          }
+          created = GEONODE$upload(files = list.files(path = "data/temp", pattern = layername, full.names = TRUE))
+          uploaded = !is.null(created$dataset)
+          unlink("data/temp",recursive = TRUE, force = TRUE)
         }else{
           errMsg <- sprintf("Upload from local file(s): no zipped file found for source '%s' (%s)", filepath, datasource)
           config$logger.error(errMsg)