Changeset 4618

Timestamp:

03/05/14 08:34:57 (10 years ago)

Author:

Twan Goosen

Message:

added components, models and service required to show resource type counts in search results

Location:

vlo/branches/vlo-3.0/vlo-web-app/src/main

Files:

• java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java (modified) (2 diffs)
• java/eu/clarin/cmdi/vlo/pojo/ResourceType.java (added)
• java/eu/clarin/cmdi/vlo/pojo/ResourceTypeCount.java (added)
• java/eu/clarin/cmdi/vlo/service/ResourceTypeCountingService.java (added)
• java/eu/clarin/cmdi/vlo/service/impl/ResourceTypeCountingServiceImpl.java (added)
• java/eu/clarin/cmdi/vlo/wicket/components/SearchResultItemPanel.html (modified) (1 diff)
• java/eu/clarin/cmdi/vlo/wicket/components/SearchResultItemPanel.java (modified) (3 diffs)
• java/eu/clarin/cmdi/vlo/wicket/model/CollectionListModel.java (added)
• java/eu/clarin/cmdi/vlo/wicket/provider/ResouceTypeCountDataProvider.java (added)
• webapp/style/vlo-search.css (modified) (2 diffs)

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.VloWicketApplication;
 import eu.clarin.cmdi.vlo.service.FacetFieldsService;
+import eu.clarin.cmdi.vlo.service.ResourceTypeCountingService;
 import eu.clarin.cmdi.vlo.service.SearchResultsDao;
 import eu.clarin.cmdi.vlo.service.SolrDocumentService;
 import eu.clarin.cmdi.vlo.service.SolrFacetQueryFactory;
+import eu.clarin.cmdi.vlo.service.impl.ResourceTypeCountingServiceImpl;
 import eu.clarin.cmdi.vlo.service.impl.SearchResultsDaoImpl;
 import eu.clarin.cmdi.vlo.service.impl.SolrDocumentQueryFactoryImpl;
@@ -97 +99 @@
 
     @Bean
