Changeset 6288

Timestamp:

06/12/15 07:45:47 (9 years ago)

Author:

Twan Goosen

Message:

Added fields with part count and resource count for further ranking
Also added a constant for running the importer and web app without network connection (e.g. on an ICE :))
Refs #750

Location:

vlo/trunk/vlo-commons/src/main/java/eu/clarin/cmdi/vlo

Files:

• CommonUtils.java (modified) (5 diffs)
• FacetConstants.java (modified) (2 diffs)
• LanguageCodeUtils.java (modified) (4 diffs)

vlo/trunk/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/CommonUtils.java

@@ -21 +21 @@
 public final class CommonUtils {
 
+    /**
+     * Set to true to make run/import possible without a network connection
+     * (todo: make environment variable?)
+     */
+    public static final Boolean SWALLOW_LOOKUP_ERRORS = false; //ONLY COMMIT AS FALSE!
+
     private final static Set<String> ANNOTATION_MIMETYPES = new HashSet<String>();
+
     static {
         ANNOTATION_MIMETYPES.add("text/x-eaf+xml");
@@ -33 +40 @@
     }
     private final static Set<String> TEXT_MIMETYPES = new HashSet<String>();
+
     static {
         TEXT_MIMETYPES.add("application/pdf");
@@ -38 +46 @@
     }
     private final static Set<String> VIDEO_MIMETYPES = new HashSet<String>();
+
     static {
         VIDEO_MIMETYPES.add("application/mxf");
     }
     private final static Set<String> AUDIO_MIMETYPES = new HashSet<String>();
+
     static {
         AUDIO_MIMETYPES.add("application/ogg");
@@ -75 +85 @@
 
     /**
-     * Create a mapping out of simple CMDI components for instance: lists of items: <item AppInfo="Tigrinya (ti)">ti</item> Will become key (after removal of trailing 2 or 3 letter codes),
-     * values: ti, Tigrinya
+     * Create a mapping out of simple CMDI components for instance: lists of
+     * items: <item AppInfo="Tigrinya (ti)">ti</item> Will become key (after
+     * removal of trailing 2 or 3 letter codes), values: ti, Tigrinya
+     *
      * @param urlToComponent
      * @return Map with item_value, AppInfo_value pairs
@@ -102 +114 @@
         return result;
     }
-    
+
     /**
-     * Create a mapping out of simple CMDI components for instance: lists of items: <item AppInfo="Tigrinya">ti</item> Will become key (after removal of trailing 2 or 3 letter codes),
-     * values: Tigrinya, ti
+     * Create a mapping out of simple CMDI components for instance: lists of
+     * items: <item AppInfo="Tigrinya">ti</item> Will become key (after removal
+     * of trailing 2 or 3 letter codes), values: Tigrinya, ti
+     *
      * @param urlToComponent
      * @return Map with item_value, AppInfo_value pairs

vlo/trunk/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/FacetConstants.java

@@ -39 +39 @@
     public static final String FIELD_FILENAME = "_fileName";
     public static final String FIELD_RESOURCE = "_resourceRef";
+    public static final String FIELD_RESOURCE_COUNT = "_resourceRefCount";
     public static final String FIELD_CLARIN_PROFILE = "_componentProfile";
     public static final String FIELD_SEARCH_SERVICE = "_contentSearchRef";
@@ -45 +46 @@
     public static final String FIELD_IS_PART_OF = "_isPartOf";
     public static final String FIELD_HAS_PART = "_hasPart";
+    public static final String FIELD_HAS_PART_COUNT = "_hasPartCount";
 
     /**

vlo/trunk/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/LanguageCodeUtils.java

@@ -19 +19 @@
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import java.net.URL;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -149 +150 @@
             return result;
         } catch (Exception e) {
-            throw new RuntimeException("Cannot instantiate postProcessor:", e);
+            if (CommonUtils.SWALLOW_LOOKUP_ERRORS) {
+                return new HashMap<String, String>();
+            } else {
+                throw new RuntimeException("Cannot instantiate postProcessor:", e);
+            }
         }
     }
@@ -159 +164 @@
             return result;
         } catch (Exception e) {
-            throw new RuntimeException("Cannot instantiate postProcessor:", e);
+            if (CommonUtils.SWALLOW_LOOKUP_ERRORS) {
+                return new HashMap<String, String>();
+            } else {
+                throw new RuntimeException("Cannot instantiate postProcessor:", e);
+            }
         }
     }
@@ -182 +191 @@
             return result;
         } catch (Exception e) {
-            throw new RuntimeException("Cannot instantiate postProcessor:", e);
+            if (CommonUtils.SWALLOW_LOOKUP_ERRORS) {
+                return new HashMap<String, String>();
+            } else {
+                throw new RuntimeException("Cannot instantiate postProcessor:", e);
+            }
         }
     }