Changeset 6754

Timestamp:

11/09/15 13:22:00 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

merged with trunk 3.4

Location:

vlo/branches/vlo-3.3-oeaw/vlo-commons

Files:

• . (modified) (1 prop)
• pom.xml (modified) (3 diffs)
• src/main/java/eu/clarin/cmdi/vlo/FacetConstants.java (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/vlo/LanguageCodeUtils.java (modified) (4 diffs)
• src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java (modified) (2 diffs)
• src/main/resources/VloConfig.xml (modified) (4 diffs)
• src/main/resources/dataroots-beta.xml (copied) (copied from vlo/trunk/vlo-commons/src/main/resources/dataroots-beta.xml)
• src/main/resources/dataroots-testvm.xml (modified) (1 diff)
• src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java (modified) (3 diffs)
• src/test/java/eu/clarin/cmdi/vlo/config/VloConfigMarshallerTest.java (modified) (1 diff)

vlo/branches/vlo-3.3-oeaw/vlo-commons/pom.xml

@@ -6 +6 @@
         <groupId>eu.clarin.cmdi</groupId>
         <artifactId>vlo</artifactId>
-        <version>3.3-SNAPSHOT</version>
+        <version>3.4-SNAPSHOT</version>
     </parent>
     <groupId>eu.clarin.cmdi</groupId>
     <artifactId>vlo-commons</artifactId>
-    <version>3.3-SNAPSHOT</version>
+    <version>3.4-SNAPSHOT</version>
     <name>VLO Commons</name>
     <url>http://maven.apache.org</url>
@@ -126 +126 @@
         
         <profile>
+            <!-- For deployment to catalog-clarin.esc.rzg.mpg.de -->
+            <id>dev-vm</id>
+            <properties>
+                <vloconfig.solrUrl>http://localhost:8080/vlo-solr/core0/</vloconfig.solrUrl>
+                <vloconfig.dataRootsFile>file:/lat/webapps/vlo/dataroots-testvm.xml</vloconfig.dataRootsFile>
+            </properties>
+        </profile>
+        
+        <profile>
             <!-- For deployment to vlo.clarin.eu -->
             <id>production</id>
@@ -138 +147 @@
         
         <profile>
-            <!-- For deployment to vlo.clarin.eu -->
-            <id>dev-vm</id>
-            <properties>
-                <vloconfig.solrUrl>http://localhost:8080/vlo-solr/core0/</vloconfig.solrUrl>
-                <vloconfig.dataRootsFile>dataroots-testvm.xml</vloconfig.dataRootsFile>
-            </properties>
-        </profile>
-        
-        <profile>
-            <!--  For deployment to beta.vlo.clarin.eu -->
+            <!--  For deployment to beta-vlo.clarin.eu -->
             <id>beta</id>
             <properties>
-                <vloconfig.solrUrl><!-- TODO!!! --></vloconfig.solrUrl>
-                <vloconfig.homeUrl>http://beta.vlo.clarin.eu</vloconfig.homeUrl>
-                <vloconfig.dataRootsFile>dataroots-production.xml</vloconfig.dataRootsFile>
+                <vloconfig.deleteAllFirst>false</vloconfig.deleteAllFirst>
+                <vloconfig.maxDaysInSolr>7</vloconfig.maxDaysInSolr>
+                <vloconfig.solrUrl>http://172.17.42.1:8080/solr/core0/</vloconfig.solrUrl>
+                <vloconfig.homeUrl>http://beta-vlo.clarin.eu</vloconfig.homeUrl>
+                <vloconfig.dataRootsFile>dataroots-beta.xml</vloconfig.dataRootsFile>
             </properties>
         </profile>

vlo/branches/vlo-3.3-oeaw/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/FacetConstants.java

@@ -93 +93 @@
      */
     public static final String LANGUAGE_CODE_PATTERN = "(name|code):(.*)";
+    
+    
+    /**
+     * Name of the Solr request handler for fast queries (no sorting, boosting or aliases)
+     */
+    public static final String SOLR_REQUEST_HANDLER_FAST = "fast";
 }

vlo/branches/vlo-3.3-oeaw/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/LanguageCodeUtils.java

@@ -151 +151 @@
         } catch (Exception e) {
             if (CommonUtils.SWALLOW_LOOKUP_ERRORS) {
+                LOG.warn("Ignoring exception", e);
                 return new HashMap<String, String>();
             } else {
-                throw new RuntimeException("Cannot instantiate postProcessor:", e);
+                throw new RuntimeException("Cannot instantiate postProcessor. URL: " + url, e);
             }
         }
@@ -165 +166 @@
         } catch (Exception e) {
             if (CommonUtils.SWALLOW_LOOKUP_ERRORS) {
+                LOG.warn("Ignoring exception", e);
                 return new HashMap<String, String>();
             } else {
-                throw new RuntimeException("Cannot instantiate postProcessor:", e);
+                throw new RuntimeException("Cannot instantiate postProcessor. URL: " + url, e);
             }
         }
