From eaf54b81a7e1e231348654737fb4fe0a25ee3255 Mon Sep 17 00:00:00 2001 From: eblondel Date: Thu, 16 May 2024 01:31:50 +0200 Subject: [PATCH] fix #388 --- R/executeWorkflowJob.R | 3 ++- doc/documentation.md | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/R/executeWorkflowJob.R b/R/executeWorkflowJob.R index 8799385f..cfbacbfc 100644 --- a/R/executeWorkflowJob.R +++ b/R/executeWorkflowJob.R @@ -29,6 +29,7 @@ executeWorkflowJob <- function(config, jobdir = NULL, queue = NULL, monitor = NU skipDataDownload = config$profile$options$skipFileDownload } skipDataDownload <- if(!is.null(config$profile$options$skipDataDownload)) config$profile$options$skipDataDownload else FALSE + skipEnrichWithDatatypes <- if(!is.null(config$profile$options$skipEnrichWithDatatypes)) config$profile$options$skipEnrichWithDatatypes else FALSE skipEnrichWithData = if(!is.null(config$profile$options$skipEnrichWithData)) config$profile$options$skipEnrichWithData else FALSE #Actions onstart @@ -136,7 +137,7 @@ executeWorkflowJob <- function(config, jobdir = NULL, queue = NULL, monitor = NU #we copy data to job data dir (for data files) entity$copyDataToJobDir(config, jobdir) #enrich with data types - entity$enrichWithDatatypes(config, jobdir) + if(!skipEnrichWithDatatypes) entity$enrichWithDatatypes(config, jobdir) #vector data: we enrich entity with features #control is added in case of entity already enriched with features/coverages (when loaded from custom R entity handlers) if(!skipEnrichWithData) if(is.null(entity$data$features) && is.null(entity$data$coverages)){ diff --git a/doc/documentation.md b/doc/documentation.md index d949bffa..a34c4130 100644 --- a/doc/documentation.md +++ b/doc/documentation.md @@ -220,6 +220,8 @@ possible geoflow global options: | `skipDataDownload` | Indicates whether data associated to an entity should be download | **false** | | `skipFileDownload` | Deprecated, use `skipDataDownload` instead. | **false** | | `skipDynamicBbox` | Indicates whether bbox inherited from data should be ignored. | **false** | +| `skipEnrichWithData` | Indicates whether the entity should be enriched with data | **false** | +| `skipEnrichWithDatatypes` | Indicates whether the entity data should be enriched with datatypes (case where a zip archive needs to be scanneed to inherit source/upload types) | **false** | | `enrichDataStrategy` | Strategy to use when inheriting spatial bbox from multiple data objects, either “first” (take the first data object for the bbox, or “union” (union of bboxes from the different data objects). | \*\*“first”\* | Note on the **mode**: