You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2012/12/07 17:51:34 UTC

svn commit: r1418389 - /stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java

Author: rwesten
Date: Fri Dec  7 16:51:33 2012
New Revision: 1418389

URL: http://svn.apache.org/viewvc?rev=1418389&view=rev
Log:
STANBOL-824: improved error handling on missing namespace prefix mappings

Modified:
    stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java

Modified: stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java?rev=1418389&r1=1418388&r2=1418389&view=diff
==============================================================================
--- stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java (original)
+++ stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java Fri Dec  7 16:51:33 2012
@@ -157,7 +157,12 @@ public final class FieldMappingUtils {
         List<String> mappedTo = Collections.emptyList();
         String fieldPattern;
         if(!parts[0].isEmpty() && !parts[0].equals("*")){
-            fieldPattern = NamespaceMappingUtils.getConfiguredUri(nps,parts[0]);
+            try {
+                fieldPattern = NamespaceMappingUtils.getConfiguredUri(nps,parts[0]);
+            } catch (IllegalArgumentException e) {
+                log.warn("Unable to parse fieldMapping because of unknown namespace prefix",e);
+                return null;
+            }
         } else {
             fieldPattern = parts[0];
         }
@@ -197,7 +202,7 @@ public final class FieldMappingUtils {
             if(mappingString != null && 
                     !mappingString.isEmpty() && //not an empty line
                     !(mappingString.charAt(0) == FieldMapping.COMMENT_CHAR)){ //not an comment
-                FieldMapping fieldMapping = FieldMappingUtils.parseFieldMapping(mappingString.toString(),nps);
+                FieldMapping fieldMapping = parseFieldMapping(mappingString.toString(),nps);
                 if(fieldMapping != null){
                     fieldMappings.add(fieldMapping);
                 } else {
@@ -245,7 +250,11 @@ public final class FieldMappingUtils {
         ArrayList<String> mappings = new ArrayList<String>(parts.length-start);
         for(int i=start;i<parts.length;i++){
             if(!parts[i].isEmpty()){ //needed to remove two spaces in a row
-                mappings.add(NamespaceMappingUtils.getConfiguredUri(nps, parts[i]));
+                try {
+                    mappings.add(NamespaceMappingUtils.getConfiguredUri(nps, parts[i]));
+                } catch (IllegalArgumentException e) {
+                    log.warn("Unable to parse mapping because of unkown namespace prefix in "+parts[i],e);
+                }
             }
         }
         return mappings;