Changeset 5222

Timestamp:

05/19/14 08:34:43 (10 years ago)

Author:

Twan Goosen

Message:

Default VloConfig? -> no separate collections facet, modified facets available in 'simple search'

Location:

vlo/trunk/vlo-commons/src

Files:

• main/resources/VloConfig.xml (modified) (2 diffs)
• test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java (modified) (4 diffs)
• test/java/eu/clarin/cmdi/vlo/config/VloConfigMarshallerTest.java (modified) (1 diff)

vlo/trunk/vlo-commons/src/main/resources/VloConfig.xml

@@ -64 +64 @@
         move the collection facet in with the other facets).
     -->
-    <collectionFacet>collection</collectionFacet>
+    <!--<collectionFacet>collection</collectionFacet>-->
     
     <!-- Fields shown as facets on the search page -->
-    <facetFields>
+    <facetFields>        
         <facetField>language</facetField>
+        <facetField>collection</facetField>
         <facetField>resourceClass</facetField>
         <facetField>continent</facetField>
@@ -84 +85 @@
     <simpleSearchFacetFields>
         <simpleSearchFacetField>language</simpleSearchFacetField>
+        <simpleSearchFacetField>collection</simpleSearchFacetField>
         <simpleSearchFacetField>resourceClass</simpleSearchFacetField>
+        <simpleSearchFacetField>modality</simpleSearchFacetField>
         <simpleSearchFacetField>genre</simpleSearchFacetField>
-        <simpleSearchFacetField>nationalProject</simpleSearchFacetField>
     </simpleSearchFacetFields>
     

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

@@ -675 +675 @@
         List<String> expResult = Arrays.asList(
                 "language",
+                "collection",
                 "resourceClass",
                 "continent",
@@ -696 +697 @@
         final String[] expItems = new String[]{
             "language",
+            "collection",
             "resourceClass",
             "modality",
@@ -960 +962 @@
     public void testGetCollectionFacet() {
         final String result = config.getCollectionFacet();
-        assertEquals("collection", result);
+        assertNull(result);
     }
 
@@ -978 +980 @@
     public void testGetSimpleSearchFacetFields() {
         List<String> result = config.getSimpleSearchFacetFields();
-        assertEquals(4, result.size());
+        assertEquals(5, result.size());
     }
 }

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

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