[sword-cvs] sword/src/modules swmodule.cpp,1.55,1.56

[sword at www.crosswire.org]

Committed by: joachim

Update of /cvs/core/sword/src/modules
In directory www:/tmp/cvs-serv17376/src/modules

Modified Files:
	swmodule.cpp 
Log Message:
improved regexp search now as well

Index: swmodule.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/swmodule.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- swmodule.cpp	2 Jun 2004 22:28:18 -0000	1.55
+++ swmodule.cpp	3 Jun 2004 09:29:08 -0000	1.56
@@ -496,7 +496,7 @@
 #endif
 		}
 		if (searchType >= 0) {
-			if (!regexec(&preg,  StripText(), 0, 0, 0)) {
+			if (!regexec(&preg,  getRawEntry(), 0, 0, 0) && !regexec(&preg,  StripText(), 0, 0, 0)) {
 				textkey = KeyText();
 				listkey << textkey;
 			}
@@ -509,8 +509,8 @@
 			}
 			
 			if (sres) { //it's also in the StripText(), so we have a valid search result item now
-					textkey = KeyText();
-					listkey << textkey;
+				textkey = KeyText();
+				listkey << textkey;
 			}
 		}
 		else if (searchType == -2) {