Changeset 4902

Timestamp:

04/04/14 15:35:41 (11 years ago)

Author:

Twan Goosen

Message:

moved FCS form into separate panel

Location:

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

Files:

• pages/RecordPage.html (modified) (1 diff)
• pages/RecordPage.java (modified) (5 diffs)
• panels/record/ContentSearchFormPanel.html (added)
• panels/record/ContentSearchFormPanel.java (added)

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

@@ -61 +61 @@
                         </li>
                         <li wicket:id="contentSearch">
-                            <form id="contentSearchForm" wicket:id="fcsForm" method="post" name="fcsForm" target="_blank" action="[Aggregator endpoint]"> 
-                                <fieldset style="border:0px;"> 
-                                    <input type="hidden" name="query" id="query" value="" /> 
-                                    <input wicket:id="aggregationContent" type="hidden" name="x-aggregation-context" value='[Endpoint/ID JSON]' /> 
-                                    <input type="hidden" name="operation" value="searchRetrieve" /> 
-                                    <input type="hidden" name="version" value="1.2" /> 
-                                </fieldset> 
-                            </form> 
-                            <a href="#" onclick="document.fcsForm.submit();">Plain text search via Federated Content Search</a>
+                            <wicket:container wicket:id="fcsForm">[FCS form]</wicket:container>
                         </li>
                     </ul>

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

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.FacetConstants;
-import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.pojo.SearchContext;
@@ -33 +32 @@
 import eu.clarin.cmdi.vlo.wicket.panels.BreadCrumbPanel;
 import eu.clarin.cmdi.vlo.wicket.panels.PermaLinkPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.record.ContentSearchFormPanel;
 import eu.clarin.cmdi.vlo.wicket.panels.record.FieldsTablePanel;
 import eu.clarin.cmdi.vlo.wicket.panels.record.RecordNavigationPanel;
@@ -38 +38 @@
 import eu.clarin.cmdi.vlo.wicket.provider.DocumentFieldsProvider;
 import org.apache.solr.common.SolrDocument;
-import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
 import org.apache.wicket.RestartResponseException;
 import org.apache.wicket.Session;
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.json.JSONArray;
-import org.apache.wicket.ajax.json.JSONException;
-import org.apache.wicket.ajax.json.JSONObject;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -65 +61 @@
 
     @SpringBean
-    private VloConfig vloConfig;
-    @SpringBean
     private PageParametersConverter<QueryFacetsSelection> selectionParametersConverter;
     @SpringBean(name = "basicPropertiesFilter")
@@ -209 +203 @@
                     @Override
                     protected void populateItem(ListItem<String> item) {
-                        try {
-                            item.add(createContentSearchForm("fcsForm", item.getModel()));
-                        } catch (JSONException ex) {
-                            //TODO: handle gracefully?
-                            throw new RuntimeException(ex);
-                        }
-                    }
-
-                    private WebMarkupContainer createContentSearchForm(String id, IModel<String> endpointModel) throws JSONException {
-                        // Prepare a JSON object that holds the CQL endpoint and the document ID
-                        final JSONObject json = new JSONObject();
-                        final String endPoint = endpointModel.getObject();
-                        final Object docId = RecordPage.this.getModel().getObject().getFirstValue(FacetConstants.FIELD_ID);
-                        json.put(endPoint, new JSONArray(new Object[]{docId}));
-
-                        // Populate attributes in submit form...
-                        final WebMarkupContainer fcsForm = new WebMarkupContainer(id);
-                        // The action of the form should be the aggregator endpoint
-                        fcsForm.add(new AttributeModifier("action", vloConfig.getFederatedContentSearchUrl()));
-
-                        final WebMarkupContainer aggregationContext = new WebMarkupContainer("aggregationContent");
-                        // The value of the aggregation context hidden form field should be the JSON object
-                        aggregationContext.add(new AttributeModifier("value", json.toString(2)));
-                        fcsForm.add(aggregationContext);
-
-                        return fcsForm;
+                        item.add(new ContentSearchFormPanel("fcsForm", RecordPage.this.getModel(), item.getModel()));
                     }
                 });