[Redpos-cvs] RedPOS/src/org/redpos/client/product ProductStorage.java,1.1,1.2

[Lennart P. <le...@us...>]

Update of /cvsroot/redpos/RedPOS/src/org/redpos/client/product
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21041/src/org/redpos/client/product

Modified Files:
	ProductStorage.java 
Log Message:
Commented out not used finders.
Method findProductByBarcode() now first searching on Barcode2 where EAN is.
Method findProductByTextOrProductIdOrBarcode became findProductByTextOrBarcode.

Index: ProductStorage.java
===================================================================
RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/product/ProductStorage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ProductStorage.java	23 Nov 2004 16:02:43 -0000	1.1
--- ProductStorage.java	19 Feb 2005 08:29:35 -0000	1.2
***************
*** 127,153 ****
      * @param like
      * @return
!     */
!    public Vector findProductByText(final String text, Boolean like)
!                                                                    throws SQLException
!    {
!       // create column names for where clause
!       String where[] = {DB_COLUMN_NAME_PRODUCTTEXT};
!       // create values for where clause
!       String values[] = {text};
!       // create column names for order by
!       String orderBy[] = {DB_COLUMN_NAME_PRODUCTTEXT};
!       // call select in table
!       Vector result = productTable.select(getConnection(), where, values,
!             orderBy, like.booleanValue(), true);
  
!       Vector products = new Vector();
!       for(Iterator iter = result.iterator(); iter.hasNext();)
!       {
!          RedPOSRow row = (RedPOSRow)iter.next();
!          products.add(createProductData(row));
!       }
  
!       return products;
!    }
  
     /**
--- 127,154 ----
      * @param like
      * @return
!     * TODO Seems to not be used - remove it
!     public Vector findProductByText(final String text, Boolean like)
!     throws SQLException
!     {
!     // create column names for where clause
!     String where[] = {DB_COLUMN_NAME_PRODUCTTEXT};
!     // create values for where clause
!     String values[] = {text};
!     // create column names for order by
!     String orderBy[] = {DB_COLUMN_NAME_PRODUCTTEXT};
!     // call select in table
!     Vector result = productTable.select(getConnection(), where, values,
!     orderBy, like.booleanValue(), true);
  
!     Vector products = new Vector();
!     for(Iterator iter = result.iterator(); iter.hasNext();)
!     {
!     RedPOSRow row = (RedPOSRow)iter.next();
!     products.add(createProductData(row));
!     }
  
!     return products;
!     }
!     */
  
     /**
***************
*** 181,208 ****
      * @param like
      * @return
!     */
!    public Vector findProductByTextOrProductId(final String text,
!                                               final String productId,
!                                               Boolean like) throws SQLException
!    {
!       // create column names for where clause
!       String where[] = {DB_COLUMN_NAME_PRODUCTTEXT, DB_COLUMN_NAME_PRODUCTID};
!       // create values for where clause
!       String values[] = {text, productId};
!       // create column names for order by
!       String orderBy[] = {DB_COLUMN_NAME_PRODUCTTEXT};
!       // call select in table
!       Vector result = productTable.select(getConnection(), where, values,
!             orderBy, like.booleanValue(), false);
  
!       Vector products = new Vector();
!       for(Iterator iter = result.iterator(); iter.hasNext();)
!       {
!          RedPOSRow row = (RedPOSRow)iter.next();
!          products.add(createProductData(row));
!       }
  
!       return products;
!    }
  
     /**
--- 182,210 ----
      * @param like
      * @return
!     * TODO Seems not to be used, remove it
!     public Vector findProductByTextOrProductId(final String text,
!     final String productId,
!     Boolean like) throws SQLException
!     {
!     // create column names for where clause
!     String where[] = {DB_COLUMN_NAME_PRODUCTTEXT, DB_COLUMN_NAME_PRODUCTID};
!     // create values for where clause
!     String values[] = {text, productId};
!     // create column names for order by
!     String orderBy[] = {DB_COLUMN_NAME_PRODUCTTEXT};
!     // call select in table
!     Vector result = productTable.select(getConnection(), where, values,
!     orderBy, like.booleanValue(), false);
  
!     Vector products = new Vector();
!     for(Iterator iter = result.iterator(); iter.hasNext();)
!     {
!     RedPOSRow row = (RedPOSRow)iter.next();
!     products.add(createProductData(row));
!     }
  
!     return products;
!     }
!     */
  
     /**
***************
*** 216,220 ****
      * @return
      */
!    public Vector findProductByTextOrProductIdOrBarcode(
                                                         final String text,
                                                         final String productId,
--- 218,222 ----
      * @return
      */
!    public Vector findProductByTextOrBarcode(
                                                         final String text,
                                                         final String productId,
***************
*** 224,231 ****
     {
        // create column names for where clause
!       String where[] = {DB_COLUMN_NAME_PRODUCTTEXT, DB_COLUMN_NAME_PRODUCTID,
!             DB_COLUMN_NAME_BARCODE1};
        // create values for where clause
!       String values[] = {text, productId, primBarcode};
        // create column names for order by
        String orderBy[] = {DB_COLUMN_NAME_PRODUCTTEXT};
--- 226,232 ----
     {
        // create column names for where clause
!       String where[] = {DB_COLUMN_NAME_PRODUCTTEXT, DB_COLUMN_NAME_BARCODE1};
        // create values for where clause
!       String values[] = {text, primBarcode};
        // create column names for order by
        String orderBy[] = {DB_COLUMN_NAME_PRODUCTTEXT};
***************
*** 255,259 ****
     {
        // create column names for where clause
!       String where[] = {DB_COLUMN_NAME_BARCODE1};
        // create values for where clause
        String values[] = {barcode};
--- 256,260 ----
     {
        // create column names for where clause
!       String where[] = {DB_COLUMN_NAME_BARCODE2}; // barcode
        // create values for where clause
        String values[] = {barcode};
***************
*** 264,269 ****
        if(result.isEmpty())
        {
!          // no result, try second barcode column
!          where[0] = DB_COLUMN_NAME_BARCODE2;
           // call select in table
           result = productTable.select(getConnection(), where, values, null,
--- 265,270 ----
        if(result.isEmpty())
        {
!          // no result, try first barcode column
!          where[0] = DB_COLUMN_NAME_BARCODE1; // RedPOS product id
           // call select in table
           result = productTable.select(getConnection(), where, values, null,
***************
*** 271,275 ****
           if(result.isEmpty())
           {
!             // no result try third barcode column
              where[0] = DB_COLUMN_NAME_BARCODE3;
              // call select in table
--- 272,276 ----
           if(result.isEmpty())
           {
!             // no result try third barcode column // 
              where[0] = DB_COLUMN_NAME_BARCODE3;
              // call select in table