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

Timestamp:

12/22/10 13:27:06 (13 years ago)

Author:

patdui

Message:

• added resourceType facet and added a list of resources on the show result page.
• added i18n properties
• fixed some olac facets supporting multiple patterns to match a facet

File:

• vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java (modified) (5 diffs)

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

@@ -20 +20 @@
 import org.apache.wicket.model.CompoundPropertyModel;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
+import org.apache.wicket.model.ResourceModel;
+
+import eu.clarin.cmdi.vlo.Resources;
 
 public class FacetedSearchPage extends BasePage {
@@ -26 +28 @@
     private static final long serialVersionUID = 1L;
 
-    private AjaxFallbackDefaultDataTable<SolrDocument> searchResultList;
     private SearchPageQuery query;
 
@@ -73 +74 @@
             @Override
             protected void populateItem(Item<FacetField> item) {
-                item.add(new FacetBoxPanel("facetBox", item.getModel()).create(query, searchResultList));
+                item.add(new FacetBoxPanel("facetBox", item.getModel()).create(query));
             }
 
@@ -88 +89 @@
     private void addSearchResults() {
         List<IColumn<SolrDocument>> columns = new ArrayList<IColumn<SolrDocument>>();
-        columns.add(new AbstractColumn<SolrDocument>(new Model<String>("Results")) {
+        columns.add(new AbstractColumn<SolrDocument>(new ResourceModel(Resources.RESULTS)) {
 
             @Override
@@ -95 +96 @@
             }
         });
-        searchResultList = new AjaxFallbackDefaultDataTable("searchResults", columns, new SolrDocumentDataProvider(query.getSolrQuery()
-                .getCopy()), 10);
-        
+        AjaxFallbackDefaultDataTable<SolrDocument> searchResultList = new AjaxFallbackDefaultDataTable("searchResults", columns,
+                new SolrDocumentDataProvider(query.getSolrQuery().getCopy()), 10);
+
         add(searchResultList);
     }