[sword-svn] r2644 - in trunk: include lib/bcppmake src/keys

[scribe at crosswire.org]

Author: scribe
Date: 2011-07-18 05:13:14 -0700 (Mon, 18 Jul 2011)
New Revision: 2644

Modified:
   trunk/include/ftplib.h
   trunk/lib/bcppmake/libsword.bpf
   trunk/lib/bcppmake/libsword.bpr
   trunk/src/keys/versekey.cpp
Log:
Added XHTML filters.
turn compat off in ftplib.h
versekey pass own copy of buf.  Why was this change in the SWORD checkout for BibleCS?  Need new memory.

Modified: trunk/include/ftplib.h
===================================================================
--- trunk/include/ftplib.h	2011-07-18 11:23:26 UTC (rev 2643)
+++ trunk/include/ftplib.h	2011-07-18 12:13:14 UTC (rev 2644)
@@ -23,6 +23,10 @@
 #if !defined(__FTPLIB_H)
 #define __FTPLIB_H
 
+#define _FTPLIB_NO_COMPAT
+
+
+
 #if defined(__unix__) || defined(VMS)
 #define GLOBALDEF
 #define GLOBALREF extern
@@ -50,7 +54,6 @@
 /* connection modes */
 #define FTPLIB_PASSIVE 1
 #define FTPLIB_PORT 2
-
 /* connection option names */
 #define FTPLIB_CONNMODE 1
 #define FTPLIB_CALLBACK 2

Modified: trunk/lib/bcppmake/libsword.bpf
===================================================================
--- trunk/lib/bcppmake/libsword.bpf	2011-07-18 11:23:26 UTC (rev 2643)
+++ trunk/lib/bcppmake/libsword.bpf	2011-07-18 12:13:14 UTC (rev 2644)
@@ -153,6 +153,9 @@
 USEUNIT("..\..\src\mgr\versemgr.cpp");
 USEUNIT("..\..\src\modules\filters\osisruby.cpp");
 USEUNIT("..\..\src\mgr\curlhttpt.cpp");
+USEUNIT("..\..\src\modules\filters\gbfxhtml.cpp");
+USEUNIT("..\..\src\modules\filters\osisxhtml.cpp");
+USEUNIT("..\..\src\modules\filters\thmlxhtml.cpp");
 //---------------------------------------------------------------------------
 #define Library
 

Modified: trunk/lib/bcppmake/libsword.bpr
===================================================================
--- trunk/lib/bcppmake/libsword.bpr	2011-07-18 11:23:26 UTC (rev 2643)
+++ trunk/lib/bcppmake/libsword.bpr	2011-07-18 12:13:14 UTC (rev 2644)
@@ -119,7 +119,10 @@
       ..\..\src\modules\comments\rawcom4\rawcom4.obj 
       ..\..\src\modules\common\rawverse4.obj 
       ..\..\src\modules\filters\teihtmlhref.obj ..\..\src\mgr\versemgr.obj 
-      ..\..\src\modules\filters\osisruby.obj ..\..\src\mgr\curlhttpt.obj"/>
+      ..\..\src\modules\filters\osisruby.obj ..\..\src\mgr\curlhttpt.obj 
+      ..\..\src\modules\filters\gbfxhtml.obj 
+      ..\..\src\modules\filters\osisxhtml.obj 
+      ..\..\src\modules\filters\thmlxhtml.obj"/>
     <RESFILES value=""/>
     <IDLFILES value=""/>
     <IDLGENFILES value=""/>
@@ -164,7 +167,7 @@
     <CFLAG1 value="-Od -Vx -X- -r- -a8 -4 -b- -k -y -v -vi- -c -tW -tWM"/>
     <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
     <AFLAGS value="/mx /w2 /zi"/>
-    <LFLAGS value="/P512"/>
+    <LFLAGS value="/P1024"/>
   </OPTIONS>
   <LINKER>
     <ALLOBJ value="$(OBJFILES)"/>
@@ -273,12 +276,14 @@
 Item2=../
 
 [HistoryLists\hlTlibPageSize]
-Count=5
-Item0=0x0200
-Item1=0x0080
-Item2=0x0040
-Item3=0x0020
-Item4=0x0010
+Count=7
+Item0=0x0400
+Item1=1024
+Item2=0x0200
+Item3=0x0080
+Item4=0x0040
+Item5=0x0020
+Item6=0x0010
 
 [Debugging]
 DebugSourceDirs=$(BCB)\source\vcl

Modified: trunk/src/keys/versekey.cpp
===================================================================
--- trunk/src/keys/versekey.cpp	2011-07-18 11:23:26 UTC (rev 2643)
+++ trunk/src/keys/versekey.cpp	2011-07-18 12:13:14 UTC (rev 2644)
@@ -285,7 +285,8 @@
 	int error = 0;
 
 	if (keytext) {
-		ListKey tmpListKey = ParseVerseList(keytext);
+		// pass our own copy of keytext as keytext memory may be freshed during parse 
+		ListKey tmpListKey = ParseVerseList(SWBuf(keytext).c_str());
 		if (tmpListKey.Count()) {
 			this->positionFrom(*tmpListKey.getElement(0));
 			error = this->error;