[sword-cvs] sword/src/modules/genbook/rawgenbook rawgenbook.cpp,1.13,1.14

[sword@www.crosswire.org]

Update of /cvs/core/sword/src/modules/genbook/rawgenbook
In directory www:/tmp/cvs-serv27118/src/modules/genbook/rawgenbook

Modified Files:
	rawgenbook.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: rawgenbook.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/genbook/rawgenbook/rawgenbook.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- rawgenbook.cpp	16 Jan 2004 03:42:42 -0000	1.13
+++ rawgenbook.cpp	6 Feb 2004 21:01:02 -0000	1.14
@@ -48,7 +48,7 @@
 
 
 	sprintf(buf, "%s.bdt", path);
-	bdtfd = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
+	bdtfd = FileMgr::getSystemFileMgr()->open(buf, fileMode|O_BINARY, true);
 
 	delete [] buf;
 
@@ -61,7 +61,7 @@
 
 RawGenBook::~RawGenBook() {
 
-	FileMgr::systemFileMgr.close(bdtfd);
+	FileMgr::getSystemFileMgr()->close(bdtfd);
 
 	if (path)
 		delete [] path;
@@ -191,9 +191,9 @@
 
 	sprintf(buf, "%s.bdt", path);
 	FileMgr::removeFile(buf);
-	fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
+	fd = FileMgr::getSystemFileMgr()->open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
 	fd->getFd();
-	FileMgr::systemFileMgr.close(fd);
+	FileMgr::getSystemFileMgr()->close(fd);
 
 	retval = TreeKeyIdx::create(path);
 	delete [] path;