[sword-svn] r2325 - in trunk: . bindings include tests tests/testsuite utilities

[scribe at crosswire.org]

Author: scribe
Date: 2009-04-20 12:09:25 -0700 (Mon, 20 Apr 2009)
New Revision: 2325

Modified:
   trunk/ChangeLog
   trunk/bindings/flatapi.cpp
   trunk/include/config.h
   trunk/tests/testsuite/versekeytest.good
   trunk/tests/versekeytest.cpp
   trunk/utilities/osis2mod.cpp
Log:
Fixed compile on UNIX.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-04-20 18:40:15 UTC (rev 2324)
+++ trunk/ChangeLog	2009-04-20 19:09:25 UTC (rev 2325)
@@ -1,5 +1,7 @@
 API ChangeLog 
 
+* Release 1.6.0 *
+
 12-Apr-2009	Troy A. Griffitts <scribe at crosswire.org>
 	Added '.' feature for entryAttrib search, e.g,
 		Word//Lemma./G932/ will find in Lemma, Lemma.1, etc.

Modified: trunk/bindings/flatapi.cpp
===================================================================
--- trunk/bindings/flatapi.cpp	2009-04-20 18:40:15 UTC (rev 2324)
+++ trunk/bindings/flatapi.cpp	2009-04-20 19:09:25 UTC (rev 2325)
@@ -321,7 +321,7 @@
 
 SWHANDLE listkey_getVerselistIterator(const char *list, const char *key, const char *v11n) {
 	VerseKey versekey;
-        versekey.setVersification(v11n);
+        versekey.setVersificationSystem(v11n);
 	static ListKey verses;
 	
 	versekey.setText(key);

Modified: trunk/include/config.h
===================================================================
--- trunk/include/config.h	2009-04-20 18:40:15 UTC (rev 2324)
+++ trunk/include/config.h	2009-04-20 19:09:25 UTC (rev 2325)
@@ -40,6 +40,10 @@
 /* Define to 1 if you have the `vsnprintf' function. */
 #define HAVE_VSNPRINTF 1
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
 /* Name of package */
 #define PACKAGE "sword"
 

Modified: trunk/tests/testsuite/versekeytest.good
===================================================================
--- trunk/tests/testsuite/versekeytest.good	2009-04-20 18:40:15 UTC (rev 2324)
+++ trunk/tests/testsuite/versekeytest.good	2009-04-20 19:09:25 UTC (rev 2325)
@@ -36,3 +36,4 @@
 MAXCHAPTER: John 21:1
 TOP: Genesis 1:1
 BOTTOM: Revelation of John 22:21
+John 3:16: 0

Modified: trunk/tests/versekeytest.cpp
===================================================================
--- trunk/tests/versekeytest.cpp	2009-04-20 18:40:15 UTC (rev 2324)
+++ trunk/tests/versekeytest.cpp	2009-04-20 19:09:25 UTC (rev 2325)
@@ -198,6 +198,9 @@
 	vk = BOTTOM;
 	cout << "BOTTOM: " << vk << "\n";
 
+	VerseKey yo = "jn.3.16";
+	VerseKey yo2 = yo++;
+	cout << yo2 << ": " << (int)yo2.Error() <<  endl;
 
 	return 0;
 }

Modified: trunk/utilities/osis2mod.cpp
===================================================================
--- trunk/utilities/osis2mod.cpp	2009-04-20 18:40:15 UTC (rev 2324)
+++ trunk/utilities/osis2mod.cpp	2009-04-20 19:09:25 UTC (rev 2325)
@@ -93,7 +93,7 @@
 
 bool isOSISAbbrev(const char *buf) {
         VerseMgr *vmgr = VerseMgr::getSystemVerseMgr();
-        VerseMgr::System *v11n = vmgr->getVersificationSystem(currentVerse.getVersificationSystem());
+        const VerseMgr::System *v11n = vmgr->getVersificationSystem(currentVerse.getVersificationSystem());
         return v11n->getBookNumberByOSISName(buf) >= 0;
 }
 
@@ -388,7 +388,7 @@
 	}
 
 	static VerseKey lastKey;
-	lastKey.setVersificationSystem(currentKey.getVersificationSystem());
+	lastKey.setVersificationSystem(currentVerse.getVersificationSystem());
 	lastKey.AutoNormalize(0);
 	lastKey.Headings(1);