Changeset 6310

Timestamp:

06/19/15 13:03:55 (9 years ago)

Author:

Twan Goosen

Message:

some refactoring of the matchPattern method for readability and code reusability

File:

• vlo/trunk/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java (modified) (5 diffs)

vlo/trunk/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java

@@ -211 +211 @@
                 cmdiData.addResource(ref, type, mimeType);
             }
-            
+
             // resource hierarchy information?
-            if(type.toLowerCase().equals("metadata")) {
+            if (type.toLowerCase().equals("metadata")) {
                 ResourceStructureGraph.addEdge(ref, mdSelfLinkString);
             }
@@ -265 +265 @@
      */
     private boolean matchPattern(CMDIData cmdiData, VTDNav nav, FacetConfiguration config, String pattern, Boolean allowMultipleValues) throws VTDException {
-        boolean matchedPattern = false;
-        AutoPilot ap = new AutoPilot(nav);
+        final AutoPilot ap = new AutoPilot(nav);
         setNameSpace(ap);
         ap.selectXPath(pattern);
+        
+        boolean matchedPattern = false;
         int index = ap.evalXPath();
         while (index != -1) {
@@ -276 +277 @@
                 index++;
             }
-            String value = nav.toString(index);
-
-            // extract language code in xml:lang if available
-            Integer langAttrIndex = nav.getAttrVal("xml:lang");
-            String languageCode = DEFAULT_LANGUAGE;
-            if (langAttrIndex != -1) {
-                languageCode = nav.toString(langAttrIndex).trim();
-            }
-            // replace 2-letter with 3-letter codes
-            if (MetadataImporter.languageCodeUtils.getSilToIso639Map().containsKey(languageCode)) {
-                languageCode = MetadataImporter.languageCodeUtils.getSilToIso639Map().get(languageCode);
-            }
+            final String value = nav.toString(index);
+
+            final String languageCode = extractLanguageCode(nav);
 
             // ignore non-English language names for facet LANGUAGE_CODE
@@ -295 +287 @@
             }
 
-            List<String> valueList = postProcess(config.getName(), value);
-            for (int i = 0; i < valueList.size(); i++) {
-                if (!allowMultipleValues && i > 0) {
-                    break;
-                }
-                String fieldValue = valueList.get(i).trim();
-                if (config.getName().equals(FacetConstants.FIELD_DESCRIPTION)) {
-                    fieldValue = "{lang='" + languageCode + "'}" + fieldValue;
-                }
-                cmdiData.addDocField(config.getName(), fieldValue, config.isCaseInsensitive());
-            }
+            final List<String> valueList = postProcess(config.getName(), value);
+            insertFacetValues(config.getName(), valueList, cmdiData, languageCode, allowMultipleValues, config.isCaseInsensitive());
             index = ap.evalXPath();
 
@@ -313 +296 @@
         }
         return matchedPattern;
+    }
+
+    private String extractLanguageCode(VTDNav nav) throws NavException {
+        // extract language code in xml:lang if available
+        Integer langAttrIndex = nav.getAttrVal("xml:lang");
+        String languageCode = DEFAULT_LANGUAGE;
+        if (langAttrIndex != -1) {
+            languageCode = nav.toString(langAttrIndex).trim();
+        }
+        // replace 2-letter with 3-letter codes
+        if (MetadataImporter.languageCodeUtils.getSilToIso639Map().containsKey(languageCode)) {
+            languageCode = MetadataImporter.languageCodeUtils.getSilToIso639Map().get(languageCode);
+        }
+        return languageCode;
+    }
+
+    private void insertFacetValues(String name, List<String> valueList, CMDIData cmdiData, String languageCode, boolean allowMultipleValues, boolean caseInsensitive) {
+        for (int i = 0; i < valueList.size(); i++) {
+            if (!allowMultipleValues && i > 0) {
+                break;
+            }
+            String fieldValue = valueList.get(i).trim();
+            if (name.equals(FacetConstants.FIELD_DESCRIPTION)) {
+                fieldValue = "{lang='" + languageCode + "'}" + fieldValue;
+            }
+            cmdiData.addDocField(name, fieldValue, caseInsensitive);
+        }
     }