[sword-svn] r2157 - in trunk: . bindings/corba/orbitcpp include src/modules/filters

[scribe at www.crosswire.org]

Author: scribe
Date: 2008-05-13 16:37:56 -0700 (Tue, 13 May 2008)
New Revision: 2157

Modified:
   trunk/bindings/corba/orbitcpp/Makefile
   trunk/include/thmlhtmlhref.h
   trunk/src/modules/filters/osisfootnotes.cpp
   trunk/src/modules/filters/osishtmlhref.cpp
   trunk/src/modules/filters/osisstrongs.cpp
   trunk/usrinst.sh
Log:
Fixed a number of bugs


Modified: trunk/bindings/corba/orbitcpp/Makefile
===================================================================
--- trunk/bindings/corba/orbitcpp/Makefile	2008-05-13 02:58:16 UTC (rev 2156)
+++ trunk/bindings/corba/orbitcpp/Makefile	2008-05-13 23:37:56 UTC (rev 2157)
@@ -18,9 +18,9 @@
 LIBS += -L/usr/lib64 -lORBit-2-cpp
 
 #comment out for release
-CXXFLAGS += -g -O0
-CFLAGS += -g -O0
-LDFLAGS += -g -O0
+#CXXFLAGS += -g -O0
+#CFLAGS += -g -O0
+#LDFLAGS += -g -O0
 #-----------------------------------------------------------------------------
 
 

Modified: trunk/include/thmlhtmlhref.h
===================================================================
--- trunk/include/thmlhtmlhref.h	2008-05-13 02:58:16 UTC (rev 2156)
+++ trunk/include/thmlhtmlhref.h	2008-05-13 23:37:56 UTC (rev 2157)
@@ -34,7 +34,7 @@
 	class MyUserData : public BasicFilterUserData {
 	public:
 		MyUserData(const SWModule *module, const SWKey *key);//: BasicFilterUserData(module, key) {}
-		SWBuf inscriptRef;
+		bool inscriptRef;
 		bool SecHead;
 		bool BiblicalText;
 		SWBuf version;

Modified: trunk/src/modules/filters/osisfootnotes.cpp
===================================================================
--- trunk/src/modules/filters/osisfootnotes.cpp	2008-05-13 02:58:16 UTC (rev 2156)
+++ trunk/src/modules/filters/osisfootnotes.cpp	2008-05-13 23:37:56 UTC (rev 2157)
@@ -108,7 +108,7 @@
 					hide = false;
 					if (option || (startTag.getAttribute("type") && !strcmp(startTag.getAttribute("type"), "crossReference"))) {	// we want the tag in the text; crossReferences are handled by another filter
 						text.append(startTag);
-						text.append(tagText);
+//						text.append(tagText);	// we don't put the body back in because it is retrievable from EntryAttributes["Footnotes"][]["body"].
 					}
 					else	continue;
 				}

Modified: trunk/src/modules/filters/osishtmlhref.cpp
===================================================================
--- trunk/src/modules/filters/osishtmlhref.cpp	2008-05-13 02:58:16 UTC (rev 2156)
+++ trunk/src/modules/filters/osishtmlhref.cpp	2008-05-13 23:37:56 UTC (rev 2157)
@@ -226,7 +226,10 @@
 						SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
 						VerseKey *vkey = NULL;
 						char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
-						u->inXRefNote = true; // Any note can have references in, so we need to set this to true for all notes
+
+						u->inXRefNote = true; // Why this change? Ben Morgan: Any note can have references in, so we need to set this to true for all notes
+//						u->inXRefNote = (ch == 'x');
+
 						// see if we have a VerseKey * or descendant
 						SWTRY {
 							vkey = SWDYNAMIC_CAST(VerseKey, u->key);

Modified: trunk/src/modules/filters/osisstrongs.cpp
===================================================================
--- trunk/src/modules/filters/osisstrongs.cpp	2008-05-13 02:58:16 UTC (rev 2156)
+++ trunk/src/modules/filters/osisstrongs.cpp	2008-05-13 23:37:56 UTC (rev 2157)
@@ -195,6 +195,9 @@
 				}
 
 				if (!option) {
+/*
+ * Code which handles multiple lemma types.  Kindof works but breaks at least WEBIF filters for strongs.
+ *
 					int count = wtag.getAttributePartCount("lemma", ' ');
 					for (int i = 0; i < count; i++) {
 						SWBuf a = wtag.getAttribute("lemma", i, ' ');
@@ -206,11 +209,19 @@
 							count--;
 						}
 					}
-					token = wtag;
-					token.trim();
-					// drop <>
-					token << 1;
-					token--;
+* Instead the codee below just removes the lemma attribute
+*****/
+					const char *l = wtag.getAttribute("lemma");
+					if (l) {
+						SWBuf savlm = l;
+						wtag.setAttribute("lemma", 0);
+						wtag.setAttribute("savlm", savlm);
+						token = wtag;
+						token.trim();
+						// drop <>
+						token << 1;
+						token--;
+					}
 				}
 			}
 			if (token.startsWith("/w")) {	// Word End

Modified: trunk/usrinst.sh
===================================================================
--- trunk/usrinst.sh	2008-05-13 02:58:16 UTC (rev 2156)
+++ trunk/usrinst.sh	2008-05-13 23:37:56 UTC (rev 2157)
@@ -12,6 +12,7 @@
 #OPTIONS="--without-curl $OPTIONS"
 OPTIONS="--enable-tests $OPTIONS"
 #OPTIONS="--disable-utilities $OPTIONS"
+#OPTIONS="--libdir=/usr/lib64 $OPTIONS"
 
 
 CPPFLAGS="$CFLAGS $CPPFLAGS -DUSBINARY" ./configure $OPTIONS $*