Changeset 4645

Timestamp:

03/07/14 13:27:40 (10 years ago)

Author:

Twan Goosen

Message:

Moveddefinition of property filters from record page into configuration (todo: read from actual config file)

Location:

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

Files:

• config/VloSpringConfig.java (modified) (3 diffs)
• service/impl/ExclusiveFieldFilter.java (added)
• service/impl/InclusiveFieldFilter.java (added)
• wicket/pages/RecordPage.java (modified) (5 diffs)

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

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.config;
 
+import eu.clarin.cmdi.vlo.service.impl.ExclusiveFieldFilter;
+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.service.FacetFieldsService;
+import eu.clarin.cmdi.vlo.service.FieldFilter;
 import eu.clarin.cmdi.vlo.service.ResourceStringConverter;
 import eu.clarin.cmdi.vlo.service.ResourceTypeCountingService;
@@ -32 +37 @@
 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;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -112 +119 @@
         return new HttpSolrServer(vloConfig().getSolrUrl());
     }
+
+    @Bean(name = "basicPropertiesFilter")
+    public FieldFilter basicPropertiesFieldFilter() {
+        return new ExclusiveFieldFilter(Sets.union(IGNORE_FIELDS, TECHNICAL_FIELDS));
+    }
+
+    @Bean(name="technicalPropertiesFilter")
+    public FieldFilter technicalPropertiesFieldFilter() {
+        return new InclusiveFieldFilter(TECHNICAL_FIELDS);
+    }
+
+    /**
+     * 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/wicket/pages/RecordPage.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.pages;
 
-import com.google.common.collect.Sets;
 import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
@@ -27 +26 @@
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldStringModel;
 import eu.clarin.cmdi.vlo.wicket.provider.DocumentFieldsProvider;
-import java.io.Serializable;
-import java.util.Collection;
 import org.apache.solr.common.SolrDocument;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.link.ExternalLink;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.spring.injection.annot.SpringBean;
 
 /**
@@ -40 +38 @@
 public class RecordPage extends WebPage {
 
-    /**
-     * Fields to be ignored. TODO: read this from config
-     */
-    private static final Collection<String> IGNORE_FIELDS
-            = Sets.newHashSet(
-                    FacetConstants.FIELD_FORMAT);
-    /**
-     * Fields to be included in technical details. TODO: read this from config
-     */
-    private static final Collection<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);
+    @SpringBean(name = "basicPropertiesFilter")
+    private FieldFilter basicPropertiesFilter;
+    @SpringBean(name = "technicalPropertiesFilter")
+    private FieldFilter technicalPropertiesFilter;
+    
     private final IModel<QueryFacetsSelection> contextModel;
 
@@ -66 +51 @@
         add(new SolrFieldLabel("name", documentModel, FacetConstants.FIELD_NAME, "Unnamed record"));
         add(createLandingPageLink("landingPageLink", documentModel));
-        add(new FieldsTablePanel("documentProperties", new DocumentFieldsProvider(documentModel, new BasicPropertiesFieldFilter())));
+        add(new FieldsTablePanel("documentProperties", new DocumentFieldsProvider(documentModel, basicPropertiesFilter)));
         add(new ResourceLinksPanel("resources", new SolrFieldModel<String>(documentModel, FacetConstants.FIELD_RESOURCE)));
-        add(new FieldsTablePanel("technicalProperties", new DocumentFieldsProvider(documentModel, new TechnicalPropertiesFieldFilter())));
+        add(new FieldsTablePanel("technicalProperties", new DocumentFieldsProvider(documentModel, technicalPropertiesFilter)));
     }
 
@@ -93 +78 @@
     }
 
-    private class BasicPropertiesFieldFilter implements FieldFilter, Serializable {
-
-        @Override
-        public boolean allowField(String fieldName) {
-            return !(fieldName.startsWith("_")
-                    || IGNORE_FIELDS.contains(fieldName)
-                    || TECHNICAL_FIELDS.contains(fieldName));
-        }
-    }
-
-    private class TechnicalPropertiesFieldFilter implements FieldFilter, Serializable {
-
-        @Override
-        public boolean allowField(String fieldName) {
-            return TECHNICAL_FIELDS.contains(fieldName);
-        }
-    }
-
 }