[sword-svn] r2572 - trunk/src/keys

[scribe at crosswire.org]

Author: scribe
Date: 2010-10-17 14:06:53 -0700 (Sun, 17 Oct 2010)
New Revision: 2572

Modified:
   trunk/src/keys/versekey.cpp
Log:
Applied Ben Morgan's fix for 'f' in book name triggering 'and following' notation.  Well, applied a similar fix, and Ben's formatting fix.


Modified: trunk/src/keys/versekey.cpp
===================================================================
--- trunk/src/keys/versekey.cpp	2010-10-14 15:51:46 UTC (rev 2571)
+++ trunk/src/keys/versekey.cpp	2010-10-17 21:06:53 UTC (rev 2572)
@@ -779,6 +779,8 @@
 		default:
 			if (isdigit(*buf)) {
 				number[tonumber++] = *buf;
+				suffix = 0;
+				doubleF = 0;
 			}
 			else {
 				switch (*buf) {
@@ -955,7 +957,7 @@
 						*curKey = MAXCHAPTER;
 					if (partial > 0)
 						*curKey = MAXVERSE;
-						newElement->UpperBound(*curKey);
+					newElement->UpperBound(*curKey);
 					*newElement = TOP;
 					tmpListKey.GetElement()->userData = (void *)(bufStart+(buf-iBuf.c_str()));
 				}