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

Timestamp:

01/07/14 11:05:14 (10 years ago)

Author:

twagoo

Message:

Merged twagoo branch of to-wicket-1.6 back to original, removed this branch

Location:

vlo/branches/to-wicket-1.6

Files:

• . (modified) (1 prop)
• vlo_web_app (modified) (1 prop)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java (modified) (14 diffs)

vlo/branches/to-wicket-1.6/vlo_web_app

@@ -1 +1 @@
 target
+vlo-importer.log*

@@ -1 +1 @@
 target
+vlo-importer.log*

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

@@ -21 +21 @@
 import org.apache.solr.common.SolrDocument;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.RequestCycle;
 import org.apache.wicket.extensions.ajax.markup.html.autocomplete.AutoCompleteTextField;
 import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
@@ -41 +40 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.ResourceModel;
-import org.apache.wicket.protocol.http.RequestUtils;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.cycle.RequestCycle;
 
 public class FacetedSearchPage extends BasePage {
+
     private static final long serialVersionUID = 1L;
 
@@ -50 +51 @@
     private final static String facetConceptsFile = VloConfig.getFacetConceptsFile();
     private final static Map<String, FacetConcept> facetNameMap = VLOMarshaller.getFacetConceptMapping(facetConceptsFile).getFacetConceptMap();
-    
+
+    public FacetedSearchPage(PageParameters params) {
+        this(VloPageParameters.convert(params));
+    }
+
     /**
      * @param parameters Page parameters
@@ -66 +71 @@
     @SuppressWarnings("serial")
     private class SearchBoxForm extends Form<SearchPageQuery> {
+
         private final AutoCompleteTextField<String> searchBox;
-        
+
         /*
          * Add multiline list of selected facet values
@@ -78 +84 @@
 
             // create an interator for walking over the facets
-            Iterator<Map.Entry<String, String>> entries = 
-                    selectedFacets.entrySet().iterator();
+            Iterator<Map.Entry<String, String>> entries
+                    = selectedFacets.entrySet().iterator();
 
             /*
@@ -90 +96 @@
             if (!entries.hasNext()) {
                 // not a single facet has been selected
-                facetOverview = new MultiLineLabel("facetOverview", 
+                facetOverview = new MultiLineLabel("facetOverview",
                         "No facets values selected");
             } else {
@@ -152 +158 @@
                 }
             };
-            
+
             add(searchBox);
             Button submit = new Button("searchSubmit");
             add(submit);
-            
+
             // merge link to help menu page 
-            String helpUrl = VloConfig.getHelpUrl();            
+            String helpUrl = VloConfig.getHelpUrl();
             ExternalLink helpLink = new ExternalLink("helpLink", helpUrl, "help");
             add(helpLink);
-            
-            VloPageParameters param; 
-            param = new VloPageParameters (query.getPageParameters());
-            
-            String thisURL;
-            thisURL = RequestUtils.toAbsolutePath(
-                    RequestCycle.get().urlFor(ShowResultPage.class, param.convert()).toString(), null);
+
+            VloPageParameters param;
+            param = new VloPageParameters(query.getPageParameters());
+
+            final RequestCycle reqCycle = getRequestCycle();
+            final Url reqUrl = Url.parse(reqCycle.urlFor(ShowResultPage.class, param.convert()));
+            String thisURL = reqCycle.getUrlRenderer().renderFullUrl(reqUrl);
+
             try {
                 thisURL = URLEncoder.encode(thisURL, "UTF-8");
             } catch (UnsupportedEncodingException e) {
             }
-            
+
             String feedbackFormUrl = VloConfig.getFeedbackFromUrl() + thisURL;
             ExternalLink feedbackLink = new ExternalLink("feedbackLink", feedbackFormUrl, "found an error?");
             add(feedbackLink);
-            
+
             addFacetOverview();
         }
@@ -186 +193 @@
 
             VloPageParameters newParam = new VloPageParameters();
-            
+
             setResponsePage(FacetedSearchPage.class, newParam);
         }
@@ -194 +201 @@
         add(new SearchBoxForm("searchForm", query));
     }
-    
+
     @SuppressWarnings("serial")
     private void addFacetColumns() {
         GridView<FacetField> facetColumns = new GridView<FacetField>("facetColumns", (IDataProvider<FacetField>) new SolrFacetDataProvider(query.getSolrQuery()
                 .getCopy())) {
-            @Override
-            protected void populateItem(Item<FacetField> item) {
-                String facetName = ((FacetField)item.getDefaultModelObject()).getName();
-                String descriptionTooltip = "";
-                if(facetNameMap.containsKey(facetName))
-                        descriptionTooltip = facetNameMap.get(facetName).getDescription();
-                item.add(new FacetBoxPanel("facetBox", item.getModel(), descriptionTooltip).create(query));
-            }
-
-            @Override
-            protected void populateEmptyItem(Item<FacetField> item) {
-                item.add(new Label("facetBox", ""));
-            }
-        };
+                    @Override
+                    protected void populateItem(Item<FacetField> item) {
+                        String facetName = ((FacetField) item.getDefaultModelObject()).getName();
+                        String descriptionTooltip = "";
+                        if (facetNameMap.containsKey(facetName)) {
+                            descriptionTooltip = facetNameMap.get(facetName).getDescription();
+                        }
+                        item.add(new FacetBoxPanel("facetBox", item.getModel(), descriptionTooltip).create(query));
+                    }
+
+                    @Override
+                    protected void populateEmptyItem(Item<FacetField> item) {
+                        item.add(new Label("facetBox", ""));
+                    }
+                };
         facetColumns.setColumns(2);
         add(facetColumns);
@@ -222 +230 @@
         columns = new ArrayList<IColumn<SolrDocument, String>>();
         columns.add(new AbstractColumn<SolrDocument, String>(new ResourceModel(Resources.NAME)) {
-            
+
             @Override
             public void populateItem(Item<ICellPopulator<SolrDocument>> cellItem, String componentId, IModel<SolrDocument> rowModel) {
@@ -232 +240 @@
             @Override
             public void populateItem(Item<ICellPopulator<SolrDocument>> cellItem, String componentId, IModel<SolrDocument> rowModel) {
-                String descriptionText = (String) rowModel.getObject().getFirstValue(FacetConstants.FIELD_DESCRIPTION);
+                String descriptionText = (String) rowModel.getObject().getFirstValue(FacetConstants.FIELD_DESCRIPTION);
                 cellItem.add(new TruncatedLabel(componentId, 100, descriptionText));
-                
             }
         });
@@ -241 +248 @@
         add(searchResultList);
     }
-    
+
     /**
      * Add contentSearch form (FCS)
@@ -248 +255 @@
      */
     private void addSearchServiceForm() {
-        
+
         BookmarkablePageLink link;
-        link = new BookmarkablePageLink ("link", FacetedSearchPage.class);
-        link.add (new Label ("naar deze pagina"));
-        
+        link = new BookmarkablePageLink("link", FacetedSearchPage.class);
+        link.add(new Label("naar deze pagina"));
+
         // get values for cql endpoint substitution
         String cqlEndpointFilter = VloConfig.getCqlEndpointFilter();
@@ -281 +288 @@
                             List<String> idArray = new ArrayList<String>();
                             idArray.add(id);
-                            
+
                             // substitute endpoint
-                            if (cqlEndpointFilter.length() == 0){
+                            if (cqlEndpointFilter.length() == 0) {
                                 // no substitution
                             } else {
                                 // check for the need to substitute
                             }
-                                
-                            if (cqlEndpointFilter.equals(cqlEndpointFilter)){
+
+                            if (cqlEndpointFilter.equals(cqlEndpointFilter)) {
                                 // no substitution, take the value from the record
                                 aggregationContextMap.put(fcsEndpoint, idArray);

@@ -1 +1 @@
 target
+vlo-importer.log*