Changeset 4584

Timestamp:

02/27/14 16:42:37 (10 years ago)

Author:

twagoo

Message:

added collectionFacet property to VloConfig? (class+xml)

Location:

vlo/branches/vlo-3.0

Files:

• vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java (modified) (3 diffs)
• vlo-commons/src/main/resources/VloConfig.xml (modified) (3 diffs)
• vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java (modified) (3 diffs)
• vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/VloConfigMarshallerTest.java (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.java (modified) (1 diff)

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

@@ -44 +44 @@
     private int solrTimeOut = 0;
 
-    @XmlElementWrapper(name="dataRoots")
-    @XmlElement(name="DataRoot")
+    @XmlElementWrapper(name = "dataRoots")
+    @XmlElement(name = "DataRoot")
     private List<DataRoot> dataRoot;
 
@@ -106 +106 @@
     @XmlElementWrapper(name = "facetFields")
     private List<String> facetField = new ArrayList<String>();
+
+    private String collectionFacet;
 
     // test related parameters
@@ -707 +709 @@
 
     /**
+     *
+     * @return the name of the facet that represents the collection a resource
+     * belongs to
+     */
+    public String getCollectionFacet() {
+        return collectionFacet;
+    }
+
+    /**
+     *
+     * @param collectionFacet the name of the facet that represents the
+     * collection a resource belongs to
+     */
+    public void setCollectionFacet(String collectionFacet) {
+        this.collectionFacet = collectionFacet;
+    }
+
+    /**
      * Get the value of the languageFields parameter<br><br>
      *

vlo/branches/vlo-3.0/vlo-commons/src/main/resources/VloConfig.xml

@@ -23 +23 @@
     <printMapping>false</printMapping>
     
-    <dataRoots length="3">
+    <dataRoots>
         <DataRoot>
             <originName>MPI IMDI Archive</originName>
@@ -67 +67 @@
     <nationalProjectMapping>/nationalProjectsMapping.xml</nationalProjectMapping>
     
-    <facetFields length="13">
-        <facetField>collection</facetField>
+    <collectionFacet>collection</collectionFacet>
+    
+    <facetFields>
         <facetField>language</facetField>
         <facetField>resourceClass</facetField>
@@ -83 +84 @@
     </facetFields>
     
-    <languageFilters length="3">
+    <collectionFacet>collection</collectionFacet>
+    
+    <languageFilters>
         <languageFilter>filterOne</languageFilter>
         <languageFilter>filterTwo</languageFilter>

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

@@ -680 +680 @@
 
         List<String> expResult = Arrays.asList(
-            "collection",
-            "language",
-            "resourceClass",
-            "modality",
-            "continent",
-            "genre",
-            "country",
-            "subject",
-            "organisation",
-            "format",
-            "dataProvider",
-            "nationalProject",
-            "keywords");
+                "language",
+                "resourceClass",
+                "modality",
+                "continent",
+                "genre",
+                "country",
+                "subject",
+                "organisation",
+                "format",
+                "dataProvider",
+                "nationalProject",
+                "keywords");
 
         List<String> result = config.getFacetFields();
@@ -708 +707 @@
 
         List<String> expResult = Arrays.asList(
-            "collection",
-            "language",
-            "resourceClass",
-            "modality",
-            "continent",
-            "genre",
-            "country",
-            "subject",
-            "organisation",
-            "format",
-            "dataProvider",
-            "nationalProject",
-            "keywords");
+                "language",
+                "resourceClass",
+                "modality",
+                "continent",
+                "genre",
+                "country",
+                "dataProvider",
+                "nationalProject",
+                "keywords");
 
         config.setFacetFields(expResult);
@@ -945 +940 @@
         assertEquals(param, result);
     }
+
+    @Test
+    public void testGetCollectionFacet() {
+        final String result = config.getCollectionFacet();
+        assertEquals("collection", result);
+    }
 }

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

@@ -56 +56 @@
         assertEquals("http://localhost:8080/vlo_solr/", config.getSolrUrl());
         assertEquals(3, config.getDataRoots().size());
-        assertEquals(13, config.getFacetFields().size());
+        assertEquals(12, config.getFacetFields().size());
     }
 

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java

@@ -80 +80 @@
         final ArrayList<String> facets = Lists.newArrayList(vloConfig().getFacetFields());
         //TODO: get collections facet from config
-        facets.add("collection");
+        facets.add(vloConfig().getCollectionFacet());
 
         return new SolrFacetQueryFactoryImpl(facets);

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.java

@@ -41 +41 @@
         final Model<QueryFacetsSelection> queryModel = new Model<QueryFacetsSelection>(selection);
 
-        final FacetFieldModel collectionFacetFieldModel = new FacetFieldModel(facetFieldsService, "collection", queryModel);
+        final FacetFieldModel collectionFacetFieldModel = new FacetFieldModel(facetFieldsService, vloConfig.getCollectionFacet(), queryModel);
         final FacetSelectionModel collectionSelectionModel = new FacetSelectionModel(collectionFacetFieldModel, queryModel);
         add(new FacetPanel("collectionsFacet", collectionSelectionModel));