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

Timestamp:

01/09/14 15:03:36 (10 years ago)

Author:

twagoo

Message:

Refactored adding theme as session page parameter
Merging with session parameters in FacetLinkPanel? and in ShowResultPage?

File:

• vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java (modified) (4 diffs)

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

@@ -74 +74 @@
     public ShowResultPage(final PageParameters currentParam) {
         super(currentParam);
-        //TODO: Is encoding/decoding of the page parameter required (or can it be automated?)
+        //Document ID is assumed to have been encoded (typcially in DocumentLinkPanel) decode here
         final String docId = UrlDecoder.QUERY_INSTANCE.decode(
                 getPageParameters().get(PARAM_DOC_ID).toString(),
@@ -83 +83 @@
 
             // create parameters from the query, and add them with session related parameters
-            PageParameters newParam;
-            newParam = new PageParameters(query.getPageParameters());
+            PageParameters newParam = new PageParameters(query.getPageParameters());
             // add the session persistent parameters
-            newParam.mergeWith(((VloSession)this.getSession()).getVloSessionPageParameters());
+            newParam.mergeWith(((VloSession) this.getSession()).getVloSessionPageParameters());
 
             BookmarkablePageLink<String> backLink = new BookmarkablePageLink<String>("backLink", FacetedSearchPage.class, newParam);
@@ -429 +428 @@
         PageParameters newParam = new PageParameters(parameters);
         // add the session persistent paremeters
-        newParam.mergeWith(((VloSession)this.getSession()).getVloSessionPageParameters());
+        newParam.mergeWith(((VloSession) this.getSession()).getVloSessionPageParameters());
 
         final RequestCycle reqCycle = getRequestCycle();
@@ -460 +459 @@
         PageParameters newParam;
         newParam = new PageParameters(query.getPageParameters());
-        // add the session persistent parameters
-        // newParam.add(((VloSession)this.getSession()).getVloSessionPageParameters());
         newParam.add(ShowResultPage.PARAM_DOC_ID, UrlEncoder.QUERY_INSTANCE.encode(
                 docId,
                 Application.get().getRequestCycleSettings().getResponseRequestEncoding())); // get current character set from request cycle
-
+        // add the session persistent parameters
+        newParam.mergeWith(((VloSession) VloSession.get()).getVloSessionPageParameters());
         BookmarkablePageLink<ShowResultPage> docLink = new BookmarkablePageLink<ShowResultPage>(linkId, ShowResultPage.class,
                 newParam);