Changeset 2138

Timestamp:

Mar 31, 2006, 2:15:40 PM (17 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #180: Clear filter

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/Base.java (modified) (1 diff)
• src/core/net/sf/basedb/core/ItemContext.java (modified) (3 diffs)
• www/include/scripts/table.js (modified) (2 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/Base.java

@@ -382 +382 @@
       }
       
-      // Property filters and selected items
-      // Filter parameters have names like: filter:STRING:propertyName
-      // where propertyName can start with an optional operator: <>, >=, <=, >, <, =
-      Enumeration<String> names = (Enumeration<String>)request.getParameterNames();
-      cc.getSelected().clear();
-      while (names.hasMoreElements())
-      {
-        String name = names.nextElement();
-        if (name.startsWith("filter:"))
+      if (Values.getBoolean(request.getParameter("filter:clearAll")))
+      {
+        cc.removeAllPropertyFilters();
+      }
+      else
+      {
+        // Property filters and selected items
+        // Filter parameters have names like: filter:STRING:propertyName
+        // where propertyName can start with an optional operator: <>, >=, <=, >, <, =
+        Enumeration<String> names = (Enumeration<String>)request.getParameterNames();
+        cc.getSelected().clear();
+        while (names.hasMoreElements())
         {
-          String value = Values.getStringOrNull(request.getParameter(name));
-          int colonIndex = name.indexOf(":", 7); // Second colon
-          String property = name.substring(colonIndex+1);
-          if (value != null)
+          String name = names.nextElement();
+          if (name.startsWith("filter:"))
           {
-            Type valueType = Type.valueOf(name.substring(7, colonIndex));
-
-            PropertyFilter filter = cc.getPropertyFilter(property);
-            if (filter == null) filter = new PropertyFilter(property);
-            filter.setValueType(valueType);
-            
-            Operator op = Operator.EQ;
-            if (value.startsWith("<>") || value.startsWith("!="))
+            String value = Values.getStringOrNull(request.getParameter(name));
+            int colonIndex = name.indexOf(":", 7); // Second colon
+            String property = name.substring(colonIndex+1);
+            if (value != null)
             {
-              op = Operator.NEQ;
-              value = value.substring(2);
+              Type valueType = Type.valueOf(name.substring(7, colonIndex));
+  
+              PropertyFilter filter = cc.getPropertyFilter(property);
+              if (filter == null) filter = new PropertyFilter(property);
+              filter.setValueType(valueType);
+              
+              Operator op = Operator.EQ;
+              if (value.startsWith("<>") || value.startsWith("!="))
+              {
+                op = Operator.NEQ;
+                value = value.substring(2);
+              }
+              else if (value.startsWith(">="))
+              {
+                op = Operator.GTEQ;
+                value = value.substring(2);
+              }
+              else if (value.startsWith("<="))
+              {
+                op = Operator.LTEQ;
+                value = value.substring(2);
+              }
+              else if (value.startsWith(">"))
+              {
+                op = Operator.GT;
+                value = value.substring(1);
+              }
+              else if (value.startsWith("<"))
+              {
+                op = Operator.LT;
+                value = value.substring(1);
+              }
+              else if (value.startsWith("="))
+              {
+                op = Operator.EQ;
+                value = value.substring(1);
+                if ("".equals(value)) value = null;
+              }
+              else if (value.indexOf('%') >= 0)
+              {
+                op = Operator.LIKE;
+              }
+              /*
+              TODO - null operator is a signal to use JEP for parsing as an adavanced formula
+              for example: ? = 'Nicklas' OR ? = 'Johan'
+              or: 10 <= ? AND ? <= 20
+              else if (value.startsWith(":"))
+              {
+                op = null;
+                value = value.substring(1);
+              }
+              */
+              filter.setOperator(op);
+              filter.setValue(value);
+              cc.setPropertyFilter(filter);
             }
-            else if (value.startsWith(">="))
+            else
             {
-              op = Operator.GTEQ;
-              value = value.substring(2);
+              cc.removePropertyFilter(property);
             }
-            else if (value.startsWith("<="))
-            {
-              op = Operator.LTEQ;
-              value = value.substring(2);
-            }
-            else if (value.startsWith(">"))
-            {
-              op = Operator.GT;
-              value = value.substring(1);
-            }
-            else if (value.startsWith("<"))
-            {
-              op = Operator.LT;
-              value = value.substring(1);
-            }
-            else if (value.startsWith("="))
-            {
-              op = Operator.EQ;
-              value = value.substring(1);
-              if ("".equals(value)) value = null;
-            }
-            else if (value.indexOf('%') >= 0)
-            {
-              op = Operator.LIKE;
-            }
-            /*
-            TODO - null operator is a signal to use JEP for parsing as an adavanced formula
-            for example: ? = 'Nicklas' OR ? = 'Johan'
-            or: 10 <= ? AND ? <= 20
-            else if (value.startsWith(":"))
-            {
-              op = null;
-              value = value.substring(1);
-            }
-            */
-            filter.setOperator(op);
-            filter.setValue(value);
-            cc.setPropertyFilter(filter);
+          }
+          else if (name.startsWith("D:"))
+          {
+            // Special case for file manager which lists both files and directories in the
+            // same list
+            if (dirContext == null) dirContext = sc.getCurrentContext(Item.DIRECTORY, subContext);
+            int id = Values.getInt(name.substring(2), -1);
+            if (id != -1) dirContext.getSelected().add(id);
           }
           else
           {
-            cc.removePropertyFilter(property);
+            int id = Values.getInt(name, -1);
+            if (id != -1) cc.getSelected().add(id);
           }
-        }
-        else if (name.startsWith("D:"))
-        {
-          // Special case for file manager which lists both files and directories in the
-          // same list
-          if (dirContext == null) dirContext = sc.getCurrentContext(Item.DIRECTORY, subContext);
-          int id = Values.getInt(name.substring(2), -1);
-          if (id != -1) dirContext.getSelected().add(id);
-        }
-        else
-        {
-          int id = Values.getInt(name, -1);
-          if (id != -1) cc.getSelected().add(id);
         }
       }

trunk/src/core/net/sf/basedb/core/ItemContext.java

@@ -40 +40 @@
 import net.sf.basedb.core.data.ClientData;
 
+import java.util.Collection;
 import java.util.Map;
 import java.util.HashMap;
@@ -413 +414 @@
   
   /**
+    Get a collection of all property filters stored in this context.
+    @return A Collection containsing PropertyFilter objects or null
+  */
+  public Collection<PropertyFilter> getPropertyFilters()
+  {
+    return propertyFilters == null ? null : propertyFilters.values();
+  }
+  
+  /**
     Get the value of a property filter. It is a shortcut
     for <code>getPropertyFilter(property).getValue()</code>
@@ -440 +450 @@
     {
       propertyFilters.remove(property);
+    }
+  }
+  
+  /**
+    Remove all property filter from this context.
+  */
+  public void removeAllPropertyFilters()
+  {
+    if (propertyFilters != null)
+    {
+      propertyFilters.clear();
     }
   }

trunk/www/include/scripts/table.js

@@ -3 +3 @@
   BioArray Software Environment (BASE) - http://base.thep.lu.se/
   Copyright (C) 2002-2004 Lao Saal, Carl Troein,
-  Johan Vallon-Christersson, Jari Häkkinen, Nicklas Nordborg
+  Johan Vallon-Christersson, Jari H??kkinen, Nicklas Nordborg
 
   This file is part of BASE.
@@ -223 +223 @@
   {
     var frm = document.forms[formId];
-    for (var i=0; i < frm.elements.length; i++) // >
-    {
-      var element = frm.elements[i];
-      if (element.name.substr(0, 7) == 'filter:')
-      {
-        var type = element.type;
-        if (type == 'text')
-        {
-          element.value = '';
-        }
-        else if (type == 'select-one')
-        {
-          element.selectedIndex = 0;
-        }
-        else if (type == 'radio')
-        {
-          element.checked = element.value == '';
-        }
-        else
-        {
-          alert(element.type);
-        }
-      }
-    }
+    Forms.createHidden(frm, 'filter:clearAll', '1');
     frm.submit();
   }