Changeset 4654

Timestamp:

03/07/14 16:30:01 (10 years ago)

Author:

Twan Goosen

Message:

ignored and technical fields are now configured through VloConfig?.xml

Location:

vlo/branches/vlo-3.0

Files:

• vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java (modified) (4 diffs)
• 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-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java (modified) (3 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/SolrDocumentQueryFactoryImpl.java (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java (modified) (1 diff)

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

@@ -5 +5 @@
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
@@ -96 +97 @@
 
     private String feedbackFromUrl = "";
+    /**
+     * A set of fields to be excluded from display<br><br>
+     *
+     * To let JAXB know it has to interpret the element as an array, use the
+     * XmlElementWrapper directive. Use the directive to let JAXB know that the
+     * elements inside 'facetFields' are named 'facetField'.
+     */
+    @XmlElementWrapper(name = "ignoredFields")
+    private Set<String> ignoredField;
+    /**
+     * An array of fields to be included as technical properties<br><br>
+     *
+     * To let JAXB know it has to interpret the element as an array, use the
+     * XmlElementWrapper directive. Use the directive to let JAXB know that the
+     * elements inside 'facetFields' are named 'facetField'.
+     */
+    
+    @XmlElementWrapper(name = "technicalFields")
+    private Set<String> technicalField;
 
     /**
@@ -698 +718 @@
     /**
      *
-     * @return all facet fields, including collection facet (arbitrary order unspecified)
+     * @return all facet fields, including collection facet (arbitrary order
+     * unspecified)
      * @see #getFacetFields()
      * @see #getCollectionFacet()
@@ -738 +759 @@
     }
 
+    public Set<String> getIgnoredFields() {
+        return ignoredField;
+    }
+
+    public void setIgnoredFields(Set<String> ignoredFields) {
+        this.ignoredField = ignoredFields;
+    }
+
+    public Set<String> getTechnicalFields() {
+        return technicalField;
+    }
+
+    public void setTechnicalFields(Set<String> technicalFields) {
+        this.technicalField = technicalFields;
+    }
+
     /**
      * Get the value of the languageFields parameter<br><br>

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

@@ -86 +86 @@
     <collectionFacet>collection</collectionFacet>
     
+    <ignoredFields>
+        <ignoredField>format</ignoredField>
+    </ignoredFields>
+    
+    <technicalFields>
+        <technicalField>id</technicalField>
+        <technicalField>dataProvider</technicalField>
+        <technicalField>_landingPageRef</technicalField>
+        <technicalField>_searchPageRef</technicalField>
+        <technicalField>_contentSearchRef</technicalField>
+        <technicalField>_lastSeen</technicalField>
+        <technicalField>_componentProfile</technicalField>
+    </technicalFields>
+    
     <languageFilters>
         <languageFilter>filterOne</languageFilter>

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

@@ -971 +971 @@
         assertEquals("collection", result);
     }
+    
+    @Test
+    public void testGetIgnoredFields() {
+        Set<String> result = config.getIgnoredFields();
+        assertEquals(1, result.size());
+    }
+    
+    
+    @Test
+    public void testGetTechnicalFields() {
+        Set<String> result = config.getTechnicalFields();
+        assertEquals(7, result.size());
+    }
 }
+

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

@@ -20 +20 @@
 import eu.clarin.cmdi.vlo.service.impl.InclusiveFieldFilter;
 import com.google.common.collect.Sets;
-import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.VloWicketApplication;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
@@ -40 +39 @@
 import eu.clarin.cmdi.vlo.service.impl.SolrFacetQueryFactoryImpl;
 import java.io.IOException;
-import java.util.Set;
 import org.apache.solr.client.solrj.SolrServer;
 import org.apache.solr.client.solrj.impl.HttpSolrServer;
@@ -129 +127 @@
     @Bean(name = "basicPropertiesFilter")
     public FieldFilter basicPropertiesFieldFilter() {
-        return new ExclusiveFieldFilter(Sets.union(IGNORE_FIELDS, TECHNICAL_FIELDS));
+        return new ExclusiveFieldFilter(Sets.union(
+                vloConfig().getIgnoredFields(),
+                vloConfig().getTechnicalFields()));
     }
 
     @Bean(name = "technicalPropertiesFilter")
     public FieldFilter technicalPropertiesFieldFilter() {
-        return new InclusiveFieldFilter(TECHNICAL_FIELDS);
+        return new InclusiveFieldFilter(
+                vloConfig().getTechnicalFields());
     }
-
-    /**
-     * Fields to be ignored. TODO: read this from config
-     */
-    public static final Set<String> IGNORE_FIELDS
-            = Sets.newHashSet(
-                    FacetConstants.FIELD_FORMAT);
-
-    /**
-     * Fields to be included in technical details. TODO: read this from config
-     */
-    public static final Set<String> TECHNICAL_FIELDS
-            = Sets.newHashSet(
-                    FacetConstants.FIELD_ID,
-                    FacetConstants.FIELD_DATA_PROVIDER,
-                    FacetConstants.FIELD_FORMAT,
-                    FacetConstants.FIELD_LANDINGPAGE,
-                    FacetConstants.FIELD_SEARCHPAGE,
-                    FacetConstants.FIELD_SEARCH_SERVICE,
-                    FacetConstants.FIELD_LAST_SEEN);
 }

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/SolrDocumentQueryFactoryImpl.java

@@ -44 +44 @@
         FacetConstants.FIELD_SEARCHPAGE,
         FacetConstants.FIELD_SEARCH_SERVICE,
-        FacetConstants.FIELD_LAST_SEEN
+        FacetConstants.FIELD_LAST_SEEN,
+        FacetConstants.FIELD_CLARIN_PROFILE
     };
 

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

@@ -29 +29 @@
 import eu.clarin.cmdi.vlo.wicket.provider.DocumentFieldsProvider;
 import org.apache.solr.common.SolrDocument;
-import org.apache.wicket.markup.html.GenericWebPage;
 import org.apache.wicket.markup.html.link.ExternalLink;
 import org.apache.wicket.model.IModel;