Changeset 4619

Timestamp:

03/05/14 09:16:20 (10 years ago)

Author:

Twan Goosen

Message:

implemented resource type counting service

Location:

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

Files:

• pojo/ResourceType.java (modified) (1 diff)
• service/impl/ResourceTypeCountingServiceImpl.java (modified) (2 diffs)
• wicket/components/SearchResultItemPanel.java (modified) (5 diffs)

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

@@ -23 +23 @@
  */
 public enum ResourceType {
-    VIDEO, AUDIO, TEXT, ANNOTATION, OTHER
+    VIDEO, AUDIO, IMAGE, TEXT, ANNOTATION, OTHER
     
 }

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

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package eu.clarin.cmdi.vlo.service.impl;
 
+import com.google.common.collect.HashMultiset;
+import com.google.common.collect.Multiset;
+import eu.clarin.cmdi.vlo.CommonUtils;
+import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.pojo.ResourceType;
 import eu.clarin.cmdi.vlo.pojo.ResourceTypeCount;
 import eu.clarin.cmdi.vlo.service.ResourceTypeCountingService;
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.regex.Pattern;
 
 /**
+ * Counts resource types in a resource string collection
  *
  * @author twagoo
@@ -30 +36 @@
 public class ResourceTypeCountingServiceImpl implements ResourceTypeCountingService {
 
+    private final static String SPLIT_PATTERN = Pattern.quote(FacetConstants.FIELD_RESOURCE_SPLIT_CHAR);
+
     @Override
     public Collection<ResourceTypeCount> countResourceTypes(Collection<String> resources) {
-        //mock
-        return Arrays.asList(new ResourceTypeCount(ResourceType.TEXT, 2),
-                new ResourceTypeCount(ResourceType.VIDEO, 1),
-                new ResourceTypeCount(ResourceType.OTHER, 1)
-                );
+        if (resources == null || resources.isEmpty()) {
+            return Collections.emptySet();
+        }
+
+        final Multiset<ResourceType> countBag = HashMultiset.<ResourceType>create(ResourceType.values().length);
+
+        // loop over resources and count types
+        for (String resourceString : resources) {
+            // split resource string to find mime type
+            final String[] tokens = resourceString.split(SPLIT_PATTERN, 2);
+            final String mimeType = tokens[0];
+            // normalise
+            final String normalizeMimeType = CommonUtils.normalizeMimeType(mimeType);
+            // map to ResourceType and add to bag (TODO: normalize to ResourceType directly?)
+            if (normalizeMimeType.equals(FacetConstants.RESOURCE_TYPE_ANNOTATION)) {
+                countBag.add(ResourceType.ANNOTATION);
+            } else if (normalizeMimeType.equals(FacetConstants.RESOURCE_TYPE_AUDIO)) {
+                countBag.add(ResourceType.AUDIO);
+            } else if (normalizeMimeType.equals(FacetConstants.RESOURCE_TYPE_IMAGE)) {
+                countBag.add(ResourceType.IMAGE);
+            } else if (normalizeMimeType.equals(FacetConstants.RESOURCE_TYPE_TEXT)) {
+                countBag.add(ResourceType.TEXT);
+            } else if (normalizeMimeType.equals(FacetConstants.RESOURCE_TYPE_VIDEO)) {
+                countBag.add(ResourceType.VIDEO);
+            }
+        }
+
+        // count items in bag for each resource type
+        final Collection<ResourceTypeCount> counts = new ArrayList<ResourceTypeCount>(countBag.elementSet().size());
+        for (ResourceType type : ResourceType.values()) {
+            final int count = countBag.count(type);
+            // don't add zero counts
+            if (count > 0) {
+                counts.add(new ResourceTypeCount(type, count));
+            }
+        }
+        return counts;
     }
-    
+
 }

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

@@ -53 +53 @@
         // get model for resources
         final SolrFieldModel<String> resourcesModel = new SolrFieldModel<String>(model, FacetConstants.FIELD_RESOURCE);
+        // wrap with a count provider
         final ResouceTypeCountDataProvider countProvider = new ResouceTypeCountDataProvider(resourcesModel, countingService);
+        // view that shows provided counts 
+        // TODO: hide if no resources
         add(new ResourceCountDataView("resourceCount", countProvider));
     }
 
+    /**
+     * Label that shows the content of a Solr field by its string value (using
+     * {@link SolrFieldStringModel})
+     */
     private static class SolrFieldLabel extends Label {
 
@@ -71 +78 @@
     }
 
+    /**
+     * Data view for resource type counts coming from a data provider for
+     * {@link ResourceTypeCount}
+     */
     private static class ResourceCountDataView extends DataView<ResourceTypeCount> {
 
@@ -107 +118 @@
     }
 
+    /**
+     * One-way converter for resource type counts that generates string
+     * representations like "1 video file", "2 video files" or "3 text
+     * documents"
+     */
     private static class ResourceTypeCountConverter implements IConverter<ResourceTypeCount> {
 
@@ -134 +150 @@
                 case VIDEO:
                     return "video file";
+                case IMAGE:
+                    return "image";
                 case TEXT:
                     return "text document";
@@ -152 +170 @@
                 case VIDEO:
                     return "video files";
+                case IMAGE:
+                    return "images";
                 case TEXT:
                     return "text documents";