Changeset 4636

Timestamp:

03/06/14 16:40:12 (10 years ago)

Author:

Twan Goosen

Message:

added technical details to record page

Location:

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

Files:

• service/impl/SolrDocumentQueryFactoryImpl.java (modified) (1 diff)
• wicket/pages/RecordPage.html (modified) (1 diff)
• wicket/pages/RecordPage.java (modified) (5 diffs)

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

@@ -37 +37 @@
         FacetConstants.FIELD_RESOURCE_CLASS,
         FacetConstants.FIELD_RESOURCE,
+        FacetConstants.FIELD_ID,
+        FacetConstants.FIELD_DATA_PROVIDER,
+        FacetConstants.FIELD_FILENAME,
+        FacetConstants.FIELD_FORMAT,
         FacetConstants.FIELD_LANDINGPAGE,
-        FacetConstants.FIELD_ID
+        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.html

@@ -269 +269 @@
 
                     <div id="recordtechnicalattributes">
-                        <table class="recorddetailstable">
-                            <tbody>
-                                <tr>
-                                    <td class="attribute">
-                                        <div>ID</div>
-                                    </td><td class="attributeValue">
-                                        <div>oai:dspace.library.uu.nl:1874/235456</div>
-                                    </td>
-                                </tr><tr>
-                                    <td class="attribute">
-                                        <div>Data provider</div>
-                                    </td><td class="attributeValue">
-                                        <div>CMDI Providers</div>
-                                    </td>
-                                </tr><tr>
-                                    <td class="attribute">
-                                        <div>Metadata source</div>
-                                    </td><td class="attributeValue">
-                                        <div><a href="http://catalog.clarin.eu/oai-harvester/cmdi-providers/harvested/results/cmdi/Universiteit_Utrecht/oai_dspace_library_uu_nl_1874_235456.xml">http://catalog.clarin.eu/oai-harvester/cmdi-providers/harvested/results/cmdi/Universiteit_Utrecht/oai_dspace_library_uu_nl_1874_235456.xml</a></div>
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
+                        <wicket:container wicket:id="technicalProperties">[PROPERTIES TABLE]</wicket:container>
                     </div>
                 </div> <!-- content -->

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;
@@ -25 +26 @@
 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;
@@ -36 +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);
     private final IModel<QueryFacetsSelection> contextModel;
 
@@ -45 +65 @@
         add(createLandingPageLink("landingPageLink", documentModel));
         add(new FieldsTablePanel("documentProperties", new DocumentFieldsProvider(documentModel, new BasicPropertiesFieldFilter())));
+        add(new FieldsTablePanel("technicalProperties", new DocumentFieldsProvider(documentModel, new TechnicalPropertiesFieldFilter())));
     }
 
@@ -73 +94 @@
         @Override
         public boolean allowField(String fieldName) {
-            return !fieldName.startsWith("_");
-            //TODO: Exclude excluded fields and technical fields
+            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);
         }
     }