Changeset 6657

Timestamp:

10/09/15 13:53:06 (9 years ago)

Author:

Twan Goosen

Message:

Merged changes from 3.3 branch (option to skip hierarchy processing) to trunk

Location:

vlo/trunk

Files:

• . (modified) (1 prop)
• UPGRADE.txt (modified) (1 diff, 1 prop)
• vlo-commons/src/main/java/eu/clarin/cmdi/vlo/LanguageCodeUtils.java (modified) (4 diffs)
• vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java (modified) (2 diffs)
• vlo-commons/src/main/resources/VloConfig.xml (modified) (1 diff)
• vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java (modified) (3 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AdvancedSearchOptionsPanel.html (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AdvancedSearchOptionsPanel.java (modified) (4 diffs)

vlo/trunk/UPGRADE.txt

@@ -35 +35 @@
 prepared for deployment environments at build time, so it is no longer necessary
 to copy over old configuration values in all cases.
+
+* Decide whether hierarchies should be indexed and displayed, and set the new
+'processHierarchies' configuration element accordingly (true/false). This 
+governs the behaviour of both the importer (will simply skip the 'update 
+hierarchies' step if set to false) and the front end (will not display hierarchy
+related UI components).
 
 * In the context fragment for the VLO web application, ADD the following 

vlo/trunk/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/trunk/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java

@@ -109 +109 @@
     private boolean showResultScores = false;
 
+    private boolean processHierarchies = false;
+
     /**
      * A set of fields to be excluded from display<br><br>
@@ -1097 +1099 @@
         return showResultScores;
     }
+
+    /**
+     * 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/trunk/vlo-commons/src/main/resources/VloConfig.xml

@@ -146 +146 @@
     <!-- makes the score for the result ranking visible in the search results -->
     <showResultScores>false</showResultScores>
+    
+    <processHierarchies>false</processHierarchies>
 </VloConfig>

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

@@ -166 +166 @@
                     }
                     solrServer.commit();
-                    updateDocumentHierarchy();
+                    if(config.isProcessHierarchies()){
+                        updateDocumentHierarchy();
+                    }
                 }
                 LOG.info("End of processing: " + dataRoot.getOriginName());

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java

@@ -20 +20 @@
 import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.VloWebAppParameters;
+import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.pojo.SearchContext;
@@ -86 +87 @@
     @SpringBean(name = "documentFieldOrder")
     private List<String> fieldOrder;
+    @SpringBean
+    private VloConfig config;
 
     private final IModel<SearchContext> navigationModel;
@@ -153 +156 @@
         add(createTechnicalDetailsPanel("technicalProperties"));
 
-        add(createHierarchyPanel("recordtree"));
+        if (config.isProcessHierarchies()) {
+            // show hierarchy if applicable
+            add(createHierarchyPanel("recordtree"));
+        } else {
+            // invisible stub
+            add(new WebMarkupContainer("recordtree") {
+
+                @Override
+                public boolean isVisible() {
+                    return false;
+                }
+
+            });
+        }
 
         createSearchLinks("searchlinks");

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AdvancedSearchOptionsPanel.html

@@ -31 +31 @@
                             <label for="onlyfcs">Only include resources that support content search</label>
                         </li>
-                        <li>
+                        <li wicket:id="collectionsSection">
                             <input wicket:id="collection" type="checkbox" id="onlycollections"/>
                             <label for="onlycollections">Only include collection resources</label>

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AdvancedSearchOptionsPanel.java

@@ -19 +19 @@
 import com.google.common.collect.ImmutableSet;
 import eu.clarin.cmdi.vlo.FacetConstants;
+import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.pojo.ExpansionState;
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;
@@ -27 +28 @@
 import eu.clarin.cmdi.vlo.wicket.panels.ExpandablePanel;
 import java.util.Collection;
+import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
+import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.spring.injection.annot.SpringBean;
 
 /**
@@ -45 +49 @@
 public abstract class AdvancedSearchOptionsPanel extends ExpandablePanel<QueryFacetsSelection> {
 
+    @SpringBean
+    private VloConfig config;
+    
     /**
      * The fields that this panel provides options for
@@ -58 +65 @@
         final CheckBox fcsCheck = createFieldNotEmptyOption("fcs", FacetConstants.FIELD_SEARCH_SERVICE);
         options.add(fcsCheck);
+        
+        final MarkupContainer collectionsSection = new WebMarkupContainer("collectionsSection");
         final CheckBox collectionCheck = createFieldNotEmptyOption("collection", FacetConstants.FIELD_HAS_PART_COUNT);
-        options.add(collectionCheck);
+        collectionsSection.add(collectionCheck);
+        collectionsSection.setVisible(config.isProcessHierarchies());
+        options.add(collectionsSection);
+        
         add(options);
     }