Changeset 1456

Timestamp:

06/30/11 07:47:25 (13 years ago)

Author:

patdui

Message:

#Ticket 47:
I added the description field next to the name in the result box. The first description is taken and truncated.
I also added a new library of 55minutes with extra wicket components, like TruncatedLabel?. I update the slf4j for that dependency because of conflict.

Location:

vlo/trunk/vlo_webapp

Files:

• pom.xml (modified) (3 diffs)
• src/main/java/eu/clarin/cmdi/vlo/Resources.java (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/vlo/VloApplication.properties (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/vlo/pages/SearchPageQuery.java (modified) (1 diff)
• src/main/webapp/css/main.css (modified) (2 diffs)
• src/test/java/eu/clarin/cmdi/vlo/SearchPageQueryTest.java (modified) (2 diffs)

vlo/trunk/vlo_webapp/pom.xml

@@ -31 +31 @@
         </dependency>
         <dependency>
+          <groupId>com.55minutes</groupId>
+          <artifactId>fiftyfive-wicket</artifactId>
+          <version>2.0.5</version>
+        </dependency>
+        <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
@@ -37 +42 @@
         <dependency>
             <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.5.5</version>
+            <version>1.6.1</version>
         </dependency>
         <dependency>
@@ -141 +151 @@
     </build>
 
+    <repositories>
+        <repository>
+          <id>55Minutes_wicket</id>
+           <name>55Minutes opensource wicket extensions</name>
+          <url>http://opensource.55minutes.com/maven/</url>
+        </repository>
+     </repositories>
+
+
 </project>

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/Resources.java

@@ -13 +13 @@
     public static final String VALUE = "value";
     public static final String RESULTS = "results";
+    public static final String NAME = "name";
+    public static final String DESCRIPTION = "description";
     public static final String OPEN_IN_ORIGINAL_CONTEXT = "openInOriginalContext";
     public static final String ORIGINAL_CONTEXT_NOT_AVAILABLE = "originalContextNotAvailable";    

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/VloApplication.properties

@@ -3 +3 @@
 basePage.image.alt=Click here to reset the search
 backToResult=back to results
+description=description
 facetedBrowserResources=Faceted Browser Resources
 field=Field
 more=more
+name=name
 next=next
 noResourceFound=No Resources found
@@ -14 +16 @@
 resources=Resources
 results=Results
+resultNotFound=Result could not be found
 search=search
+searchPage=Search Page
 subcategoriesIn=Subcategories in
 value=Value
 VLO_home=VLO Home
-searchPage=Search Page
-resultNotFound=Result could not be found
 youWillBeRedirectedTo=You will be redirected to the

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

@@ -24 +24 @@
 
 import eu.clarin.cmdi.vlo.Configuration;
+import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.Resources;
+import fiftyfive.wicket.basic.TruncatedLabel;
 
 public class FacetedSearchPage extends BasePage {
@@ -92 +94 @@
     private void addSearchResults() {
         List<IColumn<SolrDocument>> columns = new ArrayList<IColumn<SolrDocument>>();
-        columns.add(new AbstractColumn<SolrDocument>(new ResourceModel(Resources.RESULTS)) {
+        columns.add(new AbstractColumn<SolrDocument>(new ResourceModel(Resources.NAME)) {
+            
+            @Override
+            public void populateItem(Item<ICellPopulator<SolrDocument>> cellItem, String componentId, IModel<SolrDocument> rowModel) {
+                cellItem.add(new DocumentLinkPanel(componentId, rowModel, query));
+            }
+        });
+        columns.add(new AbstractColumn<SolrDocument>(new ResourceModel(Resources.DESCRIPTION)) {
 
             @Override
             public void populateItem(Item<ICellPopulator<SolrDocument>> cellItem, String componentId, IModel<SolrDocument> rowModel) {
-                cellItem.add(new DocumentLinkPanel(componentId, rowModel, query));
+                String descriptionText = (String) rowModel.getObject().getFirstValue(FacetConstants.FIELD_DESCRIPTION);
+                cellItem.add(new TruncatedLabel(componentId, 100, descriptionText));
+                
             }
         });

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/SearchPageQuery.java

@@ -70 +70 @@
         result.setRows(10);
         result.setStart(0);
-        result.setFields(FacetConstants.FIELD_NAME, FacetConstants.FIELD_ID);
+        result.setFields(FacetConstants.FIELD_NAME, FacetConstants.FIELD_ID, FacetConstants.FIELD_DESCRIPTION);
         result.setFacet(true);
         result.setFacetMinCount(1);

vlo/trunk/vlo_webapp/src/main/webapp/css/main.css

@@ -135 +135 @@
     background-color:#d4deef;
 }
-.navigation .navigator {
-    clear:both;
-}
 .anchorpanel{
     padding:5px;
@@ -193 +190 @@
 }
 
+.resulttable tbody tr.odd {
+    background-color: #CEDCEF;
+}

vlo/trunk/vlo_webapp/src/test/java/eu/clarin/cmdi/vlo/SearchPageQueryTest.java

@@ -25 +25 @@
         assertEquals("", q.getSearchQuery());
         assertEquals("*:*", q.getSolrQuery().getQuery());
-        assertEquals("name,id", q.getSolrQuery().getFields());
+        assertEquals("name,id,description", q.getSolrQuery().getFields());
         assertEquals(6, q.getSolrQuery().getFacetFields().length);
         assertEquals("collection", q.getSolrQuery().getFacetFields()[0]);
@@ -37 +37 @@
         assertEquals("test", q.getSearchQuery());
         assertEquals("test", q.getSolrQuery().getQuery());
-        assertEquals("name,id", q.getSolrQuery().getFields());
+        assertEquals("name,id,description", q.getSolrQuery().getFields());
         assertEquals(6, q.getSolrQuery().getFacetFields().length);
         assertEquals("collection", q.getSolrQuery().getFacetFields()[0]);