Changeset 3775 for trunk/src/clients/web


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/clients/web/net/sf/basedb/clients/web/Base.java

    r3679 r3775  
    511511            if (value != null)
    512512            {
     513              boolean hasWildcard = value.indexOf('%') >= 0;
    513514              Type valueType = Type.valueOf(name.substring(7, colonIndex));
    514515 
     
    517518              filter.setValueType(valueType);
    518519             
    519               Operator op = Operator.EQ;
     520              Operator op = hasWildcard ? Operator.LIKE : Operator.EQ;
    520521              if (value.startsWith("<>") || value.startsWith("!="))
    521522              {
    522                 op = Operator.NEQ;
     523                op = hasWildcard ? Operator.NOTLIKE : Operator.NEQ;
    523524                value = value.substring(2);
    524525              }
     
    545546              else if (value.startsWith("="))
    546547              {
    547                 op = Operator.EQ;
     548                op = hasWildcard ? Operator.LIKE : Operator.EQ;
    548549                value = value.substring(1);
    549               }
    550               else if (value.indexOf('%') >= 0)
    551               {
    552                 op = Operator.LIKE;
    553550              }
    554551              if ("".equals(value)) value = null;
     
    669666        {}
    670667      }
    671       if (op == Operator.EQ && (value == null || (value != null && value.indexOf('%') >= 0)))
     668      if (op == Operator.EQ && value == null)
    672669      {
    673670        result = "=";
    674671      }
    675       else if (op == Operator.NEQ)
     672      else if (op == Operator.NEQ || op == Operator.NOTLIKE)
    676673      {
    677674        result = "<>";
  • trunk/src/clients/web/net/sf/basedb/clients/web/plugins/SimpleExport.java

    r3679 r3775  
    227227    String whichItems = (String)job.getValue(WHICH_ITEMS);
    228228    String format = (String)job.getValue(FORMAT);
    229     List<Integer> selectedItems = (List<Integer>)job.getValues("item");
    230229    List<String> columns = (List<String>)job.getValues(WHICH_PROPERTIES);
    231230   
     
    265264    QueryWrapper queryWrapper = null;
    266265    ResultIterator result = null;
     266    Set<Integer>selectedItems = cc.getSelected();
    267267   
    268268    // The query wrapper allows us to get results from the query in a simplier way
Note: See TracChangeset for help on using the changeset viewer.