ricky/order_processor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added support for multiple searches (comma seperated)

Browse Source
This commit is contained in:
Ricky Barrette
2011-01-13 19:07:03 +00:00
parent 6113cde0d4
commit 85ff2ff57c
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Order Processor/src/com/TwentyCodes/java/OrderProcessor/DB/OrderDB.java
View File

@@ -254,7 +254,7 @@ public class OrderDB {
Statement stat = conn.createStatement(); Statement stat = conn.createStatement();
ResultSet rs = stat.executeQuery("select * from Orders;"); ResultSet rs = stat.executeQuery("select * from Orders;");
ArrayList<Order> list = new ArrayList<Order>(); ArrayList<Order> list = new ArrayList<Order>();
String[] parts = text.split(", ");
ByteArrayInputStream bais; ByteArrayInputStream bais;
ObjectInputStream ins; ObjectInputStream ins;
while (rs.next()) { while (rs.next()) {
@@ -264,18 +264,22 @@ public class OrderDB {
ins = new ObjectInputStream(bais); ins = new ObjectInputStream(bais);
Order order = (Order) ins.readObject(); Order order = (Order) ins.readObject();
for (int i = 0; i < parts.length; i++) {
if (isExclusive) { if (isExclusive) {
if ( ! order.getItemName().equalsIgnoreCase(text) if (!order.getItemName().equalsIgnoreCase(parts[i])
|| (orderNumber > 0) || (orderNumber > 0)
&& (order.getGoogleOrderNumber() == orderNumber) && (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); list.add(order);
} else if ( order.getItemName().equalsIgnoreCase(text) } else if (order.getItemName().equalsIgnoreCase(parts[i])
|| (orderNumber > 0) || (orderNumber > 0)
&& (order.getGoogleOrderNumber() == orderNumber) && (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); list.add(order);
}
ins.close(); ins.close();
bais.close(); bais.close();
} }

2
Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SearchDialog.java
View File

@@ -164,7 +164,7 @@ public class SearchDialog extends JFrame implements ActionListener, ProgressList
line = scan.nextLine(); line = scan.nextLine();
parts = line.split(", "); parts = line.split(", ");
try { 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) { } catch (Exception e) {
sb.append(line+"\n"); sb.append(line+"\n");
} }