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

Timestamp:

01/09/14 13:44:11 (10 years ago)

Author:

keeloo

Message:

Removed VloPageParameters? class. ResourceLinkPanel? test is failing.

File:

• vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java (modified) (7 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.VloPageParameters;
+import eu.clarin.cmdi.vlo.VloSession;
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.dao.AutoCompleteDao;
@@ -52 +52 @@
     private final static Map<String, FacetConcept> facetNameMap = VLOMarshaller.getFacetConceptMapping(facetConceptsFile).getFacetConceptMap();
 
-    public FacetedSearchPage(PageParameters params) {
-        this(VloPageParameters.convert(params));
-    }
-
     /**
      * @param parameters Page parameters
      * @throws SolrServerException
      */
-    public FacetedSearchPage(final VloPageParameters parameters) {
+    public FacetedSearchPage(final PageParameters parameters) {
         super(parameters);
         query = new SearchPageQuery(parameters);
@@ -144 +140 @@
             }
 
-            // finally, merge the label to the form
+            // finally, add the label to the form
             this.add(facetOverview);
         }
@@ -163 +159 @@
             add(submit);
 
-            // merge link to help menu page 
+            // add link to help menu page 
             String helpUrl = VloConfig.getHelpUrl();
             ExternalLink helpLink = new ExternalLink("helpLink", helpUrl, "help");
             add(helpLink);
 
-            VloPageParameters param;
-            param = new VloPageParameters(query.getPageParameters());
+            PageParameters param;
+            param = new PageParameters(query.getPageParameters());
+            // add the session persistent parameters
+            param.mergeWith(((VloSession)this.getSession()).getVloSessionPageParameters());
 
             final RequestCycle reqCycle = getRequestCycle();
-            final Url reqUrl = Url.parse(reqCycle.urlFor(ShowResultPage.class, param.convert()));
+            // kj, the same here
+            final Url reqUrl = Url.parse(reqCycle.urlFor(ShowResultPage.class, param));
             String thisURL = reqCycle.getUrlRenderer().renderFullUrl(reqUrl);
 
@@ -192 +191 @@
             PageParameters param = query.getPageParameters();
 
-            VloPageParameters newParam = new VloPageParameters();
+            PageParameters newParam = new PageParameters();
+            // add the session persistent parameters
+            newParam.mergeWith(((VloSession)this.getSession()).getVloSessionPageParameters());
 
             setResponsePage(FacetedSearchPage.class, newParam);
@@ -309 +310 @@
                 }
 
-                // merge HTML form to container
+                // add HTML form to container
                 String labelString;
                 if (totalResults == 1) {
@@ -321 +322 @@
                 contentSearchLabel.setEscapeModelStrings(false);
                 contentSearchContainer.add(contentSearchLabel);
-                // contentSearchContainer.merge(link);
+                // contentSearchContainer.add(link);
             } catch (UnsupportedEncodingException uee) {
                 contentSearchContainer.setVisible(false);