[sword-svn] r2374 - in trunk: include src/mgr tests

[scribe at crosswire.org]

Author: scribe
Date: 2009-05-03 20:48:01 -0700 (Sun, 03 May 2009)
New Revision: 2374

Modified:
   trunk/include/Makefile.am
   trunk/src/mgr/swmgr.cpp
   trunk/tests/parsekey.cpp
Log:
Fixed bug which inhibitted LocalePath entry from being used when SWORD_PATH (and other checks) were found.


Modified: trunk/include/Makefile.am
===================================================================
--- trunk/include/Makefile.am	2009-05-02 15:12:11 UTC (rev 2373)
+++ trunk/include/Makefile.am	2009-05-04 03:48:01 UTC (rev 2374)
@@ -3,6 +3,7 @@
 pkginclude_HEADERS =  $(swincludedir)/Greek2Greek.h
 pkginclude_HEADERS += $(swincludedir)/GreekChars.h
 pkginclude_HEADERS += $(swincludedir)/canon.h
+pkginclude_HEADERS += $(swincludedir)/canon_abbrevs.h
 pkginclude_HEADERS += $(swincludedir)/cipherfil.h
 pkginclude_HEADERS += $(swincludedir)/curlftpt.h
 pkginclude_HEADERS += $(swincludedir)/curlhttpt.h

Modified: trunk/src/mgr/swmgr.cpp
===================================================================
--- trunk/src/mgr/swmgr.cpp	2009-05-02 15:12:11 UTC (rev 2373)
+++ trunk/src/mgr/swmgr.cpp	2009-05-04 03:48:01 UTC (rev 2374)
@@ -403,6 +403,13 @@
 			if ((entry = sysConf->Sections["Install"].find("DataPath")) != sysConf->Sections["Install"].end()) {
 				sysConfDataPath = (*entry).second;
 			}
+			if (providedSysConf) {
+				*providedSysConf = sysConf;
+			}
+			else {
+				delete sysConf;
+				sysConf = 0;
+			}
 		}
 		if (!sysConfDataPath.size()) {
 			SWLog::getSystemLog()->logDebug("Checking working directory for mods.conf...");
@@ -422,7 +429,7 @@
 				return;
 			}
 
-		   // check working directory ../library/
+			// check working directory ../library/
 			SWLog::getSystemLog()->logDebug("Checking working directory ../library/ for mods.d...");
 			if (FileMgr::existsDir("../library", "mods.d")) {
 				SWLog::getSystemLog()->logDebug("found.");

Modified: trunk/tests/parsekey.cpp
===================================================================
--- trunk/tests/parsekey.cpp	2009-05-02 15:12:11 UTC (rev 2373)
+++ trunk/tests/parsekey.cpp	2009-05-04 03:48:01 UTC (rev 2374)
@@ -35,6 +35,7 @@
 		LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(argv[2]);
 
 	VerseKey DefaultVSKey;
+//	DefaultVSKey.AutoNormalize(0);
 
 	if (argc > 3)
 		DefaultVSKey.setVersificationSystem(argv[3]);