Merged lod/lodplatform into master

santteegt · Oct 6, 2015 · 07f2930 · 07f2930
2 parents 1cc61e6 + 1f1d601
commit 07f2930
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/.../ontology-mapping/src/main/java/com/ucuenca/pentaho/plugin/step/r2rml/R2RMLGenerator.java b/.../ontology-mapping/src/main/java/com/ucuenca/pentaho/plugin/step/r2rml/R2RMLGenerator.java
@@ -250,13 +250,15 @@ private void processRelationModeling()throws Exception {
 				.addProperty(RR.subjectMap,
 						r2rmlModel.createResource()
 							.addProperty(RR.template, this.baseURI + (String)entityProp1[0] + "{" + entity1 + "_ID}")
-				)
-				.addProperty(RR.predicateObjectMap,
+				);
+				//fixing problem with URI without LOD URI name conventions
+				Property vocab = (vocProperty.split(prefixes.get(vocPrefix)[0]).length > 1) ?
+						ResourceFactory.createProperty( prefixes.get(vocPrefix)[0], 
+								vocProperty.split(prefixes.get(vocPrefix)[0])[1] )
+						:ResourceFactory.createProperty(vocProperty);
+				resource.addProperty(RR.predicateObjectMap,
 						r2rmlModel.createResource()
-							.addProperty(RR.predicate,
-									ResourceFactory.createProperty( prefixes.get(vocPrefix)[0], 
-											vocProperty.split(prefixes.get(vocPrefix)[0])[1] )
-							)
+							.addProperty(RR.predicate, vocab)
 							.addProperty(RR.objectMap,
 									r2rmlModel.createResource()
 									.addProperty(RR.template, this.baseURI + (String)entityProp2[0] + "{" + entity2 + "_ID}")