Changeset 4208
- Timestamp:
- 12/20/13 10:03:18 (10 years ago)
- Location:
- vlo/branches/to-wicket-1.6/vlo_web_app
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
vlo/branches/to-wicket-1.6/vlo_web_app/pom.xml
r4199 r4208 21 21 <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir> 22 22 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 23 <netbeans.hint.deploy.server>Tomcat</netbeans.hint.deploy.server>24 23 </properties> 25 24 -
vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/VloPageParameters.java
r4201 r4208 21 21 // needs to be here because of the other constructor 22 22 super (); 23 // add the theme parameter 24 // ... 23 25 } 24 26 … … 33 35 // needs to be implemented 34 36 37 // present the page parameters in the old style 38 35 39 param = null; 36 40 … … 39 43 40 44 /** 45 * Take in old style parameters. 46 * 47 * 48 * not being used at the moment; use code in the previous method 41 49 * 42 50 * @param param … … 61 69 62 70 /** 63 * Add this, VLO page parameters, to the parameters that are already64 * associated with the session65 71 * 72 * @param PersistentParameters parameters concerning theme and other 73 * non query related parameters. These parameters are to kept in the URL 74 * during the session. 66 75 */ 67 public void addToSession() {76 public void merge(PageParameters parameters) { 68 77 69 78 // get a themed session from the current thread … … 71 80 themedSession = (VloSession)Session.get(); 72 81 73 // store the parameters in the session object 74 themedSession.addVloSessionPageParameters (this); 82 // get the parameters associated with the session 83 PageParameters persistentParameters; 84 persistentParameters = themedSession.getVloSessionPageParameters(); 85 86 // merge the parameters with the persistent ones and return the result 87 88 // ... 89 75 90 } 76 91 } -
vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/BasePage.java
r4199 r4208 57 57 // set the applications start page link to the faceted search page 58 58 VloPageParameters startPageParameters = new VloPageParameters (); 59 startPageParameters.addToSession();60 59 61 60 BookmarkablePageLink link = new BookmarkablePageLink("startpage", … … 71 70 leftImage = new Image("leftimage", leftImageRes); 72 71 73 // addthe image to the page72 // merge the image to the page 74 73 link.add(leftImage); 75 74 … … 82 81 rightImage = new Image("rightimage", rightImageRes); 83 82 84 // addit to the page83 // merge it to the page 85 84 add (rightImage); 86 85 -
vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/DocumentLinkPanel.java
r4199 r4208 17 17 SolrDocument doc = model.getObject(); 18 18 BookmarkablePageLink<ShowResultPage> docLink = ShowResultPage.createBookMarkableLink("docLink", query, doc.getFieldValue( 19 FacetConstants.FIELD_ID).toString() , (VloSession)getSession());19 FacetConstants.FIELD_ID).toString()); 20 20 add(docLink); 21 21 Object nameValue = doc.getFirstValue(FacetConstants.FIELD_NAME); -
vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanel.java
r4199 r4208 16 16 import org.apache.wicket.model.IModel; 17 17 import org.apache.wicket.model.Model; 18 import org.apache.wicket.request.mapper.parameter.PageParameters; 18 19 19 20 public class FacetBoxPanel extends BasePanel { … … 66 67 add(facetList); 67 68 VloPageParameters facetParameters = new VloPageParameters (); 68 69 facetParameters.add(ShowAllFacetValuesPage.SELECTED_FACET_PARAM, facetField.getName()); 70 facetParameters.add(ShowAllFacetValuesPage.FACET_MIN_OCCURS, "1"); 71 facetParameters.addToSession(); 69 70 PageParameters extraParameters = new PageParameters (); 71 extraParameters.add(ShowAllFacetValuesPage.SELECTED_FACET_PARAM, facetField.getName()); 72 extraParameters.add(ShowAllFacetValuesPage.FACET_MIN_OCCURS, "1"); 73 74 facetParameters.merge(extraParameters); 72 75 73 76 add(new BookmarkablePageLink("showMore", ShowAllFacetValuesPage.class, facetParameters) { -
vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetHeaderPanel.java
r4199 r4208 18 18 19 19 VloPageParameters newParam = new VloPageParameters (); 20 newParam.mergeWith(param); 21 newParam.addToSession(); 22 20 23 21 add(new BookmarkablePageLink("allLink", FacetedSearchPage.class, newParam)); 24 22 add(new Label("headerLabelSelect", model.getObject().getSelectedValue())); -
vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetLinkPanel.java
r4199 r4208 22 22 23 23 VloPageParameters newParam = new VloPageParameters (); 24 newParam.mergeWith(param);25 newParam.addToSession();26 24 27 25 Link<Count> facetLink = new BookmarkablePageLink("facetLink", FacetedSearchPage.class, newParam); -
vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java
r4201 r4208 138 138 } 139 139 140 // finally, addthe label to the form140 // finally, merge the label to the form 141 141 this.add(facetOverview); 142 142 } … … 157 157 add(submit); 158 158 159 // addlink to help menu page159 // merge link to help menu page 160 160 String helpUrl = VloConfig.getHelpUrl(); 161 161 ExternalLink helpLink = new ExternalLink("helpLink", helpUrl, "help"); … … 186 186 187 187 VloPageParameters newParam = new VloPageParameters(); 188 newParam.mergeWith(param);189 newParam.addToSession();190 188 191 189 setResponsePage(FacetedSearchPage.class, newParam); … … 304 302 } 305 303 306 // addHTML form to container304 // merge HTML form to container 307 305 String labelString; 308 306 if (totalResults == 1) { … … 316 314 contentSearchLabel.setEscapeModelStrings(false); 317 315 contentSearchContainer.add(contentSearchLabel); 318 // contentSearchContainer. add(link);316 // contentSearchContainer.merge(link); 319 317 } catch (UnsupportedEncodingException uee) { 320 318 contentSearchContainer.setVisible(false); -
vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/PrevNextHeaderPanel.java
r4199 r4208 9 9 10 10 import eu.clarin.cmdi.vlo.FacetConstants; 11 import eu.clarin.cmdi.vlo.VloSession;12 11 import eu.clarin.cmdi.vlo.dao.DaoLocator; 13 12 … … 66 65 if (index > 0) { 67 66 String prevDocId = docIdList.get(index - 1).getFieldValue(FacetConstants.FIELD_ID).toString(); 68 BookmarkablePageLink<ShowResultPage> prev = ShowResultPage.createBookMarkableLink("prev", query, prevDocId , (VloSession)getSession());67 BookmarkablePageLink<ShowResultPage> prev = ShowResultPage.createBookMarkableLink("prev", query, prevDocId); 69 68 add(prev); 70 69 } else { … … 76 75 if (index < (docIdList.size() - 1) && index >= 0) { 77 76 String prevDocId = docIdList.get(index + 1).getFieldValue(FacetConstants.FIELD_ID).toString(); 78 BookmarkablePageLink<ShowResultPage> next = ShowResultPage.createBookMarkableLink("next", query, prevDocId , (VloSession)getSession());77 BookmarkablePageLink<ShowResultPage> next = ShowResultPage.createBookMarkableLink("next", query, prevDocId); 79 78 add(next); 80 79 } else { -
vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowAllFacetValuesPage.java
r4201 r4208 39 39 */ 40 40 private void addOccurrencesFilter(PageParameters parameters) { 41 PageParameters newParameters = (PageParameters) parameters.clone();41 PageParameters newParameters = new PageParameters (parameters); 42 42 newParameters.remove(FACET_MIN_OCCURS); 43 if( !parameters.containsKey(FACET_MIN_OCCURS) || parameters.getAsInteger(FACET_MIN_OCCURS) == 1) {43 if(parameters.getPosition(FACET_MIN_OCCURS) == -1 || parameters.get(FACET_MIN_OCCURS).toInt() == 1) { 44 44 newParameters.add(FACET_MIN_OCCURS, FACET_MIN_OCCURS_VALUE.toString()); 45 45 add(new BookmarkablePageLink<Void>("filter", ShowAllFacetValuesPage.class, newParameters).add(new Label("filterLabel", "Show only values that occur at least "+FACET_MIN_OCCURS_VALUE+" times"))); -
vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java
r4199 r4208 4 4 import eu.clarin.cmdi.vlo.Resources; 5 5 import eu.clarin.cmdi.vlo.StringUtils; 6 import eu.clarin.cmdi.vlo.VloPageParameters; 6 7 import eu.clarin.cmdi.vlo.VloWebApplication; 7 8 import eu.clarin.cmdi.vlo.VloSession; … … 32 33 import org.apache.wicket.RequestCycle; 33 34 import org.apache.wicket.behavior.AbstractBehavior; 35 import org.apache.wicket.behavior.Behavior; 34 36 import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel; 35 37 import org.apache.wicket.extensions.markup.html.basic.SmartLinkMultiLineLabel; … … 74 76 75 77 super(currentParam); 76 final String docId = WicketURLDecoder.QUERY_INSTANCE.decode(getPageParameters().getString(PARAM_DOC_ID, null)); 78 final String docId; 79 docId = WicketURLDecoder.QUERY_INSTANCE.decode(getPageParameters().get(PARAM_DOC_ID).toString()); 77 80 SolrDocument solrDocument = DaoLocator.getSearchResultsDao().getSolrDocument(docId); 78 81 if (solrDocument != null) { 79 82 final SearchPageQuery query = new SearchPageQuery(currentParam); 80 83 81 // now the persistent parameters are not in the query parameters 82 PageParameters newParam = new PageParameters (); 83 // add the new query parameters to this map 84 newParam.putAll(query.getPageParameters()); 85 // add the persistent parameters to this map 86 //newParam = webApp.reflectPersistentParameters(newParam); 87 88 newParam = ((VloWebApplication.ThemedSession)getSession()).reflectPersistentParameters(newParam); 84 // create parameters from the query, and merge them with session related parameters 85 VloPageParameters newParam; 86 newParam = new VloPageParameters (query.getPageParameters()); 89 87 90 88 BookmarkablePageLink<String> backLink = new BookmarkablePageLink<String>("backLink", FacetedSearchPage.class, newParam); … … 180 178 * Create one column for the attributes and one column for their values. 181 179 * 182 * @ param180 * @newParam 183 181 */ 184 private IColumn[]createAttributesColumns() {185 IColumn[] columns = new IColumn[2];182 private List<IColumn> createAttributesColumns() { 183 List<IColumn> columns = null; 186 184 187 185 // create the column for the attribute names 188 columns[0] = new PropertyColumn<Object>(new ResourceModel(Resources.FIELD), "field") { 186 IColumn column = null; 187 column = new PropertyColumn<Object,Object>(new ResourceModel(Resources.FIELD), "field") { 189 188 190 189 @Override … … 193 192 } 194 193 }; 194 columns.add (column); 195 195 196 196 // create the column for the values of the attributes 197 column s[1] = new AbstractColumn<DocumentAttribute>(new ResourceModel(Resources.VALUE)) {197 column = new AbstractColumn<DocumentAttribute, String>(new ResourceModel(Resources.VALUE)) { 198 198 @Override 199 199 public void populateItem(Item<ICellPopulator<DocumentAttribute>> cellItem, … … 214 214 cellItem.add(new SmartLinkMultiLineLabel(componentId, attribute.getValue()) { 215 215 @Override 216 p rotectedvoid onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) {216 public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) { 217 217 setEscapeModelStrings(false); 218 218 CharSequence body = getDefaultModelObjectAsString(); … … 223 223 cellItem.add(new SmartLinkMultiLineLabel(componentId, attribute.getValue()) { 224 224 @Override 225 p rotectedvoid onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) {225 public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) { 226 226 setEscapeModelStrings(false); 227 227 CharSequence body = getDefaultModelObjectAsString(); … … 232 232 cellItem.add(new SmartLinkMultiLineLabel(componentId, attribute.getValue()) { 233 233 @Override 234 p rotectedvoid onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) {234 public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) { 235 235 CharSequence body = StringUtils.toMultiLineHtml(getDefaultModelObjectAsString()); 236 236 replaceComponentTagBody(markupStream, openTag, getSmartLink(body)); … … 245 245 } 246 246 }; 247 columns.add (column); 247 248 248 249 return columns; … … 252 253 * Add landing page links to the result page. 253 254 * 254 * @ param solrDocument the document to get the links from255 * @newParam solrDocument the document to get the links from 255 256 */ 256 257 private void addLandingPageLinks(SolrDocument solrDocument) { … … 322 323 * Add search page links to the result page. 323 324 * 324 * @ param solrDocument the document to get the links from325 * @newParam solrDocument the document to get the links from 325 326 */ 326 327 private void addSearchPageLinks(SolrDocument solrDocument) { … … 393 394 * page. 394 395 * 395 * @ param solrDocument the document to get the links from396 * @newParam solrDocument the document to get the links from 396 397 */ 397 398 private void addResourceLinks(SolrDocument solrDocument) { … … 423 424 424 425 private void addFeedbackLink(final PageParameters parameters) { 425 String thisURL = RequestUtils.toAbsolutePath(RequestCycle.get().urlFor(ShowResultPage.class, parameters).toString()); 426 427 // create VloPageParameters in orde to be able to convert to old style parameters 428 VloPageParameters newParam = new VloPageParameters (parameters); 429 430 String thisURL = RequestUtils.toAbsolutePath(RequestCycle.get().urlFor(ShowResultPage.class, newParam.convert()).toString(),null); 426 431 try { 427 432 thisURL = URLEncoder.encode(thisURL,"UTF-8"); … … 442 447 } 443 448 444 public static BookmarkablePageLink<ShowResultPage> createBookMarkableLink(String linkId, SearchPageQuery query, String docId, VloSession session) { 445 PageParameters pageParameters = query.getPageParameters(); 446 pageParameters.put(ShowResultPage.PARAM_DOC_ID, WicketURLEncoder.QUERY_INSTANCE.encode(docId)); 447 448 // webApp.reflectPersistentParameters(pageParameters); 449 // instead of this: pass page parameters back to the session 450 session.reflectPersistentParameters(pageParameters); 449 public static BookmarkablePageLink<ShowResultPage> createBookMarkableLink(String linkId, SearchPageQuery query, String docId) { 450 451 // create new page parameters from the query parameters and the session related ones 452 VloPageParameters newParam; 453 newParam = new VloPageParameters(query.getPageParameters()); 454 newParam.add(ShowResultPage.PARAM_DOC_ID, WicketURLEncoder.QUERY_INSTANCE.encode(docId)); 451 455 452 456 BookmarkablePageLink<ShowResultPage> docLink = new BookmarkablePageLink<ShowResultPage>(linkId, ShowResultPage.class, 453 pageParameters);457 newParam); 454 458 return docLink; 455 459 } … … 457 461 /** 458 462 * Add contentSearch form (FCS) 459 * @ param solrDocument463 * @newParam solrDocument 460 464 */ 461 465 private void addSearchServiceForm(final SolrDocument solrDocument) { … … 483 487 /** 484 488 * Add complete CMDI view 485 * @ param solrDocument489 * @newParam solrDocument 486 490 */ 487 491 private void addCompleteCmdiView(final SolrDocument solrDocument) { … … 515 519 516 520 // remove complete CMDI view on page load 517 add(new AbstractBehavior() {521 add(new Behavior() { 518 522 private static final long serialVersionUID = 1865219352602175954L; 519 523 520 @Override521 524 public void renderHead(IHeaderResponse response) { 522 super.renderHead(response); 525 523 526 response.renderOnLoadJavascript("toogleDiv('completeCmdi', 'toogleLink')"); 524 527 } -
vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/SolrDocumentDataProvider.java
r2768 r4208 13 13 import eu.clarin.cmdi.vlo.dao.SearchResultsDao; 14 14 15 public class SolrDocumentDataProvider extends SortableDataProvider<SolrDocument > {15 public class SolrDocumentDataProvider extends SortableDataProvider<SolrDocument, String> { 16 16 17 17 private static final long serialVersionUID = 1L; … … 36 36 37 37 @Override 38 public Iterator<? extends SolrDocument> iterator( int first, intcount) {38 public Iterator<? extends SolrDocument> iterator(long first, long count) { 39 39 if (first != query.getStart().intValue() || count != query.getRows().intValue()) { 40 query.setStart( first).setRows(count);40 query.setStart((int)first).setRows((int)count); 41 41 docList = null; 42 42 } … … 50 50 51 51 @Override 52 public intsize() {52 public long size() { 53 53 return (int) getDocList().getNumFound(); 54 54 } -
vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/SolrFacetDataProvider.java
r2768 r4208 13 13 import eu.clarin.cmdi.vlo.dao.SearchResultsDao; 14 14 15 public class SolrFacetDataProvider extends SortableDataProvider<FacetField > {15 public class SolrFacetDataProvider extends SortableDataProvider<FacetField, String> { 16 16 17 17 private static final long serialVersionUID = 1L; … … 29 29 30 30 @Override 31 public Iterator<? extends FacetField> iterator( int first, intcount) {31 public Iterator<? extends FacetField> iterator(long first, long count) { 32 32 return facets.iterator(); 33 33 } … … 47 47 48 48 @Override 49 public intsize() {49 public long size() { 50 50 return (int) getFacets().size(); 51 51 } -
vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/SolrFacetFieldDataProvider.java
r2768 r4208 57 57 58 58 @Override 59 public Iterator<? extends Count> iterator( int first, intcount) {60 return getFacet().getValues().subList( first, first +count).iterator();59 public Iterator<? extends Count> iterator(long first, long count) { 60 return getFacet().getValues().subList((int)first, (int)first + (int)count).iterator(); 61 61 } 62 62 63 63 @Override 64 public intsize() {64 public long size() { 65 65 return getFacet().getValueCount(); 66 66 } -
vlo/branches/to-wicket-1.6/vlo_web_app/src/test/java/eu/clarin/cmdi/vlo/SearchPageQueryTest.java
r3935 r4208 5 5 import org.apache.solr.client.solrj.response.FacetField; 6 6 import org.apache.solr.common.params.CommonParams; 7 import org.apache.wicket. PageParameters;7 import org.apache.wicket.request.mapper.parameter.PageParameters; 8 8 import static org.junit.Assert.assertEquals; 9 9 import static org.junit.Assert.assertNull;
Note: See TracChangeset
for help on using the changeset viewer.