handle case when a column is missing from the json file in offline mode

usc-isi-i2 · Dec 10, 2014 · 09db0dc · 09db0dc
1 parent c831272
commit 09db0dc
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/karma-common/src/main/java/edu/isi/karma/kr2rml/affinity/ParentRowColumnAffinity.java b/karma-common/src/main/java/edu/isi/karma/kr2rml/affinity/ParentRowColumnAffinity.java
@@ -62,6 +62,9 @@ else if(o instanceof ParentRowColumnAffinity)
 	@Override
 	public boolean isValidFor(HNodePath a, HNodePath b) {
 		HNodePath commonPath = HNodePath.findCommon(a, b);
+		if(commonPath == null || a == null || b == null)
+			return false;
+
 		if(commonPath.length() == a.length() && b.length() > a.length())
 		{
 			return true;

diff --git a/karma-common/src/main/java/edu/isi/karma/kr2rml/affinity/RowColumnAffinity.java b/karma-common/src/main/java/edu/isi/karma/kr2rml/affinity/RowColumnAffinity.java
@@ -34,7 +34,7 @@ public int compareTo(ColumnAffinity o) {
 	@Override
 	public boolean isValidFor(HNodePath a, HNodePath b) {
 		HNodePath commonPath = HNodePath.findCommon(a, b);
-		if(commonPath == null)
+		if(commonPath == null || a == null || b == null)
 			return false;
 		int commonPathLength = commonPath.length();
 		return commonPathLength +1 == a.length() && commonPathLength +1 == b.length();

diff --git a/...-common/src/main/java/edu/isi/karma/kr2rml/planning/ColumnPredicateObjectMappingPlan.java b/...-common/src/main/java/edu/isi/karma/kr2rml/planning/ColumnPredicateObjectMappingPlan.java
@@ -115,14 +115,16 @@ else if(generateContext && objectTemplateTermSetPopulator.getTerms().isSingleCol
 	}
 
 	protected String getColumnContextUri (String hNodeId) {
-
-		if (hNodeToContextUriMap.containsKey(hNodeId))
-			return hNodeToContextUriMap.get(hNodeId);
-		else {
-			String randomId = UUID.randomUUID().toString();
-			String uri = Namespaces.KARMA_DEV + randomId + "_" + hNodeId;
-			hNodeToContextUriMap.put(hNodeId, uri);
-			return uri;
+		if(hNodeId != null) {
+			if (hNodeToContextUriMap.containsKey(hNodeId))
+				return hNodeToContextUriMap.get(hNodeId);
+			else {
+				String randomId = UUID.randomUUID().toString();
+				String uri = Namespaces.KARMA_DEV + randomId + "_" + hNodeId;
+				hNodeToContextUriMap.put(hNodeId, uri);
+				return uri;
+			}
 		}
+		return null;
 	}
 }
diff --git a/karma-common/src/main/java/edu/isi/karma/kr2rml/planning/MapPlan.java b/karma-common/src/main/java/edu/isi/karma/kr2rml/planning/MapPlan.java
@@ -74,8 +74,11 @@ protected void populateTermsToPathForSubject(
 			throws HNodeNotFoundKarmaException {
 		for(ColumnTemplateTerm term : subjMapTemplate.getAllColumnNameTermElements())
 		{
-			HNodePath path = factory.getHNode(translator.getHNodeIdForColumnName(term.getTemplateTermValue())).getHNodePath(factory);
-			subjectTermsToPaths.put(term, path);
+			String hNodeId = translator.getHNodeIdForColumnName(term.getTemplateTermValue());
+			if(hNodeId != null) {
+				HNodePath path = factory.getHNode(hNodeId).getHNodePath(factory);
+				subjectTermsToPaths.put(term, path);
+			}
 		}
 	}
 	protected TemplateTermSet generateSubjectMapTemplateForBlankNode(SubjectMap subjectMap,