[sword-cvs] sword/src/keys versekey.cpp,1.51,1.52

sword@www.crosswire.org sword@www.crosswire.org
Sun, 25 May 2003 21:32:47 -0700


Update of /usr/local/cvsroot/sword/src/keys
In directory www:/tmp/cvs-serv8807/src/keys

Modified Files:
	versekey.cpp 
Log Message:
	Added utilfuns/utilxml.cpp and test/xmltest which
		include basic xml utility classes
	Added comparison operators to SWBuf so it plays
		nicely with stl containers



Index: versekey.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/keys/versekey.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** versekey.cpp	9 May 2003 18:27:14 -0000	1.51
--- versekey.cpp	26 May 2003 04:32:45 -0000	1.52
***************
*** 388,395 ****
--- 388,397 ----
  	char dash = 0;
  	const char *orig = buf;
+ 	int q;
  	ListKey tmpListKey;
  	ListKey internalListKey;
  	SWKey tmpDefaultKey = defaultKey;
  	char lastPartial = 0;
+ 	bool inTerm = true;
  
  	curkey.AutoNormalize(0);
***************
*** 407,410 ****
--- 409,424 ----
  			break;
  
+ 		case ' ':
+ 			inTerm = true;
+ 			while (true) {
+ 				if (!*number)
+ 					break;
+ 				for (q = 1; ((buf[q]) && (buf[q] != ' ')); q++);
+ 				if (buf[q] == ':')
+ 					break;
+ 				inTerm = false;
+ 				break;
+ 			}
+ 			if (inTerm) break;
  		case '-': 
  		case ',': // on number new verse