Using system wide property for resource name

OpenDataNode · Jul 14, 2015 · 0547432 · 0547432
1 parent c211bca
commit 0547432
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -29,6 +29,7 @@
 |Parameter                        |Description                             |                                                        
 |---------------------------------|----------------------------------------|
 |**dpu.uv-l-rdfToVirtuosoAndCkan.dataset.uri.pattern** |URL  pattern to build RDF graph name in Virtuoso storage. |
+|**dpu.uv-l-rdfToVirtuosoAndCkan.resource.name** | Name of the CKAN resource to be used, has precedence over distributionMetadata input |
 |**org.opendatanode.CKAN.secret.token**    |Token used to authenticate to CKAN, has to be set in backend.properties  |
 |**org.opendatanode.CKAN.api.url** | URL where CKAN api is located, has to be set in backend.properties |
 |**org.opendatanode.CKAN.http.header.[key]** | Custom HTTP header added to requests on CKAN |

diff --git a/pom.xml b/pom.xml
@@ -43,7 +43,7 @@
 		<dependency>
 			<groupId>org.opendatanode.plugins</groupId>
 			<artifactId>uv-l-rdfToCkan</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<!-- Provided by Core. -->
 		<dependency>

diff --git a/src/main/java/eu/unifiedviews/plugins/loader/rdftovirtuosoandckan/RdfToVirtuosoAndCkan.java b/src/main/java/eu/unifiedviews/plugins/loader/rdftovirtuosoandckan/RdfToVirtuosoAndCkan.java
@@ -40,6 +40,8 @@ public class RdfToVirtuosoAndCkan extends AbstractDpu<RdfToVirtuosoAndCkanConfig
 
     public static final String CONFIGURATION_DATASET_URI_PATTERN = "dpu.uv-l-rdfToVirtuosoAndCkan.dataset.uri.pattern";
 
+    public static final String CONFIGURATION_RESOURCE_NAME = "dpu.uv-l-rdfToVirtuosoAndCkan.resource.name";
+
     public RdfToVirtuosoAndCkan() {
         super(RdfToVirtuosoAndCkanVaadinDialog.class, ConfigHistory.noHistory(RdfToVirtuosoAndCkanConfig_V1.class));
     }
@@ -68,7 +70,9 @@ protected void innerExecute() throws DPUException {
             throw ContextUtils.dpuException(ctx, "RdfToCkan.execute.exception.missingCatalogApiLocation");
         }
         String datasetUriPattern = environment.get(CONFIGURATION_DATASET_URI_PATTERN);
-
+
+        String resourceName = environment.get(CONFIGURATION_RESOURCE_NAME);
+
         Map<String, String> additionalHttpHeaders = new HashMap<>();
         for (Map.Entry<String, String> configEntry : environment.entrySet()) {
             if (configEntry.getKey().startsWith(RdfToCkan.CONFIGURATION_HTTP_HEADER)) {
@@ -102,6 +106,8 @@ protected void innerExecute() throws DPUException {
 
         rdfToCkan.rdfInput = rdfIntermediate;
         rdfToCkan.distributionInput = distributionInput;
-        rdfToCkan.outerExecute(ctx, new RdfToCkanConfig_V1());
+        RdfToCkanConfig_V1 rdfToCkanConfig= new RdfToCkanConfig_V1();
+        rdfToCkanConfig.setResourceName(resourceName);
+        rdfToCkan.outerExecute(ctx, rdfToCkanConfig);
     }
 }