Changeset 4220 for vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java
- Timestamp:
- 01/07/14 11:05:14 (10 years ago)
- Location:
- vlo/branches/to-wicket-1.6
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
vlo/branches/to-wicket-1.6
- Property svn:mergeinfo changed
/vlo/branches/to-wicket-1.6-twagoo (added) merged: 4212-4216,4218-4219
- Property svn:mergeinfo changed
-
vlo/branches/to-wicket-1.6/vlo_web_app
- Property svn:ignore
-
old new 1 1 target 2 vlo-importer.log*
-
- Property svn:ignore
-
vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java
r4208 r4220 5 5 import eu.clarin.cmdi.vlo.StringUtils; 6 6 import eu.clarin.cmdi.vlo.VloPageParameters; 7 import eu.clarin.cmdi.vlo.VloWebApplication;8 import eu.clarin.cmdi.vlo.VloSession;9 7 import eu.clarin.cmdi.vlo.config.VloConfig; 10 8 import eu.clarin.cmdi.vlo.dao.DaoLocator; … … 29 27 import net.sf.saxon.s9api.XsltTransformer; 30 28 import org.apache.solr.common.SolrDocument; 29 import org.apache.wicket.Application; 31 30 import org.apache.wicket.Component; 32 31 import org.apache.wicket.request.mapper.parameter.PageParameters; 33 import org.apache.wicket.RequestCycle;34 import org.apache.wicket.behavior.AbstractBehavior;35 32 import org.apache.wicket.behavior.Behavior; 36 33 import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel; … … 44 41 import org.apache.wicket.markup.ComponentTag; 45 42 import org.apache.wicket.markup.MarkupStream; 46 import org.apache.wicket.markup.html.IHeaderResponse; 43 import org.apache.wicket.markup.head.IHeaderResponse; 44 import org.apache.wicket.markup.head.JavaScriptHeaderItem; 47 45 import org.apache.wicket.markup.html.WebMarkupContainer; 48 46 import org.apache.wicket.markup.html.basic.Label; … … 54 52 import org.apache.wicket.model.ResourceModel; 55 53 import org.apache.wicket.protocol.http.RequestUtils; 56 import org.apache.wicket.protocol.http.WicketURLDecoder; 57 import org.apache.wicket.protocol.http.WicketURLEncoder; 54 import org.apache.wicket.request.cycle.RequestCycle; 55 import org.apache.wicket.util.encoding.UrlDecoder; 56 import org.apache.wicket.util.encoding.UrlEncoder; 58 57 import org.slf4j.Logger; 59 58 import org.slf4j.LoggerFactory; … … 73 72 74 73 @SuppressWarnings("serial") 75 public ShowResultPage(final PageParameters currentParam) { 76 74 public ShowResultPage(final PageParameters currentParam) { 77 75 super(currentParam); 78 final String docId; 79 docId = WicketURLDecoder.QUERY_INSTANCE.decode(getPageParameters().get(PARAM_DOC_ID).toString()); 76 //TODO: Is encoding/decoding of the page parameter required (or can it be automated?) 77 final String docId = UrlDecoder.QUERY_INSTANCE.decode( 78 getPageParameters().get(PARAM_DOC_ID).toString(), 79 Application.get().getRequestCycleSettings().getResponseRequestEncoding()); // get current character set from request cycle 80 80 SolrDocument solrDocument = DaoLocator.getSearchResultsDao().getSolrDocument(docId); 81 81 if (solrDocument != null) { … … 452 452 VloPageParameters newParam; 453 453 newParam = new VloPageParameters(query.getPageParameters()); 454 newParam.add(ShowResultPage.PARAM_DOC_ID, WicketURLEncoder.QUERY_INSTANCE.encode(docId)); 454 newParam.add(ShowResultPage.PARAM_DOC_ID, UrlEncoder.QUERY_INSTANCE.encode( 455 docId, 456 Application.get().getRequestCycleSettings().getResponseRequestEncoding())); // get current character set from request cycle 455 457 456 458 BookmarkablePageLink<ShowResultPage> docLink = new BookmarkablePageLink<ShowResultPage>(linkId, ShowResultPage.class, … … 523 525 524 526 public void renderHead(IHeaderResponse response) { 525 526 response.renderOnLoadJavascript("toogleDiv('completeCmdi', 'toogleLink')"); 527 response.render(JavaScriptHeaderItem.forScript("toogleDiv('completeCmdi', 'toogleLink')", null)); 527 528 } 528 529 });
Note: See TracChangeset
for help on using the changeset viewer.