Changeset 4199 for vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java

Timestamp:

12/18/13 09:51:19 (10 years ago)

Author:

keeloo

Message:

 

Location:

vlo/branches/to-wicket-1.6

Files:

• . (copied) (copied from vlo/trunk)
• vlo_web_app (copied) (copied from vlo/trunk/vlo_web_app)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java (copied) (copied from vlo/trunk/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java) (11 diffs)

vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java

@@ -3 +3 @@
 import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.Resources;
-import eu.clarin.cmdi.vlo.VloWebApplication.ThemedSession;
+import eu.clarin.cmdi.vlo.VloPageParameters;
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.dao.AutoCompleteDao;
@@ -20 +20 @@
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.solr.common.SolrDocument;
-import org.apache.wicket.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.RequestCycle;
 import org.apache.wicket.extensions.ajax.markup.html.autocomplete.AutoCompleteTextField;
@@ -27 +27 @@
 import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -36 +37 @@
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.markup.repeater.data.GridView;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
 import org.apache.wicket.model.CompoundPropertyModel;
 import org.apache.wicket.model.IModel;
@@ -53 +55 @@
      * @throws SolrServerException
      */
-    public FacetedSearchPage(final PageParameters parameters) {
+    public FacetedSearchPage(final VloPageParameters parameters) {
         super(parameters);
         query = new SearchPageQuery(parameters);
@@ -160 +162 @@
             add(helpLink);
             
-            String thisURL = RequestUtils.toAbsolutePath(RequestCycle.get().urlFor(ShowResultPage.class, query.getPageParameters()).toString());
+            VloPageParameters param; 
+            param = new VloPageParameters (query.getPageParameters());
+            
+            String thisURL;
+            thisURL = RequestUtils.toAbsolutePath(
+                    RequestCycle.get().urlFor(ShowResultPage.class, param.convert()).toString(), null);
             try {
-                thisURL = URLEncoder.encode(thisURL,"UTF-8");
+                thisURL = URLEncoder.encode(thisURL, "UTF-8");
             } catch (UnsupportedEncodingException e) {
             }
@@ -176 +183 @@
         protected void onSubmit() {
             SearchPageQuery query = getModelObject();
-            PageParameters pageParameters = query.getPageParameters();
-
-            // pageParameters = webApp.reflectPersistentParameters(pageParameters);
-            pageParameters = ((ThemedSession)getSession()).reflectPersistentParameters(pageParameters);
-            
-            setResponsePage(FacetedSearchPage.class, pageParameters);
+            PageParameters param = query.getPageParameters();
+
+            VloPageParameters newParam = new VloPageParameters();
+            newParam.mergeWith(param);
+            newParam.addToSession();
+            
+            setResponsePage(FacetedSearchPage.class, newParam);
         }
     }
@@ -191 +199 @@
     @SuppressWarnings("serial")
     private void addFacetColumns() {
-        GridView<FacetField> facetColumns = new GridView<FacetField>("facetColumns", new SolrFacetDataProvider(query.getSolrQuery()
+        GridView<FacetField> facetColumns = new GridView<FacetField>("facetColumns", (IDataProvider<FacetField>) new SolrFacetDataProvider(query.getSolrQuery()
                 .getCopy())) {
             @Override
@@ -213 +221 @@
     @SuppressWarnings("serial")
     private void addSearchResults() {
-        List<IColumn<SolrDocument>> columns = new ArrayList<IColumn<SolrDocument>>();
-        columns.add(new AbstractColumn<SolrDocument>(new ResourceModel(Resources.NAME)) {
+        List<IColumn<SolrDocument, String>> columns;
+        columns = new ArrayList<IColumn<SolrDocument, String>>();
+        columns.add(new AbstractColumn<SolrDocument, String>(new ResourceModel(Resources.NAME)) {
             
             @Override
@@ -221 +230 @@
             }
         });
-        columns.add(new AbstractColumn<SolrDocument>(new ResourceModel(Resources.DESCRIPTION)) {
+        columns.add(new AbstractColumn<SolrDocument, String>(new ResourceModel(Resources.DESCRIPTION)) {
 
             @Override
@@ -230 +239 @@
             }
         });
-        AjaxFallbackDefaultDataTable<SolrDocument> searchResultList = new AjaxFallbackDefaultDataTable<SolrDocument>("searchResults", columns,
-                new SolrDocumentDataProvider(query.getSolrQuery().getCopy()), 30);
+        AjaxFallbackDefaultDataTable<SolrDocument, String> searchResultList = new AjaxFallbackDefaultDataTable<SolrDocument, String>("searchResults", columns, (ISortableDataProvider<SolrDocument, String>) new SolrDocumentDataProvider(query.getSolrQuery().getCopy()), 30);
 
         add(searchResultList);