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

Timestamp:

01/06/14 08:18:53 (10 years ago)

Author:

twagoo

Message:

Branched off keeloo's wicket-6 conversion branch.
Applied a number of fixes to make code properly compilable, runnable (app still doesn't start properly).
To be merged back with keeloo's work.

Location:

vlo/branches/to-wicket-1.6-twagoo

Files:

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

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

@@ -5 +5 @@
 import eu.clarin.cmdi.vlo.StringUtils;
 import eu.clarin.cmdi.vlo.VloPageParameters;
-import eu.clarin.cmdi.vlo.VloWebApplication;
-import eu.clarin.cmdi.vlo.VloSession;
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.dao.DaoLocator;
@@ -29 +27 @@
 import net.sf.saxon.s9api.XsltTransformer;
 import org.apache.solr.common.SolrDocument;
+import org.apache.wicket.Application;
 import org.apache.wicket.Component;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.behavior.AbstractBehavior;
 import org.apache.wicket.behavior.Behavior;
 import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
@@ -44 +41 @@
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.MarkupStream;
-import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -54 +52 @@
 import org.apache.wicket.model.ResourceModel;
 import org.apache.wicket.protocol.http.RequestUtils;
-import org.apache.wicket.protocol.http.WicketURLDecoder;
-import org.apache.wicket.protocol.http.WicketURLEncoder;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.util.encoding.UrlDecoder;
+import org.apache.wicket.util.encoding.UrlEncoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -73 +72 @@
     
     @SuppressWarnings("serial")
-    public ShowResultPage(final PageParameters currentParam) {
-        
+    public ShowResultPage(final PageParameters currentParam) {        
         super(currentParam);
-        final String docId;
-        docId = WicketURLDecoder.QUERY_INSTANCE.decode(getPageParameters().get(PARAM_DOC_ID).toString());
+        //TODO: Is encoding/decoding of the page parameter required (or can it be automated?)
+        final String docId = UrlDecoder.QUERY_INSTANCE.decode(
+                getPageParameters().get(PARAM_DOC_ID).toString(), 
+                Application.get().getRequestCycleSettings().getResponseRequestEncoding()); // get current character set from request cycle
         SolrDocument solrDocument = DaoLocator.getSearchResultsDao().getSolrDocument(docId);
         if (solrDocument != null) {
@@ -452 +452 @@
         VloPageParameters newParam;
         newParam = new VloPageParameters(query.getPageParameters());
-        newParam.add(ShowResultPage.PARAM_DOC_ID, WicketURLEncoder.QUERY_INSTANCE.encode(docId));
+        newParam.add(ShowResultPage.PARAM_DOC_ID, UrlEncoder.QUERY_INSTANCE.encode(
+                docId, 
+                Application.get().getRequestCycleSettings().getResponseRequestEncoding())); // get current character set from request cycle
 
         BookmarkablePageLink<ShowResultPage> docLink = new BookmarkablePageLink<ShowResultPage>(linkId, ShowResultPage.class,
@@ -523 +525 @@
 
                         public void renderHead(IHeaderResponse response) {
-
-                                response.renderOnLoadJavascript("toogleDiv('completeCmdi', 'toogleLink')");
+                            response.render(JavaScriptHeaderItem.forScript("toogleDiv('completeCmdi', 'toogleLink')", null));
                         }
                 });