Changeset 981

Timestamp:

12/11/10 17:15:09 (13 years ago)

Author:

oschonef

Message:

• add filter to virtual collections tables

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main

Files:

• java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/AjaxGoAndClearFilter.html (deleted)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/AjaxGoAndClearFilter.java (deleted)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/FilterForm.html (added)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/FilterForm.java (added)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/FilterState.java (modified) (5 diffs)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/Provider.java (modified) (2 diffs)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/VirtualCollectionTable.html (modified) (1 diff)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/VirtualCollectionTable.java (modified) (2 diffs)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/VirtualCollectionTable.properties (modified) (1 diff)
• webapp/css/vcr.css (modified) (3 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/FilterState.java

@@ -9 +9 @@
 @SuppressWarnings("serial")
 final class FilterState implements Serializable {
+    public enum SearchMode {
+        CONTAINS,
+        STARTS_WITH,
+        ENDS_WITH
+    } // enum FilterState.SearchMode
+    private SearchMode nameMode;
     private String name;
+    private SearchMode descriptionMode;
+    private String description;
     private VirtualCollection.Type type;
     private VirtualCollection.State state;
-    private String description;
-    private QueryOptions.Relation createdRelation = QueryOptions.Relation.EQ;
+    private QueryOptions.Relation createdRelation;
     private Date created;
 
+    public FilterState() {
+        clear();
+    }
+
+    public SearchMode getNameMode() {
+        return nameMode;
+    }
+    
+    public void setNameMode(SearchMode nameMode) {
+        if (nameMode == null) {
+            throw new IllegalArgumentException("nameMode == null");
+        }
+        this.nameMode = nameMode;
+    }
+    
     public String getName() {
         return name;
@@ -26 +48 @@
     public boolean hasName() {
         return name != null;
+    }
+
+    public String getNameWithWildcard() {
+        return addWildcards(name, nameMode);
+    }
+    
+    public SearchMode getDescriptionMode() {
+        return descriptionMode;
+    }
+
+    public void setDescriptionMode(SearchMode descriptionMode) {
+        if (descriptionMode == null) {
+            throw new IllegalArgumentException("descriptionMode == null");
+        }
+        this.descriptionMode = descriptionMode;
+    }
+    
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
     }
 
@@ -52 +97 @@
     }
 
-    public String getDescription() {
-        return description;
+    public boolean hasDescription() {
+        return description != null;
     }
 
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public boolean hasDescription() {
-        return description != null;
+    public String getDescriptionWithWildcard() {
+        return addWildcards(description, descriptionMode);
     }
 
@@ -69 +110 @@
     
     public void setCreatedRelation(QueryOptions.Relation createdRelation) {
+        if (createdRelation == null) {
+            throw new IllegalArgumentException("createdRelation == null");
+        }
         this.createdRelation = createdRelation;
     }
@@ -85 +129 @@
 
     public void clear() {
+        nameMode = SearchMode.CONTAINS;
         name = null;
+        descriptionMode = SearchMode.CONTAINS;
+        description = null;
         type = null;
         state = null;
-        description = null;
         createdRelation = QueryOptions.Relation.EQ;
         created = null;
     }
 
+    private static String addWildcards(String s, SearchMode mode) {
+        s = s.replaceAll("\\*+", "*");
+        StringBuilder sb = new StringBuilder();
+        if ((mode != SearchMode.STARTS_WITH) && !s.startsWith("*")) {
+            sb.append('*');
+        }
+        sb.append(s);
+        if ((mode != SearchMode.ENDS_WITH) && !s.endsWith("*")) {
+            sb.append('*');
+        }
+        return sb.toString();
+    }
+
 } // class FilterState

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/Provider.java

@@ -87 +87 @@
             filter.add(QueryOptions.Property.VC_NAME,
                        QueryOptions.Relation.EQ,
-                       filterstate.getName());
+                       filterstate.getNameWithWildcard());
         }
         if (filterstate.hasType()) {
@@ -102 +102 @@
             filter.add(QueryOptions.Property.VC_DESCRIPTION,
                        QueryOptions.Relation.EQ,
-                       filterstate.getDescription());
+                       filterstate.getDescriptionWithWildcard());
         }
         if (filterstate.hasCreated()) {

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/VirtualCollectionTable.html

@@ -7 +7 @@
 <wicket:panel>
   <div wicket:id="border">
-    <label>Name</label>&nbsp;<select><option>contains</option><option>starts with</option><option>ends with</option></select>&nbsp;<input type="text" /><br />
-    <label>Description</label>&nbsp;<select><option>contains</option><option>starts with</option><option>ends with</option></select>&nbsp;<input type="text" /><br />
-    <label>Type</label>&nbsp;<select><option>extensional</option><option>intensional</option></select><br />
-    <label>Created</label>&nbsp;<select><option>is less-than</option><option>is less-than or equals</option><option>equals</option><option>is greater-than or equals</option><option>is greater-than</option></select>&nbsp;<input type="text" /><br />
-    <input type="submit" value="filter" /><input type="submit" value="reset" />
+    <div wicket:id="filterForm"></div>
   </div>
   <table wicket:id="table" class="collectionsTable"></table>
-  <!-- 
-  <div wicket:id="feedback" class="collectionsTableFeedback"></div>
-  -->
 </wicket:panel>
 </body>

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/VirtualCollectionTable.java

@@ -22 +22 @@
         setOutputMarkupId(true);
 
-        final AjaxToggleBorder border = new AjaxToggleBorder("border",
-                new Model<String>("Filter"));
-        add(border);
-
-        // setup table 
+        // setup table provider
         List<IColumn<VirtualCollection>> columns =
             new ArrayList<IColumn<VirtualCollection>>();
@@ -37 +33 @@
         columns.add(new ColumnActions(this));
         Provider provider = new Provider(privateMode);
+
+        // setup table
         final DataTable<VirtualCollection> table =
             new AjaxFallbackDefaultDataTable<VirtualCollection>("table",
-                columns, provider, 4);
+                columns, provider, 30);
         table.addBottomToolbar(new AjaxNavigationToolbar(table));
+
+        // setup filter
+        final AjaxToggleBorder border =
+            new AjaxToggleBorder("border", new Model<String>("Filter"));
+        border.add(new FilterForm("filterForm", provider, table, privateMode));
+        add(border);
         add(table);
     }

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/VirtualCollectionTable.properties

@@ -11 +11 @@
 State.DELETED: deleted
 State.DEAD: dead
+Relation.LT: less-than
+Relation.LE: less-than or equals
+Relation.EQ: equals
+Relation.GE: greater-than or equals
+Relation.GT: greater-than
+SearchMode.CONTAINS: contains
+SearchMode.STARTS_WITH: starts with
+SearchMode.ENDS_WITH: ends with
 button.filter: Filter
 button.clear: Clear

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/webapp/css/vcr.css

@@ -182 +182 @@
     font-family: Verdana, sans-serif;
     font-size: 100%;
+    border: 1px solid #000000;
 }
 
@@ -328 +329 @@
         width: 570px;
         overflow: auto;
+        margin-bottom: 5px;
 }
 
@@ -779 +781 @@
     padding: 5px;
 }
+
+form.filterForm {
+        margin: 0;
+        padding: 0;
+}
+        
+form.filterForm fieldset {
+        padding: 0;
+        margin: 0;
+        border: none;
+}
+
+form.filterForm div.optional {
+        margin-bottom: 4px;
+}
+
+form.filterForm label {
+        width: 75px !important;
+}
+
+form.filterForm input.name,
+form.filterForm input.desc {
+        width: 790px;
+}