[sword-cvs] sword/src/modules/texts/rawtext rawtext.cpp,1.62,1.63

[sword@www.crosswire.org]

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

Modified Files:
	rawtext.cpp 
Log Message:
no message

Index: rawtext.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/texts/rawtext/rawtext.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** rawtext.cpp	19 Jun 2003 16:58:30 -0000	1.62
--- rawtext.cpp	27 Jun 2003 01:41:08 -0000	1.63
***************
*** 14,18 ****
  #endif
  
- #include <string>
  #include <utilfuns.h>
  #include <rawverse.h>
--- 14,17 ----
***************
*** 28,32 ****
  #endif
  
- using std::string;
  using std::map;
  using std::list;
--- 27,30 ----
***************
*** 35,39 ****
  SWORD_NAMESPACE_START
  
! typedef  map < string, list<long> > strlist;
  typedef list<long> longlist;
  
--- 33,37 ----
  SWORD_NAMESPACE_START
  
! typedef  map < SWBuf, list<long> > strlist;
  typedef list<long> longlist;
  
***************
*** 50,54 ****
            RawVerse(ipath) {
            
! 	string fname;
  	fname = path;
  	char ch = fname.c_str()[strlen(fname.c_str())-1];
--- 48,52 ----
            RawVerse(ipath) {
            
! 	SWBuf fname;
  	fname = path;
  	char ch = fname.c_str()[strlen(fname.c_str())-1];
***************
*** 58,62 ****
  	for (int loop = 0; loop < 2; loop++) {
       	fastSearch[loop] = 0;
! 		string fastidxname =(fname + ((loop)?"ntwords.dat":"otwords.dat"));
  		if (!access(fastidxname.c_str(), 04)) {
  			fastidxname = (fname + ((loop)?"ntwords.idx":"otwords.idx"));
--- 56,60 ----
  	for (int loop = 0; loop < 2; loop++) {
       	fastSearch[loop] = 0;
! 		SWBuf fastidxname =(fname + ((loop)?"ntwords.dat":"otwords.dat"));
  		if (!access(fastidxname.c_str(), 04)) {
  			fastidxname = (fname + ((loop)?"ntwords.idx":"otwords.idx"));
***************
*** 149,153 ****
  	// containing every module position that contains
  	// the word.  [0] Old Testament; [1] NT
! 	map < string, list<long> > dictionary[2];
  
  
--- 147,151 ----
  	// containing every module position that contains
  	// the word.  [0] Old Testament; [1] NT
! 	map < SWBuf, list<long> > dictionary[2];
  
  
***************
*** 212,216 ****
  	unsigned short size;
  
! 	string fname;
  	fname = path;
  	char ch = fname.c_str()[strlen(fname.c_str())-1];
--- 210,214 ----
  	unsigned short size;
  
! 	SWBuf fname;
  	fname = path;
  	char ch = fname.c_str()[strlen(fname.c_str())-1];