[sword-svn] r1750 - in trunk: lib/bcppmake src/modules
src/modules/filters
scribe at crosswire.org
scribe at crosswire.org
Sun Mar 20 15:41:55 MST 2005
Author: scribe
Date: 2005-03-20 15:41:55 -0700 (Sun, 20 Mar 2005)
New Revision: 1750
Modified:
trunk/lib/bcppmake/libsword.bpr
trunk/src/modules/filters/osisfootnotes.cpp
trunk/src/modules/filters/osisrtf.cpp
trunk/src/modules/swmodule.cpp
Log:
Modified: trunk/lib/bcppmake/libsword.bpr
===================================================================
--- trunk/lib/bcppmake/libsword.bpr 2005-03-20 21:08:22 UTC (rev 1749)
+++ trunk/lib/bcppmake/libsword.bpr 2005-03-20 22:41:55 UTC (rev 1750)
@@ -118,7 +118,7 @@
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<LINKER value="TLib"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="libsword.bpf"/>
<INCLUDEPATH value="..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include"/>
@@ -144,9 +144,9 @@
-I..\..\..\biblecs\apps\InstallMgr\curl\include -src_suffix cpp -D_ICU_
-D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 -DUSELUCENE
-DLUCENE_DISABLE_MULTITHREADING -D_WIN32 -DHAVE_DIRENT -boa"/>
- <CFLAG1 value="-O2 -Vx -X- -a8 -b- -k- -vi -c -tW -tWM"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <AFLAGS value="/mx /w2 /zn"/>
+ <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -X- -r- -a8 -b- -k -y -v -vi- -c -tW -tWM"/>
+ <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+ <AFLAGS value="/mx /w2 /zi"/>
<LFLAGS value="/P512"/>
</OPTIONS>
<LINKER>
@@ -218,8 +218,8 @@
[HistoryLists\hlConditionals]
Count=15
-Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
-Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG
+Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG
+Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
Item2=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
Item3=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE
Item4=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG
@@ -261,13 +261,8 @@
[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
-LinkCGLIB=0
+LinkCGLIB=1
-[CORBA]
-AddServerUnit=1
-AddClientUnit=1
-PrecompiledHeaders=1
-
[Language]
ActiveLang=
ProjectLang=
Modified: trunk/src/modules/filters/osisfootnotes.cpp
===================================================================
--- trunk/src/modules/filters/osisfootnotes.cpp 2005-03-20 21:08:22 UTC (rev 1749)
+++ trunk/src/modules/filters/osisfootnotes.cpp 2005-03-20 22:41:55 UTC (rev 1750)
@@ -24,7 +24,6 @@
const SWBuf choices[3] = {"Off", "On", ""};
const StringList oValues(&choices[0], &choices[2]);
-VerseKey parser;
OSISFootnotes::OSISFootnotes() : SWOptionFilter(oName, oTip, &oValues) {
setOptionValue("Off");
@@ -44,8 +43,7 @@
SWBuf refs = "";
int footnoteNum = 1;
char buf[254];
-// VerseKey parser = key->getText();
- parser = key->getText();
+ VerseKey parser(key->getText());
SWBuf orig = text;
const char *from = orig.c_str();
Modified: trunk/src/modules/filters/osisrtf.cpp
===================================================================
--- trunk/src/modules/filters/osisrtf.cpp 2005-03-20 21:08:22 UTC (rev 1749)
+++ trunk/src/modules/filters/osisrtf.cpp 2005-03-20 22:41:55 UTC (rev 1750)
@@ -170,10 +170,10 @@
// <p> paragraph tag
else if (!strcmp(tag.getName(), "p")) {
if ((!tag.isEndTag()) && (!tag.isEmpty())) { // non-empty start tag
- buf += "{\\par ";
+ buf += "{\\par}";
}
else if (tag.isEndTag()) { // end tag
- buf += "\\par}";
+ buf += "{\\par}";
userData->supressAdjacentWhitespace = true;
}
else { // empty paragraph break marker
@@ -197,10 +197,10 @@
// <l> poetry
else if (!strcmp(tag.getName(), "l")) {
if ((!tag.isEndTag()) && (!tag.isEmpty())) {
- buf += "{";
+ buf += "";
}
else if (tag.isEndTag()) {
- buf += "\\par}";
+ buf += "{\\par}";
}
else if (tag.getAttribute("sID")) { // empty line marker
buf += "{\\par}";
Modified: trunk/src/modules/swmodule.cpp
===================================================================
--- trunk/src/modules/swmodule.cpp 2005-03-20 21:08:22 UTC (rev 1749)
+++ trunk/src/modules/swmodule.cpp 2005-03-20 22:41:55 UTC (rev 1750)
@@ -951,6 +951,9 @@
if (content && *content) {
+ // get "key" field
+ SWBuf keyText = (vkcheck) ? vkcheck->getOSISRef() : getKeyText();
+
// build "strong" field
SWBuf strong;
@@ -976,7 +979,7 @@
// add our entry to the clucene index
Document *doc = new Document();
- doc->add( Field::UnIndexed(_T("key"), getKeyText() ) );
+ doc->add( Field::UnIndexed(_T("key"), keyText ) );
doc->add( Field::UnStored(_T("content"), content) );
if (strong.length() > 0)
doc->add( Field::UnStored(_T("strong"), strong) );
More information about the sword-cvs
mailing list