[sword-cvs] sword/src/keys treekeyidx.cpp,1.15,1.16 versekey.cpp,1.60,1.61

[sword@www.crosswire.org]

Update of /cvs/core/sword/src/keys
In directory www:/tmp/cvs-serv27118/src/keys

Modified Files:
	treekeyidx.cpp versekey.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: treekeyidx.cpp
===================================================================
RCS file: /cvs/core/sword/src/keys/treekeyidx.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- treekeyidx.cpp	16 Jan 2004 03:42:41 -0000	1.15
+++ treekeyidx.cpp	6 Feb 2004 21:01:00 -0000	1.16
@@ -62,9 +62,9 @@
 	}
 		
 	sprintf(buf, "%s.idx", path);
-	idxfd = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
+	idxfd = FileMgr::getSystemFileMgr()->open(buf, fileMode|O_BINARY, true);
 	sprintf(buf, "%s.dat", path);
-	datfd = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
+	datfd = FileMgr::getSystemFileMgr()->open(buf, fileMode|O_BINARY, true);
 
 	if (datfd <= 0) {
 		sprintf(buf, "Error: %d", errno);
@@ -86,8 +86,8 @@
 	if (path)
 		delete [] path;
 
-	FileMgr::systemFileMgr.close(idxfd);
-	FileMgr::systemFileMgr.close(datfd);
+	FileMgr::getSystemFileMgr()->close(idxfd);
+	FileMgr::getSystemFileMgr()->close(datfd);
 }
 
 
@@ -256,15 +256,15 @@
 
 	sprintf(buf, "%s.dat", 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);
 
 	sprintf(buf, "%s.idx", path);
 	FileMgr::removeFile(buf);
-	fd2 = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
+	fd2 = FileMgr::getSystemFileMgr()->open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
 	fd2->getFd();
-	FileMgr::systemFileMgr.close(fd2);
+	FileMgr::getSystemFileMgr()->close(fd2);
 
 	TreeKeyIdx newTree(path);
 	TreeKeyIdx::TreeNode root;
@@ -430,11 +430,11 @@
 		stdstr(&path, ikey.path);
 
 		if (idxfd) {
-			FileMgr::systemFileMgr.close(idxfd);
-			FileMgr::systemFileMgr.close(datfd);
+			FileMgr::getSystemFileMgr()->close(idxfd);
+			FileMgr::getSystemFileMgr()->close(datfd);
 		}
-		idxfd = FileMgr::systemFileMgr.open(ikey.idxfd->path, ikey.idxfd->mode, ikey.idxfd->perms);
-		datfd = FileMgr::systemFileMgr.open(ikey.datfd->path, ikey.datfd->mode, ikey.datfd->perms);
+		idxfd = FileMgr::getSystemFileMgr()->open(ikey.idxfd->path, ikey.idxfd->mode, ikey.idxfd->perms);
+		datfd = FileMgr::getSystemFileMgr()->open(ikey.datfd->path, ikey.datfd->mode, ikey.datfd->perms);
 	}
 }
 

Index: versekey.cpp
===================================================================
RCS file: /cvs/core/sword/src/keys/versekey.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- versekey.cpp	5 Feb 2004 10:24:36 -0000	1.60
+++ versekey.cpp	6 Feb 2004 21:01:01 -0000	1.61
@@ -60,7 +60,7 @@
 	verse = 0;
 	locale = 0;
 
-	setLocale(LocaleMgr::systemLocaleMgr().getDefaultLocaleName());
+	setLocale(LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName());
 }
 
 /******************************************************************************
@@ -155,7 +155,7 @@
 		localeCache.abbrevsCnt = 0;
 	}
 
-	SWLocale *locale = (useCache) ? localeCache.locale : LocaleMgr::systemLocaleMgr().getLocale(name);
+	SWLocale *locale = (useCache) ? localeCache.locale : LocaleMgr::getSystemLocaleMgr()->getLocale(name);
 	localeCache.locale = locale;
 
 	if (locale) {
@@ -198,7 +198,7 @@
             for (int i = 0; i < BMAX[t]; i++) {
                 int bn = getBookAbbrev(books[t][i].name);
                 if ((bn-1)%39 != i) {
-				SWLog::systemlog->LogError("Book: %s does not have a matching toupper abbrevs entry! book number returned was: %d", books[t][i].name, bn);
+				SWLog::getSystemLog()->logError("Book: %s does not have a matching toupper abbrevs entry! book number returned was: %d", books[t][i].name, bn);
                 }
             }
         }