[sword-cvs] sword/src/modules/texts/ztext ztext.cpp,1.44,1.45

sword@www.crosswire.org sword@www.crosswire.org
Sat, 30 Aug 2003 18:58:16 -0700


Update of /usr/local/cvsroot/sword/src/modules/texts/ztext
In directory www:/tmp/cvs-serv24365/src/modules/texts/ztext

Modified Files:
	ztext.cpp 
Log Message:



Index: ztext.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/texts/ztext/ztext.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- ztext.cpp	29 Aug 2003 19:02:45 -0000	1.44
+++ ztext.cpp	31 Aug 2003 01:58:14 -0000	1.45
@@ -359,7 +359,7 @@
 	if ((is) && (ir)) {
 
 		switch (searchType) {
-		case -3: {
+		case -2: {	// let lucene replace multiword for now
 
 
 			// test to see if our scope for this search is bounded by a
@@ -407,8 +407,12 @@
 					// check to see if it set ok and if so, add to our return list
 					if (*testKeyType == vk)
 						listkey << (const char *) vk;
+						listkey.GetElement()->userData = (void *)(int)(h.score(i)*100);
+				}
+				else {
+					listkey << (const char*) vk;
+					listkey.GetElement()->userData = (void *)(int)(h.score(i)*100);
 				}
-				else listkey << (const char*) vk;
 			}
 			(*percent)(98, percentUserData);
 
@@ -432,7 +436,7 @@
 	}
 #endif
 	// if we don't support this search, fall back to base class
-	return SWModule::Search(istr, searchType, flags, scope, justCheckIfSupported, percent, percentUserData);
+	return SWModule::search(istr, searchType, flags, scope, justCheckIfSupported, percent, percentUserData);
 }