From 85ff2ff57c6876d4b133170c511acce6086c7b12 Mon Sep 17 00:00:00 2001 From: ricky barrette Date: Thu, 13 Jan 2011 19:07:03 +0000 Subject: [PATCH] added support for multiple searches (comma seperated) --- .../java/OrderProcessor/DB/OrderDB.java | 26 +++++++++++-------- .../java/OrderProcessor/UI/SearchDialog.java | 4 +-- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/DB/OrderDB.java b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/DB/OrderDB.java index 9d63284..cd02eb8 100644 --- a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/DB/OrderDB.java +++ b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/DB/OrderDB.java @@ -254,7 +254,7 @@ public class OrderDB { Statement stat = conn.createStatement(); ResultSet rs = stat.executeQuery("select * from Orders;"); ArrayList list = new ArrayList(); - + String[] parts = text.split(", "); ByteArrayInputStream bais; ObjectInputStream ins; while (rs.next()) { @@ -264,19 +264,23 @@ public class OrderDB { ins = new ObjectInputStream(bais); Order order = (Order) ins.readObject(); - if (isExclusive){ - if ( ! order.getItemName().equalsIgnoreCase(text) + for (int i = 0; i < parts.length; i++) { + if (isExclusive) { + if (!order.getItemName().equalsIgnoreCase(parts[i]) + || (orderNumber > 0) + && (order.getGoogleOrderNumber() == orderNumber) + || order.getCustomerName() + .toLowerCase(Locale.ENGLISH) + .contains(parts[i].toLowerCase(Locale.ENGLISH))) + list.add(order); + } else if (order.getItemName().equalsIgnoreCase(parts[i]) || (orderNumber > 0) && (order.getGoogleOrderNumber() == orderNumber) - || order.getCustomerName().toLowerCase(Locale.ENGLISH).contains(text.toLowerCase(Locale.ENGLISH))) + || order.getCustomerName().toLowerCase(Locale.ENGLISH) + .contains(parts[i].toLowerCase(Locale.ENGLISH))) list.add(order); - } else if ( order.getItemName().equalsIgnoreCase(text) - || (orderNumber > 0) - && (order.getGoogleOrderNumber() == orderNumber) - || order.getCustomerName().toLowerCase(Locale.ENGLISH).contains(text.toLowerCase(Locale.ENGLISH))) - list.add(order); - - ins.close(); + } + ins.close(); bais.close(); } rs.close(); diff --git a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SearchDialog.java b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SearchDialog.java index 97cbba2..abdde45 100644 --- a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SearchDialog.java +++ b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SearchDialog.java @@ -162,9 +162,9 @@ public class SearchDialog extends JFrame implements ActionListener, ProgressList String line; while(scan.hasNext()){ line = scan.nextLine(); - parts = line.split(","); + parts = line.split(", "); try { - sb.append(parts[0].substring(1)+","+parts[1].substring(1)+","+parts[2].substring(1)+","+parts[3].substring(1)+","+parts[4].substring(1)+","+parts[5].substring(1)+","+parts[6].substring(1)+","+parts[7].substring(1)+","+parts[8].substring(1)+"\n"); + sb.append(parts[0]+","+parts[1]+","+parts[2]+","+parts[3]+","+parts[4]+","+parts[5]+","+parts[6]+","+parts[7]+","+parts[8]+"\n"); } catch (Exception e) { sb.append(line+"\n"); }