@@ -174 +176 @@
     private Map<String, String> createSilToIsoCodeMap() {
         LOG.debug("Creating silToIso code map.");
+        final String urlString = config.getSilToISO639CodesUrl();
         try {
             Map<String, String> result = new ConcurrentHashMap<String, String>();
             DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
             domFactory.setNamespaceAware(true);
-            URL url = new URL(config.getSilToISO639CodesUrl());
+            URL url = new URL(urlString);
             DocumentBuilder builder = domFactory.newDocumentBuilder();
             Document doc = builder.parse(url.openStream());
@@ -192 +195 @@
         } catch (Exception e) {
             if (CommonUtils.SWALLOW_LOOKUP_ERRORS) {
+                LOG.warn("Ignoring exception", e);
                 return new HashMap<String, String>();
             } else {
-                throw new RuntimeException("Cannot instantiate postProcessor:", e);
+                throw new RuntimeException("Cannot instantiate postProcessor. URL: " + urlString, e);
             }
         }

vlo/branches/vlo-3.3-oeaw/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java

@@ -113 +113 @@
     private boolean showResultScores = false;
 
+    private boolean processHierarchies = true;
+
     /**
      * A set of fields to be excluded from display<br><br>
@@ -1121 +1123 @@
     
     
+
+    /**
+     * Get the value of processHierarchies
+     *
+     * @return the value of processHierarchies
+     */
+    public boolean isProcessHierarchies() {
+        return processHierarchies;
+    }
+
+    /**
+     * Set the value of processHierarchies
+     *
+     * @param processHierarchies new value of processHierarchies
+     */
+    public void setProcessHierarchies(boolean processHierarchies) {
+        this.processHierarchies = processHierarchies;
+    }
 }

vlo/branches/vlo-3.3-oeaw/vlo-commons/src/main/resources/VloConfig.xml

@@ -67 +67 @@
         <facetField>resourceClass</facetField>
                 <facetField>resourceClassOrig</facetField>
-        <facetField>continent</facetField>
         <facetField>country</facetField>
         <facetField>modality</facetField>
@@ -99 +98 @@
         <searchResultField>subject</searchResultField>
         <searchResultField>genre</searchResultField>
-        <searchResultField>organization</searchResultField>
+        <searchResultField>organisation</searchResultField>
         <searchResultField>collection</searchResultField>
         <searchResultField>nationalProject</searchResultField>
@@ -124 +123 @@
         <technicalField>_componentProfile</technicalField>
         <technicalField>_hierarchyWeight</technicalField>
-        <technicalField>_hasPart</technicalField>
-        <technicalField>_isPartOf</technicalField>
+        <technicalField>_hasPartCount</technicalField>
     </technicalFields>
     
@@ -157 +155 @@
     
     <!-- makes the score for the result ranking visible in the search results -->
-    <showResultScores>true</showResultScores>
+    <showResultScores>false</showResultScores>
+    
+    <processHierarchies>true</processHierarchies>
 </VloConfig>

vlo/branches/vlo-3.3-oeaw/vlo-commons/src/main/resources/dataroots-testvm.xml

@@ -3 +3 @@
     <DataRoot>
         <originName>European Library</originName>
-        <rootFile>/lat/apache/htdocs/oai-harvester/work/european-library/results/cmdi/</rootFile>            
-        <prefix>http://catalog-clarin.esc.rzg.mpg.de/cmdi/</prefix>
-        <tostrip>/lat/apache/htdocs/oai-harvester/work/</tostrip>
+        <rootFile>/lat/apache/htdocs/oai-harvester/european-library/results/cmdi/</rootFile>            
+        <prefix>http://catalog-clarin.esc.rzg.mpg.de/oai-harvester/</prefix>
+        <tostrip>/lat/apache/htdocs/oai-harvester/</tostrip>
         <deleteFirst>false</deleteFirst>
     </DataRoot>

vlo/branches/vlo-3.3-oeaw/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java

@@ -633 +633 @@
                 "resourceClass",
                 "resourceClassOrig",
-                "continent",
                 "country",
                 "modality",
@@ -659 +658 @@
             "resourceClass",
             "modality",
-            "continent",
             "genre",
             "country",
@@ -687 +685 @@
                 "resourceClass",
                 "modality",
-                "continent",
                 "genre",
                 "country",

vlo/branches/vlo-3.3-oeaw/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/VloConfigMarshallerTest.java

@@ -60 +60 @@
         assertNotNull(config);
         assertEquals(testProps.getProperty("solrUrl"), config.getSolrUrl());
-        assertEquals(17, config.getFacetFields().size());
+        assertEquals(13, config.getFacetFields().size());
     }