Changeset 6087

Timestamp:

03/09/15 14:15:18 (9 years ago)

Author:

Twan Goosen

Message:

License facet actually shown in the VLO web app
Fixes #740

Location:

vlo/trunk

Files:

• vlo-commons/src/main/resources/VloConfig.xml (modified) (1 diff)
• vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java (modified) (1 diff)
• 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/VloSolrSpringConfig.java (modified) (1 diff)

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

@@ -80 +80 @@
         <facetField>format</facetField>
         <facetField>organisation</facetField>
+        <facetField>license</facetField>
         <facetField>nationalProject</facetField>
         <facetField>keywords</facetField>

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

@@ -641 +641 @@
                 "format",
                 "organisation",
+                "license",
                 "nationalProject",
                 "keywords",

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(13, config.getFacetFields().size());
+        assertEquals(14, config.getFacetFields().size());
     }
 

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSolrSpringConfig.java

@@ -103 +103 @@
             FacetConstants.FIELD_SUBJECT,
             FacetConstants.FIELD_ORGANISATION,
+            FacetConstants.FIELD_LICENSE,
             FacetConstants.FIELD_KEYWORDS,
             FacetConstants.FIELD_NATIONAL_PROJECT,