+    public ResourceTypeCountingService resourceTypeCountingService() {
+        return new ResourceTypeCountingServiceImpl();
+    }
+
+    @Bean
     public SolrServer solrServer() {
         return new HttpSolrServer(vloConfig().getSolrUrl());

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SearchResultItemPanel.html

@@ -34 +34 @@
                     [DESCRIPTION]
                 </p>
-                <p class="searchresultresources">
-                    Resources: <a href="record1.html">1 text file</a>, <a href="record1.html">1 audio file</a>, <a href="record1.html">1 annotation file</a>
-                </p>
+                <div class="searchresultresources">
+                    Resources: 
+                    <ul>
+                        <li wicket:id="resourceCount">
+                            <a wicket:id="recordLink" href="record1.html">
+                                <wicket:container wicket:id="resourceCountLabel">1 text file</wicket:container>
+                            </a>
+                        </li>
+                    </ul>
+                </div>
             </div>
 <!--

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SearchResultItemPanel.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.components;
 
+import eu.clarin.cmdi.vlo.wicket.provider.ResouceTypeCountDataProvider;
 import eu.clarin.cmdi.vlo.FacetConstants;
+import eu.clarin.cmdi.vlo.pojo.ResourceTypeCount;
+import eu.clarin.cmdi.vlo.service.ResourceTypeCountingService;
 import eu.clarin.cmdi.vlo.wicket.model.NullFallbackModel;
+import eu.clarin.cmdi.vlo.wicket.model.SolrFieldModel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldStringModel;
+import java.util.Locale;
 import org.apache.solr.common.SolrDocument;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.DataView;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.spring.injection.annot.SpringBean;
+import org.apache.wicket.util.convert.ConversionException;
+import org.apache.wicket.util.convert.IConverter;
 
 /**
@@ -31 +43 @@
 public class SearchResultItemPanel extends Panel {
 
+    @SpringBean
+    private ResourceTypeCountingService countingService;
+
     public SearchResultItemPanel(String id, IModel<SolrDocument> model) {
         super(id, model);
         add(new SolrFieldLabel("title", model, FacetConstants.FIELD_NAME));
         add(new SolrFieldLabel("description", model, FacetConstants.FIELD_DESCRIPTION, "<no description>"));
+
+        // get model for resources
+        final SolrFieldModel<String> resourcesModel = new SolrFieldModel<String>(model, FacetConstants.FIELD_RESOURCE);
+        final ResouceTypeCountDataProvider countProvider = new ResouceTypeCountDataProvider(resourcesModel, countingService);
+        add(new ResourceCountDataView("resourceCount", countProvider));
     }
 
-
-    public static class SolrFieldLabel extends Label {
+    private static class SolrFieldLabel extends Label {
 
         public SolrFieldLabel(String id, IModel<SolrDocument> documentModel, String fieldName) {
@@ -51 +70 @@
 
     }
+
+    private static class ResourceCountDataView extends DataView<ResourceTypeCount> {
+
+        private final static ResourceTypeCountConverter resourceTypeCountConverter
+                = new ResourceTypeCountConverter();
+
+        public ResourceCountDataView(String id, IDataProvider<ResourceTypeCount> dataProvider) {
+            super(id, dataProvider);
+        }
+
+        @Override
+        protected void populateItem(Item<ResourceTypeCount> item) {
+            final Link resourceLink = new Link("recordLink") {
+
+                @Override
+                public void onClick() {
+                    throw new UnsupportedOperationException("Not supported yet.");
+                }
+            };
+            final Label label = new Label("resourceCountLabel", item.getModel()) {
+
+                @Override
+                public <C> IConverter<C> getConverter(Class<C> type) {
+                    if (type == ResourceTypeCount.class) {
+                        return (IConverter<C>) resourceTypeCountConverter;
+                    } else {
+                        return super.getConverter(type);
+                    }
+                }
+
+            };
+
+            resourceLink.add(label);
+            item.add(resourceLink);
+        }
+    }
+
+    private static class ResourceTypeCountConverter implements IConverter<ResourceTypeCount> {
+
+        @Override
+        public ResourceTypeCount convertToObject(String value, Locale locale) throws ConversionException {
+            throw new UnsupportedOperationException("Not supported");
+        }
+
+        @Override
+        public String convertToString(ResourceTypeCount value, Locale locale) {
+            final String resourceTypeString;
+            if (value.getCount() == 1) {
+                resourceTypeString = getSingularResourceTypeString(value);
+            } else {
+                resourceTypeString = getPluralResourceTypeString(value);
+            }
+            return String.format("%d %s", value.getCount(), resourceTypeString);
+        }
+
+        private String getSingularResourceTypeString(ResourceTypeCount value) {
+            //TODO: read from resource bundle
+            switch (value.getResourceType()) {
+                case ANNOTATION:
+                    return "annotation file";
+                case AUDIO:
+                    return "audio file";
+                case VIDEO:
+                    return "video file";
+                case TEXT:
+                    return "text document";
+                case OTHER:
+                    return "other";
+                default:
+                    return "unknown";
+            }
+        }
+
+        private String getPluralResourceTypeString(ResourceTypeCount value) {
+            //TODO: read from resource bundle
+            switch (value.getResourceType()) {
+                case ANNOTATION:
+                    return "annotation files";
+                case AUDIO:
+                    return "audio files";
+                case VIDEO:
+                    return "video files";
+                case TEXT:
+                    return "text documents";
+                case OTHER:
+                    return "other";
+                default:
+                    return "unknown";
+            }
+        }
+
+    }
 }

vlo/branches/vlo-3.0/vlo-web-app/src/main/webapp/style/vlo-search.css

@@ -95 +95 @@
 }
 
-p.searchresultresources {
+.searchresultresources {
     width: 70%;
     float: left;
@@ -101 +101 @@
     padding: 0px;
 }
+
+.searchresultresources ul {
+    display: inline;
+    padding: 0em 0em 0em .5em;
+    margin: 0px;
+    border-right: 1px solid;
+}
+
+.searchresultresources ul li {
+    display: inline;
+    list-style: none;
+    padding: 0em 0em 0em .5em;
+    margin: 0em .5em 0em 0em;
+    border-left: 1px solid;
+}
+
 
 div.searchresultattributes {