Changeset 5017

Timestamp:

04/22/14 12:52:55 (10 years ago)

Author:

Twan Goosen

Message:

added another 'browse all' link to simple search page

Location:

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket

Files:

• pages/SimpleSearchPage.java (modified) (5 diffs)
• pages/VloBasePage.java (modified) (1 diff)
• panels/search/SimpleSearchBrowsePanel.java (modified) (3 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/SimpleSearchPage.java

@@ -19 +19 @@
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
+import eu.clarin.cmdi.vlo.service.PageParametersConverter;
 import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
 import eu.clarin.cmdi.vlo.wicket.components.SearchForm;
@@ -42 +43 @@
     @SpringBean
     private FacetFieldsService facetFieldsService;
+    @SpringBean(name = "queryParametersConverter")
+    private PageParametersConverter<QueryFacetsSelection> paramsConverter;
 
     private final SingleFacetPanel collectionsPanel;
@@ -58 +61 @@
         setModel(model);
 
+        // add an updatable container for breadcrumbs and top links
         navigation = new WebMarkupContainer("navigation");
         navigation.setOutputMarkupId(true);
@@ -65 +69 @@
         navigation.add(new TopLinksPanel("topLinks"));
 
+        // add a persistenet panel for selection of a value for the collection facet
         collectionsPanel = new SingleFacetPanel("collectionsFacet", model, vloConfig.getCollectionFacet(), facetFieldsService) {
 
@@ -79 +84 @@
         add(collectionsPanel);
 
+        // add a search form (on submit will go to faceted search page)
         add(new SearchForm("search", model) {
 
             @Override
             protected void onSubmit(AjaxRequestTarget target) {
-                setResponsePage(new FacetedSearchPage(model));
+                setResponsePage(FacetedSearchPage.class, paramsConverter.toParameters(model.getObject()));
             }
         });
 
+        // add a panel with browsing options
         browse = new SimpleSearchBrowsePanel("browse", getModel());
         add(browse);

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/VloBasePage.java

@@ -20 +20 @@
 import eu.clarin.cmdi.vlo.VloWebAppParameters;
 import eu.clarin.cmdi.vlo.config.VloConfig;
-import org.apache.wicket.Component;
 import org.apache.wicket.Session;
-import org.apache.wicket.behavior.Behavior;
 import org.apache.wicket.markup.head.CssHeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
 import org.apache.wicket.markup.html.GenericWebPage;
 import org.apache.wicket.markup.html.link.ExternalLink;

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SimpleSearchBrowsePanel.java

@@ -20 +20 @@
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
+import eu.clarin.cmdi.vlo.service.PageParametersConverter;
 import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
 import eu.clarin.cmdi.vlo.service.solr.SolrDocumentService;
@@ -53 +54 @@
     @SpringBean
     private SolrDocumentService documentService;
+    @SpringBean(name = "queryParametersConverter")
+    private PageParametersConverter<QueryFacetsSelection> paramsConverter;
     @SpringBean
     private VloConfig vloConfig;
@@ -93 +96 @@
                         final IModel<QueryFacetsSelection> selectionModel = SimpleSearchBrowsePanel.this.getModel();
                         selectionModel.getObject().selectValues(facet, values);
-                        setResponsePage(new FacetedSearchPage(selectionModel));
+                        setResponsePage(FacetedSearchPage.class, paramsConverter.toParameters(selectionModel.getObject()));
                     }