Changeset 3775 for trunk/src/clients/web

Timestamp:

Sep 25, 2007, 11:12:36 AM (15 years ago)

Author:

Johan Enell

Message:

Merged the 2.4.2 release

log:branches/2.4-stable#3694:3770

Location:

trunk/src/clients/web/net/sf/basedb/clients/web

Files:

• Base.java (modified) (4 diffs)
• plugins/SimpleExport.java (modified) (2 diffs)

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

@@ -511 +511 @@
             if (value != null)
             {
+              boolean hasWildcard = value.indexOf('%') >= 0;
               Type valueType = Type.valueOf(name.substring(7, colonIndex));
   
@@ -517 +518 @@
               filter.setValueType(valueType);
               
-              Operator op = Operator.EQ;
+              Operator op = hasWildcard ? Operator.LIKE : Operator.EQ;
               if (value.startsWith("<>") || value.startsWith("!="))
               {
-                op = Operator.NEQ;
+                op = hasWildcard ? Operator.NOTLIKE : Operator.NEQ;
                 value = value.substring(2);
               }
@@ -545 +546 @@
               else if (value.startsWith("="))
               {
-                op = Operator.EQ;
+                op = hasWildcard ? Operator.LIKE : Operator.EQ;
                 value = value.substring(1);
-              }
-              else if (value.indexOf('%') >= 0)
-              {
-                op = Operator.LIKE;
               }
               if ("".equals(value)) value = null;
@@ -669 +666 @@
         {}
       }
-      if (op == Operator.EQ && (value == null || (value != null && value.indexOf('%') >= 0)))
+      if (op == Operator.EQ && value == null)
       {
         result = "=";
       }
-      else if (op == Operator.NEQ)
+      else if (op == Operator.NEQ || op == Operator.NOTLIKE)
       {
         result = "<>";

trunk/src/clients/web/net/sf/basedb/clients/web/plugins/SimpleExport.java

@@ -227 +227 @@
     String whichItems = (String)job.getValue(WHICH_ITEMS);
     String format = (String)job.getValue(FORMAT);
-    List<Integer> selectedItems = (List<Integer>)job.getValues("item");
     List<String> columns = (List<String>)job.getValues(WHICH_PROPERTIES);
     
@@ -265 +264 @@
     QueryWrapper queryWrapper = null;
     ResultIterator result = null;
+    Set<Integer>selectedItems = cc.getSelected();
     
     // The query wrapper allows us to get results from the query in a simplier way