Changeset 4971

Timestamp:

04/14/14 14:22:57 (10 years ago)

Author:

Twan Goosen

Message:

added 'only FCS records' option to new advanced option panel in faceted search page

Location:

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

Files:

• pojo/FacetSelection.java (modified) (4 diffs)
• pojo/FacetSelectionType.java (modified) (1 diff)
• wicket/model/FacetSelectionModel.java (added)
• wicket/model/ToggleModel.java (added)
• wicket/pages/FacetedSearchPage.html (modified) (1 diff)
• wicket/pages/FacetedSearchPage.java (modified) (2 diffs)
• wicket/panels/search/AdvancedSearchOptionsPanel.html (modified) (3 diffs)
• wicket/panels/search/AdvancedSearchOptionsPanel.java (modified) (1 diff)
• wicket/panels/search/FacetsPanel.java (modified) (2 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/FacetSelection.java

@@ -23 +23 @@
 
 /**
+ * Represents the selection for a single facet
  *
  * @author twagoo
@@ -31 +32 @@
     private final Collection<String> values;
 
+    /**
+     * Creates an {@link FacetSelectionType#AND} selection for the specified
+     * values
+     *
+     * @param values
+     */
     public FacetSelection(Collection<String> values) {
         this(FacetSelectionType.AND, values);
     }
 
+    /**
+     * Creates an empty selection with the specified type
+     *
+     * @param type
+     */
     public FacetSelection(FacetSelectionType type) {
         this(type, Lists.<String>newArrayList());
@@ -50 +62 @@
     }
 
+    /**
+     *
+     * @return type of selection
+     */
     public FacetSelectionType getSelectionType() {
         return selectionType;
     }
 
+    /**
+     *
+     * @return values subject to selection type
+     */
     public Collection<String> getValues() {
         return values;
@@ -62 +82 @@
     }
 
+    @Override
+    public int hashCode() {
+        int hash = 3;
+        hash = 79 * hash + (this.selectionType != null ? this.selectionType.hashCode() : 0);
+        hash = 79 * hash + (this.values != null ? this.values.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final FacetSelection other = (FacetSelection) obj;
+        if (this.selectionType != other.selectionType) {
+            return false;
+        }
+        if (this.values != other.values && (this.values == null || !this.values.equals(other.values))) {
+            return false;
+        }
+        return true;
+    }
+
 }

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/FacetSelectionType.java

@@ -23 +23 @@
 public enum FacetSelectionType {
 
+    /**
+     * Specifies a selection of all documents with a non-empty value for this
+     * facet; values supplied in the selection should be ignored
+     */
     NOT_EMPTY,
+    /**
+     * Specifies a selection of all documents that match all values supplied in
+     * the selection
+     */
     AND,
+    /**
+     * Specifies a selection of all documents that match at least one of the
+     * values supplied in the selection
+     */
     OR,
+    /**
+     * Specifies a selection of all documents that match none of the values
+     * supplied in the selection
+     */
     NOT
 

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

@@ -66 +66 @@
             <div class="sidebar">
 
-                <div wicket:id="facets"></div>
-
-<!--                <div class="sidebaritem facet collapsedfacet">
-                     rounded corners - top **** 
-                    <div class="rtop"><div class="r1"></div><div class="r2"></div><div class="r3"></div><div class="r4"></div></div>
-                    <a href="#" class="expandfacet"><span>expand</span></a>
-                    <a href="#" class="collapsefacet"><span>collapse</span></a>
-                    <h1><a href="#">Search options</a></h1>
-                    <div class="sbilinks facetvalues">
-                        <form id="advancedoptions" action="">
-                            <ul>
-                                <li>
-                                    <input type="checkbox" id="onlyfcs"/>
-                                    <label for="onlyfcs">Only include resources that support content search</label>
-                                </li>
-                                <li>
-                                    <input type="checkbox" id="onlymdformat"/>
-                                    <label for="onlyfcs">Only include resources described with</label>
-                                    <select>
-                                        <option>CMDI</option>
-                                        <option>OLAC</option>
-                                    </select>
-                                </li>
-                            </ul>
-                            <input type="submit" value="Apply" />
-                        </form>
-                    </div>
-                     rounded corners - bottom **** 
-                    <div class="rbottom"><div class="r4"></div><div class="r3"></div><div class="r2"></div><div class="r1"></div></div>
-                </div>-->
+                <div wicket:id="facets">[facets]</div>
+                <div wicket:id="options">[options]</div>
             </div>
         </wicket:extend>

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

@@ -14 +14 @@
 import eu.clarin.cmdi.vlo.wicket.panels.search.FacetValuesPanel;
 import eu.clarin.cmdi.vlo.wicket.panels.TopLinksPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.search.AdvancedSearchOptionsPanel;
 import java.util.List;
 import org.apache.solr.client.solrj.response.FacetField;
@@ -84 +85 @@
         add(facetsPanel);
 
+        Panel optionsPanel = createOptionsPanel("options");
+        add(optionsPanel);
+
         searchResultsPanel = new SearchResultsPanel("searchResults", getModel());
         add(searchResultsPanel);
+    }
+
+    public Panel createOptionsPanel(String id) {
+        final Panel optionsPanel = new AdvancedSearchOptionsPanel(id, getModel()) {
+
+            @Override
+            protected void selectionChanged(AjaxRequestTarget target) {
+                updateSelection(target);
+            }
+        };
+        return optionsPanel;
     }
 

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

@@ -24 +24 @@
     <body>
         <wicket:panel>
-            <div class="sidebaritem facet collapsedfacet">
+            <div class="sidebaritem facet expandedfacet">
                 <!--rounded corners - top ****--> 
                 <div class="rtop"><div class="r1"></div><div class="r2"></div><div class="r3"></div><div class="r4"></div></div>
@@ -31 +31 @@
                 <h1><a href="#">Search options</a></h1>
                 <div class="sbilinks facetvalues">
-                    <form id="advancedoptions" action="">
+                    <form wicket:id="options" id="advancedoptions" action="">
                         <ul>
                             <li>
@@ -46 +46 @@
                             </li>
                         </ul>
-                        <input type="submit" value="Apply" />
+                        <input type="submit" value="Apply" class="nonjsfallback" />
                     </form>
                 </div>

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

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package eu.clarin.cmdi.vlo.wicket.panels.search;
 
+import eu.clarin.cmdi.vlo.FacetConstants;
+import eu.clarin.cmdi.vlo.pojo.FacetSelection;
+import eu.clarin.cmdi.vlo.pojo.FacetSelectionType;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
+import eu.clarin.cmdi.vlo.wicket.model.FacetSelectionModel;
+import eu.clarin.cmdi.vlo.wicket.model.ToggleModel;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.panel.GenericPanel;
 import org.apache.wicket.model.IModel;
 
 /**
+ * A panel showing advanced search options:
+ * <ul>
+ * <li>selection of records that support FCS</li>
+ * <li>selection of records that are based on either CMDI or OLAC</li>
+ * </ul>
  *
  * @author twagoo
  */
-public class AdvancedSearchOptionsPanel extends GenericPanel<QueryFacetsSelection> {
+public abstract class AdvancedSearchOptionsPanel extends GenericPanel<QueryFacetsSelection> {
 
     public AdvancedSearchOptionsPanel(String id, IModel<QueryFacetsSelection> model) {
         super(id, model);
+
+        // create a model for the selection state for the FCS facet
+        final IModel<FacetSelection> fcsFacetModel = new FacetSelectionModel(model, FacetConstants.FIELD_SEARCH_SERVICE);
+        // wrap in a toggle model that allows switching between a null selection and a 'not empty' selection
+        final ToggleModel<FacetSelection> toggleModel = new ToggleModel<FacetSelection>(fcsFacetModel, null, new FacetSelection(FacetSelectionType.NOT_EMPTY));
+
+        final Form options = new Form("options");
+        final CheckBox fcsCheck = new CheckBox("fcs", toggleModel);
+        fcsCheck.add(new OnChangeAjaxBehavior() {
+
+            @Override
+            protected void onUpdate(AjaxRequestTarget target) {
+                selectionChanged(target);
+            }
+        });
+        options.add(fcsCheck);
+        add(options);
     }
-    
+
+    protected abstract void selectionChanged(AjaxRequestTarget target);
+
 }

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

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.pojo.ExpansionState;
-import eu.clarin.cmdi.vlo.pojo.FacetSelection;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
@@ -24 +23 @@
 import eu.clarin.cmdi.vlo.wicket.model.FacetFieldModel;
 import eu.clarin.cmdi.vlo.wicket.model.FacetFieldSelectionModel;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;