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

[scribe at crosswire.org]

Author: scribe
Date: 2005-03-15 18:57:51 -0700 (Tue, 15 Mar 2005)
New Revision: 1741

Modified:
   trunk/bindings/corba/orbitcpp/Makefile
   trunk/bindings/corba/orbitcpp/testclient.cpp
   trunk/src/modules/filters/thmlwordjs.cpp
   trunk/usrinst.sh
Log:
Trying to make morphs into popups


Modified: trunk/bindings/corba/orbitcpp/Makefile
===================================================================
--- trunk/bindings/corba/orbitcpp/Makefile	2005-03-11 12:31:32 UTC (rev 1740)
+++ trunk/bindings/corba/orbitcpp/Makefile	2005-03-16 01:57:51 UTC (rev 1741)
@@ -9,9 +9,9 @@
 LIBS += -licui18n -licuuc -licudata -lpthread -licuio
 
 #comment out for release
-#CXXFLAGS += -g -O0
-#CFLAGS += -g -O0
-#LDFLAGS += -g -O0
+CXXFLAGS += -g -O0
+CFLAGS += -g -O0
+LDFLAGS += -g -O0
 #----------------------------------
 
 server: swordorb-common.o server.cpp swordorb-impl.o swordorb-cpp.o swordorb-cpp-common.o swordorb-stubs.o swordorb-cpp-stubs.o swordorb-cpp-skels.o swordorb-skels.o swordorb-cpp.o

Modified: trunk/bindings/corba/orbitcpp/testclient.cpp
===================================================================
--- trunk/bindings/corba/orbitcpp/testclient.cpp	2005-03-11 12:31:32 UTC (rev 1740)
+++ trunk/bindings/corba/orbitcpp/testclient.cpp	2005-03-16 01:57:51 UTC (rev 1741)
@@ -46,7 +46,7 @@
 */
 		mgr->setJavascript(true);
 		mgr->setGlobalOption("Textual Variants", "Secondary Reading");
-		module = mgr->getModuleByName("NASB");
+		module = mgr->getModuleByName("WHNU");
 		for (module->setKeyText("jas.1.1"); !module->error(); module->next()) {
 			std::cout << "KeyText: " << module->getKeyText() << "\n";
 			std::cout << "Text: " << module->getRenderText() << "\n";

Modified: trunk/src/modules/filters/thmlwordjs.cpp
===================================================================
--- trunk/src/modules/filters/thmlwordjs.cpp	2005-03-11 12:31:32 UTC (rev 1740)
+++ trunk/src/modules/filters/thmlwordjs.cpp	2005-03-16 01:57:51 UTC (rev 1741)
@@ -153,11 +153,14 @@
 						else strong << 1;
 
 						SWModule *sLex = 0;
+						SWModule *sMorph = 0;
 						if (gh == 'G') {
 							sLex = defaultGreekLex;
+							sMorph = defaultGreekParse;
 						}
 						if (gh == 'H') {
 							sLex = defaultHebLex;
+							sMorph = defaultHebParse;
 						}
 						SWBuf lexName = "";
 						if (sLex) {
@@ -186,8 +189,19 @@
 							int textStr = atoi(textSt.c_str());
 							textStr += lastAppendLen;
 							SWBuf spanStart = "";
+
+
+
+							if (sMorph) {
+								SWBuf popMorph = "";
+								popMorph.appendFormatted("<a onclick=\"p(\'%s\',\'%s\','%s_%s','');\" >%s</a>", sMorph->Name(), morph.c_str(), layer.c_str(), wstr, morph.c_str());
+								morph = popMorph;
+							}
+
+
+
 							// 'p' = 'fillpop' to save bandwidth
-							spanStart.appendFormatted("<span onclick=\"p(\'%s\', \'%s\', '%s_%s', '%s');\" >", lexName.c_str(), strong.c_str(), layer.c_str(), wstr, morph.c_str());
+							spanStart.appendFormatted("<span onclick=\"p(\'%s\',\'%s\','%s_%s','%s');\" >", lexName.c_str(), strong.c_str(), layer.c_str(), wstr, morph.c_str());
 							text.insert(textStr, spanStart);
 							lastAppendLen = spanStart.length();
 						}

Modified: trunk/usrinst.sh
===================================================================
--- trunk/usrinst.sh	2005-03-11 12:31:32 UTC (rev 1740)
+++ trunk/usrinst.sh	2005-03-16 01:57:51 UTC (rev 1741)
@@ -6,12 +6,12 @@
 OPTIONS="--sysconfdir=/etc $OPTIONS"
 OPTIONS="--with-icu $OPTIONS"
 #OPTIONS="--with-vcl $OPTIONS"
-OPTIONS="--enable-debug $OPTIONS"
+#OPTIONS="--enable-debug $OPTIONS"
 #OPTIONS="--enable-profile $OPTIONS"
 OPTIONS="--with-lucene $OPTIONS"
 #OPTIONS="--without-curl $OPTIONS"
 #OPTIONS="--enable-tests $OPTIONS"
-#OPTIONS="--disable-utilities $OPTIONS"
+OPTIONS="--disable-utilities $OPTIONS"
 
 
 CPPFLAGS="$CFLAGS $CPPFLAGS -DUSBINARY" ./configure $OPTIONS $*