[sword-svn] r1899 - in trunk: bindings/corba/orbitcpp include utilities

[scribe at crosswire.org]

Author: scribe
Date: 2006-03-24 19:45:52 -0700 (Fri, 24 Mar 2006)
New Revision: 1899

Modified:
   trunk/bindings/corba/orbitcpp/swordorb-impl.cpp
   trunk/include/swmgr.h
   trunk/utilities/mod2osis.cpp
Log:
Changes to support FC5 gcc 4.1 compiler
fixed bug that corba bindings didn't change to adjust to the deprecated TreeKey::getFullPath deletion.


Modified: trunk/bindings/corba/orbitcpp/swordorb-impl.cpp
===================================================================
--- trunk/bindings/corba/orbitcpp/swordorb-impl.cpp	2006-03-21 15:26:25 UTC (rev 1898)
+++ trunk/bindings/corba/orbitcpp/swordorb-impl.cpp	2006-03-25 02:45:52 UTC (rev 1899)
@@ -321,7 +321,7 @@
 	TreeKeyIdx *tkey = SWDYNAMIC_CAST(TreeKeyIdx, key);
 	if (tkey) {
 		if (tkey->parent()) {
-			retVal = tkey->getFullName();
+			retVal = tkey->getText();
 		}
 	}
 	return CORBA::string_dup((const char *)retVal);

Modified: trunk/include/swmgr.h
===================================================================
--- trunk/include/swmgr.h	2006-03-21 15:26:25 UTC (rev 1898)
+++ trunk/include/swmgr.h	2006-03-25 02:45:52 UTC (rev 1899)
@@ -307,7 +307,7 @@
 	 * @param module context module if filter needs this for processing
 	 * @return error status
 	 */
-	virtual char SWMgr::filterText(const char *filterName, SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+	virtual char filterText(const char *filterName, SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
 
 	/**
 	 * Sets the cipher key for the given module. This function updates the key

Modified: trunk/utilities/mod2osis.cpp
===================================================================
--- trunk/utilities/mod2osis.cpp	2006-03-21 15:26:25 UTC (rev 1898)
+++ trunk/utilities/mod2osis.cpp	2006-03-25 02:45:52 UTC (rev 1899)
@@ -71,7 +71,7 @@
 	SWKey *key = (SWKey *)*inModule;
 	VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
 
-	char *buf;
+	char buf[1024];
 	bool opentest = false;
 	bool openbook = false;
 	bool openchap = false;
@@ -156,7 +156,6 @@
 				if (openbook)
 					cout << "\t</div>\n";
 			}
-			buf = new char [205];
 			*buf = 0;
 			tmpKey = *vkey;
 			tmpKey.Chapter(0);
@@ -164,7 +163,6 @@
 			sprintf(buf, "\t<div type=\"book\" osisID=\"%s\">\n", tmpKey.getOSISRef());
 //			filter.ProcessText(buf, 200 - 3, &lastHeading, inModule);
 			cout << "" << buf << endl;
-			delete [] buf;
 			openbook = true;
 			newBook = true;
 		}
@@ -173,18 +171,17 @@
 				if (openchap)
 					cout << "\t</chapter>\n";
 			}
-			buf = new char [205];
 			*buf = 0;
 			tmpKey = *vkey;
 			tmpKey.Verse(0);
 			sprintf(buf, "\t<chapter osisID=\"%s\">\n", tmpKey.getOSISRef());
 //			filter.ProcessText(buf, 200 - 3, &lastHeading, inModule);
 			cout << "" << buf;
-			delete [] buf;
 			openchap = true;
 		}
-		SWBuf verseText = inModule->RenderText();
-		cout << verseText.c_str() << endl;
+		SWBuf verseText = inModule->getRawEntry();
+		sprintf(buf, "\t\t<verse osisID=\"%s\">", vkey->getOSISRef());
+		cout << buf << verseText.c_str() << "</verse>\n" << endl;
 		lastChap = vkey->Chapter();
 		lastBook = vkey->Book();
 		lastTest = vkey->Testament();