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

[sword at www.crosswire.org]

Committed by: joachim

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

Modified Files:
	swmodule.cpp 
Log Message:
changed back to old searching for phrase and regexp

Index: swmodule.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/swmodule.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- swmodule.cpp	3 Jun 2004 09:29:08 -0000	1.56
+++ swmodule.cpp	4 Jun 2004 16:33:55 -0000	1.57
@@ -496,18 +496,13 @@
 #endif
 		}
 		if (searchType >= 0) {
-			if (!regexec(&preg,  getRawEntry(), 0, 0, 0) && !regexec(&preg,  StripText(), 0, 0, 0)) {
+			if (!regexec(&preg,  StripText(), 0, 0, 0)) {
 				textkey = KeyText();
 				listkey << textkey;
 			}
 		}
 		else if (searchType == -1) {
-			sres = ((flags & REG_ICASE) == REG_ICASE) ? stristr(getRawEntry(), istr) : strstr(getRawEntry(), istr);
-			
-			if (sres) { //the raw text has the search text, check the stripped text for the text to be sure the text wasn't a tag value or similair
-				sres = ((flags & REG_ICASE) == REG_ICASE) ? stristr(StripText(), istr) : strstr(StripText(), istr);
-			}
-			
+			sres = ((flags & REG_ICASE) == REG_ICASE) ? stristr(StripText(), istr) : strstr(StripText(), istr);
 			if (sres) { //it's also in the StripText(), so we have a valid search result item now
 				textkey = KeyText();
 				listkey << textkey;