From ab1c20fa8ff665ab80691b4c4dd272dfad950878 Mon Sep 17 00:00:00 2001
From: Yung Han Khoe <yung@webgui-svn>
Date: Thu, 7 Aug 2008 15:20:30 +0000
Subject: [PATCH] fixed: WebGUI Search errors - boolean search using filtering
 does not work

---
 docs/changelog/7.x.x.txt | 1 +
 lib/WebGUI/Search.pm     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 3e6fb0461..173e1ec32 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -34,6 +34,7 @@
  - fixed: Shop/Transaction was not updating shopCreditDeduction column.  Added that to the update and now users correctly have purchases deducted from their instore credit.
  - fixed: Hover Help outdated: automatically request commit
  - fixed: Thingy: Subtext disappears when editing a field
+ - fixed: WebGUI Search errors - boolean search using filtering does not work
 
 7.5.18
  - fixed: Collateral Image Manager broken in Firefox 3
diff --git a/lib/WebGUI/Search.pm b/lib/WebGUI/Search.pm
index b8237d1a8..434d22ebe 100644
--- a/lib/WebGUI/Search.pm
+++ b/lib/WebGUI/Search.pm
@@ -369,7 +369,7 @@ sub search {
         		for (my $i = 0; $i < scalar(@terms); $i++) {
 			#-------------- Edited by zxp for Chinese Word Segment
 				utf8::decode($terms[$i]);
-				my @segs = split /([A-z|\d]+|\S)/, $terms[$i];
+				my @segs = split /([A-z,+-|\d]+|\S)/, $terms[$i];
 				$terms[$i] = join " ",@segs;
 				$terms[$i] =~ s/\s{2,}/ /g;
 				$terms[$i] =~ s/(^\s|\s$)//g;