[sword-cvs] sword/src/modules/comments/rawfiles rawfiles.cpp,1.30,1.31

[sword@www.crosswire.org]

Update of /cvs/core/sword/src/modules/comments/rawfiles
In directory www:/tmp/cvs-serv27118/src/modules/comments/rawfiles

Modified Files:
	rawfiles.cpp 
Log Message:
	Changed system[Log|File|Locale]Mgr to
		*Mgr *[get|set]System*Mgr() per Daniel Glassey's
		discovery of potential problems from order of
		initializing statics.

	Added new prefix recognition for OSIS lemma prefix
		"strong:"



Index: rawfiles.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/comments/rawfiles/rawfiles.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- rawfiles.cpp	16 Jan 2004 03:42:41 -0000	1.30
+++ rawfiles.cpp	6 Feb 2004 21:01:01 -0000	1.31
@@ -78,7 +78,7 @@
 		readText(key->Testament(), start, size, entryBuf);
 		tmpbuf += entryBuf;
 		entryBuf = "";
-		datafile = FileMgr::systemFileMgr.open(tmpbuf.c_str(), O_RDONLY|O_BINARY);
+		datafile = FileMgr::getSystemFileMgr()->open(tmpbuf.c_str(), O_RDONLY|O_BINARY);
 		if (datafile->getFd() > 0) {
 			size = lseek(datafile->getFd(), 0, SEEK_END);
 			char *tmpBuf = new char [ size + 1 ];
@@ -89,7 +89,7 @@
 			delete [] tmpBuf;
 //			preptext(entrybuf);
 		}
-		FileMgr::systemFileMgr.close(datafile);
+		FileMgr::getSystemFileMgr()->close(datafile);
 	}
 
 	if (key != this->key)
@@ -135,11 +135,11 @@
 		doSetText(key->Testament(), key->Index(), tmpbuf);
 		entryBuf += tmpbuf;
 	}
-	datafile = FileMgr::systemFileMgr.open(entryBuf, O_CREAT|O_WRONLY|O_BINARY|O_TRUNC);
+	datafile = FileMgr::getSystemFileMgr()->open(entryBuf, O_CREAT|O_WRONLY|O_BINARY|O_TRUNC);
 	if (datafile->getFd() > 0) {
 		write(datafile->getFd(), inbuf, len);
 	}
-	FileMgr::systemFileMgr.close(datafile);
+	FileMgr::getSystemFileMgr()->close(datafile);
 	
 	if (key != this->key)
 		delete key;
@@ -228,15 +228,15 @@
 	FileDesc *datafile;
 
 	sprintf(incfile, "%s/incfile", path);
-	datafile = FileMgr::systemFileMgr.open(incfile, O_RDONLY|O_BINARY);
+	datafile = FileMgr::getSystemFileMgr()->open(incfile, O_RDONLY|O_BINARY);
 	if (read(datafile->getFd(), &number, 4) != 4)
 		number = 0;
 	number++;
-	FileMgr::systemFileMgr.close(datafile);
+	FileMgr::getSystemFileMgr()->close(datafile);
 	
-	datafile = FileMgr::systemFileMgr.open(incfile, O_CREAT|O_WRONLY|O_BINARY|O_TRUNC);
+	datafile = FileMgr::getSystemFileMgr()->open(incfile, O_CREAT|O_WRONLY|O_BINARY|O_TRUNC);
 	write(datafile->getFd(), &number, 4);
-	FileMgr::systemFileMgr.close(datafile);
+	FileMgr::getSystemFileMgr()->close(datafile);
 	sprintf(incfile, "%.7ld", number-1);
 	return incfile;
 }
@@ -248,10 +248,10 @@
 	FileDesc *datafile;
 
 	sprintf(incfile, "%s/incfile", path);
-	datafile = FileMgr::systemFileMgr.open(incfile, O_CREAT|O_WRONLY|O_BINARY|O_TRUNC);
+	datafile = FileMgr::getSystemFileMgr()->open(incfile, O_CREAT|O_WRONLY|O_BINARY|O_TRUNC);
     delete [] incfile;
 	write(datafile->getFd(), &zero, 4);
-	FileMgr::systemFileMgr.close(datafile);
+	FileMgr::getSystemFileMgr()->close(datafile);
 
     return RawVerse::createModule (path);
 }