Changeset 3933

Timestamp:

11/05/13 10:05:16 (11 years ago)

Author:

teckart

Message:

Fixed ticket #404 (Add tooltips to facets on start page)

Location:

vlo/trunk

Files:

• vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/FacetConceptMapping.java (modified) (4 diffs)
• vlo_importer/src/main/resources/facetConcepts.xml (modified) (9 diffs)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanel.java (modified) (2 diffs)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java (modified) (4 diffs)
• vlo_web_app/src/test/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanelTest.java (modified) (1 diff)

vlo/trunk/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/FacetConceptMapping.java

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.slf4j.Logger;
@@ -40 +42 @@
     }
     
+    public Map<String, FacetConcept> getFacetConceptMap() {
+        Map<String, FacetConcept> facetConceptMap = new HashMap<String, FacetConcept>();
+        for(FacetConcept facet : getFacetConcepts())
+                facetConceptMap.put(facet.getName(), facet);
+        
+        return facetConceptMap;
+    }
+    
     public void check() {
         for (FacetConcept facetConcept : getFacetConcepts()) {
@@ -71 +81 @@
         @XmlAttribute
         private boolean allowMultipleValues = true;
+        
+        @XmlAttribute
+        private String description = "";
 
         @XmlElement(name = "concept")
@@ -142 +155 @@
         public boolean isAllowMultipleValues() {
             return allowMultipleValues;
+        }
+        
+        public void setDescription(String description) {
+                this.description = description;
+        }
+        
+        public String getDescription() {
+                return this.description;
         }
 

vlo/trunk/vlo_importer/src/main/resources/facetConcepts.xml

@@ -5 +5 @@
     <pattern>/c:CMD/c:Header/c:MdSelfLink/text()</pattern>
   </facetConcept>
-  <facetConcept name="collection">
+  <facetConcept name="collection" description="The collection to which the resource belongs">
     <pattern>/c:CMD/c:Header/c:MdCollectionDisplayName/text()</pattern>
   </facetConcept>
-  <facetConcept name="projectName">
+  <facetConcept name="projectName" description="Projects that were involved in creation and distribution of the resource">
     <concept>http://www.isocat.org/datcat/DC-2536</concept>
     <concept>http://www.isocat.org/datcat/DC-2537</concept>
     <concept>http://www.isocat.org/datcat/DC-5414</concept>
   </facetConcept>
-  <facetConcept name="name" allowMultipleValues="false">
+  <facetConcept name="name" allowMultipleValues="false" description="Name of the resource">
     <concept>http://www.isocat.org/datcat/DC-5428</concept>
     <concept>http://www.isocat.org/datcat/DC-5127</concept>
@@ -33 +33 @@
     <concept>http://www.isocat.org/datcat/DC-6176</concept>
   </facetConcept>
-  <facetConcept name="continent">
+  <facetConcept name="continent" description="Continent">
     <concept>http://www.isocat.org/datcat/DC-2531</concept>
     <concept>http://www.isocat.org/datcat/DC-3791</concept>
   </facetConcept>
-  <facetConcept name="country">
+  <facetConcept name="country" description="Country">
     <concept>http://www.isocat.org/datcat/DC-2532</concept>
     <concept>http://www.isocat.org/datcat/DC-3792</concept>
@@ -43 +43 @@
     <pattern>/c:CMD/c:Components/c:OLAC-DcmiTerms/c:coverage[@dcterms-type="ISO3166"]/text()</pattern>
   </facetConcept>
-  <facetConcept name="language">
+  <facetConcept name="language" description="Language">
     <concept>http://www.isocat.org/datcat/DC-2482</concept> <!-- language code -->
     <concept>http://www.isocat.org/datcat/DC-2484</concept> <!-- language name -->
@@ -64 +64 @@
     <pattern>/c:CMD/c:Components/c:LrtInventoryResource/c:LrtCommon/c:Languages/c:ISO639/c:iso-639-3-code/text()</pattern>
   </facetConcept>
-  <facetConcept name="organisation">
+  <facetConcept name="organisation" description="Organisations that were involved in creation and distribution of the resource">
     <concept>http://www.isocat.org/datcat/DC-2459</concept>
     <concept>http://www.isocat.org/datcat/DC-2979</concept>
@@ -71 +71 @@
     <concept>http://www.isocat.org/datcat/DC-6134</concept>
   </facetConcept>
-  <facetConcept name="genre" isCaseInsensitive="true" allowMultipleValues="false">
+  <facetConcept name="genre" isCaseInsensitive="true" allowMultipleValues="false" description="Genre">
     <concept>http://www.isocat.org/datcat/DC-2470</concept>
     <concept>http://www.isocat.org/datcat/DC-3899</concept>
@@ -77 +77 @@
     <pattern>/c:CMD/c:Components/c:mods/c:genre/text()</pattern>
   </facetConcept>
-  <facetConcept name="modality" isCaseInsensitive="true" allowMultipleValues="true">
+  <facetConcept name="modality" isCaseInsensitive="true" allowMultipleValues="true" description="Modality">
     <concept>http://www.isocat.org/datcat/DC-2490</concept>
   </facetConcept>
-  <facetConcept name="subject" isCaseInsensitive="true" allowMultipleValues="true">
+  <facetConcept name="subject" isCaseInsensitive="true" allowMultipleValues="true" description="Subject">
     <concept>http://www.isocat.org/datcat/DC-2591</concept>
     <concept>http://purl.org/dc/terms/subject</concept>
@@ -97 +97 @@
     <pattern>/c:CMD/c:Components/c:mods/c:abstract/text()</pattern>  
   </facetConcept>
-  <facetConcept name="resourceType">
+  <facetConcept name="resourceType" description="Resourcetype">
     <concept>http://www.isocat.org/datcat/DC-2571</concept>
     <concept>http://purl.org/dc/terms/type</concept>
@@ -106 +106 @@
     <pattern>/c:CMD/c:Components/c:mods/c:typeOfResource/text()</pattern>    
   </facetConcept>
-  <facetConcept name="nationalProject">
+  <facetConcept name="nationalProject" description="The national project in which this resource is provided">
     <pattern>/c:CMD/c:Header/c:MdCollectionDisplayName/text()</pattern>
   </facetConcept>
@@ -115 +115 @@
     <pattern>/c:CMD/c:Header/c:MdProfile/text()</pattern>
   </facetConcept>
-  <facetConcept name="keywords">
+  <facetConcept name="keywords" description="Keywords that describe the resource">
         <concept>http://www.isocat.org/datcat/DC-5436</concept>
         <concept>http://www.isocat.org/rest/dc/5436</concept>  not an official ISOcat PID - added to support LrtInventoryResource, should be removed in the future 

vlo/trunk/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanel.java

@@ -10 +10 @@
 import org.apache.solr.client.solrj.response.FacetField.Count;
 import org.apache.wicket.PageParameters;
+import org.apache.wicket.behavior.SimpleAttributeModifier;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -31 +32 @@
     private int maxNrOfFacetValues;
     
-    public FacetBoxPanel(String id, IModel<FacetField> model) {
+    public FacetBoxPanel(String id, IModel<FacetField> model, String tooltipText) {
         super(id, model);
         setOutputMarkupId(true);
         setMaxNrOfFacetValues(MAX_NR_OF_FACET_VALUES);
+        SimpleAttributeModifier tooltip = new SimpleAttributeModifier("title", tooltipText);
+        add(tooltip);
     }
     

vlo/trunk/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java

@@ -6 +6 @@
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.dao.AutoCompleteDao;
+import eu.clarin.cmdi.vlo.importer.FacetConceptMapping;
+import eu.clarin.cmdi.vlo.importer.FacetConceptMapping.FacetConcept;
+import eu.clarin.cmdi.vlo.importer.VLOMarshaller;
 import fiftyfive.wicket.basic.TruncatedLabel;
 import java.io.UnsupportedEncodingException;
@@ -13 +16 @@
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.response.FacetField;
@@ -40 +45 @@
     private final SearchPageQuery query;
     private final static AutoCompleteDao autoCompleteDao = new AutoCompleteDao();
+    private final static Map<String, FacetConcept> facetNameMap = VLOMarshaller.getFacetConceptMapping().getFacetConceptMap();
     
     /**
@@ -105 +111 @@
             @Override
             protected void populateItem(Item<FacetField> item) {
-                item.add(new FacetBoxPanel("facetBox", item.getModel()).create(query));
+                String facetName = ((FacetField)item.getDefaultModelObject()).getName();
+                String descriptionTooltip = "";
+                if(facetNameMap.containsKey(facetName))
+                        descriptionTooltip = facetNameMap.get(facetName).getDescription();
+                item.add(new FacetBoxPanel("facetBox", item.getModel(), descriptionTooltip).create(query));
             }
 

vlo/trunk/vlo_web_app/src/test/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanelTest.java

@@ -29 +29 @@
     @Test
     public void testCalculateFacetBoxPanel() throws Exception {
-        FacetBoxPanel panel = new FacetBoxPanel("test", null);
+        FacetBoxPanel panel = new FacetBoxPanel("test", null, "Tooltip");
         panel.setMaxNrOfFacetValues(5);
         FacetField facetField = new FacetField("test");