[sword-svn] r2764 - in trunk: . bindings bindings/corba/omniorbcpp bindings/corba/orbitcpp examples/classes include src/frontend src/keys src/mgr src/modules src/modules/comments src/modules/comments/hrefcom src/modules/comments/rawcom src/modules/comments/rawcom4 src/modules/comments/rawfiles src/modules/comments/zcom src/modules/common src/modules/filters src/modules/genbook src/modules/genbook/rawgenbook src/modules/lexdict src/modules/lexdict/rawld src/modules/lexdict/rawld4 src/modules/lexdict/zld src/modules/texts src/modules/texts/rawtext src/modules/texts/rawtext4 src/modules/texts/ztext tests tests/testsuite utilities utilities/diatheke
scribe at crosswire.org
scribe at crosswire.org
Sat Jan 19 09:19:47 MST 2013
Author: scribe
Date: 2013-01-19 09:19:47 -0700 (Sat, 19 Jan 2013)
New Revision: 2764
Modified:
trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp
trunk/bindings/corba/orbitcpp/webmgr.hpp
trunk/bindings/flatapi.cpp
trunk/buildtest.cpp
trunk/configure.ac
trunk/examples/classes/Makefile
trunk/include/echomod.h
trunk/include/hrefcom.h
trunk/include/rawcom.h
trunk/include/rawcom4.h
trunk/include/rawfiles.h
trunk/include/rawgenbook.h
trunk/include/rawld.h
trunk/include/rawld4.h
trunk/include/rawstr.h
trunk/include/rawstr4.h
trunk/include/rawtext.h
trunk/include/rawtext4.h
trunk/include/rawverse.h
trunk/include/rawverse4.h
trunk/include/swcom.h
trunk/include/swdisp.h
trunk/include/swgenbook.h
trunk/include/swkey.h
trunk/include/swld.h
trunk/include/swmgr.h
trunk/include/swmodule.h
trunk/include/swtext.h
trunk/include/versekey.h
trunk/include/versetreekey.h
trunk/include/zcom.h
trunk/include/zld.h
trunk/include/zstr.h
trunk/include/ztext.h
trunk/include/zverse.h
trunk/src/frontend/swdisp.cpp
trunk/src/keys/listkey.cpp
trunk/src/keys/swkey.cpp
trunk/src/keys/treekeyidx.cpp
trunk/src/keys/versekey.cpp
trunk/src/keys/versetreekey.cpp
trunk/src/mgr/encfiltmgr.cpp
trunk/src/mgr/markupfiltmgr.cpp
trunk/src/mgr/swmgr.cpp
trunk/src/modules/comments/hrefcom/hrefcom.cpp
trunk/src/modules/comments/rawcom/rawcom.cpp
trunk/src/modules/comments/rawcom4/rawcom4.cpp
trunk/src/modules/comments/rawfiles/rawfiles.cpp
trunk/src/modules/comments/swcom.cpp
trunk/src/modules/comments/zcom/zcom.cpp
trunk/src/modules/common/rawstr.cpp
trunk/src/modules/common/rawstr4.cpp
trunk/src/modules/common/rawverse.cpp
trunk/src/modules/common/rawverse4.cpp
trunk/src/modules/common/zstr.cpp
trunk/src/modules/common/zverse.cpp
trunk/src/modules/filters/gbffootnotes.cpp
trunk/src/modules/filters/gbfhtmlhref.cpp
trunk/src/modules/filters/gbfosis.cpp
trunk/src/modules/filters/gbfwordjs.cpp
trunk/src/modules/filters/gbfxhtml.cpp
trunk/src/modules/filters/osisfootnotes.cpp
trunk/src/modules/filters/osishtmlhref.cpp
trunk/src/modules/filters/osisosis.cpp
trunk/src/modules/filters/osisplain.cpp
trunk/src/modules/filters/osisrtf.cpp
trunk/src/modules/filters/osisstrongs.cpp
trunk/src/modules/filters/osiswebif.cpp
trunk/src/modules/filters/osiswordjs.cpp
trunk/src/modules/filters/osisxhtml.cpp
trunk/src/modules/filters/teihtmlhref.cpp
trunk/src/modules/filters/teirtf.cpp
trunk/src/modules/filters/teixhtml.cpp
trunk/src/modules/filters/thmlfootnotes.cpp
trunk/src/modules/filters/thmlhtmlhref.cpp
trunk/src/modules/filters/thmlosis.cpp
trunk/src/modules/filters/thmlrtf.cpp
trunk/src/modules/filters/thmlscripref.cpp
trunk/src/modules/filters/thmlwordjs.cpp
trunk/src/modules/filters/thmlxhtml.cpp
trunk/src/modules/filters/utf8transliterator.cpp
trunk/src/modules/genbook/rawgenbook/rawgenbook.cpp
trunk/src/modules/genbook/swgenbook.cpp
trunk/src/modules/lexdict/rawld/rawld.cpp
trunk/src/modules/lexdict/rawld4/rawld4.cpp
trunk/src/modules/lexdict/swld.cpp
trunk/src/modules/lexdict/zld/zld.cpp
trunk/src/modules/swmodule.cpp
trunk/src/modules/texts/rawtext/rawtext.cpp
trunk/src/modules/texts/rawtext4/rawtext4.cpp
trunk/src/modules/texts/swtext.cpp
trunk/src/modules/texts/ztext/ztext.cpp
trunk/tests/indextest.cpp
trunk/tests/introtest.cpp
trunk/tests/keytest.cpp
trunk/tests/listtest.cpp
trunk/tests/mgrtest.cpp
trunk/tests/modtest.cpp
trunk/tests/parsekey.cpp
trunk/tests/striptest.cpp
trunk/tests/testsuite/osis.good
trunk/tests/versekeytest.cpp
trunk/tests/vtreekeytest.cpp
trunk/utilities/addgb.cpp
trunk/utilities/addld.cpp
trunk/utilities/addvs.cpp
trunk/utilities/cipherraw.cpp
trunk/utilities/diatheke/corediatheke.cpp
trunk/utilities/diatheke/diafiltmgr.cpp
trunk/utilities/diatheke/diathekemgr.cpp
trunk/utilities/diatheke/gbfcgi.cpp
trunk/utilities/diatheke/gbfcgi.h
trunk/utilities/diatheke/thmlcgi.cpp
trunk/utilities/diatheke/thmlcgi.h
trunk/utilities/emptyvss.cpp
trunk/utilities/gbfidx.cpp
trunk/utilities/genbookutil.cpp
trunk/utilities/imp2gbs.cpp
trunk/utilities/imp2ld.cpp
trunk/utilities/imp2vs.cpp
trunk/utilities/installmgr.cpp
trunk/utilities/mkfastmod.cpp
trunk/utilities/mod2imp.cpp
trunk/utilities/mod2osis.cpp
trunk/utilities/mod2vpl.cpp
trunk/utilities/mod2zmod.cpp
trunk/utilities/osis2mod.cpp
trunk/utilities/tei2mod.cpp
trunk/utilities/treeidxutil.cpp
trunk/utilities/vpl2mod.cpp
trunk/utilities/vs2osisreftxt.cpp
Log:
Updated naming conventions in swkey and swmodule, which rippled out to most every class and file
Modified: trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp
===================================================================
--- trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -59,22 +59,22 @@
sword::ListKey result;
if ((scope) && (strlen(scope)) > 0) {
- sword::SWKey *p = delegate->CreateKey();
+ sword::SWKey *p = delegate->createKey();
sword::VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p);
if (!parser) {
delete p;
parser = new VerseKey();
}
*parser = delegate->getKeyText();
- lscope = parser->ParseVerseList(scope, *parser, true);
- result = delegate->Search(istr, stype, flags, &lscope);
+ lscope = parser->parseVerseList(scope, *parser, true);
+ result = delegate->search(istr, stype, flags, &lscope);
delete parser;
}
- else result = delegate->Search(istr, stype, flags);
+ else result = delegate->search(istr, stype, flags);
swordorb::SearchHitList *retVal = new swordorb::SearchHitList;
int count = 0;
- for (result = sword::TOP; !result.Error(); result++) count++;
+ for (result = sword::TOP; !result.popError(); result++) count++;
retVal->length(count);
int i = 0;
@@ -83,8 +83,8 @@
if ((count) && (long)result.getElement()->userData)
result.sort();
- for (result = sword::TOP; !result.Error(); result++) {
- (*retVal)[i].modName = CORBA::string_dup(assureValidUTF8(delegate->Name()));
+ for (result = sword::TOP; !result.popError(); result++) {
+ (*retVal)[i].modName = CORBA::string_dup(assureValidUTF8(delegate->getName()));
(*retVal)[i].key = CORBA::string_dup(assureValidUTF8((const char *)result));
(*retVal)[i++].score = (long)result.getElement()->userData;
}
@@ -93,7 +93,7 @@
}
::CORBA::Char swordorb_SWModule_i::error() {
- return delegate->Error();
+ return delegate->popError();
}
::CORBA::Long swordorb_SWModule_i::getEntrySize(){
@@ -170,14 +170,14 @@
swordorb::StringList *retVal = new swordorb::StringList;
if (parser) {
sword::ListKey result;
- result = parser->ParseVerseList(keyText, *parser, true);
+ result = parser->parseVerseList(keyText, *parser, true);
int count = 0;
- for (result = sword::TOP; !result.Error(); result++) {
+ for (result = sword::TOP; !result.popError(); result++) {
count++;
}
retVal->length(count);
count = 0;
- for (result = sword::TOP; !result.Error(); result++) {
+ for (result = sword::TOP; !result.popError(); result++) {
(*retVal)[count++] = CORBA::string_dup(assureValidUTF8(VerseKey(result).getOSISRef()));
}
}
@@ -204,18 +204,18 @@
}
}
else if (*keyText=='=') {
- vkey->Headings(true);
- vkey->AutoNormalize(false);
+ vkey->setIntros(true);
+ vkey->setAutoNormalize(false);
vkey->setText(keyText+1);
return;
}
}
- delegate->KeyText(keyText);
+ delegate->setKey(keyText);
}
char* swordorb_SWModule_i::getKeyText(){
- return CORBA::string_dup(assureValidUTF8((char *)delegate->KeyText()));
+ return CORBA::string_dup(assureValidUTF8((char *)delegate->getKeyText()));
}
::CORBA::Boolean swordorb_SWModule_i::hasKeyChildren(){
@@ -296,15 +296,15 @@
}
char* swordorb_SWModule_i::getName(){
- return CORBA::string_dup(assureValidUTF8((char *)delegate->Name()));
+ return CORBA::string_dup(assureValidUTF8((char *)delegate->getName()));
}
char* swordorb_SWModule_i::getDescription(){
- return CORBA::string_dup(assureValidUTF8((char *)delegate->Description()));
+ return CORBA::string_dup(assureValidUTF8((char *)delegate->getDescription()));
}
char* swordorb_SWModule_i::getCategory(){
- SWBuf type = delegate->Type();
+ SWBuf type = delegate->getType();
SWBuf cat = delegate->getConfigEntry("Category");
if (cat.length() > 0)
type = cat;
@@ -378,14 +378,14 @@
for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); it++) {
module = it->second;
if ((!(module->getConfigEntry("CipherKey"))) || (*(module->getConfigEntry("CipherKey")))) {
- SWBuf type = module->Type();
+ SWBuf type = module->getType();
SWBuf cat = module->getConfigEntry("Category");
if (cat.length() > 0)
type = cat;
- (*milist)[i].name = CORBA::string_dup(assureValidUTF8(module->Name()));
- (*milist)[i].description = CORBA::string_dup(assureValidUTF8(module->Description()));
+ (*milist)[i].name = CORBA::string_dup(assureValidUTF8(module->getName()));
+ (*milist)[i].description = CORBA::string_dup(assureValidUTF8(module->getDescription()));
(*milist)[i].category = CORBA::string_dup(assureValidUTF8(type.c_str()));
- (*milist)[i++].language = CORBA::string_dup(assureValidUTF8(module->Lang()));
+ (*milist)[i++].language = CORBA::string_dup(assureValidUTF8(module->getLanguage()));
if (i >= size) break;
}
}
Modified: trunk/bindings/corba/orbitcpp/webmgr.hpp
===================================================================
--- trunk/bindings/corba/orbitcpp/webmgr.hpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/bindings/corba/orbitcpp/webmgr.hpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -67,12 +67,12 @@
void AddGlobalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start, ConfigEntMap::iterator end) {
// ThML word stuff needs to process before strongs strip
- if (module->Markup() == FMT_THML) {
- module->AddOptionFilter(thmlWordJS);
+ if (module->getMarkup() == FMT_THML) {
+ module->addOptionFilter(thmlWordJS);
}
- if (module->Markup() == FMT_GBF) {
- module->AddOptionFilter(gbfWordJS);
+ if (module->getMarkup() == FMT_GBF) {
+ module->addOptionFilter(gbfWordJS);
}
// add other module filters
@@ -94,12 +94,12 @@
if (module->getConfig().has("GlobalOptionFilter", "ThMLVariants")) {
OptionFilterMap::iterator it = optionFilters.find("ThMLVariants");
if (it != optionFilters.end()) {
- module->AddOptionFilter((*it).second); // add filter to module and option as a valid option
+ module->addOptionFilter((*it).second); // add filter to module and option as a valid option
}
}
- if (module->Markup() == FMT_OSIS) {
- module->AddOptionFilter(osisWordJS);
+ if (module->getMarkup() == FMT_OSIS) {
+ module->addOptionFilter(osisWordJS);
}
}
Modified: trunk/bindings/flatapi.cpp
===================================================================
--- trunk/bindings/flatapi.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/bindings/flatapi.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -178,7 +178,7 @@
return -1;
results.ClearList();
- results = module->Search(searchString, type, params, scope, 0, percent, (void *) &percentUserData);
+ results = module->search(searchString, type, params, scope, 0, percent, (void *) &percentUserData);
return (SWHANDLE)&results;
}
@@ -188,7 +188,7 @@
*/
char SWModule_error(SWHANDLE hmodule) {
SWModule *module = (SWModule *)hmodule;
- return (module) ? module->Error() : 0;
+ return (module) ? module->popError() : 0;
}
@@ -209,7 +209,7 @@
const char *SWModule_getKeyText(SWHANDLE hmodule) {
SWModule *module = (SWModule *)hmodule;
- return (const char *)((module) ? module->KeyText() : 0);
+ return (const char *)((module) ? module->getKeyText() : 0);
}
@@ -218,19 +218,19 @@
const char *SWModule_getName(SWHANDLE hmodule) {
SWModule *module = (SWModule *)hmodule;
- return (const char *)((module) ? module->Name() : 0);
+ return (const char *)((module) ? module->getName() : 0);
}
const char *SWModule_getDescription(SWHANDLE hmodule) {
SWModule *module = (SWModule *)hmodule;
- return (const char *)((module) ? module->Description() : 0);
+ return (const char *)((module) ? module->getDescription() : 0);
}
const char *SWModule_getType(SWHANDLE hmodule) {
SWModule *module = (SWModule *)hmodule;
- return (const char *)((module) ? module->Type() : 0);
+ return (const char *)((module) ? module->getType() : 0);
}
@@ -279,7 +279,7 @@
static SWBuf preverseHeading;
char buf[12];
sprintf(buf, "%i", pvHeading);
- module->SetKey(key);
+ module->setKey(key);
module->RenderText();
preverseHeading = module->getEntryAttributes()["Heading"]["Preverse"][buf].c_str();
return (preverseHeading.length()) ? (const char*)preverseHeading.c_str() : NULL;
@@ -288,8 +288,8 @@
const char *SWModule_getFootnoteType(SWHANDLE hmodule, const char *key, const char *note) {
SWModule *module = (SWModule *)hmodule;
static SWBuf type;
- module->Error();
- module->SetKey(key);
+ module->popError();
+ module->setKey(key);
module->RenderText();
type = module->getEntryAttributes()["Footnote"][note]["type"].c_str();
return (type) ? (const char*)type.c_str() : NULL;
@@ -298,7 +298,7 @@
const char *SWModule_getFootnoteBody(SWHANDLE hmodule, const char *key, const char *note) {
SWModule *module = (SWModule *)hmodule;
static SWBuf body;
- module->Error();
+ module->popError();
module->setKey(key);
module->RenderText();
body = module->getEntryAttributes()["Footnote"][note]["body"].c_str();
@@ -310,8 +310,8 @@
const char *SWModule_getFootnoteRefList(SWHANDLE hmodule, const char *key, const char *note) {
SWModule *module = (SWModule *)hmodule;
static SWBuf refList;
- module->Error();
- module->SetKey(key);
+ module->popError();
+ module->setKey(key);
module->RenderText();
refList = module->getEntryAttributes()["Footnote"][note]["refList"].c_str();
return (refList) ? (const char*)refList.c_str() : NULL;
@@ -326,7 +326,7 @@
versekey.setText(key);
verses.ClearList();
- verses = versekey.ParseVerseList(list, versekey);
+ verses = versekey.parseVerseList(list, versekey);
return (SWHANDLE)&verses;
}
@@ -357,7 +357,7 @@
const char *listkey_iterator_val(SWHANDLE lki) {
ListKey *lk = (ListKey*)lki;
- if(!lk->Error())
+ if(!lk->popError())
return (const char *) lk->getText();
return NULL;
}
Modified: trunk/buildtest.cpp
===================================================================
--- trunk/buildtest.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/buildtest.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -50,13 +50,13 @@
if (argc > 3)
- mykey.AutoNormalize(0); // Turn off autonormalize if 3 args to allow for intros
+ mykey.setAutoNormalize(false); // Turn off autonormalize if 3 args to allow for intros
// This is kludgy but at lease you can try it
// with something like: sword "Matthew 1:0" 1 1
mykey = (argc < 2) ? "James 1:19" : argv[1];
- mykey.Persist(1);
+ mykey.setPersist(true);
text.setKey(mykey);
commentary.setKey(mykey);
@@ -69,10 +69,10 @@
for (loop = 0; loop < max; loop++) {
cout << (SWKey &)text << ":\n";
- text.Display();
+ text.display();
cout << "\n";
cout << "-------------\n";
- commentary.Display();
+ commentary.display();
cout << "\n";
cout << "==========================\n";
mykey++;
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/configure.ac 2013-01-19 16:19:47 UTC (rev 2764)
@@ -92,14 +92,14 @@
if test x$enable_debug = xyes; then
GCJFLAGS="-g -O0"
if test x$ac_cv_prog_cc_g = xyes; then
- AM_CFLAGS="-g3 -O0 -Wall -Werror"
+ AM_CFLAGS="-g3 -O0 -Wall -Werror -Woverloaded-virtual"
else
- AM_CFLAGS="-O0 -Wall -Werror"
+ AM_CFLAGS="-O0 -Wall -Werror -Woverloaded-virtual"
fi
if test x$ac_cv_prog_cxx_g = xyes; then
- AM_CXXFLAGS="-g3 -O0 -Wall -Werror"
+ AM_CXXFLAGS="-g3 -O0 -Wall -Werror -Woverloaded-virtual"
else
- AM_CXXFLAGS="-O0 -Wall -Werror"
+ AM_CXXFLAGS="-O0 -Wall -Werror -Woverloaded-virtual"
fi
else
AM_CFLAGS="-O3"
@@ -211,8 +211,8 @@
AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
if test x$enable_warnings = xyes; then
- AM_CFLAGS="$AM_CFLAGS -Werror"
- AM_CXXFLAGS="$AM_CXXFLAGS -Werror"
+ AM_CFLAGS="$AM_CFLAGS -Werror -Woverloaded-virtual"
+ AM_CXXFLAGS="$AM_CXXFLAGS -Werror -Woverloaded-virtual"
fi
if test x$enable_profile = xyes; then
Modified: trunk/examples/classes/Makefile
===================================================================
--- trunk/examples/classes/Makefile 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/examples/classes/Makefile 2013-01-19 16:19:47 UTC (rev 2764)
@@ -1,4 +1,4 @@
-TARGETS= ciphercng swmgrex verseranges lastVerseInChapter
+TARGETS= ciphercng swmgrex verseranges lastVerseInChapter verseposition
all: $(TARGETS)
clean:
Modified: trunk/include/echomod.h
===================================================================
--- trunk/include/echomod.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/echomod.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -34,7 +34,7 @@
public:
EchoMod();
virtual ~EchoMod();
- virtual SWBuf &getRawEntryBuf();
+ virtual SWBuf &getRawEntryBuf() const;
};
SWORD_NAMESPACE_END
Modified: trunk/include/hrefcom.h
===================================================================
--- trunk/include/hrefcom.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/hrefcom.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -40,7 +40,7 @@
HREFCom(const char *ipath, const char *prefix, const char *iname = 0,
const char *idesc = 0, SWDisplay * idisp = 0);
virtual ~HREFCom();
- virtual SWBuf &getRawEntryBuf();
+ virtual SWBuf &getRawEntryBuf() const;
// OPERATORS -----------------------------------------------------------------
Modified: trunk/include/rawcom.h
===================================================================
--- trunk/include/rawcom.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/rawcom.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -41,13 +41,13 @@
const char *ilang = 0, const char *versification = "KJV");
virtual ~RawCom();
- virtual SWBuf &getRawEntryBuf();
+ virtual SWBuf &getRawEntryBuf() const;
virtual void increment(int steps = 1);
virtual void decrement(int steps = 1) { increment(-steps); }
// write interface ----------------------------
- virtual bool isWritable();
+ virtual bool isWritable() const;
static char createModule(const char *path, const char *v11n = "KJV") { return RawVerse::createModule(path, v11n); }
virtual void setEntry(const char *inbuf, long len = -1); // Modify current module entry
virtual void linkEntry(const SWKey *linkKey); // Link current module entry to other module entry
Modified: trunk/include/rawcom4.h
===================================================================
--- trunk/include/rawcom4.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/rawcom4.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -41,13 +41,13 @@
const char *ilang = 0, const char *versification = "KJV");
virtual ~RawCom4();
- virtual SWBuf &getRawEntryBuf();
+ virtual SWBuf &getRawEntryBuf() const;
virtual void increment(int steps = 1);
virtual void decrement(int steps = 1) { increment(-steps); }
// write interface ----------------------------
- virtual bool isWritable();
+ virtual bool isWritable() const;
static char createModule(const char *path, const char *v11n = "KJV") { return RawVerse4::createModule(path, v11n); }
virtual void setEntry(const char *inbuf, long len = -1); // Modify current module entry
virtual void linkEntry(const SWKey *linkKey); // Link current module entry to other module entry
Modified: trunk/include/rawfiles.h
===================================================================
--- trunk/include/rawfiles.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/rawfiles.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -43,13 +43,13 @@
SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN,
const char *ilang = 0);
virtual ~RawFiles();
- virtual SWBuf &getRawEntryBuf();
+ virtual SWBuf &getRawEntryBuf() const;
// write interface ----------------------------
/** Is the module writable? :)
* @return yes or no
*/
- virtual bool isWritable();
+ virtual bool isWritable() const;
/** Creates a new module
* @param path The first parameter is path of the new module
Modified: trunk/include/rawgenbook.h
===================================================================
--- trunk/include/rawgenbook.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/rawgenbook.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -44,14 +44,14 @@
SWTextDirection dir = DIRECTION_LTR,
SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, const char *keyType = "TreeKey");
virtual ~RawGenBook();
- virtual SWBuf &getRawEntryBuf();
+ virtual SWBuf &getRawEntryBuf() const;
// write interface ----------------------------
- virtual bool isWritable();
+ virtual bool isWritable() const;
static char createModule(const char *ipath);
virtual void setEntry(const char *inbuf, long len = -1); // Modify current module entry
virtual void linkEntry(const SWKey * linkKey); // Link current module entry to other module entry
virtual void deleteEntry(); // Delete current module entry
- virtual SWKey *CreateKey() const;
+ virtual SWKey *createKey() const;
// end write interface ------------------------
virtual bool hasEntry(const SWKey *k) const;
Modified: trunk/include/rawld.h
===================================================================
--- trunk/include/rawld.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/rawld.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -31,7 +31,7 @@
SWORD_NAMESPACE_START
class SWDLLEXPORT RawLD : public RawStr, public SWLD {
- char getEntry(long away = 0);
+ char getEntry(long away = 0) const;
public:
@@ -42,12 +42,12 @@
SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, bool caseSensitive = false);
virtual ~RawLD();
- virtual SWBuf &getRawEntryBuf();
+ virtual SWBuf &getRawEntryBuf() const;
virtual void increment(int steps = 1);
virtual void decrement(int steps = 1) { increment(-steps); }
// write interface ----------------------------
- virtual bool isWritable();
+ virtual bool isWritable() const;
static char createModule(const char *path) { return RawStr::createModule (path); }
virtual void setEntry(const char *inbuf, long len = -1); // Modify current module entry
Modified: trunk/include/rawld4.h
===================================================================
--- trunk/include/rawld4.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/rawld4.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -31,7 +31,7 @@
SWORD_NAMESPACE_START
class SWDLLEXPORT RawLD4 : public RawStr4, public SWLD {
- char getEntry(long away = 0);
+ char getEntry(long away = 0) const;
public:
@@ -42,12 +42,12 @@
SWTextMarkup markup = FMT_UNKNOWN, const char *ilang = 0, bool caseSensitive = false);
virtual ~RawLD4();
- virtual SWBuf &getRawEntryBuf();
+ virtual SWBuf &getRawEntryBuf() const;
virtual void increment(int steps = 1);
virtual void decrement(int steps = 1) { increment(-steps); }
// write interface ----------------------------
- virtual bool isWritable();
+ virtual bool isWritable() const;
static char createModule(const char *path) { return RawStr4::createModule(path); }
virtual void setEntry(const char *inbuf, long len = -1); // Modify current module entry
Modified: trunk/include/rawstr.h
===================================================================
--- trunk/include/rawstr.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/rawstr.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -54,7 +54,7 @@
void getIDXBuf(long ioffset, char **buf) const;
void getIDXBufDat(long ioffset, char **buf) const;
signed char findOffset(const char *key, __u32 *start, __u16 *size, long away = 0, __u32 *idxoff = 0) const;
- void readText(__u32 start, __u16 *size, char **idxbuf, SWBuf &buf);
+ void readText(__u32 start, __u16 *size, char **idxbuf, SWBuf &buf) const;
static signed char createModule(const char *path);
};
Modified: trunk/include/rawstr4.h
===================================================================
--- trunk/include/rawstr4.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/rawstr4.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -53,7 +53,7 @@
void getIDXBuf(long ioffset, char **buf) const;
void getIDXBufDat(long ioffset, char **buf) const;
signed char findOffset(const char *key, __u32 *start, __u32 *size, long away = 0, __u32 *idxoff = 0) const;
- void readText(__u32 start, __u32 *size, char **idxbuf, SWBuf &buf);
+ void readText(__u32 start, __u32 *size, char **idxbuf, SWBuf &buf) const;
static signed char createModule(const char *path);
};
Modified: trunk/include/rawtext.h
===================================================================
--- trunk/include/rawtext.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/rawtext.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -38,11 +38,11 @@
RawText(const char *ipath, const char *iname = 0, const char *idesc = 0, SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, const char *versification = "KJV");
virtual ~RawText();
- virtual SWBuf &getRawEntryBuf();
+ virtual SWBuf &getRawEntryBuf() const;
virtual void increment(int steps = 1);
virtual void decrement(int steps = 1) { increment(-steps); }
// write interface ----------------------------
- virtual bool isWritable();
+ virtual bool isWritable() const;
static char createModule(const char *path, const char *v11n = "KJV") { return RawVerse::createModule(path, v11n); }
virtual void setEntry(const char *inbuf, long len = -1); // Modify current module entry
virtual void linkEntry(const SWKey *linkKey); // Link current module entry to other module entry
Modified: trunk/include/rawtext4.h
===================================================================
--- trunk/include/rawtext4.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/rawtext4.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -39,11 +39,11 @@
RawText4(const char *ipath, const char *iname = 0, const char *idesc = 0, SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, const char *versification = "KJV");
virtual ~RawText4();
- virtual SWBuf &getRawEntryBuf();
+ virtual SWBuf &getRawEntryBuf() const;
virtual void increment(int steps = 1);
virtual void decrement(int steps = 1) { increment(-steps); }
// write interface ----------------------------
- virtual bool isWritable();
+ virtual bool isWritable() const;
static char createModule(const char *path, const char *v11n = "KJV") { return RawVerse4::createModule(path, v11n); }
virtual void setEntry(const char *inbuf, long len = -1); // Modify current module entry
virtual void linkEntry(const SWKey *linkKey); // Link current module entry to other module entry
Modified: trunk/include/rawverse.h
===================================================================
--- trunk/include/rawverse.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/rawverse.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -33,7 +33,7 @@
RawVerse(const char *ipath, int fileMode = -1);
virtual ~RawVerse();
void findOffset(char testmt, long idxoff, long *start, unsigned short *end) const;
- void readText(char testmt, long start, unsigned short size, SWBuf &buf);
+ void readText(char testmt, long start, unsigned short size, SWBuf &buf) const;
static char createModule(const char *path, const char *v11n = "KJV");
};
Modified: trunk/include/rawverse4.h
===================================================================
--- trunk/include/rawverse4.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/rawverse4.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -33,7 +33,7 @@
RawVerse4(const char *ipath, int fileMode = -1);
virtual ~RawVerse4();
void findOffset(char testmt, long idxoff, long *start, unsigned long *end) const;
- void readText(char testmt, long start, unsigned long size, SWBuf &buf);
+ void readText(char testmt, long start, unsigned long size, SWBuf &buf) const;
static char createModule(const char *path, const char *v11n = "KJV");
};
Modified: trunk/include/swcom.h
===================================================================
--- trunk/include/swcom.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/swcom.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -68,7 +68,7 @@
const char *versification = "KJV");
virtual ~SWCom();
- virtual SWKey *CreateKey() const;
+ virtual SWKey *createKey() const;
virtual long getIndex() const;
virtual void setIndex(long iindex);
Modified: trunk/include/swdisp.h
===================================================================
--- trunk/include/swdisp.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/swdisp.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -46,7 +46,7 @@
* @param imodule module to display
* @return error status
*/
- virtual char Display (SWModule & imodule);
+ virtual char display(SWModule & imodule);
};
SWORD_NAMESPACE_END
Modified: trunk/include/swgenbook.h
===================================================================
--- trunk/include/swgenbook.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/swgenbook.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -35,7 +35,7 @@
class SWDLLEXPORT SWGenBook : public SWModule {
protected:
- char *entkeytxt;
+ mutable char *entkeytxt;
mutable TreeKey *tmpTreeKey;
TreeKey &getTreeKey(const SWKey *k = 0) const;
@@ -48,7 +48,7 @@
SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0);
virtual ~SWGenBook();
- virtual SWKey *CreateKey() const = 0;
+ virtual SWKey *createKey() const = 0;
// OPERATORS -----------------------------------------------------------------
Modified: trunk/include/swkey.h
===================================================================
--- trunk/include/swkey.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/swkey.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -103,7 +103,7 @@
char *keytext;
mutable char *rangeText;
mutable bool boundSet;
- char persist;
+ bool persist;
char error;
char *localeName;
@@ -137,23 +137,27 @@
*/
virtual SWKey *clone() const;
+
/** Gets whether this key should persist in any module to which it is set
* otherwise just a copy will be used in the module.
* @return 1 - persists in module; 0 - a copy is attempted
*/
- char Persist() const;
+ bool isPersist() const;
+ SWDEPRECATED char Persist() const { return isPersist(); }
/** Sets whether this key should persist in any module to which it is set
* otherwise just a copy will be used in the module.
* @param ipersist value which to set persist;
* @return 1 - persists in module; 0 - a copy is attempted
*/
- char Persist(signed char ipersist);
+ SWDEPRECATED char Persist(signed char ipersist) { setPersist(ipersist); return isPersist(); }
+ void setPersist(bool ipersist);
/** Gets and clears error status
* @return error status
*/
- virtual char Error();
+ SWDEPRECATED char Error() { return popError(); }
+ virtual char popError();
virtual void setError(char err) { error = err; }
/** Sets this SWKey with a character string
@@ -204,10 +208,6 @@
*/
virtual void increment(int steps = 1);
- /** deprecated, use isTraversible
- */
- SWDEPRECATED char Traversable() { return (isTraversable()) ? 1:0; }
-
/** Whether or not this key can be ++ -- incremented
*/
virtual bool isTraversable() const { return false; }
@@ -218,12 +218,10 @@
/** Use this function to get an index position within a module.
*/
virtual long getIndex() const { return index; }
- SWDEPRECATED long Index() const { return getIndex(); } // deprecated, use getIndex()
/** See documentation for @ref Index()
*/
virtual void setIndex(long iindex) { index = iindex; }
- SWDEPRECATED long Index(long iindex) { setIndex(iindex); return getIndex(); } // deprecated, use setIndex(...)
SWKEY_OPERATORS
Modified: trunk/include/swld.h
===================================================================
--- trunk/include/swld.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/swld.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -34,7 +34,7 @@
*/
class SWDLLEXPORT SWLD : public SWModule {
protected:
- char *entkeytxt;
+ mutable char *entkeytxt;
static void strongsPad(char *buf);
public:
/** Initializes data for instance of SWLD
@@ -45,7 +45,7 @@
SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0);
virtual ~SWLD();
- virtual SWKey *CreateKey() const;
+ virtual SWKey *createKey() const;
/** Sets/gets module KeyText, getting from saved text if key is persistent
*
@@ -53,7 +53,7 @@
* [0] - only get
* @return pointer to keytext
*/
- virtual const char *KeyText(const char *ikeytext = 0);
+ virtual const char *getKeyText() const;
virtual void setPosition(SW_POSITION pos);
Modified: trunk/include/swmgr.h
===================================================================
--- trunk/include/swmgr.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/swmgr.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -98,7 +98,6 @@
SWConfig *mysysconfig;
SWConfig *homeConfig;
void CreateMods(bool multiMod = false);
- SWDEPRECATED SWModule *CreateMod(const char *name, const char *driver, ConfigEntMap §ion) { return createModule(name, driver, section); }
virtual SWModule *createModule(const char *name, const char *driver, ConfigEntMap §ion);
void DeleteMods();
char configType; // 0 = file; 1 = directory
Modified: trunk/include/swmodule.h
===================================================================
--- trunk/include/swmodule.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/swmodule.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -93,7 +93,7 @@
mutable AttributeTypeList entryAttributes;
mutable bool procEntAttr;
- char error;
+ mutable char error;
bool skipConsecutiveLinks;
/** the current key */
@@ -113,7 +113,7 @@
SWDisplay *disp;
static SWDisplay rawdisp;
- SWBuf entryBuf;
+ mutable SWBuf entryBuf;
/** filters to be executed to remove all markup (for searches) */
FilterList *stripFilters;
@@ -130,7 +130,7 @@
/** filters to be executed to decode text for display */
FilterList *encodingFilters;
- int entrySize;
+ mutable int entrySize;
mutable long entryIndex; // internal common storage for index
static void prepText(SWBuf &buf);
@@ -165,7 +165,8 @@
*
* @return error status
*/
- virtual char Error();
+ virtual char popError();
+ SWDEPRECATED virtual char Error() { return popError(); }
/**
* @return True if this module is encoded in Unicode, otherwise returns false.
@@ -201,15 +202,15 @@
/**
* @deprecated Use setKey() instead.
*/
- char SetKey(const SWKey *ikey) { return setKey(ikey); }
+ SWDEPRECATED char SetKey(const SWKey *ikey) { return setKey(ikey); }
/**
* @deprecated Use setKey() instead.
*/
- char SetKey(const SWKey &ikey) { return setKey(ikey); }
+ SWDEPRECATED char SetKey(const SWKey &ikey) { return setKey(ikey); }
/**
* @deprecated Use setKey() instead.
*/
- char Key(const SWKey & ikey) { return setKey(ikey); }
+ SWDEPRECATED char Key(const SWKey & ikey) { return setKey(ikey); }
/** Gets the current module key
* @return the current key of this module
@@ -218,7 +219,7 @@
/**
* @deprecated Use getKey() instead.
*/
- SWKey &Key() const { return *getKey(); }
+ SWDEPRECATED SWKey &Key() const { return *getKey(); }
/**
* Sets/gets module KeyText
@@ -226,7 +227,7 @@
* @param ikeytext Value which to set keytext; [0]-only get
* @return pointer to keytext
*/
- virtual const char *KeyText(const char *ikeytext = 0) {
+ SWDEPRECATED const char *KeyText(const char *ikeytext = 0) {
if (ikeytext) setKey(ikeytext);
return *getKey();
}
@@ -244,15 +245,16 @@
virtual long getIndex() const { return entryIndex; }
virtual void setIndex(long iindex) { entryIndex = iindex; }
// deprecated, use getIndex()
- long Index() const { return getIndex(); }
+ SWDEPRECATED long Index() const { return getIndex(); }
// deprecated, use setIndex(...)
- long Index(long iindex) { setIndex(iindex); return getIndex(); }
+ SWDEPRECATED long Index(long iindex) { setIndex(iindex); return getIndex(); }
/** Calls this module's display object and passes itself
*
* @return error status
*/
- virtual char Display();
+ virtual char display();
+ SWDEPRECATED char Display() { return display(); }
/** Gets display driver
*
@@ -269,7 +271,7 @@
/**
* @deprecated Use get/setDisplay() instead.
*/
- SWDisplay *Disp(SWDisplay * idisp = 0) {
+ SWDEPRECATED SWDisplay *Disp(SWDisplay * idisp = 0) {
if (idisp)
setDisplay(idisp);
return getDisplay();
@@ -279,74 +281,76 @@
*
* @return pointer to modname
*/
- char *Name() const { return getName(); }
- virtual char *getName() const;
+ const char *getName() const;
+ SWDEPRECATED const char *Name() const { return getName(); }
/** Sets module name
*
* @param imodname Value which to set modname; [0]-only get
* @return pointer to modname
*/
- char *Name(const char *imodname) { setName(imodname); return getName(); }
- virtual void setName(const char *imodname);
+ SWDEPRECATED const char *Name(const char *imodname) { stdstr(&modname, imodname); return getName(); }
/** Gets module description
*
* @return pointer to moddesc
*/
- char *Description() const { return getDescription(); }
- virtual char *getDescription() const;
+ const char *getDescription() const;
+ SWDEPRECATED const char *Description() const { return getDescription(); }
/** Sets module description
*
* @param imoddesc Value which to set moddesc; [0]-only get
* @return pointer to moddesc
*/
- char *Description(const char *imoddesc) { setDescription(imoddesc); return getDescription(); }
- virtual void setDescription(const char *imoddesc);
+ SWDEPRECATED const char *Description(const char *imoddesc) { stdstr(&moddesc, imoddesc); return getDescription(); }
/** Gets module type
*
* @return pointer to modtype
*/
- char *Type() const { return getType(); }
- virtual char *getType() const;
+ const char *getType() const;
+ SWDEPRECATED const char *Type() const { return getType(); }
/** Sets module type
*
* @param imodtype Value which to set modtype; [0]-only get
* @return pointer to modtype
*/
- char *Type(const char *imodtype) { setType(imodtype); return getType(); }
- virtual void setType(const char *imodtype);
+ SWDEPRECATED const char *Type(const char *imodtype) { setType(imodtype); return getType(); }
+ void setType(const char *imodtype) { stdstr(&modtype, imodtype); }
/** Sets/gets module direction
*
* @param newdir Value which to set direction; [-1]-only get
* @return new direction
*/
- virtual char Direction(signed char newdir = -1);
+ virtual char getDirection() const;
+ SWDEPRECATED char Direction(signed char newdir = -1) { char retVal = getDirection(); if (newdir != -1) return direction = newdir; return retVal; }
/** Sets/gets module encoding
*
* @param enc Value which to set encoding; [-1]-only get
* @return Encoding
*/
- virtual char Encoding(signed char enc = -1);
+ char getEncoding() const { return encoding; }
+ SWDEPRECATED char Encoding(signed char enc = -1) { char retVal = getEncoding(); if (enc != -1) encoding = enc; return retVal; }
/** Sets/gets module markup
*
- * @param markup Vvalue which to set markup; [-1]-only get
+ * @param markup Value which to set markup; [-1]-only get
* @return Markup
*/
- virtual char Markup(signed char markup = -1);
+ char getMarkup() const { return markup; }
+ SWDEPRECATED char Markup(signed char imarkup = -1) { char retVal = getMarkup(); if (imarkup != -1) markup = imarkup; return retVal; }
/** Sets/gets module language
*
* @param imodlang Value which to set modlang; [0]-only get
* @return pointer to modlang
*/
- virtual char *Lang(const char *imodlang = 0);
+ const char *getLanguage() const { return modlang; }
+ SWDEPRECATED const char *Lang(char *imodlang = 0) { if (imodlang != 0) stdstr(&modlang, imodlang); return getLanguage(); }
// search interface -------------------------------------------------
@@ -376,7 +380,7 @@
void *percentUserData = 0);
// for backward compat-- deprecated
- virtual ListKey &Search(const char *istr, int searchType = 0, int flags = 0,
+ SWDEPRECATED ListKey &Search(const char *istr, int searchType = 0, int flags = 0,
SWKey * scope = 0,
bool * justCheckIfSupported = 0,
void (*percent) (char, void *) = &nullPercent,
@@ -386,18 +390,20 @@
/** Allocates a key of specific type for module
- * The different reimplementatiosn of SWModule (e.g. SWText) support SWKey implementations, which support special.
- * This functions returns a SWKey object which works with the current implementation of SWModule. For example for the SWText class it returns a VerseKey object.
+ * The different reimplementations of SWModule (e.g. SWText) support SWKey implementations,
+ * which support special. This functions returns a SWKey object which works with the current
+ * implementation of SWModule. For example for the SWText class it returns a VerseKey object.
* @see VerseKey, ListKey, SWText, SWLD, SWCom
- * @return pointer to allocated key
+ * @return pointer to allocated key. Caller is responsible for deleting the object
*/
- virtual SWKey *CreateKey() const;
+ virtual SWKey *createKey() const;
+ SWDEPRECATED SWKey *CreateKey() const { return createKey(); }
/** This function is reimplemented by the different kinds
* of module objects
* @return the raw module text of the current entry
*/
- virtual SWBuf &getRawEntryBuf() = 0;
+ virtual SWBuf &getRawEntryBuf() const = 0;
virtual const char *getRawEntry() { return getRawEntryBuf().c_str(); }
@@ -405,7 +411,7 @@
/** Is the module writable? :)
* @return yes or no
*/
- virtual bool isWritable() { return false; }
+ virtual bool isWritable() const { return false; }
/** Creates a new, empty module
* @param path path where to create the new module
@@ -448,14 +454,14 @@
* @param buf the buffer to filter
* @param key key location from where this buffer was extracted
*/
- virtual void filterBuffer(OptionFilterList *filters, SWBuf &buf, const SWKey *key);
+ virtual void filterBuffer(OptionFilterList *filters, SWBuf &buf, const SWKey *key) const;
/** FilterBuffer a text buffer
* @param filters the FilterList of filters to iterate
* @param buf the buffer to filter
* @param key key location from where this buffer was extracted
*/
- virtual void filterBuffer(FilterList *filters, SWBuf &buf, const SWKey *key);
+ virtual void filterBuffer(FilterList *filters, SWBuf &buf, const SWKey *key) const;
/** Adds a RenderFilter to this module's renderFilters queue.
* Render Filters are called when the module is asked to produce
@@ -463,10 +469,13 @@
* @param newfilter the filter to add
* @return *this
*/
- virtual SWModule &AddRenderFilter(SWFilter *newfilter) {
- renderFilters->push_back(newfilter);
+ virtual SWModule &addRenderFilter(SWFilter *newFilter) {
+ renderFilters->push_back(newFilter);
return *this;
}
+ SWDEPRECATED SWModule &AddRenderFilter(SWFilter *newFilter) {
+ return addRenderFilter(newFilter);
+ }
/** Retrieves a container of render filters associated with this
* module.
@@ -480,30 +489,36 @@
* @param oldfilter the filter to remove
* @return *this
*/
- virtual SWModule &RemoveRenderFilter(SWFilter *oldfilter) {
- renderFilters->remove(oldfilter);
+ virtual SWModule &removeRenderFilter(SWFilter *oldFilter) {
+ renderFilters->remove(oldFilter);
return *this;
}
+ SWDEPRECATED SWModule &RemoveRenderFilter(SWFilter *oldFilter) {
+ return removeRenderFilter(oldFilter);
+ }
/** Replaces a RenderFilter in this module's renderfilters queue
* @param oldfilter the filter to remove
* @param newfilter the filter to add in its place
* @return *this
*/
- virtual SWModule &ReplaceRenderFilter(SWFilter *oldfilter, SWFilter *newfilter) {
+ virtual SWModule &replaceRenderFilter(SWFilter *oldFilter, SWFilter *newFilter) {
FilterList::iterator iter;
for (iter = renderFilters->begin(); iter != renderFilters->end(); iter++) {
- if (*iter == oldfilter)
- *iter = newfilter;
+ if (*iter == oldFilter)
+ *iter = newFilter;
}
return *this;
}
+ SWDEPRECATED SWModule &ReplaceRenderFilter(SWFilter *oldFilter, SWFilter *newFilter) {
+ return replaceRenderFilter(oldFilter, newFilter);
+ }
/** RenderFilter run a buf through this module's Render Filters
* @param buf the buffer to filter
* @param key key location from where this buffer was extracted
*/
- virtual void renderFilter(SWBuf &buf, const SWKey *key) {
+ virtual void renderFilter(SWBuf &buf, const SWKey *key) const {
filterBuffer(renderFilters, buf, key);
}
@@ -514,39 +529,48 @@
* @param newfilter the filter to add
* @return *this
*/
- virtual SWModule &AddEncodingFilter(SWFilter *newfilter) {
- encodingFilters->push_back(newfilter);
+ virtual SWModule &addEncodingFilter(SWFilter *newFilter) {
+ encodingFilters->push_back(newFilter);
return *this;
}
+ SWDEPRECATED SWModule &AddEncodingFilter(SWFilter *newFilter) {
+ return addEncodingFilter(newFilter);
+ }
/** Removes an EncodingFilter from this module's encodingFilters queue
* @param oldfilter the filter to remove
* @return *this
*/
- virtual SWModule &RemoveEncodingFilter(SWFilter *oldfilter) {
- encodingFilters->remove(oldfilter);
+ virtual SWModule &removeEncodingFilter(SWFilter *oldFilter) {
+ encodingFilters->remove(oldFilter);
return *this;
}
+ SWDEPRECATED SWModule &RemoveEncodingFilter(SWFilter *oldFilter) {
+ return removeEncodingFilter(oldFilter);
+ }
/** Replaces an EncodingFilter in this module's encodingfilters queue
* @param oldfilter the filter to remove
* @param newfilter the filter to add in its place
* @return *this
*/
- virtual SWModule &ReplaceEncodingFilter(SWFilter *oldfilter, SWFilter *newfilter) {
+ virtual SWModule &replaceEncodingFilter(SWFilter *oldFilter, SWFilter *newFilter) {
FilterList::iterator iter;
for (iter = encodingFilters->begin(); iter != encodingFilters->end(); iter++) {
- if (*iter == oldfilter)
- *iter = newfilter;
+ if (*iter == oldFilter)
+ *iter = newFilter;
}
return *this;
}
+ SWDEPRECATED SWModule &ReplaceEncodingFilter(SWFilter *oldFilter, SWFilter *newFilter) {
+ return replaceEncodingFilter(oldFilter, newFilter);
+ }
/** encodingFilter run a buf through this module's Encoding Filters
* @param buf the buffer to filter
* @param key key location from where this buffer was extracted
*/
- virtual void encodingFilter(SWBuf &buf, const SWKey *key) {
+ virtual void encodingFilter(SWBuf &buf, const SWKey *key) const {
filterBuffer(encodingFilters, buf, key);
}
@@ -556,25 +580,31 @@
* @param newfilter the filter to add
* @return *this
*/
- virtual SWModule &AddStripFilter(SWFilter *newfilter) {
- stripFilters->push_back(newfilter);
+ virtual SWModule &addStripFilter(SWFilter *newFilter) {
+ stripFilters->push_back(newFilter);
return *this;
}
+ SWDEPRECATED SWModule &AddStripFilter(SWFilter *newFilter) {
+ return addStripFilter(newFilter);
+ }
/** Adds a RawFilter to this module's rawFilters queue
- * @param newfilter the filter to add
+ * @param newFilter the filter to add
* @return *this
*/
- virtual SWModule &AddRawFilter(SWFilter *newfilter) {
+ virtual SWModule &addRawFilter(SWFilter *newfilter) {
rawFilters->push_back(newfilter);
return *this;
}
+ SWDEPRECATED SWModule &AddRawFilter(SWFilter *newFilter) {
+ return addRawFilter(newFilter);
+ }
/** StripFilter run a buf through this module's Strip Filters
* @param buf the buffer to filter
* @param key key location from where this buffer was extracted
*/
- virtual void stripFilter(SWBuf &buf, const SWKey *key) {
+ virtual void stripFilter(SWBuf &buf, const SWKey *key) const {
filterBuffer(stripFilters, buf, key);
}
@@ -583,7 +613,7 @@
* @param buf the buffer to filter
* @param key key location from where this buffer was extracted
*/
- virtual void rawFilter(SWBuf &buf, const SWKey *key) {
+ virtual void rawFilter(SWBuf &buf, const SWKey *key) const {
filterBuffer(rawFilters, buf, key);
}
@@ -594,16 +624,19 @@
* @param newfilter the filter to add
* @return *this
*/
- virtual SWModule &AddOptionFilter(SWOptionFilter *newfilter) {
- optionFilters->push_back(newfilter);
+ virtual SWModule &addOptionFilter(SWOptionFilter *newFilter) {
+ optionFilters->push_back(newFilter);
return *this;
}
+ SWDEPRECATED SWModule &AddOptionFilter(SWOptionFilter *newFilter) {
+ return addOptionFilter(newFilter);
+ }
/** OptionFilter a text buffer
* @param buf the buffer to filter
* @param key key location from where this buffer was extracted
*/
- virtual void optionFilter(SWBuf &buf, const SWKey *key) {
+ virtual void optionFilter(SWBuf &buf, const SWKey *key) const {
filterBuffer(optionFilters, buf, key);
}
@@ -654,7 +687,8 @@
/** Whether or not to only hit one entry when iterating encounters
* consecutive links when iterating
*/
- virtual bool getSkipConsecutiveLinks() { return skipConsecutiveLinks; }
+ virtual bool isSkipConsecutiveLinks() { return skipConsecutiveLinks; }
+ SWDEPRECATED bool getSkipConsecutiveLinks() { return isSkipConsecutiveLinks(); }
virtual bool isLinked(const SWKey *, const SWKey *) const { return false; }
virtual bool hasEntry(const SWKey *) const { return false; }
@@ -672,7 +706,8 @@
* engine processing turns them off (like searching) temporarily for
* optimization.
*/
- virtual void processEntryAttributes(bool val) const { procEntAttr = val; }
+ virtual void setProcessEntryAttributes(bool val) const { procEntAttr = val; }
+ SWDEPRECATED void processEntryAttributes(bool val) const { setProcessEntryAttributes(val); }
/** Whether or not we're processing Entry Attributes
*/
Modified: trunk/include/swtext.h
===================================================================
--- trunk/include/swtext.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/swtext.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -57,7 +57,7 @@
virtual ~SWText();
/** Create the correct key (VerseKey) for use with SWText
*/
- virtual SWKey *CreateKey() const;
+ virtual SWKey *createKey() const;
virtual long getIndex() const;
virtual void setIndex(long iindex);
Modified: trunk/include/versekey.h
===================================================================
--- trunk/include/versekey.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/versekey.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -61,9 +61,9 @@
*/
char autonorm;
- /** flag for headings on/off
+ /** flag for intros on/off
*/
- char headings;
+ char intros;
/** initializes this VerseKey()
*/
@@ -104,13 +104,13 @@
signed char suffix;
/************************************************************************
- * VerseKey::getBookAbbrev - Attempts to find a book no from a name or
+ * VerseKey::getBookFromAbbrev - Attempts to find a book no from a name or
* abbreviation
*
* ENT: @param abbr - key for which to search;
* RET: @return book number or < 0 = not valid
*/
- virtual int getBookAbbrev(const char *abbr) const;
+ virtual int getBookFromAbbrev(const char *abbr) const;
/** Refresh keytext based on testament|book|chapter|verse
* default auto normalization to true
@@ -173,36 +173,38 @@
*/
virtual ~VerseKey();
- /** sets the lower boundary for this VerseKey
- * and returns the new boundary
+ /** sets the lower boundary for this VerseKey
*
- * @param ub the new upper boundary for this VerseKey
- * @return the lower boundary the key was set to
+ * @param lb the new lower boundary for this VerseKey
*/
- VerseKey &LowerBound(const VerseKey &ub);
+ void setLowerBound(const VerseKey &lb);
+ SWDEPRECATED VerseKey &LowerBound(const VerseKey &lb) { setLowerBound(lb); return getLowerBound(); }
- /** sets the upper boundary for this VerseKey
- * and returns the new boundary
- * @param ub the new upper boundary for this VerseKey
+ /** sets the upper boundary for this VerseKey
+ * @param ub the new upper boundary for this VerseKey
* @return the upper boundary the key was set to
*/
- VerseKey &UpperBound(const VerseKey &ub);
+ void setUpperBound(const VerseKey &ub);
+ SWDEPRECATED VerseKey &UpperBound(const VerseKey &ub) { setUpperBound(ub); return getUpperBound(); }
- /** gets the lower boundary of this VerseKey
- * @return the lower boundary of this VerseKey
+ /** gets the lower boundary of this VerseKey
+ * @return the lower boundary of this VerseKey
*/
- VerseKey &LowerBound() const;
+ VerseKey &getLowerBound() const;
+ SWDEPRECATED VerseKey &LowerBound() const { return getLowerBound(); }
- /** gets the upper boundary of this VerseKey
- * @return the upper boundary of this VerseKey
+ /** gets the upper boundary of this VerseKey
+ * @return the upper boundary of this VerseKey
*/
- VerseKey &UpperBound() const;
+ VerseKey &getUpperBound() const;
+ SWDEPRECATED VerseKey &UpperBound() const { return getUpperBound(); }
- /** clears the boundaries of this VerseKey
+ /** clears the boundaries of this VerseKey
*/
- void ClearBounds();
+ void clearBounds();
+ SWDEPRECATED void ClearBounds() { clearBounds(); }
- /** Creates a new SWKey based on the current VerseKey
+ /** Creates a new SWKey based on the current VerseKey
* see also the Copy Constructor
*/
virtual SWKey *clone() const;
@@ -256,32 +258,44 @@
*
* @return value of testament
*/
- virtual char Testament() const { return getTestament(); } // deprecated
virtual char getTestament() const;
+ /**
+ * @deprecated Use getTestament() instead.
+ */
+ SWDEPRECATED char Testament() const { return getTestament(); } // deprecated
virtual int getTestamentMax() const { return 2; }
/** Gets book
*
* @return value of book
*/
- virtual char Book() const { return getBook(); } // deprecated
virtual char getBook() const;
+ /**
+ * @deprecated Use getBook() instead.
+ */
+ SWDEPRECATED char Book() const { return getBook(); } // deprecated
virtual int getBookMax() const { return BMAX[testament-1]; }
/** Gets chapter
*
* @return value of chapter
*/
- virtual int Chapter() const { return getChapter(); } // deprecated
virtual int getChapter() const;
+ /**
+ * @deprecated Use getChapter() instead.
+ */
+ SWDEPRECATED int Chapter() const { return getChapter(); } // deprecated
virtual int getChapterMax() const;
/** Gets verse
*
* @return value of verse
*/
- virtual int Verse() const { return getVerse(); } // deprecated
virtual int getVerse() const;
+ /**
+ * @deprecated Use getVerse() instead.
+ */
+ SWDEPRECATED int Verse() const { return getVerse(); } // deprecated
virtual int getVerseMax() const;
/** Gets verse suffix
@@ -290,45 +304,45 @@
*/
virtual char getSuffix() const;
- /** Sets/gets testament
+ /** Sets testament
*
* @param itestament value which to set testament
- * [MAXPOS(char)] - only get
- * @return if unchanged -> value of testament,
- * if changed -> previous value of testament
*/
- virtual char Testament(char itestament) { char retVal = getTestament(); setTestament(itestament); return retVal; } // deprecated
virtual void setTestament(char itestament);
+ /**
+ * @deprecated Use setTestament() instead.
+ */
+ SWDEPRECATED char Testament(char itestament) { char retVal = getTestament(); setTestament(itestament); return retVal; } // deprecated
- /** Sets/gets book
+ /** Sets book
*
* @param ibook value which to set book
- * [MAXPOS(char)] - only get
- * @return if unchanged -> value of book,
- * if changed -> previous value of book
*/
- virtual char Book(char ibook) { char retVal = getBook(); setBook(ibook); return retVal; } // deprecated
virtual void setBook(char ibook);
+ /**
+ * @deprecated Use setBook() instead.
+ */
+ SWDEPRECATED char Book(char ibook) { char retVal = getBook(); setBook(ibook); return retVal; } // deprecated
- /** Sets/gets chapter
+ /** Sets chapter
*
* @param ichapter value which to set chapter
- * [MAXPOS(int)] - only get
- * @return if unchanged -> value of chapter,
- * if changed -> previous value of chapter
*/
- virtual int Chapter(int ichapter) { char retVal = getChapter(); setChapter(ichapter); return retVal; } // deprecated
virtual void setChapter(int ichapter);
+ /**
+ * @deprecated Use setChapter() instead.
+ */
+ SWDEPRECATED int Chapter(int ichapter) { char retVal = getChapter(); setChapter(ichapter); return retVal; } // deprecated
- /** Sets/gets verse
+ /** Sets verse
*
* @param iverse value which to set verse
- * [MAXPOS(int)] - only get
- * @return if unchanged -> value of verse,
- * if changed -> previous value of verse
*/
- virtual int Verse(int iverse) { char retVal = getVerse(); setVerse(iverse); return retVal; } // deprecated;
virtual void setVerse(int iverse);
+ /**
+ * @deprecated Use setVerse() instead.
+ */
+ SWDEPRECATED int Verse(int iverse) { char retVal = getVerse(); setVerse(iverse); return retVal; } // deprecated;
/** Sets/gets verse suffix
*
@@ -342,9 +356,10 @@
*
* @return *this
*/
- virtual void Normalize(char autocheck = 0);
+ virtual void normalize(bool autocheck = false);
+ SWDEPRECATED void Normalize(char autocheck = 0) { normalize(autocheck); }
- /** Sets/gets flag that tells VerseKey to
+ /** Sets flag that tells VerseKey to
* automatically normalize itself when modified
*
* @param iautonorm value which to set autonorm
@@ -352,23 +367,37 @@
* @return if unchanged -> value of autonorm,
* if changed -> previous value of autonorm
*/
- virtual char AutoNormalize(char iautonorm) { char retVal = isAutoNormalize()?1:0; setAutoNormalize(iautonorm); return retVal; } // deprecated
- virtual char AutoNormalize() const { return isAutoNormalize()?1:0; } // deprecated
-
+ virtual void setAutoNormalize(bool iautonorm);
virtual bool isAutoNormalize() const;
- virtual void setAutoNormalize(bool iautonorm);
+ /**
+ * @deprecated Use setAutoNormalize() instead.
+ */
+ SWDEPRECATED char AutoNormalize(char iautonorm) { char retVal = isAutoNormalize()?1:0; setAutoNormalize(iautonorm); return retVal; } // deprecated
+ /**
+ * @deprecated Use isAutoNormalize() instead.
+ */
+ SWDEPRECATED char AutoNormalize() const { return isAutoNormalize()?1:0; } // deprecated
+
+
/** Sets/gets flag that tells VerseKey to include
- * chapter/book/testament/module headings
+ * chapter/book/testament/module intros
*
- * @param iheadings value which to set headings
+ * @deprecated Use setIntros() and isIntros() instead.
+ * @param iheadings value which to set intros
* [MAXPOS(char)] - only get
- * @return if unchanged -> value of headings,
- * if changed -> previous value of headings
+ * @return if unchanged -> value of intros,
+ * if changed -> previous value of intros
*/
- virtual char Headings(char iheadings = MAXPOS(char));
+ SWDEPRECATED char Headings(char iheadings = MAXPOS(char)) { char retVal = isIntros(); if (iheadings != MAXPOS(char)) setIntros(iheadings); return retVal; }
+ /** The Intros property determine whether or not to include
+ * chapter/book/testament/module intros
+ */
+ virtual void setIntros(bool val);
+ virtual bool isIntros() const;
+
/** Gets index based upon current verse
*
* @return offset
@@ -389,8 +418,12 @@
* @return offset
*/
virtual long getTestamentIndex() const;
- virtual long TestamentIndex() const { return getTestamentIndex(); } // deprecated, use getTestamentIndex()
+ /**
+ * @deprecated Use getTestamentIndex()
+ */
+ SWDEPRECATED long TestamentIndex() const { return getTestamentIndex(); } // deprecated, use getTestamentIndex()
+
virtual const char *getOSISRef() const;
virtual const char *getOSISBookName() const;
@@ -400,7 +433,23 @@
*/
static const char *convertToOSIS(const char *inRef, const SWKey *defaultKey);
- virtual ListKey ParseVerseList(const char *buf, const char *defaultKey = 0, bool expandRange = false, bool useChapterAsVerse = false);
+ /******************************************************************************
+ * VerseKey::parseVerseList - Attempts to parse a buffer into separate
+ * verse entries returned in a ListKey
+ *
+ * ENT: buf - buffer to parse;
+ * defaultKey - if verse, chap, book, or testament is left off,
+ * pull info from this key (ie. Gen 2:3; 4:5;
+ * Gen would be used when parsing the 4:5 section)
+ * expandRange - whether or not to expand eg. John 1:10-12 or just
+ * save John 1:10
+ *
+ * RET: ListKey reference filled with verse entries contained in buf
+ *
+ * COMMENT: This code works but wreaks. Rewrite to make more maintainable.
+ */
+ virtual ListKey parseVerseList(const char *buf, const char *defaultKey = 0, bool expandRange = false, bool useChapterAsVerse = false);
+ SWDEPRECATED ListKey ParseVerseList(const char *buf, const char *defaultKey = 0, bool expandRange = false, bool useChapterAsVerse = false);
virtual const char *getRangeText() const;
virtual const char *getOSISRefRangeText() const;
/** Compares another SWKey object
Modified: trunk/include/versetreekey.h
===================================================================
--- trunk/include/versetreekey.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/versetreekey.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -47,7 +47,7 @@
long lastGoodOffset;
protected:
- virtual int getBookAbbrev(const char *abbr);
+ virtual int getBookFromAbbrev(const char *abbr) const;
public:
Modified: trunk/include/zcom.h
===================================================================
--- trunk/include/zcom.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/zcom.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -45,12 +45,12 @@
SWTextMarkup markup = FMT_UNKNOWN, const char *ilang = 0,
const char *versification = "KJV");
virtual ~zCom();
- virtual SWBuf &getRawEntryBuf();
+ virtual SWBuf &getRawEntryBuf() const;
virtual void increment(int steps = 1);
virtual void decrement(int steps = 1) { increment(-steps); }
// write interface ----------------------------
- virtual bool isWritable();
+ virtual bool isWritable() const;
static char createModule(const char *path, int blockBound, const char *v11n = "KJV") {
return zVerse::createModule(path, blockBound, v11n);
}
@@ -59,7 +59,7 @@
virtual void deleteEntry(); // Delete current module entry
// end write interface ------------------------
- virtual void rawZFilter(SWBuf &buf, char direction = 0) { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
+ virtual void rawZFilter(SWBuf &buf, char direction = 0) const { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
// swcacher interface ----------------------
virtual void flush() { flushCache(); }
Modified: trunk/include/zld.h
===================================================================
--- trunk/include/zld.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/zld.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -31,20 +31,20 @@
SWORD_NAMESPACE_START
class SWDLLEXPORT zLD : public zStr, public SWLD {
- char getEntry(long away = 0);
+ char getEntry(long away = 0) const;
public:
zLD(const char *ipath, const char *iname = 0, const char *idesc = 0, long blockCount = 200, SWCompress *icomp = 0, SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, bool caseSensitive = false);
virtual ~zLD();
- virtual SWBuf &getRawEntryBuf();
+ virtual SWBuf &getRawEntryBuf() const;
virtual void increment(int steps = 1);
virtual void decrement(int steps = 1) { increment(-steps); }
// write interface ----------------------------
- virtual bool isWritable();
+ virtual bool isWritable() const;
static char createModule(const char *path) {
return zStr::createModule(path);
}
@@ -54,7 +54,7 @@
virtual void deleteEntry(); // Delete current module entry
// end write interface ------------------------
- virtual void rawZFilter(SWBuf &buf, char direction = 0) { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
+ virtual void rawZFilter(SWBuf &buf, char direction = 0) const { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
// swcacher interface ----------------------
virtual void flush() { flushCache(); }
Modified: trunk/include/zstr.h
===================================================================
--- trunk/include/zstr.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/zstr.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -38,9 +38,9 @@
private:
static int instance; // number of instantiated zStr objects or derivitives
- EntriesBlock *cacheBlock;
- long cacheBlockIndex;
- bool cacheDirty;
+ mutable EntriesBlock *cacheBlock;
+ mutable long cacheBlockIndex;
+ mutable bool cacheDirty;
char *path;
bool caseSensitive;
mutable long lastoff; // for caching and optimization
@@ -55,8 +55,8 @@
static const int IDXENTRYSIZE;
static const int ZDXENTRYSIZE;
- void getCompressedText(long block, long entry, char **buf);
- void flushCache();
+ void getCompressedText(long block, long entry, char **buf) const;
+ void flushCache() const;
void getKeyFromDatOffset(long ioffset, char **buf) const;
void getKeyFromIdxOffset(long ioffset, char **buf) const;
@@ -65,10 +65,10 @@
zStr(const char *ipath, int fileMode = -1, long blockCount = 100, SWCompress *icomp = 0, bool caseSensitive = false);
virtual ~zStr();
signed char findKeyIndex(const char *ikey, long *idxoff, long away = 0) const;
- void getText(long index, char **idxbuf, char **buf);
+ void getText(long index, char **idxbuf, char **buf) const;
void setText(const char *ikey, const char *buf, long len = -1);
void linkEntry(const char *destkey, const char *srckey);
- virtual void rawZFilter(SWBuf &buf, char direction = 0) {}
+ virtual void rawZFilter(SWBuf &buf, char direction = 0) const {}
static signed char createModule (const char *path);
};
Modified: trunk/include/ztext.h
===================================================================
--- trunk/include/ztext.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/ztext.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -59,13 +59,13 @@
const char *versification = "KJV");
virtual ~zText();
- virtual SWBuf &getRawEntryBuf();
+ virtual SWBuf &getRawEntryBuf() const;
virtual void increment(int steps = 1);
virtual void decrement(int steps = 1) { increment(-steps); }
// write interface ----------------------------
- virtual bool isWritable();
+ virtual bool isWritable() const;
static char createModule(const char *path, int blockBound, const char *v11n = "KJV") {
return zVerse::createModule(path, blockBound, v11n);
}
@@ -75,7 +75,7 @@
virtual void deleteEntry(); // Delete current module entry
// end write interface ------------------------
- virtual void rawZFilter(SWBuf &buf, char direction = 0) { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
+ virtual void rawZFilter(SWBuf &buf, char direction = 0) const { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
// swcacher interface ----------------------
virtual void flush() { flushCache(); }
Modified: trunk/include/zverse.h
===================================================================
--- trunk/include/zverse.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/include/zverse.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -28,12 +28,12 @@
char *path;
void doSetText(char testmt, long idxoff, const char *buf, long len = 0);
void doLinkEntry(char testmt, long destidxoff, long srcidxoff);
- void flushCache();
- char *cacheBuf;
- unsigned int cacheBufSize;
- char cacheTestament;
- long cacheBufIdx;
- bool dirtyCache;
+ void flushCache() const;
+ mutable char *cacheBuf;
+ mutable unsigned int cacheBufSize;
+ mutable char cacheTestament;
+ mutable long cacheBufIdx;
+ mutable bool dirtyCache;
public:
@@ -50,8 +50,8 @@
virtual ~zVerse();
void findOffset(char testmt, long idxoff, long *start, unsigned short *size, unsigned long *buffnum) const;
- void zReadText(char testmt, long start, unsigned short size, unsigned long buffnum, SWBuf &buf);
- virtual void rawZFilter(SWBuf &buf, char direction = 0) {}
+ void zReadText(char testmt, long start, unsigned short size, unsigned long buffnum, SWBuf &buf) const;
+ virtual void rawZFilter(SWBuf &buf, char direction = 0) const {}
static char createModule(const char *path, int blockBound, const char *v11n = "KJV");
};
Modified: trunk/src/frontend/swdisp.cpp
===================================================================
--- trunk/src/frontend/swdisp.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/frontend/swdisp.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -40,7 +40,7 @@
* RET: error status
*/
-char SWDisplay::Display(SWModule &imodule)
+char SWDisplay::display(SWModule &imodule)
{
#ifndef _WIN32_WCE
std::cout << (const char *)imodule;
Modified: trunk/src/keys/listkey.cpp
===================================================================
--- trunk/src/keys/listkey.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/keys/listkey.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -163,12 +163,12 @@
decrement(step*-1);
return;
}
- Error(); // clear error
- for(; step && !Error(); step--) {
+ popError(); // clear error
+ for(; step && !popError(); step--) {
if (arraypos < arraycnt && arraycnt) {
if (array[arraypos]->isBoundSet())
(*(array[arraypos]))++;
- if ((array[arraypos]->Error()) || (!array[arraypos]->isBoundSet())) {
+ if ((array[arraypos]->popError()) || (!array[arraypos]->isBoundSet())) {
SetToElement(arraypos+1);
}
else SWKey::setText((const char *)(*array[arraypos]));
@@ -187,12 +187,12 @@
increment(step*-1);
return;
}
- Error(); // clear error
- for(; step && !Error(); step--) {
+ popError(); // clear error
+ for(; step && !popError(); step--) {
if (arraypos > -1 && arraycnt) {
if (array[arraypos]->isBoundSet())
(*(array[arraypos]))--;
- if ((array[arraypos]->Error()) || (!array[arraypos]->isBoundSet())) {
+ if ((array[arraypos]->popError()) || (!array[arraypos]->isBoundSet())) {
SetToElement(arraypos-1, BOTTOM);
}
else SWKey::setText((const char *)(*array[arraypos]));
@@ -341,7 +341,7 @@
if (key) {
if (key->isTraversable() && key->isBoundSet()) {
key->setText(ikey);
- if (!key->Error())
+ if (!key->popError())
break;
}
else {
Modified: trunk/src/keys/swkey.cpp
===================================================================
--- trunk/src/keys/swkey.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/keys/swkey.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -95,7 +95,7 @@
* RET: value of persist
*/
-char SWKey::Persist() const
+bool SWKey::isPersist() const
{
return persist;
}
@@ -126,20 +126,14 @@
/******************************************************************************
* SWKey::Persist - Set/gets whether this object itself persists within a
* module that it was used to setKey or just a copy.
- * (1 - persists in module; 0 - a copy is attempted
+ * (true - persists in module; false - a copy is attempted
*
* ENT: ipersist - value which to set persist
- * [-1] - only get
- *
- * RET: value of persist
*/
-char SWKey::Persist(signed char ipersist)
+void SWKey::setPersist(bool ipersist)
{
- if (ipersist != -1)
- persist = ipersist;
-
- return persist;
+ persist = ipersist;
}
@@ -149,7 +143,7 @@
* RET: error status
*/
-char SWKey::Error()
+char SWKey::popError()
{
char retval = error;
Modified: trunk/src/keys/treekeyidx.cpp
===================================================================
--- trunk/src/keys/treekeyidx.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/keys/treekeyidx.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -517,7 +517,7 @@
SWBuf leaf = strtok(buf, "/");
leaf.trim();
root();
- while ((leaf.size()) && (!Error())) {
+ while ((leaf.size()) && (!popError())) {
bool ok, inChild = false;
error = KEYERR_OUTOFBOUNDS;
for (ok = firstChild(); ok; ok = nextSibling()) {
@@ -562,7 +562,7 @@
break;
}
positionChanged();
- Error(); // clear error from normalize
+ popError(); // clear error from normalize
}
Modified: trunk/src/keys/versekey.cpp
===================================================================
--- trunk/src/keys/versekey.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/keys/versekey.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -55,7 +55,7 @@
instance++;
autonorm = 1; // default auto normalization to true
- headings = 0; // default display headings option is false
+ intros = false; // default display intros option is false
upperBound = 0;
lowerBound = 0;
boundSet = false;
@@ -120,10 +120,10 @@
void VerseKey::setFromOther(const VerseKey &ikey) {
if (refSys == ikey.refSys) {
- testament = ikey.Testament();
- book = ikey.Book();
- chapter = ikey.Chapter();
- verse = ikey.Verse();
+ testament = ikey.getTestament();
+ book = ikey.getBook();
+ chapter = ikey.getChapter();
+ verse = ikey.getVerse();
suffix = ikey.getSuffix();
}
// TODO: versification mapping
@@ -158,12 +158,12 @@
}
// should we always perform bounds checks? Tried but seems to cause infinite recursion
- if (_compare(UpperBound()) > 0) {
- setFromOther(UpperBound());
+ if (_compare(getUpperBound()) > 0) {
+ setFromOther(getUpperBound());
error = KEYERR_OUTOFBOUNDS;
}
- if (_compare(LowerBound()) < 0) {
- setFromOther(LowerBound());
+ if (_compare(getLowerBound()) < 0) {
+ setFromOther(getLowerBound());
error = KEYERR_OUTOFBOUNDS;
}
}
@@ -175,17 +175,17 @@
void VerseKey::copyFrom(const VerseKey &ikey) {
autonorm = ikey.autonorm;
- headings = ikey.headings;
- testament = ikey.Testament();
- book = ikey.Book();
- chapter = ikey.Chapter();
- verse = ikey.Verse();
+ intros = ikey.intros;
+ testament = ikey.getTestament();
+ book = ikey.getBook();
+ chapter = ikey.getChapter();
+ verse = ikey.getVerse();
suffix = ikey.getSuffix();
setLocale(ikey.getLocale());
setVersificationSystem(ikey.getVersificationSystem());
if (ikey.isBoundSet()) {
- LowerBound(ikey.LowerBound());
- UpperBound(ikey.UpperBound());
+ setLowerBound(ikey.getLowerBound());
+ setUpperBound(ikey.getUpperBound());
}
}
@@ -217,15 +217,15 @@
VerseKey::VerseKey(const char *min, const char *max, const char *v11n) : SWKey()
{
init(v11n);
- ListKey tmpListKey = ParseVerseList(min);
+ ListKey tmpListKey = parseVerseList(min);
if (tmpListKey.Count()) {
VerseKey *newElement = SWDYNAMIC_CAST(VerseKey, tmpListKey.GetElement(0));
- LowerBound(*newElement);
+ setLowerBound(*newElement);
}
- tmpListKey = ParseVerseList(max, min, true);
+ tmpListKey = parseVerseList(max, min, true);
if (tmpListKey.Count()) {
VerseKey *newElement = SWDYNAMIC_CAST(VerseKey, tmpListKey.GetElement(0));
- UpperBound((newElement->isBoundSet())?newElement->UpperBound():*newElement);
+ setUpperBound((newElement->isBoundSet())?newElement->getUpperBound():*newElement);
}
setPosition(TOP);
}
@@ -263,7 +263,7 @@
// TODO: adjust bounds for versificaion system ???
// TODO: when we have mapping done, rethink this
//necessary as our bounds might not mean anything in the new v11n system
- ClearBounds();
+ clearBounds();
}
}
@@ -290,14 +290,14 @@
if (keytext) {
// pass our own copy of keytext as keytext memory may be freshed during parse
- ListKey tmpListKey = ParseVerseList(SWBuf(keytext).c_str());
+ ListKey tmpListKey = parseVerseList(SWBuf(keytext).c_str());
if (tmpListKey.Count()) {
this->positionFrom(*tmpListKey.getElement(0));
error = this->error;
} else error = 1;
}
if (checkAutoNormalize) {
- Normalize(1);
+ normalize(true);
}
freshtext();
@@ -349,7 +349,7 @@
* RET: book number or < 0 = not valid
*/
-int VerseKey::getBookAbbrev(const char *iabbr) const
+int VerseKey::getBookFromAbbrev(const char *iabbr) const
{
int diff, abLen, min, max, target, retVal = -1;
@@ -429,7 +429,7 @@
void VerseKey::validateCurrentLocale() const {
if (SWLog::getSystemLog()->getLogLevel() >= SWLog::LOG_DEBUG) { //make sure log is wanted, this loop stuff costs a lot of time
for (int i = 0; i < refSys->getBookCount(); i++) {
- const int bn = getBookAbbrev(getPrivateLocale()->translate(refSys->getBook(i)->getLongName()));
+ const int bn = getBookFromAbbrev(getPrivateLocale()->translate(refSys->getBook(i)->getLongName()));
if (bn != i+1) {
char *abbr = 0;
stdstr(&abbr, getPrivateLocale()->translate(refSys->getBook(i)->getLongName()), 2);
@@ -453,7 +453,7 @@
/******************************************************************************
- * VerseKey::ParseVerseList - Attempts to parse a buffer into separate
+ * VerseKey::parseVerseList - Attempts to parse a buffer into separate
* verse entries returned in a ListKey
*
* ENT: buf - buffer to parse;
@@ -468,7 +468,7 @@
* COMMENT: This code works but wreaks. Rewrite to make more maintainable.
*/
-ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool expandRange, bool useChapterAsVerse) {
+ListKey VerseKey::parseVerseList(const char *buf, const char *defaultKey, bool expandRange, bool useChapterAsVerse) {
// hold on to our own copy of params, as threads/recursion may change outside values
const char *bufStart = buf;
@@ -503,17 +503,17 @@
VerseKey *curKey = (VerseKey *)this->clone();
VerseKey *lastKey = (VerseKey *)this->clone();
- lastKey->ClearBounds();
- curKey->ClearBounds();
+ lastKey->clearBounds();
+ curKey->clearBounds();
// some silly checks for corner cases
if (!strcmp(buf, "[ Module Heading ]")) {
- curKey->Verse(0);
- curKey->Chapter(0);
- curKey->Book(0);
- curKey->Testament(0);
- lastKey->LowerBound(*curKey);
- lastKey->UpperBound(*curKey);
+ curKey->setVerse(0);
+ curKey->setChapter(0);
+ curKey->setBook(0);
+ curKey->setTestament(0);
+ lastKey->setLowerBound(*curKey);
+ lastKey->setUpperBound(*curKey);
internalListKey << *lastKey;
delete curKey;
delete lastKey;
@@ -522,20 +522,20 @@
if ((!strncmp(buf, "[ Testament ", 12)) &&
(isdigit(buf[12])) &&
(!strcmp(buf+13, " Heading ]"))) {
- curKey->Verse(0);
- curKey->Chapter(0);
- curKey->Book(0);
- curKey->Testament(buf[12]-48);
- lastKey->LowerBound(*curKey);
- lastKey->UpperBound(*curKey);
+ curKey->setVerse(0);
+ curKey->setChapter(0);
+ curKey->setBook(0);
+ curKey->setTestament(buf[12]-48);
+ lastKey->setLowerBound(*curKey);
+ lastKey->setUpperBound(*curKey);
internalListKey << *lastKey;
delete curKey;
delete lastKey;
return internalListKey;
}
- curKey->AutoNormalize(AutoNormalize());
- lastKey->AutoNormalize(0);
+ curKey->setAutoNormalize(isAutoNormalize());
+ lastKey->setAutoNormalize(false);
if (defaultKey) *lastKey = defaultKey;
while (*buf) {
@@ -575,7 +575,7 @@
book[tobook] = *buf;
book[tobook+1] = *(buf+1);
book[tobook+2] = 0;
- int bookno = getBookAbbrev(book);
+ int bookno = getBookFromAbbrev(book);
if (bookno > -1) {
tobook++;
buf++;
@@ -636,27 +636,27 @@
if ((!stricmp(book, "V")) || (!stricmp(book, "VER"))) { // Verse abbrev
if (verse == -1) {
verse = chap;
- chap = lastKey->Chapter();
+ chap = lastKey->getChapter();
*book = 0;
}
}
if ((!stricmp(book, "ch")) || (!stricmp(book, "chap"))) { // Verse abbrev
strcpy(book, lastKey->getBookName());
}
- bookno = getBookAbbrev(book);
+ bookno = getBookFromAbbrev(book);
if ((bookno > -1) && (suffix == 'f') && (book[strlen(book)-1] == 'f')) {
suffix = 0;
}
}
if (((bookno > -1) || (!*book)) && ((*book) || (chap >= 0) || (verse >= 0))) {
char partial = 0;
- curKey->Verse(1);
- curKey->Chapter(1);
- curKey->Book(1);
+ curKey->setVerse(1);
+ curKey->setChapter(1);
+ curKey->setBook(1);
if (bookno < 0) {
- curKey->Testament(lastKey->Testament());
- curKey->Book(lastKey->Book());
+ curKey->setTestament(lastKey->getTestament());
+ curKey->setBook(lastKey->getBook());
}
else {
int t = 1;
@@ -664,15 +664,15 @@
t++;
bookno -= BMAX[0];
}
- curKey->Testament(t);
- curKey->Book(bookno);
+ curKey->setTestament(t);
+ curKey->setBook(bookno);
}
if (((comma)||((verse < 0)&&(bookno < 0)))&&(!lastPartial)) {
// if (comma) {
- curKey->Chapter(lastKey->Chapter());
- curKey->Verse(chap); // chap because this is the first number captured
+ curKey->setChapter(lastKey->getChapter());
+ curKey->setVerse(chap); // chap because this is the first number captured
if (suffix) {
curKey->setSuffix(suffix);
}
@@ -685,21 +685,21 @@
if (chap >= 0) {
- curKey->Chapter(chap);
+ curKey->setChapter(chap);
}
else {
partial++;
- curKey->Chapter(1);
+ curKey->setChapter(1);
}
if (verse >= 0) {
- curKey->Verse(verse);
+ curKey->setVerse(verse);
if (suffix) {
curKey->setSuffix(suffix);
}
}
else {
partial++;
- curKey->Verse(1);
+ curKey->setVerse(1);
}
}
@@ -707,7 +707,7 @@
for (q = 0; ((buf[q]) && (buf[q] == ' ')); q++);
if ((buf[q] == '-') && (expandRange)) { // if this is a dash save lowerBound and wait for upper
buf+=q;
- lastKey->LowerBound(*curKey);
+ lastKey->setLowerBound(*curKey);
lastKey->setPosition(TOP);
tmpListKey << *lastKey;
tmpListKey.GetElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
@@ -715,12 +715,12 @@
else {
if (!dash) { // if last separator was not a dash just add
if (expandRange && partial) {
- lastKey->LowerBound(*curKey);
+ lastKey->setLowerBound(*curKey);
if (partial > 1)
curKey->setPosition(MAXCHAPTER);
if (partial > 0)
*curKey = MAXVERSE;
- lastKey->UpperBound(*curKey);
+ lastKey->setUpperBound(*curKey);
*lastKey = TOP;
tmpListKey << *lastKey;
tmpListKey.GetElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
@@ -731,10 +731,10 @@
curKey->setSuffix(0);
f = true;
}
- lastKey->LowerBound(*curKey);
+ lastKey->setLowerBound(*curKey);
if (f && doubleF) (*curKey) = MAXVERSE;
else if (f) (*curKey)++;
- lastKey->UpperBound(*curKey);
+ lastKey->setUpperBound(*curKey);
*lastKey = TOP;
tmpListKey << *lastKey;
tmpListKey.GetElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
@@ -747,7 +747,7 @@
*curKey = MAXCHAPTER;
if (partial > 0)
*curKey = MAXVERSE;
- newElement->UpperBound(*curKey);
+ newElement->setUpperBound(*curKey);
*lastKey = *curKey;
*newElement = TOP;
tmpListKey.GetElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
@@ -883,7 +883,7 @@
if ((!stricmp(book, "V")) || (!stricmp(book, "VER"))) { // Verse abbrev.
if (verse == -1) {
verse = chap;
- chap = lastKey->Chapter();
+ chap = lastKey->getChapter();
*book = 0;
}
}
@@ -891,20 +891,20 @@
if ((!stricmp(book, "ch")) || (!stricmp(book, "chap"))) { // Verse abbrev
strcpy(book, lastKey->getBookName());
}
- bookno = getBookAbbrev(book);
+ bookno = getBookFromAbbrev(book);
if ((bookno > -1) && (suffix == 'f') && (book[strlen(book)-1] == 'f')) {
suffix = 0;
}
}
if (((bookno > -1) || (!*book)) && ((*book) || (chap >= 0) || (verse >= 0))) {
char partial = 0;
- curKey->Verse(1);
- curKey->Chapter(1);
- curKey->Book(1);
+ curKey->setVerse(1);
+ curKey->setChapter(1);
+ curKey->setBook(1);
if (bookno < 0) {
- curKey->Testament(lastKey->Testament());
- curKey->Book(lastKey->Book());
+ curKey->setTestament(lastKey->getTestament());
+ curKey->setBook(lastKey->getBook());
}
else {
int t = 1;
@@ -912,13 +912,13 @@
t++;
bookno -= BMAX[0];
}
- curKey->Testament(t);
- curKey->Book(bookno);
+ curKey->setTestament(t);
+ curKey->setBook(bookno);
}
if (((comma)||((verse < 0)&&(bookno < 0)))&&(!lastPartial)) {
- curKey->Chapter(lastKey->Chapter());
- curKey->Verse(chap); // chap because this is the first number captured
+ curKey->setChapter(lastKey->getChapter());
+ curKey->setVerse(chap); // chap because this is the first number captured
if (suffix) {
curKey->setSuffix(suffix);
}
@@ -931,26 +931,26 @@
if (chap >= 0) {
- curKey->Chapter(chap);
+ curKey->setChapter(chap);
}
else {
partial++;
- curKey->Chapter(1);
+ curKey->setChapter(1);
}
if (verse >= 0) {
- curKey->Verse(verse);
+ curKey->setVerse(verse);
if (suffix) {
curKey->setSuffix(suffix);
}
}
else {
partial++;
- curKey->Verse(1);
+ curKey->setVerse(1);
}
}
if ((*buf == '-') && (expandRange)) { // if this is a dash save lowerBound and wait for upper
- lastKey->LowerBound(*curKey);
+ lastKey->setLowerBound(*curKey);
*lastKey = TOP;
tmpListKey << *lastKey;
tmpListKey.GetElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
@@ -958,12 +958,12 @@
else {
if (!dash) { // if last separator was not a dash just add
if (expandRange && partial) {
- lastKey->LowerBound(*curKey);
+ lastKey->setLowerBound(*curKey);
if (partial > 1)
*curKey = MAXCHAPTER;
if (partial > 0)
*curKey = MAXVERSE;
- lastKey->UpperBound(*curKey);
+ lastKey->setUpperBound(*curKey);
*lastKey = TOP;
tmpListKey << *lastKey;
tmpListKey.GetElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
@@ -974,10 +974,10 @@
curKey->setSuffix(0);
f = true;
}
- lastKey->LowerBound(*curKey);
+ lastKey->setLowerBound(*curKey);
if (f && doubleF) (*curKey) = MAXVERSE;
else if (f) (*curKey)++;
- lastKey->UpperBound(*curKey);
+ lastKey->setUpperBound(*curKey);
*lastKey = TOP;
tmpListKey << *lastKey;
tmpListKey.GetElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
@@ -990,7 +990,7 @@
*curKey = MAXCHAPTER;
if (partial > 0)
*curKey = MAXVERSE;
- newElement->UpperBound(*curKey);
+ newElement->setUpperBound(*curKey);
*newElement = TOP;
tmpListKey.GetElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
}
@@ -1010,10 +1010,10 @@
/******************************************************************************
- * VerseKey::LowerBound - sets / gets the lower boundary for this key
+ * VerseKey::setLowerBound - sets / gets the lower boundary for this key
*/
-VerseKey &VerseKey::LowerBound(const VerseKey &lb)
+void VerseKey::setLowerBound(const VerseKey &lb)
{
initBounds();
@@ -1029,16 +1029,14 @@
// and set values without restrictions, as expected
if (upperBound < lowerBound) upperBound = lowerBound;
boundSet = true;
-
- return LowerBound();
}
/******************************************************************************
- * VerseKey::UpperBound - sets / gets the upper boundary for this key
+ * VerseKey::setUpperBound - sets / gets the upper boundary for this key
*/
-VerseKey &VerseKey::UpperBound(const VerseKey &ub)
+void VerseKey::setUpperBound(const VerseKey &ub)
{
initBounds();
@@ -1049,19 +1047,17 @@
upperBoundComponents.verse = ub.getVerse();
upperBoundComponents.suffix = ub.getSuffix();
- // see LowerBound comment, above
+ // see setLowerBound comment, above
if (upperBound < lowerBound) upperBound = lowerBound;
boundSet = true;
-
- return UpperBound();
}
/******************************************************************************
- * VerseKey::LowerBound - sets / gets the lower boundary for this key
+ * VerseKey::getLowerBound - gets the lower boundary for this key
*/
-VerseKey &VerseKey::LowerBound() const
+VerseKey &VerseKey::getLowerBound() const
{
initBounds();
if (!isAutoNormalize()) {
@@ -1081,10 +1077,10 @@
/******************************************************************************
- * VerseKey::UpperBound - sets / gets the upper boundary for this key
+ * VerseKey::getUpperBound - sets / gets the upper boundary for this key
*/
-VerseKey &VerseKey::UpperBound() const
+VerseKey &VerseKey::getUpperBound() const
{
initBounds();
if (!isAutoNormalize()) {
@@ -1104,10 +1100,10 @@
/******************************************************************************
- * VerseKey::ClearBounds - clears bounds for this VerseKey
+ * VerseKey::clearBounds - clears bounds for this VerseKey
*/
-void VerseKey::ClearBounds()
+void VerseKey::clearBounds()
{
delete tmpClone;
tmpClone = 0;
@@ -1119,12 +1115,12 @@
{
if (!tmpClone) {
tmpClone = (VerseKey *)this->clone();
- tmpClone->AutoNormalize(0);
- tmpClone->Headings(1);
- tmpClone->Testament((BMAX[1])?2:1);
- tmpClone->Book(BMAX[(BMAX[1])?1:0]);
- tmpClone->Chapter(tmpClone->getChapterMax());
- tmpClone->Verse(tmpClone->getVerseMax());
+ tmpClone->setAutoNormalize(false);
+ tmpClone->setIntros(true);
+ tmpClone->setTestament((BMAX[1])?2:1);
+ tmpClone->setBook(BMAX[(BMAX[1])?1:0]);
+ tmpClone->setChapter(tmpClone->getChapterMax());
+ tmpClone->setVerse(tmpClone->getVerseMax());
upperBound = tmpClone->getIndex();
upperBoundComponents.test = tmpClone->getTestament();
upperBoundComponents.book = tmpClone->getBook();
@@ -1198,37 +1194,37 @@
void VerseKey::setPosition(SW_POSITION p) {
switch (p) {
case POS_TOP: {
- const VerseKey *lb = &LowerBound();
- testament = (lb->Testament() || headings) ? lb->Testament() : 1;
- book = (lb->Book() || headings) ? lb->Book() : 1;
- chapter = (lb->Chapter() || headings) ? lb->Chapter() : 1;
- verse = (lb->Verse() || headings) ? lb->Verse() : 1;
+ const VerseKey *lb = &getLowerBound();
+ testament = (lb->getTestament() || intros) ? lb->getTestament() : 1;
+ book = (lb->getBook() || intros) ? lb->getBook() : 1;
+ chapter = (lb->getChapter() || intros) ? lb->getChapter() : 1;
+ verse = (lb->getVerse() || intros) ? lb->getVerse() : 1;
suffix = lb->getSuffix();
break;
}
case POS_BOTTOM: {
- const VerseKey *ub = &UpperBound();
- testament = (ub->Testament() || headings) ? ub->Testament() : 1;
- book = (ub->Book() || headings) ? ub->Book() : 1;
- chapter = (ub->Chapter() || headings) ? ub->Chapter() : 1;
- verse = (ub->Verse() || headings) ? ub->Verse() : 1;
+ const VerseKey *ub = &getUpperBound();
+ testament = (ub->getTestament() || intros) ? ub->getTestament() : 1;
+ book = (ub->getBook() || intros) ? ub->getBook() : 1;
+ chapter = (ub->getChapter() || intros) ? ub->getChapter() : 1;
+ verse = (ub->getVerse() || intros) ? ub->getVerse() : 1;
suffix = ub->getSuffix();
break;
}
case POS_MAXVERSE:
- Normalize();
+ normalize();
verse = getVerseMax();
suffix = 0;
break;
case POS_MAXCHAPTER:
verse = 1;
suffix = 0;
- Normalize();
+ normalize();
chapter = getChapterMax();
break;
}
- Normalize(1);
- Error(); // clear error from normalize
+ normalize(true);
+ popError(); // clear error from normalize
}
int VerseKey::getChapterMax() const {
@@ -1253,9 +1249,9 @@
void VerseKey::increment(int step) {
char ierror = 0;
setIndex(getIndex() + step);
- while ((!verse) && (!headings) && (!ierror)) {
+ while ((!verse) && (!intros) && (!ierror)) {
setIndex(getIndex() + 1);
- ierror = Error();
+ ierror = popError();
}
error = (ierror) ? ierror : error;
@@ -1274,11 +1270,11 @@
char ierror = 0;
setIndex(getIndex() - step);
- while ((!verse) && (!headings) && (!ierror)) {
+ while ((!verse) && (!intros) && (!ierror)) {
setIndex(getIndex() - 1);
- ierror = Error();
+ ierror = popError();
}
- if ((ierror) && (!headings))
+ if ((ierror) && (!intros))
(*this)++;
error = (ierror) ? ierror : error;
@@ -1286,18 +1282,18 @@
/******************************************************************************
- * VerseKey::Normalize - checks limits and normalizes if necessary (e.g.
+ * VerseKey::normalize - checks limits and normalizes if necessary (e.g.
* Matthew 29:47 = Mark 2:2). If last verse is
* exceeded, key is set to last Book CH:VS
* RET: *this
*/
-void VerseKey::Normalize(char autocheck)
+void VerseKey::normalize(bool autocheck)
{
if (((!autocheck) || (autonorm)) // only normalize if we were explicitely called or if autonorm is turned on
&&
- ((!headings) || ((verse) && (chapter)))) { // this is cheeze and temporary until deciding what actions should be taken; so headings should only be turned on when positioning with setIndex() or incrementors
+ ((!intros) || ((verse) && (chapter)))) { // this is cheeze and temporary until deciding what actions should be taken; so intros should only be turned on when positioning with setIndex() or incrementors
error = 0;
while ((testament < 3) && (testament > 0)) {
@@ -1372,20 +1368,20 @@
}
if (testament < 1) {
- error = ((!headings) || (testament < 0) || (book < 0)) ? KEYERR_OUTOFBOUNDS : 0;
- testament = ((headings) ? 0 : 1);
- book = ((headings) ? 0 : 1);
- chapter = ((headings) ? 0 : 1);
- verse = ((headings) ? 0 : 1);
+ error = ((!intros) || (testament < 0) || (book < 0)) ? KEYERR_OUTOFBOUNDS : 0;
+ testament = ((intros) ? 0 : 1);
+ book = ((intros) ? 0 : 1);
+ chapter = ((intros) ? 0 : 1);
+ verse = ((intros) ? 0 : 1);
}
// should we always perform bounds checks? Tried but seems to cause infinite recursion
- if (_compare(UpperBound()) > 0) {
- positionFrom(UpperBound());
+ if (_compare(getUpperBound()) > 0) {
+ positionFrom(getUpperBound());
error = KEYERR_OUTOFBOUNDS;
}
- if (_compare(LowerBound()) < 0) {
- positionFrom(LowerBound());
+ if (_compare(getLowerBound()) < 0) {
+ positionFrom(getLowerBound());
error = KEYERR_OUTOFBOUNDS;
}
}
@@ -1417,7 +1413,7 @@
/******************************************************************************
- * VerseKey::Chapter - Gets chapter
+ * VerseKey::getChapter - Gets chapter
*
* RET: value of chapter
*/
@@ -1429,7 +1425,7 @@
/******************************************************************************
- * VerseKey::Verse - Gets verse
+ * VerseKey::getVerse - Gets verse
*
* RET: value of verse
*/
@@ -1454,7 +1450,7 @@
{
if (itestament != MAXPOS(char)) {
testament = itestament;
- Normalize(1);
+ normalize(true);
}
}
@@ -1470,7 +1466,7 @@
verse = 1;
chapter = 1;
book = ibook;
- Normalize(1);
+ normalize(true);
}
@@ -1483,7 +1479,7 @@
void VerseKey::setBookName(const char *bname)
{
- int bnum = getBookAbbrev(bname);
+ int bnum = getBookFromAbbrev(bname);
if (bnum > -1) {
if (bnum > BMAX[0]) {
bnum -= BMAX[0];
@@ -1506,8 +1502,8 @@
{
verse = 1;
chapter = ichapter;
- Normalize(1);
- // TODO: easiest fix, but should be in Normalize
+ normalize(true);
+ // TODO: easiest fix, but should be in normalize
verse = 1;
}
@@ -1526,7 +1522,7 @@
{
setSuffix(0);
verse = iverse;
- Normalize(1);
+ normalize(true);
}
@@ -1539,7 +1535,7 @@
}
/******************************************************************************
- * VerseKey::AutoNormalize - Sets/gets flag that tells VerseKey to auto-
+ * VerseKey::isAutoNormalize - gets flag that tells VerseKey to auto-
* matically normalize itself when modified
*/
@@ -1551,33 +1547,29 @@
void VerseKey::setAutoNormalize(bool iautonorm)
{
autonorm = iautonorm?1:0;
- Normalize(1);
+ normalize(true);
}
/******************************************************************************
- * VerseKey::Headings - Sets/gets flag that tells VerseKey to include
- * chap/book/testmnt/module headings
+ * VerseKey::setIntros - Sets flag that tells VerseKey to include
+ * chap/book/testmnt/module introductions
*
- * ENT: iheadings - value which to set headings
- * [MAXPOS(char)] - only get
+ * ENT: val - value which to set intros
*
- * RET: if unchanged -> value of headings
- * if changed -> previous value of headings
*/
-char VerseKey::Headings(char iheadings)
+void VerseKey::setIntros(bool val)
{
- char retval = headings;
+ intros = val;
+ normalize(true);
+}
- if (iheadings != MAXPOS(char)) {
- headings = iheadings;
- Normalize(1);
- }
- return retval;
+bool VerseKey::isIntros() const
+{
+ return intros;
}
-
/******************************************************************************
* VerseKey::findindex - binary search to find the index closest, but less
* than the given value.
@@ -1720,14 +1712,14 @@
unsigned long keyval1 = 0;
unsigned long keyval2 = 0;
- keyval1 += Testament() * 1000000000;
- keyval2 += ivkey.Testament() * 1000000000;
- keyval1 += Book() * 10000000;
- keyval2 += ivkey.Book() * 10000000;
- keyval1 += Chapter() * 10000;
- keyval2 += ivkey.Chapter() * 10000;
- keyval1 += Verse() * 50;
- keyval2 += ivkey.Verse() * 50;
+ keyval1 += getTestament() * 1000000000;
+ keyval2 += ivkey.getTestament() * 1000000000;
+ keyval1 += getBook() * 10000000;
+ keyval2 += ivkey.getBook() * 10000000;
+ keyval1 += getChapter() * 10000;
+ keyval2 += ivkey.getChapter() * 10000;
+ keyval1 += getVerse() * 50;
+ keyval2 += ivkey.getVerse() * 50;
keyval1 += (int)getSuffix();
keyval2 += (int)ivkey.getSuffix();
keyval1 = (keyval1 != keyval2) ? ((keyval1 > keyval2) ? 1 : -1) : 0; // -1 | 0 | 1
@@ -1742,11 +1734,11 @@
if (loop > 4)
loop = 0;
- if (Verse())
- sprintf(buf[loop], "%s.%d.%d", getOSISBookName(), (int)Chapter(), (int)Verse());
- else if (Chapter())
- sprintf(buf[loop], "%s.%d", getOSISBookName(), (int)Chapter());
- else if (Book())
+ if (getVerse())
+ sprintf(buf[loop], "%s.%d.%d", getOSISBookName(), getChapter(), getVerse());
+ else if (getChapter())
+ sprintf(buf[loop], "%s.%d", getOSISBookName(), getChapter());
+ else if (getBook())
sprintf(buf[loop], "%s", getOSISBookName());
else buf[loop][0] = 0;
return buf[loop++];
@@ -1759,9 +1751,9 @@
const char *VerseKey::getRangeText() const {
if (isBoundSet() && lowerBound != upperBound) {
- SWBuf buf = (const char *)LowerBound();
+ SWBuf buf = (const char *)getLowerBound();
buf += "-";
- buf += (const char *)UpperBound();
+ buf += (const char *)getUpperBound();
stdstr(&rangeText, buf.c_str());
}
else stdstr(&rangeText, getText());
@@ -1775,9 +1767,9 @@
const char *VerseKey::getOSISRefRangeText() const {
if (isBoundSet() && (lowerBound != upperBound)) {
- SWBuf buf = LowerBound().getOSISRef();
+ SWBuf buf = getLowerBound().getOSISRef();
buf += "-";
- buf += UpperBound().getOSISRef();
+ buf += getUpperBound().getOSISRef();
stdstr(&rangeText, buf.c_str());
}
else stdstr(&rangeText, getOSISRef());
@@ -1793,7 +1785,7 @@
outRef = "";
VerseKey defLanguage;
- ListKey verses = defLanguage.ParseVerseList(inRef, (*lastKnownKey), true);
+ ListKey verses = defLanguage.parseVerseList(inRef, (*lastKnownKey), true);
const char *startFrag = inRef;
for (int i = 0; i < verses.Count(); i++) {
SWKey *element = verses.GetElement(i);
Modified: trunk/src/keys/versetreekey.cpp
===================================================================
--- trunk/src/keys/versetreekey.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/keys/versetreekey.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -86,15 +86,15 @@
}
-int VerseTreeKey::getBookAbbrev(const char *iabbr)
+int VerseTreeKey::getBookFromAbbrev(const char *iabbr) const
{
- int bookno = VerseKey::getBookAbbrev(iabbr);
+ int bookno = VerseKey::getBookFromAbbrev(iabbr);
if (bookno < 0) {
/*
vector<struct sbook>::iterator it = find(books, iabbr);
if (it == books.end()) {
TreeKey *tkey = this->treeKey;
- int saveError = tkey->Error();
+ int saveError = tkey->popError();
long bookmark = tkey->getOffset();
SWBuf segment;
internalPosChange = true;
@@ -129,7 +129,7 @@
if (!error) lastGoodOffset = getTreeKey()->getOffset();
do {
treeKey->decrement();
- treeError = treeKey->Error();
+ treeError = treeKey->popError();
// iterate until 3 levels and no versekey parse errors
} while (!treeError && ((treeKey->getLevel() < 3) || error));
if (error && !treeError) {
@@ -141,12 +141,12 @@
treeKey->setOffset(lastGoodOffset);
error = treeError;
}
- if (_compare(UpperBound()) > 0) {
- positionFrom(UpperBound());
+ if (_compare(getUpperBound()) > 0) {
+ positionFrom(getUpperBound());
error = KEYERR_OUTOFBOUNDS;
}
- if (_compare(LowerBound()) < 0) {
- positionFrom(LowerBound());
+ if (_compare(getLowerBound()) < 0) {
+ positionFrom(getLowerBound());
error = KEYERR_OUTOFBOUNDS;
}
}
@@ -157,7 +157,7 @@
if (!error) lastGoodOffset = getTreeKey()->getOffset();
do {
treeKey->increment();
- treeError = treeKey->Error();
+ treeError = treeKey->popError();
// iterate until 3 levels and no versekey parse errors
} while (!treeError && ((treeKey->getLevel() < 3) || error));
if (error && !treeError) {
@@ -170,12 +170,12 @@
error = treeError;
}
// bounds
- if (_compare(UpperBound()) > 0) {
- positionFrom(UpperBound());
+ if (_compare(getUpperBound()) > 0) {
+ positionFrom(getUpperBound());
error = KEYERR_OUTOFBOUNDS;
}
- if (_compare(LowerBound()) < 0) {
- positionFrom(LowerBound());
+ if (_compare(getLowerBound()) < 0) {
+ positionFrom(getLowerBound());
error = KEYERR_OUTOFBOUNDS;
}
}
@@ -184,7 +184,7 @@
void VerseTreeKey::positionChanged() {
if (!internalPosChange) {
TreeKey *tkey = this->TreeKey::PositionChangeListener::getTreeKey();
- int saveError = tkey->Error();
+ int saveError = tkey->popError();
long bookmark = tkey->getOffset();
SWBuf seg[4];
internalPosChange = true;
@@ -231,15 +231,15 @@
void VerseTreeKey::syncVerseToTree() {
internalPosChange = true;
SWBuf path;
- if (!Testament()) path = "/"; // "[ Module Heading ]";
- else if (!Book()) path.setFormatted("/[ Testament %d Heading ]", Testament());
+ if (!getTestament()) path = "/"; // "[ Module Heading ]";
+ else if (!getBook()) path.setFormatted("/[ Testament %d Heading ]", getTestament());
else path.setFormatted("/%s/%d/%d", getOSISBookName(), getChapter(), getVerse());
if (getSuffix()) path += getSuffix();
long bookmark = treeKey->getOffset();
treeKey->setText(path);
// if our module has jacked inconsistencies, then let's put our tree back to where it was
- if (treeKey->Error()) {
+ if (treeKey->popError()) {
treeKey->setOffset(bookmark);
}
@@ -270,18 +270,18 @@
switch (p) {
case POS_TOP:
- Error();
+ popError();
treeKey->setPosition(p);
increment();
decrement();
- Error();
+ popError();
break;
case POS_BOTTOM:
- Error();
+ popError();
treeKey->setPosition(p);
decrement();
increment();
- Error();
+ popError();
break;
case POS_MAXVERSE:
case POS_MAXCHAPTER:
Modified: trunk/src/mgr/encfiltmgr.cpp
===================================================================
--- trunk/src/mgr/encfiltmgr.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/mgr/encfiltmgr.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -82,13 +82,13 @@
SWBuf encoding = ((entry = section.find("Encoding")) != section.end()) ? (*entry).second : (SWBuf)"";
if (!encoding.length() || !stricmp(encoding.c_str(), "Latin-1")) {
- module->AddRawFilter(latin1utf8);
+ module->addRawFilter(latin1utf8);
}
}
void EncodingFilterMgr::AddEncodingFilters(SWModule *module, ConfigEntMap §ion) {
if (targetenc)
- module->AddEncodingFilter(targetenc);
+ module->addEncodingFilter(targetenc);
}
/******************************************************************************
@@ -126,17 +126,17 @@
if (oldfilter) {
if (!targetenc) {
for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); module++)
- module->second->RemoveRenderFilter(oldfilter);
+ module->second->removeRenderFilter(oldfilter);
}
else {
for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); module++)
- module->second->ReplaceRenderFilter(oldfilter, targetenc);
+ module->second->replaceRenderFilter(oldfilter, targetenc);
}
delete oldfilter;
}
else if (targetenc) {
for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); module++)
- module->second->AddRenderFilter(targetenc);
+ module->second->addRenderFilter(targetenc);
}
}
Modified: trunk/src/mgr/markupfiltmgr.cpp
===================================================================
--- trunk/src/mgr/markupfiltmgr.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/mgr/markupfiltmgr.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -109,19 +109,19 @@
CreateFilters(markup);
for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); module++)
- switch (module->second->Markup()) {
+ switch (module->second->getMarkup()) {
case FMT_THML:
if (oldthml != fromthml) {
if (oldthml) {
if (!fromthml) {
- module->second->RemoveRenderFilter(oldthml);
+ module->second->removeRenderFilter(oldthml);
}
else {
- module->second->ReplaceRenderFilter(oldthml, fromthml);
+ module->second->replaceRenderFilter(oldthml, fromthml);
}
}
else if (fromthml) {
- module->second->AddRenderFilter(fromthml);
+ module->second->addRenderFilter(fromthml);
}
}
break;
@@ -129,14 +129,14 @@
if (oldgbf != fromgbf) {
if (oldgbf) {
if (!fromgbf) {
- module->second->RemoveRenderFilter(oldgbf);
+ module->second->removeRenderFilter(oldgbf);
}
else {
- module->second->ReplaceRenderFilter(oldgbf, fromgbf);
+ module->second->replaceRenderFilter(oldgbf, fromgbf);
}
}
else if (fromgbf) {
- module->second->AddRenderFilter(fromgbf);
+ module->second->addRenderFilter(fromgbf);
}
break;
}
@@ -144,14 +144,14 @@
if (oldplain != fromplain) {
if (oldplain) {
if (!fromplain) {
- module->second->RemoveRenderFilter(oldplain);
+ module->second->removeRenderFilter(oldplain);
}
else {
- module->second->ReplaceRenderFilter(oldplain, fromplain);
+ module->second->replaceRenderFilter(oldplain, fromplain);
}
}
else if (fromplain) {
- module->second->AddRenderFilter(fromplain);
+ module->second->addRenderFilter(fromplain);
}
break;
}
@@ -159,14 +159,14 @@
if (oldosis != fromosis) {
if (oldosis) {
if (!fromosis) {
- module->second->RemoveRenderFilter(oldosis);
+ module->second->removeRenderFilter(oldosis);
}
else {
- module->second->ReplaceRenderFilter(oldosis, fromosis);
+ module->second->replaceRenderFilter(oldosis, fromosis);
}
}
else if (fromosis) {
- module->second->AddRenderFilter(fromosis);
+ module->second->addRenderFilter(fromosis);
}
break;
}
@@ -174,14 +174,14 @@
if (oldtei != fromtei) {
if (oldtei) {
if (!fromtei) {
- module->second->RemoveRenderFilter(oldtei);
+ module->second->removeRenderFilter(oldtei);
}
else {
- module->second->ReplaceRenderFilter(oldtei, fromtei);
+ module->second->replaceRenderFilter(oldtei, fromtei);
}
}
else if (fromtei) {
- module->second->AddRenderFilter(fromtei);
+ module->second->addRenderFilter(fromtei);
}
break;
}
@@ -202,26 +202,26 @@
}
void MarkupFilterMgr::AddRenderFilters(SWModule *module, ConfigEntMap §ion) {
- switch (module->Markup()) {
+ switch (module->getMarkup()) {
case FMT_THML:
if (fromthml)
- module->AddRenderFilter(fromthml);
+ module->addRenderFilter(fromthml);
break;
case FMT_GBF:
if (fromgbf)
- module->AddRenderFilter(fromgbf);
+ module->addRenderFilter(fromgbf);
break;
case FMT_PLAIN:
if (fromplain)
- module->AddRenderFilter(fromplain);
+ module->addRenderFilter(fromplain);
break;
case FMT_OSIS:
if (fromosis)
- module->AddRenderFilter(fromosis);
+ module->addRenderFilter(fromosis);
break;
case FMT_TEI:
if (fromtei)
- module->AddRenderFilter(fromtei);
+ module->addRenderFilter(fromtei);
break;
}
}
Modified: trunk/src/mgr/swmgr.cpp
===================================================================
--- trunk/src/mgr/swmgr.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/mgr/swmgr.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -1023,7 +1023,7 @@
if (newmod) {
// if a specific module type is set in the config, use this
if ((entry = section.find("Type")) != section.end())
- newmod->Type(entry->second.c_str());
+ newmod->setType(entry->second.c_str());
newmod->setConfig(§ion);
}
@@ -1037,7 +1037,7 @@
OptionFilterMap::iterator it;
it = optionFilters.find((*start).second);
if (it != optionFilters.end()) {
- module->AddOptionFilter((*it).second); // add filter to module and option as a valid option
+ module->addOptionFilter((*it).second); // add filter to module and option as a valid option
StringList::iterator loop;
for (loop = options.begin(); loop != options.end(); loop++) {
if (!strcmp((*loop).c_str(), (*it).second->getOptionName()))
@@ -1050,7 +1050,7 @@
if (filterMgr)
filterMgr->AddGlobalOptions(module, section, start, end);
#ifdef _ICU_
- module->AddOptionFilter(transliterator);
+ module->addOptionFilter(transliterator);
#endif
}
@@ -1085,7 +1085,7 @@
OptionFilterMap::iterator it;
it = optionFilters.find((*start).second);
if (it != optionFilters.end()) {
- module->AddOptionFilter((*it).second); // add filter to module
+ module->addOptionFilter((*it).second); // add filter to module
}
}
@@ -1101,7 +1101,7 @@
OptionFilterMap::iterator it;
it = optionFilters.find((*start).second);
if (it != optionFilters.end()) {
- module->AddStripFilter((*it).second); // add filter to module
+ module->addStripFilter((*it).second); // add filter to module
}
}
}
@@ -1114,9 +1114,9 @@
cipherKey = ((entry = section.find("CipherKey")) != section.end()) ? (*entry).second : (SWBuf)"";
if (cipherKey.length()) {
SWFilter *cipherFilter = new CipherFilter(cipherKey.c_str());
- cipherFilters.insert(FilterMap::value_type(module->Name(), cipherFilter));
+ cipherFilters.insert(FilterMap::value_type(module->getName(), cipherFilter));
cleanupFilters.push_back(cipherFilter);
- module->AddRawFilter(cipherFilter);
+ module->addRawFilter(cipherFilter);
}
if (filterMgr)
@@ -1171,16 +1171,16 @@
}
if (!stricmp(sourceformat.c_str(), "GBF")) {
- module->AddStripFilter(gbfplain);
+ module->addStripFilter(gbfplain);
}
else if (!stricmp(sourceformat.c_str(), "ThML")) {
- module->AddStripFilter(thmlplain);
+ module->addStripFilter(thmlplain);
}
else if (!stricmp(sourceformat.c_str(), "OSIS")) {
- module->AddStripFilter(osisplain);
+ module->addStripFilter(osisplain);
}
else if (!stricmp(sourceformat.c_str(), "TEI")) {
- module->AddStripFilter(teiplain);
+ module->addStripFilter(teiplain);
}
if (filterMgr)
@@ -1232,12 +1232,12 @@
AddRenderFilters(newmod, section);
AddEncodingFilters(newmod, section);
- SWModule *oldmod = Modules[newmod->Name()];
+ SWModule *oldmod = Modules[newmod->getName()];
if (oldmod) {
delete oldmod;
}
- Modules[newmod->Name()] = newmod;
+ Modules[newmod->getName()] = newmod;
}
}
}
@@ -1408,7 +1408,7 @@
SWFilter *cipherFilter = new CipherFilter(key);
cipherFilters.insert(FilterMap::value_type(modName, cipherFilter));
cleanupFilters.push_back(cipherFilter);
- (*it2).second->AddRawFilter(cipherFilter);
+ (*it2).second->addRawFilter(cipherFilter);
return 0;
}
}
Modified: trunk/src/modules/comments/hrefcom/hrefcom.cpp
===================================================================
--- trunk/src/modules/comments/hrefcom/hrefcom.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/comments/hrefcom/hrefcom.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -67,19 +67,19 @@
* RET: string buffer with verse
*/
-SWBuf &HREFCom::getRawEntryBuf() {
+SWBuf &HREFCom::getRawEntryBuf() const {
long start;
unsigned short size;
VerseKey *key = 0;
key = &getVerseKey();
- findOffset(key->Testament(), key->TestamentIndex(), &start, &size);
+ findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size);
entrySize = size; // support getEntrySize call
SWBuf tmpbuf;
- readText(key->Testament(), start, size, tmpbuf);
+ readText(key->getTestament(), start, size, tmpbuf);
entryBuf = prefix;
entryBuf += tmpbuf.c_str();
prepText(entryBuf);
Modified: trunk/src/modules/comments/rawcom/rawcom.cpp
===================================================================
--- trunk/src/modules/comments/rawcom/rawcom.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/comments/rawcom/rawcom.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -54,7 +54,7 @@
}
-bool RawCom::isWritable() {
+bool RawCom::isWritable() const {
return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR));
}
/******************************************************************************
@@ -64,16 +64,16 @@
* RET: string buffer with verse
*/
-SWBuf &RawCom::getRawEntryBuf() {
+SWBuf &RawCom::getRawEntryBuf() const {
long start = 0;
unsigned short size = 0;
VerseKey *key = &getVerseKey();
- findOffset(key->Testament(), key->TestamentIndex(), &start, &size);
+ findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size);
entrySize = size; // support getEntrySize call
entryBuf = "";
- readText(key->Testament(), start, size, entryBuf);
+ readText(key->getTestament(), start, size, entryBuf);
rawFilter(entryBuf, 0); // hack, decipher
rawFilter(entryBuf, key);
@@ -98,7 +98,7 @@
unsigned short size;
VerseKey *tmpkey = &getVerseKey();
- findOffset(tmpkey->Testament(), tmpkey->TestamentIndex(), &start, &size);
+ findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size);
SWKey lastgood = *tmpkey;
while (steps) {
@@ -108,12 +108,12 @@
(steps > 0) ? ++(*key) : --(*key);
tmpkey = &getVerseKey();
- if ((error = key->Error())) {
+ if ((error = key->popError())) {
*key = lastgood;
break;
}
- long index = tmpkey->TestamentIndex();
- findOffset(tmpkey->Testament(), index, &start, &size);
+ long index = tmpkey->getTestamentIndex();
+ findOffset(tmpkey->getTestament(), index, &start, &size);
if (
(((laststart != start) || (lastsize != size)) // we're a different entry
// && (start > 0)
@@ -129,7 +129,7 @@
void RawCom::setEntry(const char *inbuf, long len) {
VerseKey *key = &getVerseKey();
- doSetText(key->Testament(), key->TestamentIndex(), inbuf, len);
+ doSetText(key->getTestament(), key->getTestamentIndex(), inbuf, len);
}
@@ -137,7 +137,7 @@
VerseKey *destkey = &getVerseKey();
const VerseKey *srckey = &getVerseKey(inkey);
- doLinkEntry(destkey->Testament(), destkey->TestamentIndex(), srckey->TestamentIndex());
+ doLinkEntry(destkey->getTestament(), destkey->getTestamentIndex(), srckey->getTestamentIndex());
if (inkey != srckey) // free our key if we created a VerseKey
delete srckey;
@@ -153,7 +153,7 @@
void RawCom::deleteEntry() {
VerseKey *key = &getVerseKey();
- doSetText(key->Testament(), key->TestamentIndex(), "");
+ doSetText(key->getTestament(), key->getTestamentIndex(), "");
}
bool RawCom::isLinked(const SWKey *k1, const SWKey *k2) const {
@@ -161,10 +161,10 @@
unsigned short size1, size2;
VerseKey *vk1 = &getVerseKey(k1);
VerseKey *vk2 = &getVerseKey(k2);
- if (vk1->Testament() != vk2->Testament()) return false;
+ if (vk1->getTestament() != vk2->getTestament()) return false;
- findOffset(vk1->Testament(), vk1->TestamentIndex(), &start1, &size1);
- findOffset(vk2->Testament(), vk2->TestamentIndex(), &start2, &size2);
+ findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1);
+ findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2);
if (!size1 || !size2) return false;
return start1 == start2;
}
@@ -174,7 +174,7 @@
unsigned short size;
VerseKey *vk = &getVerseKey(k);
- findOffset(vk->Testament(), vk->TestamentIndex(), &start, &size);
+ findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size);
return size;
}
Modified: trunk/src/modules/comments/rawcom4/rawcom4.cpp
===================================================================
--- trunk/src/modules/comments/rawcom4/rawcom4.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/comments/rawcom4/rawcom4.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -53,7 +53,7 @@
}
-bool RawCom4::isWritable() {
+bool RawCom4::isWritable() const {
return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR));
}
/******************************************************************************
@@ -63,16 +63,16 @@
* RET: string buffer with verse
*/
-SWBuf &RawCom4::getRawEntryBuf() {
+SWBuf &RawCom4::getRawEntryBuf() const {
long start = 0;
unsigned long size = 0;
VerseKey *key = &getVerseKey();
- findOffset(key->Testament(), key->TestamentIndex(), &start, &size);
+ findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size);
entrySize = size; // support getEntrySize call
entryBuf = "";
- readText(key->Testament(), start, size, entryBuf);
+ readText(key->getTestament(), start, size, entryBuf);
rawFilter(entryBuf, 0); // hack, decipher
rawFilter(entryBuf, key);
@@ -97,7 +97,7 @@
unsigned long size;
VerseKey *tmpkey = &getVerseKey();
- findOffset(tmpkey->Testament(), tmpkey->TestamentIndex(), &start, &size);
+ findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size);
SWKey lastgood = *tmpkey;
while (steps) {
@@ -107,12 +107,12 @@
(steps > 0) ? ++(*key) : --(*key);
tmpkey = &getVerseKey();
- if ((error = key->Error())) {
+ if ((error = key->popError())) {
*key = lastgood;
break;
}
- long index = tmpkey->TestamentIndex();
- findOffset(tmpkey->Testament(), index, &start, &size);
+ long index = tmpkey->getTestamentIndex();
+ findOffset(tmpkey->getTestament(), index, &start, &size);
if (
(((laststart != start) || (lastsize != size)) // we're a different entry
// && (start > 0)
@@ -128,14 +128,14 @@
void RawCom4::setEntry(const char *inbuf, long len) {
VerseKey *key = &getVerseKey();
- doSetText(key->Testament(), key->TestamentIndex(), inbuf, len);
+ doSetText(key->getTestament(), key->getTestamentIndex(), inbuf, len);
}
void RawCom4::linkEntry(const SWKey *inkey) {
VerseKey *destkey = &getVerseKey();
const VerseKey *srckey = &getVerseKey(inkey);
- doLinkEntry(destkey->Testament(), destkey->TestamentIndex(), srckey->TestamentIndex());
+ doLinkEntry(destkey->getTestament(), destkey->getTestamentIndex(), srckey->getTestamentIndex());
}
@@ -148,7 +148,7 @@
void RawCom4::deleteEntry() {
VerseKey *key = &getVerseKey();
- doSetText(key->Testament(), key->TestamentIndex(), "");
+ doSetText(key->getTestament(), key->getTestamentIndex(), "");
}
bool RawCom4::isLinked(const SWKey *k1, const SWKey *k2) const {
@@ -156,10 +156,10 @@
unsigned long size1, size2;
VerseKey *vk1 = &getVerseKey(k1);
VerseKey *vk2 = &getVerseKey(k2);
- if (vk1->Testament() != vk2->Testament()) return false;
+ if (vk1->getTestament() != vk2->getTestament()) return false;
- findOffset(vk1->Testament(), vk1->TestamentIndex(), &start1, &size1);
- findOffset(vk2->Testament(), vk2->TestamentIndex(), &start2, &size2);
+ findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1);
+ findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2);
if (!size1 || !size2) return false;
return start1 == start2;
}
@@ -169,7 +169,7 @@
unsigned long size;
VerseKey *vk = &getVerseKey(k);
- findOffset(vk->Testament(), vk->TestamentIndex(), &start, &size);
+ findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size);
return size;
}
Modified: trunk/src/modules/comments/rawfiles/rawfiles.cpp
===================================================================
--- trunk/src/modules/comments/rawfiles/rawfiles.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/comments/rawfiles/rawfiles.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -57,7 +57,7 @@
/** Is the module writable? :)
* @return yes or no
*/
-bool RawFiles::isWritable() {
+bool RawFiles::isWritable() const {
return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR));
}
@@ -69,19 +69,19 @@
* RET: entry contents
*/
-SWBuf &RawFiles::getRawEntryBuf() {
+SWBuf &RawFiles::getRawEntryBuf() const {
FileDesc *datafile;
long start = 0;
unsigned short size = 0;
VerseKey *key = &getVerseKey();
- findOffset(key->Testament(), key->TestamentIndex(), &start, &size);
+ findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size);
entryBuf = "";
if (size) {
SWBuf tmpbuf = path;
tmpbuf += '/';
- readText(key->Testament(), start, size, entryBuf);
+ readText(key->getTestament(), start, size, entryBuf);
tmpbuf += entryBuf;
entryBuf = "";
datafile = FileMgr::getSystemFileMgr()->open(tmpbuf.c_str(), FileMgr::RDONLY);
@@ -114,13 +114,13 @@
len = (len<0)?strlen(inbuf):len;
- findOffset(key->Testament(), key->TestamentIndex(), &start, &size);
+ findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size);
if (size) {
SWBuf tmpbuf;
entryBuf = path;
entryBuf += '/';
- readText(key->Testament(), start, size, tmpbuf);
+ readText(key->getTestament(), start, size, tmpbuf);
entryBuf += tmpbuf;
}
else {
@@ -128,7 +128,7 @@
entryBuf = path;
entryBuf += '/';
tmpbuf = getNextFilename();
- doSetText(key->Testament(), key->TestamentIndex(), tmpbuf);
+ doSetText(key->getTestament(), key->getTestamentIndex(), tmpbuf);
entryBuf += tmpbuf;
}
datafile = FileMgr::getSystemFileMgr()->open(entryBuf, FileMgr::CREAT|FileMgr::WRONLY|FileMgr::TRUNC);
@@ -152,14 +152,14 @@
unsigned short size;
const VerseKey *key = &getVerseKey();
- findOffset(key->Testament(), key->TestamentIndex(), &start, &size);
+ findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size);
if (size) {
SWBuf tmpbuf;
- readText(key->Testament(), start, size + 2, tmpbuf);
+ readText(key->getTestament(), start, size + 2, tmpbuf);
key = &getVerseKey(inkey);
- doSetText(key->Testament(), key->TestamentIndex(), tmpbuf.c_str());
+ doSetText(key->getTestament(), key->getTestamentIndex(), tmpbuf.c_str());
}
}
@@ -172,7 +172,7 @@
void RawFiles::deleteEntry() {
VerseKey *key = &getVerseKey();
- doSetText(key->Testament(), key->TestamentIndex(), "");
+ doSetText(key->getTestament(), key->getTestamentIndex(), "");
}
Modified: trunk/src/modules/comments/swcom.cpp
===================================================================
--- trunk/src/modules/comments/swcom.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/comments/swcom.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -41,9 +41,9 @@
this->versification = 0;
stdstr(&(this->versification), versification);
delete key;
- key = (VerseKey *)CreateKey();
- tmpVK1 = (VerseKey *)CreateKey();
- tmpVK2 = (VerseKey *)CreateKey();
+ key = (VerseKey *)createKey();
+ tmpVK1 = (VerseKey *)createKey();
+ tmpVK2 = (VerseKey *)createKey();
tmpSecond = false;
}
@@ -59,7 +59,7 @@
}
-SWKey *SWCom::CreateKey() const {
+SWKey *SWCom::createKey() const {
VerseKey *vk = new VerseKey();
vk->setVersificationSystem(versification);
@@ -76,7 +76,7 @@
void SWCom::setIndex(long iindex) {
VerseKey *key = &getVerseKey();
- key->Testament(1);
+ key->setTestament(1);
key->setIndex(iindex);
if (key != this->key) {
Modified: trunk/src/modules/comments/zcom/zcom.cpp
===================================================================
--- trunk/src/modules/comments/zcom/zcom.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/comments/zcom/zcom.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -59,7 +59,7 @@
}
-bool zCom::isWritable() {
+bool zCom::isWritable() const {
return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR));
}
@@ -70,17 +70,17 @@
*
* RET: string buffer with verse
*/
-SWBuf &zCom::getRawEntryBuf() {
+SWBuf &zCom::getRawEntryBuf() const {
long start = 0;
unsigned short size = 0;
unsigned long buffnum;
VerseKey *key = &getVerseKey();
- findOffset(key->Testament(), key->TestamentIndex(), &start, &size, &buffnum);
+ findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size, &buffnum);
entrySize = size; // support getEntrySize call
entryBuf = "";
- zReadText(key->Testament(), start, size, buffnum, entryBuf);
+ zReadText(key->getTestament(), start, size, buffnum, entryBuf);
rawFilter(entryBuf, key);
@@ -92,18 +92,18 @@
bool zCom::sameBlock(VerseKey *k1, VerseKey *k2) {
- if (k1->Testament() != k2->Testament())
+ if (k1->getTestament() != k2->getTestament())
return false;
switch (blockType) {
case VERSEBLOCKS:
- if (k1->Verse() != k2->Verse())
+ if (k1->getVerse() != k2->getVerse())
return false;
case CHAPTERBLOCKS:
- if (k1->Chapter() != k2->Chapter())
+ if (k1->getChapter() != k2->getChapter())
return false;
case BOOKBLOCKS:
- if (k1->Book() != k2->Book())
+ if (k1->getBook() != k2->getBook())
return false;
}
return true;
@@ -120,7 +120,7 @@
delete lastWriteKey;
}
- doSetText(key->Testament(), key->TestamentIndex(), inbuf, len);
+ doSetText(key->getTestament(), key->getTestamentIndex(), inbuf, len);
lastWriteKey = (VerseKey *)key->clone(); // must delete
}
@@ -130,7 +130,7 @@
VerseKey *destkey = &getVerseKey();
const VerseKey *srckey = &getVerseKey(inkey);
- doLinkEntry(destkey->Testament(), destkey->TestamentIndex(), srckey->TestamentIndex());
+ doLinkEntry(destkey->getTestament(), destkey->getTestamentIndex(), srckey->getTestamentIndex());
if (inkey != srckey) // free our key if we created a VerseKey
delete srckey;
@@ -145,7 +145,7 @@
void zCom::deleteEntry() {
VerseKey *key = &getVerseKey();
- doSetText(key->Testament(), key->TestamentIndex(), "");
+ doSetText(key->getTestament(), key->getTestamentIndex(), "");
}
@@ -163,7 +163,7 @@
unsigned long buffnum;
VerseKey *tmpkey = &getVerseKey();
- findOffset(tmpkey->Testament(), tmpkey->TestamentIndex(), &start, &size, &buffnum);
+ findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size, &buffnum);
SWKey lastgood = *tmpkey;
while (steps) {
@@ -173,12 +173,12 @@
(steps > 0) ? ++(*key) : --(*key);
tmpkey = &getVerseKey();
- if ((error = key->Error())) {
+ if ((error = key->popError())) {
*key = lastgood;
break;
}
- long index = tmpkey->TestamentIndex();
- findOffset(tmpkey->Testament(), index, &start, &size, &buffnum);
+ long index = tmpkey->getTestamentIndex();
+ findOffset(tmpkey->getTestament(), index, &start, &size, &buffnum);
if (
(((laststart != start) || (lastsize != size)) // we're a different entry
// && (start > 0)
@@ -197,10 +197,10 @@
unsigned long buffnum1, buffnum2;
VerseKey *vk1 = &getVerseKey(k1);
VerseKey *vk2 = &getVerseKey(k2);
- if (vk1->Testament() != vk2->Testament()) return false;
+ if (vk1->getTestament() != vk2->getTestament()) return false;
- findOffset(vk1->Testament(), vk1->TestamentIndex(), &start1, &size1, &buffnum1);
- findOffset(vk2->Testament(), vk2->TestamentIndex(), &start2, &size2, &buffnum2);
+ findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1, &buffnum1);
+ findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2, &buffnum2);
return start1 == start2 && buffnum1 == buffnum2;
}
@@ -210,7 +210,7 @@
unsigned long buffnum;
VerseKey *vk = &getVerseKey(k);
- findOffset(vk->Testament(), vk->TestamentIndex(), &start, &size, &buffnum);
+ findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size, &buffnum);
return size;
}
Modified: trunk/src/modules/common/rawstr.cpp
===================================================================
--- trunk/src/modules/common/rawstr.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/common/rawstr.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -302,7 +302,7 @@
*
*/
-void RawStr::readText(__u32 istart, __u16 *isize, char **idxbuf, SWBuf &buf)
+void RawStr::readText(__u32 istart, __u16 *isize, char **idxbuf, SWBuf &buf) const
{
unsigned int ch;
char *idxbuflocal = 0;
Modified: trunk/src/modules/common/rawstr4.cpp
===================================================================
--- trunk/src/modules/common/rawstr4.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/common/rawstr4.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -311,7 +311,7 @@
*
*/
-void RawStr4::readText(__u32 istart, __u32 *isize, char **idxbuf, SWBuf &buf)
+void RawStr4::readText(__u32 istart, __u32 *isize, char **idxbuf, SWBuf &buf) const
{
unsigned int ch;
char *idxbuflocal = 0;
Modified: trunk/src/modules/common/rawverse.cpp
===================================================================
--- trunk/src/modules/common/rawverse.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/common/rawverse.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -149,7 +149,7 @@
*
*/
-void RawVerse::readText(char testmt, long start, unsigned short size, SWBuf &buf) {
+void RawVerse::readText(char testmt, long start, unsigned short size, SWBuf &buf) const {
buf = "";
buf.setFillByte(0);
buf.setSize(size + 1);
@@ -278,15 +278,15 @@
VerseKey vk;
vk.setVersificationSystem(v11n);
- vk.Headings(1);
+ vk.setIntros(1);
__s32 offset = 0;
__u16 size = 0;
offset = archtosword32(offset);
size = archtosword16(size);
- for (vk = TOP; !vk.Error(); vk++) {
- if (vk.Testament() < 2) {
+ for (vk = TOP; !vk.popError(); vk++) {
+ if (vk.getTestament() < 2) {
fd->write(&offset, 4);
fd->write(&size, 2);
}
Modified: trunk/src/modules/common/rawverse4.cpp
===================================================================
--- trunk/src/modules/common/rawverse4.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/common/rawverse4.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -149,7 +149,7 @@
*
*/
-void RawVerse4::readText(char testmt, long start, unsigned long size, SWBuf &buf) {
+void RawVerse4::readText(char testmt, long start, unsigned long size, SWBuf &buf) const {
buf = "";
buf.setFillByte(0);
buf.setSize(size + 1);
@@ -278,14 +278,14 @@
VerseKey vk;
vk.setVersificationSystem(v11n);
- vk.Headings(1);
+ vk.setIntros(1);
__u32 offset = 0;
__u32 size = 0;
offset = archtosword32(offset);
size = archtosword32(size);
- for (vk = TOP; !vk.Error(); vk++) {
- if (vk.Testament() < 2) {
+ for (vk = TOP; !vk.popError(); vk++) {
+ if (vk.getTestament() < 2) {
fd->write(&offset, 4);
fd->write(&size, 4);
}
Modified: trunk/src/modules/common/zstr.cpp
===================================================================
--- trunk/src/modules/common/zstr.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/common/zstr.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -321,7 +321,7 @@
*
*/
-void zStr::getText(long offset, char **idxbuf, char **buf) {
+void zStr::getText(long offset, char **idxbuf, char **buf) const {
char *ch;
char *idxbuflocal = 0;
getKeyFromIdxOffset(offset, &idxbuflocal);
@@ -386,7 +386,7 @@
* file.
*/
-void zStr::getCompressedText(long block, long entry, char **buf) {
+void zStr::getCompressedText(long block, long entry, char **buf) const {
__u32 size = 0;
@@ -583,7 +583,7 @@
}
-void zStr::flushCache() {
+void zStr::flushCache() const {
if (cacheBlock) {
if (cacheDirty) {
__u32 start = 0;
Modified: trunk/src/modules/common/zverse.cpp
===================================================================
--- trunk/src/modules/common/zverse.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/common/zverse.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -202,7 +202,7 @@
*
*/
-void zVerse::zReadText(char testmt, long start, unsigned short size, unsigned long ulBuffNum, SWBuf &inBuf) {
+void zVerse::zReadText(char testmt, long start, unsigned short size, unsigned long ulBuffNum, SWBuf &inBuf) const {
__u32 ulCompOffset = 0; // compressed buffer start
__u32 ulCompSize = 0; // buffer size compressed
__u32 ulUnCompSize = 0; // buffer size uncompressed
@@ -335,7 +335,7 @@
}
-void zVerse::flushCache() {
+void zVerse::flushCache() const {
if (dirtyCache) {
__u32 idxoff;
__u32 start, outstart;
@@ -469,15 +469,15 @@
VerseKey vk;
vk.setVersificationSystem(v11n);
- vk.Headings(1);
+ vk.setIntros(true);
__s32 offset = 0;
__s16 size = 0;
offset = archtosword32(offset);
size = archtosword16(size);
- for (vk = TOP; !vk.Error(); vk++) {
- if (vk.Testament() < 2) {
+ for (vk = TOP; !vk.popError(); vk++) {
+ if (vk.getTestament() < 2) {
fd->write(&offset, 4); //compBufIdxOffset
fd->write(&offset, 4);
fd->write(&size, 2);
Modified: trunk/src/modules/filters/gbffootnotes.cpp
===================================================================
--- trunk/src/modules/filters/gbffootnotes.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/gbffootnotes.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -86,7 +86,7 @@
if (module->isProcessEntryAttributes()) {
//tag = token;
- if((tagText.length() == 1) || !strcmp(module->Name(), "IGNT")) {
+ if((tagText.length() == 1) || !strcmp(module->getName(), "IGNT")) {
if (option) { // for ASV marks text in verse then put explanation at end of verse
text.append(" <FS>[");
text.append(tagText);
Modified: trunk/src/modules/filters/gbfhtmlhref.cpp
===================================================================
--- trunk/src/modules/filters/gbfhtmlhref.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/gbfhtmlhref.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -34,7 +34,7 @@
GBFHTMLHREF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
if (module) {
- version = module->Name();
+ version = module->getName();
}
}
Modified: trunk/src/modules/filters/gbfosis.cpp
===================================================================
--- trunk/src/modules/filters/gbfosis.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/gbfosis.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -347,7 +347,7 @@
VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
if (vkey) {
SWBuf ref = "";
- if (vkey->Verse()) {
+ if (vkey->getVerse()) {
ref.appendFormatted("\t\t<verse osisID=\"%s\">", vkey->getOSISRef());
}
@@ -355,24 +355,24 @@
text = ref + text;
- if (vkey->Verse()) {
+ if (vkey->getVerse()) {
VerseKey *tmp = (VerseKey *)vkey->clone();
*tmp = *vkey;
- tmp->AutoNormalize(0);
- tmp->Headings(1);
+ tmp->setAutoNormalize(false);
+ tmp->setIntros(true);
text += "</verse>";
*tmp = MAXVERSE;
if (*vkey == *tmp) {
- tmp->Verse(0);
+ tmp->setVerse(0);
// sprintf(ref, "\t</div>");
// pushString(&to, ref);
*tmp = MAXCHAPTER;
*tmp = MAXVERSE;
if (*vkey == *tmp) {
- tmp->Chapter(0);
- tmp->Verse(0);
+ tmp->setChapter(0);
+ tmp->setVerse(0);
// sprintf(ref, "\t</div>");
// pushString(&to, ref);
/*
Modified: trunk/src/modules/filters/gbfwordjs.cpp
===================================================================
--- trunk/src/modules/filters/gbfwordjs.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/gbfwordjs.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -65,7 +65,7 @@
bool newText = false;
bool needWordOut = false;
AttributeValue *wordAttrs = 0;
- SWBuf modName = (module)?module->Name():"";
+ SWBuf modName = (module)?module->getName():"";
SWBuf wordSrcPrefix = modName;
const SWBuf orig = text;
@@ -145,7 +145,7 @@
gh = isdigit(strong[0]) ? 0:strong[0];
if (!gh) {
if (vkey) {
- gh = vkey->Testament() ? 'H' : 'G';
+ gh = vkey->getTestament() ? 'H' : 'G';
}
}
else strong << 1;
@@ -164,7 +164,7 @@
if (sLex) {
// we can pass the real lex name in, but we have some
// aliases in the javascript to optimize bandwidth
- lexName = sLex->Name();
+ lexName = sLex->getName();
if (lexName == "StrongsGreek")
lexName = "G";
if (lexName == "StrongsHebrew")
@@ -173,7 +173,7 @@
SWBuf wordID;
if (vkey) {
// optimize for bandwidth and use only the verse as the unique entry id
- wordID.appendFormatted("%d", vkey->Verse());
+ wordID.appendFormatted("%d", vkey->getVerse());
}
else {
wordID = key->getText();
@@ -195,7 +195,7 @@
/*
if (sMorph) {
SWBuf popMorph = "<a onclick=\"";
- popMorph.appendFormatted("p(\'%s\',\'%s\','%s','');\" >%s</a>", sMorph->Name(), morph.c_str(), wordID.c_str(), morph.c_str());
+ popMorph.appendFormatted("p(\'%s\',\'%s\','%s','');\" >%s</a>", sMorph->getName(), morph.c_str(), wordID.c_str(), morph.c_str());
morph = popMorph;
}
*/
@@ -240,7 +240,7 @@
gh = isdigit(strong[0]) ? 0:strong[0];
if (!gh) {
if (vkey) {
- gh = vkey->Testament() ? 'H' : 'G';
+ gh = vkey->getTestament() ? 'H' : 'G';
}
}
else strong << 1;
@@ -256,7 +256,7 @@
if (sLex) {
// we can pass the real lex name in, but we have some
// aliases in the javascript to optimize bandwidth
- lexName = sLex->Name();
+ lexName = sLex->getName();
if (lexName == "StrongsGreek")
lexName = "G";
if (lexName == "StrongsHebrew")
@@ -265,7 +265,7 @@
SWBuf wordID;
if (vkey) {
// optimize for bandwidth and use only the verse as the unique entry id
- wordID.appendFormatted("%d", vkey->Verse());
+ wordID.appendFormatted("%d", vkey->getVerse());
}
else {
wordID = key->getText();
Modified: trunk/src/modules/filters/gbfxhtml.cpp
===================================================================
--- trunk/src/modules/filters/gbfxhtml.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/gbfxhtml.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -40,7 +40,7 @@
GBFXHTML::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
if (module) {
- version = module->Name();
+ version = module->getName();
}
}
Modified: trunk/src/modules/filters/osisfootnotes.cpp
===================================================================
--- trunk/src/modules/filters/osisfootnotes.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/osisfootnotes.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -56,7 +56,7 @@
SWBuf refs = "";
int footnoteNum = 1;
char buf[254];
- SWKey *p = (module) ? module->CreateKey() : (key) ? key->clone() : new VerseKey();
+ SWKey *p = (module) ? module->createKey() : (key) ? key->clone() : new VerseKey();
VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p);
if (!parser) {
delete p;
@@ -122,7 +122,7 @@
startTag.setAttribute("swordFootnote", buf);
if ((startTag.getAttribute("type")) && (!strcmp(startTag.getAttribute("type"), "crossReference"))) {
if (!refs.length())
- refs = parser->ParseVerseList(tagText.c_str(), *parser, true).getRangeText();
+ refs = parser->parseVerseList(tagText.c_str(), *parser, true).getRangeText();
module->getEntryAttributes()["Footnote"][buf]["refList"] = refs.c_str();
}
}
Modified: trunk/src/modules/filters/osishtmlhref.cpp
===================================================================
--- trunk/src/modules/filters/osishtmlhref.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/osishtmlhref.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -120,8 +120,8 @@
wordsOfChristEnd = "</font> ";
if (module) {
osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false")));
- version = module->Name();
- BiblicalText = (!strcmp(module->Type(), "Biblical Texts"));
+ version = module->getName();
+ BiblicalText = (!strcmp(module->getType(), "Biblical Texts"));
}
else {
osisQToTick = true; // default
Modified: trunk/src/modules/filters/osisosis.cpp
===================================================================
--- trunk/src/modules/filters/osisosis.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/osisosis.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -59,7 +59,7 @@
VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
if (vkey) {
SWBuf ref = "";
- if (vkey->Verse()) {
+ if (vkey->getVerse()) {
ref.appendFormatted("\t\t<verse osisID=\"%s\">", vkey->getOSISRef());
}
@@ -67,24 +67,24 @@
text = ref + text;
- if (vkey->Verse()) {
+ if (vkey->getVerse()) {
VerseKey *tmp = (VerseKey *)vkey->clone();
*tmp = *vkey;
- tmp->AutoNormalize(0);
- tmp->Headings(1);
+ tmp->setAutoNormalize(false);
+ tmp->setIntros(true);
text += "</verse>";
*tmp = MAXVERSE;
if (*vkey == *tmp) {
- tmp->Verse(0);
+ tmp->setVerse(0);
// sprintf(ref, "\t</div>");
// pushString(&to, ref);
*tmp = MAXCHAPTER;
*tmp = MAXVERSE;
if (*vkey == *tmp) {
- tmp->Chapter(0);
- tmp->Verse(0);
+ tmp->setChapter(0);
+ tmp->setVerse(0);
// sprintf(ref, "\t</div>");
// pushString(&to, ref);
}
Modified: trunk/src/modules/filters/osisplain.cpp
===================================================================
--- trunk/src/modules/filters/osisplain.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/osisplain.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -65,7 +65,7 @@
BasicFilterUserData *OSISPlain::createUserData(const SWModule *module, const SWKey *key) {
MyUserData *u = new MyUserData(module, key);
u->vk = SWDYNAMIC_CAST(VerseKey, u->key);
- u->testament = (u->vk) ? u->vk->Testament() : 2; // default to NT
+ u->testament = (u->vk) ? u->vk->getTestament() : 2; // default to NT
return u;
}
Modified: trunk/src/modules/filters/osisrtf.cpp
===================================================================
--- trunk/src/modules/filters/osisrtf.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/osisrtf.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -53,8 +53,8 @@
BiblicalText = false;
suspendLevel = 0;
if (module) {
- version = module->Name();
- BiblicalText = (!strcmp(module->Type(), "Biblical Texts"));
+ version = module->getName();
+ BiblicalText = (!strcmp(module->getType(), "Biblical Texts"));
}
osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false")));
}
@@ -251,7 +251,7 @@
SWCATCH ( ... ) { }
if (vkey) {
char ch = ((!strcmp(type.c_str(), "crossReference")) || (!strcmp(type.c_str(), "x-cross-ref"))) ? 'x':'n';
- scratch.setFormatted("{\\super <a href=\"\">*%c%i.%s</a>} ", ch, vkey->Verse(), footnoteNumber.c_str());
+ scratch.setFormatted("{\\super <a href=\"\">*%c%i.%s</a>} ", ch, vkey->getVerse(), footnoteNumber.c_str());
outText(scratch.c_str(), buf, u);
u->inXRefNote = (ch == 'x');
}
Modified: trunk/src/modules/filters/osisstrongs.cpp
===================================================================
--- trunk/src/modules/filters/osisstrongs.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/osisstrongs.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -150,7 +150,7 @@
if ((lClass == "x-Strongs") || (lClass == "strong") || (lClass == "Strong")) {
if (isdigit(attrib[0])) {
if (vkey) {
- gh = vkey->Testament() ? 'H' : 'G';
+ gh = vkey->getTestament() ? 'H' : 'G';
}
}
else {
Modified: trunk/src/modules/filters/osiswebif.cpp
===================================================================
--- trunk/src/modules/filters/osiswebif.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/osiswebif.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -142,7 +142,7 @@
if (!tag.isEmpty()) {
if (!strongsMarkup) { // leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off
SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
- SWBuf modName = (u->module) ? u->module->Name() : "";
+ SWBuf modName = (u->module) ? u->module->getName() : "";
VerseKey *vkey = NULL;
// see if we have a VerseKey * or descendant
SWTRY {
Modified: trunk/src/modules/filters/osiswordjs.cpp
===================================================================
--- trunk/src/modules/filters/osiswordjs.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/osiswordjs.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -61,7 +61,7 @@
bool intoken = false;
int wordNum = 1;
char wordstr[5];
- SWBuf modName = (module)?module->Name():"";
+ SWBuf modName = (module)?module->getName():"";
// add TR to w src in KJV then remove this next line
SWBuf wordSrcPrefix = (modName == "KJV")?SWBuf("TR"):modName;
@@ -134,10 +134,10 @@
// we can pass the real lex name in, but we have some
// aliases in the javascript to optimize bandwidth
if ((gh == 'G') && (defaultGreekLex)) {
- lexName = (!strcmp(defaultGreekLex->Name(), "StrongsGreek"))?"G":defaultGreekLex->Name();
+ lexName = (!strcmp(defaultGreekLex->getName(), "StrongsGreek"))?"G":defaultGreekLex->getName();
}
else if ((gh == 'H') && (defaultHebLex)) {
- lexName = (!strcmp(defaultHebLex->Name(), "StrongsHebrew"))?"H":defaultHebLex->Name();
+ lexName = (!strcmp(defaultHebLex->getName(), "StrongsHebrew"))?"H":defaultHebLex->getName();
}
SWBuf xlit = wtag.getAttribute("xlit");
@@ -150,7 +150,7 @@
SWBuf wordID;
if (vkey) {
// optimize for bandwidth and use only the verse as the unique entry id
- wordID.appendFormatted("%d", vkey->Verse());
+ wordID.appendFormatted("%d", vkey->getVerse());
}
else {
wordID = key->getText();
Modified: trunk/src/modules/filters/osisxhtml.cpp
===================================================================
--- trunk/src/modules/filters/osisxhtml.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/osisxhtml.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -41,6 +41,9 @@
.wordsOfJesus {\
color: red;\
}\
+ .transChangeSupplied {\
+ font-style: italic;\
+ }\
";
}
@@ -133,8 +136,8 @@
wordsOfChristEnd = "</span> ";
if (module) {
osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false")));
- version = module->Name();
- BiblicalText = (!strcmp(module->Type(), "Biblical Texts"));
+ version = module->getName();
+ BiblicalText = (!strcmp(module->getType(), "Biblical Texts"));
}
else {
osisQToTick = true; // default
@@ -300,14 +303,14 @@
// <p> paragraph and <lg> linegroup tags
else if (!strcmp(tag.getName(), "p") || !strcmp(tag.getName(), "lg")) {
if ((!tag.isEndTag()) && (!tag.isEmpty())) { // non-empty start tag
- outText("<!P><br />", buf, u);
+ outText("<br />", buf, u);
}
else if (tag.isEndTag()) { // end tag
- outText("<!/P><br />", buf, u);
+ outText("<br />", buf, u);
userData->supressAdjacentWhitespace = true;
}
else { // empty paragraph break marker
- outText("<!P><br />", buf, u);
+ outText("<br />", buf, u);
userData->supressAdjacentWhitespace = true;
}
}
@@ -318,11 +321,11 @@
else if (tag.isEmpty() && !strcmp(tag.getName(), "div") && tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "paragraph")) {
// <div type="paragraph" sID... />
if (tag.getAttribute("sID")) { // non-empty start tag
- outText("<!P><br />", buf, u);
+ outText("<br />", buf, u);
}
// <div type="paragraph" eID... />
else if (tag.getAttribute("eID")) {
- outText("<!/P><br />", buf, u);
+ outText("<br />", buf, u);
userData->supressAdjacentWhitespace = true;
}
}
@@ -594,14 +597,14 @@
// just do all transChange tags this way for now
if ((type == "added") || (type == "supplied"))
- outText("<i>", buf, u);
+ outText("<span class=\"transChangeSupplied\">", buf, u);
else if (type == "tenseChange")
buf += "*";
}
else if (tag.isEndTag()) {
SWBuf type = u->lastTransChange;
if ((type == "added") || (type == "supplied"))
- outText("</i>", buf, u);
+ outText("</span>", buf, u);
}
else { // empty transChange marker?
}
Modified: trunk/src/modules/filters/teihtmlhref.cpp
===================================================================
--- trunk/src/modules/filters/teihtmlhref.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/teihtmlhref.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -35,8 +35,8 @@
TEIHTMLHREF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
BiblicalText = false;
if (module) {
- version = module->Name();
- BiblicalText = (!strcmp(module->Type(), "Biblical Texts"));
+ version = module->getName();
+ BiblicalText = (!strcmp(module->getType(), "Biblical Texts"));
}
}
Modified: trunk/src/modules/filters/teirtf.cpp
===================================================================
--- trunk/src/modules/filters/teirtf.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/teirtf.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -34,8 +34,8 @@
BiblicalText = false;
inOsisRef = false;
if (module) {
- version = module->Name();
- BiblicalText = (!strcmp(module->Type(), "Biblical Texts"));
+ version = module->getName();
+ BiblicalText = (!strcmp(module->getType(), "Biblical Texts"));
}
}
Modified: trunk/src/modules/filters/teixhtml.cpp
===================================================================
--- trunk/src/modules/filters/teixhtml.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/teixhtml.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -35,8 +35,8 @@
TEIXHTML::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
BiblicalText = false;
if (module) {
- version = module->Name();
- BiblicalText = (!strcmp(module->Type(), "Biblical Texts"));
+ version = module->getName();
+ BiblicalText = (!strcmp(module->getType(), "Biblical Texts"));
}
}
Modified: trunk/src/modules/filters/thmlfootnotes.cpp
===================================================================
--- trunk/src/modules/filters/thmlfootnotes.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/thmlfootnotes.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -56,7 +56,7 @@
SWBuf refs = "";
int footnoteNum = 1;
char buf[254];
- SWKey *p = (module) ? module->CreateKey() : (key) ? key->clone() : new VerseKey();
+ SWKey *p = (module) ? module->createKey() : (key) ? key->clone() : new VerseKey();
VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p);
if (!parser) {
delete p;
@@ -101,7 +101,7 @@
startTag.setAttribute("swordFootnote", buf);
if ((startTag.getAttribute("type")) && (!strcmp(startTag.getAttribute("type"), "crossReference"))) {
if (!refs.length())
- refs = parser->ParseVerseList(tagText.c_str(), *parser, true).getRangeText();
+ refs = parser->parseVerseList(tagText.c_str(), *parser, true).getRangeText();
module->getEntryAttributes()["Footnote"][buf]["refList"] = refs.c_str();
}
}
Modified: trunk/src/modules/filters/thmlhtmlhref.cpp
===================================================================
--- trunk/src/modules/filters/thmlhtmlhref.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/thmlhtmlhref.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -34,8 +34,8 @@
ThMLHTMLHREF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
if (module) {
- version = module->Name();
- BiblicalText = (!strcmp(module->Type(), "Biblical Texts"));
+ version = module->getName();
+ BiblicalText = (!strcmp(module->getType(), "Biblical Texts"));
SecHead = false;
}
}
Modified: trunk/src/modules/filters/thmlosis.cpp
===================================================================
--- trunk/src/modules/filters/thmlosis.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/thmlosis.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -540,7 +540,7 @@
VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
if (vkey) {
SWBuf ref = "";
- if (vkey->Verse()) {
+ if (vkey->getVerse()) {
ref.appendFormatted("\t\t<verse osisID=\"%s\">", vkey->getOSISRef());
}
@@ -548,24 +548,24 @@
text = ref + text;
- if (vkey->Verse()) {
+ if (vkey->getVerse()) {
VerseKey *tmp = (VerseKey *)vkey->clone();
*tmp = *vkey;
- tmp->AutoNormalize(0);
- tmp->Headings(1);
+ tmp->setAutoNormalize(false);
+ tmp->setIntros(true);
text += "</verse>";
*tmp = MAXVERSE;
if (*vkey == *tmp) {
- tmp->Verse(0);
+ tmp->setVerse(0);
// sprintf(ref, "\t</div>");
// pushString(&to, ref);
*tmp = MAXCHAPTER;
*tmp = MAXVERSE;
if (*vkey == *tmp) {
- tmp->Chapter(0);
- tmp->Verse(0);
+ tmp->setChapter(0);
+ tmp->setVerse(0);
// sprintf(ref, "\t</div>");
// pushString(&to, ref);
/*
@@ -578,7 +578,7 @@
}
delete tmp;
}
-// else if (vkey->Chapter()) {
+// else if (vkey->getChapter()) {
// sprintf(ref, "\t<div type=\"chapter\" osisID=\"%s\">", vkey->getOSISRef());
// }
// else sprintf(ref, "\t<div type=\"book\" osisID=\"%s\">", vkey->getOSISRef());
Modified: trunk/src/modules/filters/thmlrtf.cpp
===================================================================
--- trunk/src/modules/filters/thmlrtf.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/thmlrtf.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -215,8 +215,8 @@
this->SecHead = false;
XMLTag startTag = "";
if (module) {
- version = module->Name();
- BiblicalText = (!strcmp(module->Type(), "Biblical Texts"));
+ version = module->getName();
+ BiblicalText = (!strcmp(module->getType(), "Biblical Texts"));
}
}
@@ -263,7 +263,7 @@
if (vkey) {
// leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt.
char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
- buf.appendFormatted("{\\super <a href=\"\">*%c%i.%s</a>} ", ch, vkey->Verse(), footnoteNumber.c_str());
+ buf.appendFormatted("{\\super <a href=\"\">*%c%i.%s</a>} ", ch, vkey->getVerse(), footnoteNumber.c_str());
}
u->suspendTextPassThru = true;
}
@@ -301,7 +301,7 @@
SWCATCH ( ... ) {}
if (vkey) {
// leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt.
- buf.appendFormatted("{\\super <a href=\"\">*x%i.%s</a>} ", vkey->Verse(), footnoteNumber.c_str());
+ buf.appendFormatted("{\\super <a href=\"\">*x%i.%s</a>} ", vkey->getVerse(), footnoteNumber.c_str());
}
}
Modified: trunk/src/modules/filters/thmlscripref.cpp
===================================================================
--- trunk/src/modules/filters/thmlscripref.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/thmlscripref.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -53,7 +53,7 @@
SWBuf refs = "";
int footnoteNum = 1;
char buf[254];
- SWKey *p = (module) ? module->CreateKey() : (key) ? key->clone() : new VerseKey();
+ SWKey *p = (module) ? module->createKey() : (key) ? key->clone() : new VerseKey();
VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p);
if (!parser) {
delete p;
@@ -98,8 +98,8 @@
startTag.setAttribute("swordFootnote", buf);
SWBuf passage = startTag.getAttribute("passage");
if (passage.length())
- refs = parser->ParseVerseList(passage.c_str(), *parser, true).getRangeText();
- else refs = parser->ParseVerseList(tagText.c_str(), *parser, true).getRangeText();
+ refs = parser->parseVerseList(passage.c_str(), *parser, true).getRangeText();
+ else refs = parser->parseVerseList(tagText.c_str(), *parser, true).getRangeText();
module->getEntryAttributes()["Footnote"][buf]["refList"] = refs.c_str();
}
hide = false;
Modified: trunk/src/modules/filters/thmlwordjs.cpp
===================================================================
--- trunk/src/modules/filters/thmlwordjs.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/thmlwordjs.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -68,7 +68,7 @@
bool newText = false;
bool needWordOut = false;
AttributeValue *wordAttrs = 0;
- SWBuf modName = (module)?module->Name():"";
+ SWBuf modName = (module)?module->getName():"";
SWBuf wordSrcPrefix = modName;
const SWBuf orig = text;
@@ -159,7 +159,7 @@
gh = isdigit(strong[0]) ? 0:strong[0];
if (!gh) {
if (vkey) {
- gh = vkey->Testament() ? 'H' : 'G';
+ gh = vkey->getTestament() ? 'H' : 'G';
}
}
else strong << 1;
@@ -178,7 +178,7 @@
if (sLex) {
// we can pass the real lex name in, but we have some
// aliases in the javascript to optimize bandwidth
- lexName = sLex->Name();
+ lexName = sLex->getName();
if (lexName == "StrongsGreek")
lexName = "G";
if (lexName == "StrongsHebrew")
@@ -187,7 +187,7 @@
SWBuf wordID;
if (vkey) {
// optimize for bandwidth and use only the verse as the unique entry id
- wordID.appendFormatted("%d", vkey->Verse());
+ wordID.appendFormatted("%d", vkey->getVerse());
}
else {
wordID = key->getText();
@@ -209,7 +209,7 @@
/*
if (sMorph) {
SWBuf popMorph = "<a onclick=\"";
- popMorph.appendFormatted("p(\'%s\',\'%s\','%s','');\" >%s</a>", sMorph->Name(), morph.c_str(), wordID.c_str(), morph.c_str());
+ popMorph.appendFormatted("p(\'%s\',\'%s\','%s','');\" >%s</a>", sMorph->getName(), morph.c_str(), wordID.c_str(), morph.c_str());
morph = popMorph;
}
*/
@@ -254,7 +254,7 @@
gh = isdigit(strong[0]) ? 0:strong[0];
if (!gh) {
if (vkey) {
- gh = vkey->Testament() ? 'H' : 'G';
+ gh = vkey->getTestament() ? 'H' : 'G';
}
}
else strong << 1;
@@ -270,7 +270,7 @@
if (sLex) {
// we can pass the real lex name in, but we have some
// aliases in the javascript to optimize bandwidth
- lexName = sLex->Name();
+ lexName = sLex->getName();
if (lexName == "StrongsGreek")
lexName = "G";
if (lexName == "StrongsHebrew")
@@ -279,7 +279,7 @@
SWBuf wordID;
if (vkey) {
// optimize for bandwidth and use only the verse as the unique entry id
- wordID.appendFormatted("%d", vkey->Verse());
+ wordID.appendFormatted("%d", vkey->getVerse());
}
else {
wordID = key->getText();
Modified: trunk/src/modules/filters/thmlxhtml.cpp
===================================================================
--- trunk/src/modules/filters/thmlxhtml.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/thmlxhtml.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -36,8 +36,8 @@
ThMLXHTML::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
if (module) {
- version = module->Name();
- BiblicalText = (!strcmp(module->Type(), "Biblical Texts"));
+ version = module->getName();
+ BiblicalText = (!strcmp(module->getType(), "Biblical Texts"));
SecHead = false;
}
}
Modified: trunk/src/modules/filters/utf8transliterator.cpp
===================================================================
--- trunk/src/modules/filters/utf8transliterator.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/filters/utf8transliterator.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -450,7 +450,7 @@
//Simple X to Latin transliterators
if (scripts[SE_GREEK]) {
- if (strnicmp (((SWModule*)module)->Lang(), "cop", 3)) {
+ if (strnicmp (((SWModule*)module)->getLanguage(), "cop", 3)) {
if (option == SE_SBL)
addTrans("Greek-Latin/SBL", &ID);
else if (option == SE_TC)
@@ -653,7 +653,7 @@
}
if (scripts[SE_HAN]) {
- if (!strnicmp (((SWModule*)module)->Lang(), "ja", 2)) {
+ if (!strnicmp (((SWModule*)module)->getLanguage(), "ja", 2)) {
addTrans("Kanji-Romaji", &ID);
}
else {
Modified: trunk/src/modules/genbook/rawgenbook/rawgenbook.cpp
===================================================================
--- trunk/src/modules/genbook/rawgenbook/rawgenbook.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/genbook/rawgenbook/rawgenbook.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -51,13 +51,13 @@
stdstr(&path, ipath);
verseKey = !strcmp("VerseKey", keyType);
- if (verseKey) Type("Biblical Texts");
+ if (verseKey) setType("Biblical Texts");
if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
path[strlen(path)-1] = 0;
delete key;
- key = CreateKey();
+ key = createKey();
sprintf(buf, "%s.bdt", path);
@@ -82,7 +82,7 @@
}
-bool RawGenBook::isWritable() {
+bool RawGenBook::isWritable() const {
return ((bdtfd->getFd() > 0) && ((bdtfd->mode & FileMgr::RDWR) == FileMgr::RDWR));
}
@@ -94,7 +94,7 @@
* RET: string buffer with verse
*/
-SWBuf &RawGenBook::getRawEntryBuf() {
+SWBuf &RawGenBook::getRawEntryBuf() const {
__u32 offset = 0;
__u32 size = 0;
@@ -160,7 +160,7 @@
SWCATCH ( ... ) {}
// if we don't have a VerseKey * decendant, create our own
if (!srckey) {
- srckey = (TreeKeyIdx *)CreateKey();
+ srckey = (TreeKeyIdx *)createKey();
(*srckey) = *inkey;
}
@@ -207,7 +207,7 @@
}
-SWKey *RawGenBook::CreateKey() const {
+SWKey *RawGenBook::createKey() const {
TreeKey *tKey = new TreeKeyIdx(path);
if (verseKey) { SWKey *vtKey = new VerseTreeKey(tKey); delete tKey; return vtKey; }
return tKey;
@@ -218,7 +218,7 @@
int dsize;
key.getUserData(&dsize);
- return (dsize > 7) && key.Error() == '\x00';
+ return (dsize > 7) && key.popError() == '\x00';
}
SWORD_NAMESPACE_END
Modified: trunk/src/modules/genbook/swgenbook.cpp
===================================================================
--- trunk/src/modules/genbook/swgenbook.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/genbook/swgenbook.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -89,7 +89,7 @@
if (!key) {
delete tmpTreeKey;
- tmpTreeKey = (TreeKey *)CreateKey();
+ tmpTreeKey = (TreeKey *)createKey();
(*tmpTreeKey) = *(thiskey);
return (*tmpTreeKey);
}
Modified: trunk/src/modules/lexdict/rawld/rawld.cpp
===================================================================
--- trunk/src/modules/lexdict/rawld/rawld.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/lexdict/rawld/rawld.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -53,7 +53,7 @@
}
-bool RawLD::isWritable() {
+bool RawLD::isWritable() const {
return ((idxfd->getFd() > 0) && ((idxfd->mode & FileMgr::RDWR) == FileMgr::RDWR));
}
@@ -67,7 +67,7 @@
* RET: error status
*/
-char RawLD::getEntry(long away)
+char RawLD::getEntry(long away) const
{
__u32 start = 0;
__u16 size = 0;
@@ -84,7 +84,7 @@
rawFilter(entryBuf, 0); // hack, decipher
rawFilter(entryBuf, key);
entrySize = size; // support getEntrySize call
- if (!key->Persist()) // If we have our own key
+ if (!key->isPersist()) // If we have our own key
*key = idxbuf; // reset it to entry index buffer
stdstr(&entkeytxt, idxbuf); // set entry key text that module 'snapped' to.
@@ -106,7 +106,7 @@
* RET: string buffer with entry
*/
-SWBuf &RawLD::getRawEntryBuf() {
+SWBuf &RawLD::getRawEntryBuf() const {
char ret = getEntry();
if (!ret) {
@@ -132,7 +132,7 @@
if (key->isTraversable()) {
*key += steps;
- error = key->Error();
+ error = key->popError();
steps = 0;
}
Modified: trunk/src/modules/lexdict/rawld4/rawld4.cpp
===================================================================
--- trunk/src/modules/lexdict/rawld4/rawld4.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/lexdict/rawld4/rawld4.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -53,7 +53,7 @@
}
-bool RawLD4::isWritable() {
+bool RawLD4::isWritable() const {
return ((idxfd->getFd() > 0) && ((idxfd->mode & FileMgr::RDWR) == FileMgr::RDWR));
}
@@ -67,7 +67,7 @@
* RET: error status
*/
-char RawLD4::getEntry(long away)
+char RawLD4::getEntry(long away) const
{
__u32 start = 0;
__u32 size = 0;
@@ -85,7 +85,7 @@
rawFilter(entryBuf, 0); // hack, decipher
rawFilter(entryBuf, key);
entrySize = size; // support getEntrySize call
- if (!key->Persist()) // If we have our own key
+ if (!key->isPersist()) // If we have our own key
*key = idxbuf; // reset it to entry index buffer
stdstr(&entkeytxt, idxbuf); // set entry key text that module 'snapped' to.
@@ -104,7 +104,7 @@
* RET: string buffer with entry
*/
-SWBuf &RawLD4::getRawEntryBuf() {
+SWBuf &RawLD4::getRawEntryBuf() const {
char ret = getEntry();
if (!ret) {
@@ -130,7 +130,7 @@
if (key->isTraversable()) {
*key += steps;
- error = key->Error();
+ error = key->popError();
steps = 0;
}
Modified: trunk/src/modules/lexdict/swld.cpp
===================================================================
--- trunk/src/modules/lexdict/swld.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/lexdict/swld.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -23,6 +23,7 @@
#include <stdio.h>
#include <swld.h>
#include <strkey.h>
+#include <swkey.h>
SWORD_NAMESPACE_START
@@ -37,7 +38,7 @@
SWLD::SWLD(const char *imodname, const char *imoddesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang) : SWModule(imodname, imoddesc, idisp, (char *)"Lexicons / Dictionaries", enc, dir, mark, ilang)
{
delete key;
- key = CreateKey();
+ key = createKey();
entkeytxt = new char [1];
*entkeytxt = 0;
}
@@ -54,7 +55,7 @@
}
-SWKey *SWLD::CreateKey() const { return new StrKey(); }
+SWKey *SWLD::createKey() const { return new StrKey(); }
/******************************************************************************
@@ -67,13 +68,11 @@
* RET: pointer to keytext
*/
-const char *SWLD::KeyText(const char *ikeytext)
-{
- if (key->Persist() && !ikeytext) {
+const char *SWLD::getKeyText() const {
+ if (key->isPersist()) {
getRawEntryBuf(); // force module key to snap to entry
- return entkeytxt;
}
- else return SWModule::KeyText(ikeytext);
+ return entkeytxt;
}
Modified: trunk/src/modules/lexdict/zld/zld.cpp
===================================================================
--- trunk/src/modules/lexdict/zld/zld.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/lexdict/zld/zld.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -52,7 +52,7 @@
}
-bool zLD::isWritable() {
+bool zLD::isWritable() const {
return ((idxfd->getFd() > 0) && ((idxfd->mode & FileMgr::RDWR) == FileMgr::RDWR));
}
@@ -66,7 +66,7 @@
* RET: error status
*/
-char zLD::getEntry(long away) {
+char zLD::getEntry(long away) const {
char *idxbuf = 0;
char *ebuf = 0;
char retval = 0;
@@ -86,7 +86,7 @@
rawFilter(entryBuf, key);
entrySize = size; // support getEntrySize call
- if (!key->Persist()) // If we have our own key
+ if (!key->isPersist()) // If we have our own key
*key = idxbuf; // reset it to entry index buffer
stdstr(&entkeytxt, idxbuf); // set entry key text that module 'snapped' to.
@@ -106,7 +106,7 @@
* RET: string buffer with entry
*/
-SWBuf &zLD::getRawEntryBuf() {
+SWBuf &zLD::getRawEntryBuf() const {
if (!getEntry() /*&& !isUnicode()*/) {
prepText(entryBuf);
}
@@ -128,7 +128,7 @@
if (key->isTraversable()) {
*key += steps;
- error = key->Error();
+ error = key->popError();
steps = 0;
}
Modified: trunk/src/modules/swmodule.cpp
===================================================================
--- trunk/src/modules/swmodule.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/swmodule.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -76,7 +76,7 @@
*/
SWModule::SWModule(const char *imodname, const char *imoddesc, SWDisplay *idisp, const char *imodtype, SWTextEncoding encoding, SWTextDirection direction, SWTextMarkup markup, const char *imodlang) {
- key = CreateKey();
+ key = createKey();
entryBuf = "";
config = &ownConfig;
modname = 0;
@@ -119,7 +119,7 @@
delete [] modlang;
if (key) {
- if (!key->Persist())
+ if (!key->isPersist())
delete key;
}
@@ -139,24 +139,24 @@
/******************************************************************************
- * SWModule::CreateKey - Allocates a key of specific type for module
+ * SWModule::createKey - Allocates a key of specific type for module
*
* RET: pointer to allocated key
*/
-SWKey *SWModule::CreateKey() const
+SWKey *SWModule::createKey() const
{
return new SWKey();
}
/******************************************************************************
- * SWModule::Error - Gets and clears error status
+ * SWModule::popError - Gets and clears error status
*
* RET: error status
*/
-char SWModule::Error()
+char SWModule::popError()
{
char retval = error;
@@ -174,11 +174,7 @@
* RET: pointer to modname
*/
-void SWModule::setName(const char *imodname) {
- stdstr(&modname, imodname);
-}
-
-char *SWModule::getName() const {
+const char *SWModule::getName() const {
return modname;
}
@@ -192,11 +188,7 @@
* RET: pointer to moddesc
*/
-void SWModule::setDescription(const char *imoddesc) {
- stdstr(&moddesc, imoddesc);
-}
-
-char *SWModule::getDescription() const {
+const char *SWModule::getDescription() const {
return moddesc;
}
@@ -210,74 +202,24 @@
* RET: pointer to modtype
*/
-void SWModule::setType(const char *imodtype) {
- stdstr(&modtype, imodtype);
-}
-
-char *SWModule::getType() const {
+const char *SWModule::getType() const {
return modtype;
}
/******************************************************************************
- * SWModule::Direction - Sets/gets module direction
+ * SWModule::getDirection - Sets/gets module direction
*
* ENT: newdir - value which to set direction
* [-1] - only get
*
* RET: char direction
*/
-char SWModule::Direction(signed char newdir) {
- if (newdir != -1)
- direction = newdir;
+char SWModule::getDirection() const {
return direction;
}
-/******************************************************************************
- * SWModule::Encoding - Sets/gets module encoding
- *
- * ENT: newdir - value which to set direction
- * [-1] - only get
- *
- * RET: char encoding
- */
-char SWModule::Encoding(signed char newenc) {
- if (newenc != -1)
- encoding = newenc;
- return encoding;
-}
/******************************************************************************
- * SWModule::Markup - Sets/gets module markup
- *
- * ENT: newdir - value which to set direction
- * [-1] - only get
- *
- * RET: char markup
- */
-char SWModule::Markup(signed char newmark) {
- if (newmark != -1)
- markup = newmark;
- return markup;
-}
-
-
-/******************************************************************************
- * SWModule::Lang - Sets/gets module language
- *
- * ENT: imodlang - value which to set modlang
- * [0] - only get
- *
- * RET: pointer to modname
- */
-
-char *SWModule::Lang(const char *imodlang)
-{
- if (imodlang) stdstr(&modlang, imodlang);
- return modlang;
-}
-
-
-/******************************************************************************
* SWModule::Disp - Sets/gets display driver
*
* ENT: idisp - value which to set disp
@@ -294,19 +236,17 @@
disp = idisp;
}
-
/******************************************************************************
- * SWModule::Display - Calls this modules display object and passes itself
- *
- * RET: error status
- */
+ * * SWModule::Display - Calls this modules display object and passes itself
+ * *
+ * * RET: error status
+ * */
-char SWModule::Display() {
- disp->Display(*this);
- return 0;
+char SWModule::display() {
+ disp->display(*this);
+ return 0;
}
-
/******************************************************************************
* SWModule::getKey - Gets the key from this module that points to the position
* record
@@ -332,12 +272,12 @@
SWKey *oldKey = 0;
if (key) {
- if (!key->Persist()) // if we have our own copy
+ if (!key->isPersist()) // if we have our own copy
oldKey = key;
}
- if (!ikey->Persist()) { // if we are to keep our own copy
- key = CreateKey();
+ if (!ikey->isPersist()) { // if we are to keep our own copy
+ key = createKey();
*key = *ikey;
}
else key = (SWKey *)ikey; // if we are to just point to an external key
@@ -359,7 +299,7 @@
void SWModule::setPosition(SW_POSITION p) {
*key = p;
- char saveError = key->Error();
+ char saveError = key->popError();
switch (p) {
case POS_TOP:
@@ -387,7 +327,7 @@
void SWModule::increment(int steps) {
(*key) += steps;
- error = key->Error();
+ error = key->popError();
}
@@ -401,7 +341,7 @@
void SWModule::decrement(int steps) {
(*key) -= steps;
- error = key->Error();
+ error = key->popError();
}
@@ -448,7 +388,7 @@
SWKey *saveKey = 0;
SWKey *searchKey = 0;
- SWKey *resultKey = CreateKey();
+ SWKey *resultKey = createKey();
regex_t preg;
vector<SWBuf> words;
vector<SWBuf> window;
@@ -464,18 +404,18 @@
|| (getConfig().has("GlobalOptionFilter", "UTF8ArabicPoints"))
|| (strchr(istr, '<')));
- processEntryAttributes(searchType == -3);
+ setProcessEntryAttributes(searchType == -3);
- if (!key->Persist()) {
- saveKey = CreateKey();
+ if (!key->isPersist()) {
+ saveKey = createKey();
*saveKey = *key;
}
else saveKey = key;
- searchKey = (scope)?scope->clone():(key->Persist())?key->clone():0;
+ searchKey = (scope)?scope->clone():(key->isPersist())?key->clone():0;
if (searchKey) {
- searchKey->Persist(1);
+ searchKey->setPersist(true);
setKey(*searchKey);
}
@@ -599,7 +539,7 @@
(*percent)(perc, percentUserData);
- while ((searchType != -4) && !Error() && !terminateSearch) {
+ while ((searchType != -4) && !popError() && !terminateSearch) {
long mindex = key->getIndex();
float per = (float)mindex / highIndex;
per *= 93;
@@ -807,7 +747,7 @@
setKey(*saveKey);
- if (!saveKey->Persist())
+ if (!saveKey->isPersist())
delete saveKey;
if (searchKey)
@@ -815,7 +755,7 @@
delete resultKey;
listKey = TOP;
- processEntryAttributes(savePEA);
+ setProcessEntryAttributes(savePEA);
(*percent)(100, percentUserData);
@@ -867,7 +807,7 @@
entryAttributes.clear();
}
else {
- processEntryAttributes(false);
+ setProcessEntryAttributes(false);
}
static SWBuf local;
@@ -896,7 +836,7 @@
tmpbuf = null;
}
- processEntryAttributes(savePEA);
+ setProcessEntryAttributes(savePEA);
return tmpbuf;
}
@@ -914,8 +854,8 @@
SWKey *saveKey;
const char *retVal;
- if (!key->Persist()) {
- saveKey = CreateKey();
+ if (!key->isPersist()) {
+ saveKey = createKey();
*saveKey = *key;
}
else saveKey = key;
@@ -926,7 +866,7 @@
setKey(*saveKey);
- if (!saveKey->Persist())
+ if (!saveKey->isPersist())
delete saveKey;
return retVal;
@@ -945,8 +885,8 @@
SWKey *saveKey;
const char *retVal;
- if (!key->Persist()) {
- saveKey = CreateKey();
+ if (!key->isPersist()) {
+ saveKey = createKey();
*saveKey = *key;
}
else saveKey = key;
@@ -957,7 +897,7 @@
setKey(*saveKey);
- if (!saveKey->Persist())
+ if (!saveKey->isPersist())
delete saveKey;
return retVal;
@@ -1036,15 +976,15 @@
// save key information so as not to disrupt original
// module position
- if (!key->Persist()) {
- saveKey = CreateKey();
+ if (!key->isPersist()) {
+ saveKey = createKey();
*saveKey = *key;
}
else saveKey = key;
- searchKey = (key->Persist())?key->clone():0;
+ searchKey = (key->isPersist())?key->clone():0;
if (searchKey) {
- searchKey->Persist(1);
+ searchKey->setPersist(1);
setKey(*searchKey);
}
@@ -1080,7 +1020,7 @@
highIndex = 1; // avoid division by zero errors.
bool savePEA = isProcessEntryAttributes();
- processEntryAttributes(true);
+ setProcessEntryAttributes(true);
// prox chapter blocks
// position module at the beginning
@@ -1092,7 +1032,7 @@
SWBuf strong;
SWBuf morph;
- char err = Error();
+ char err = popError();
while (!err) {
long mindex = key->getIndex();
@@ -1188,7 +1128,7 @@
if (vkcheck) {
*chapMax = *vkcheck;
// we're the first verse in a chapter
- if (vkcheck->Verse() == 1) {
+ if (vkcheck->getVerse() == 1) {
*chapMax = MAXVERSE;
VerseKey saveKey = *vkcheck;
while ((!err) && (*vkcheck <= *chapMax)) {
@@ -1245,7 +1185,7 @@
}
}
(*this)++;
- err = Error();
+ err = popError();
}
err = 0;
*vkcheck = saveKey;
@@ -1336,7 +1276,7 @@
delete doc;
(*this)++;
- err = Error();
+ err = popError();
}
// Optimizing automatically happens with the call to addIndexes
@@ -1379,7 +1319,7 @@
// reposition module back to where it was before we were called
setKey(*saveKey);
- if (!saveKey->Persist())
+ if (!saveKey->isPersist())
delete saveKey;
if (searchKey)
@@ -1387,7 +1327,7 @@
delete chapMax;
- processEntryAttributes(savePEA);
+ setProcessEntryAttributes(savePEA);
// reset option filters back to original values
StringList::iterator origVal = filterSettings.begin();
@@ -1406,7 +1346,7 @@
* @param buf the buffer to filter
* @param key key location from where this buffer was extracted
*/
-void SWModule::filterBuffer(OptionFilterList *filters, SWBuf &buf, const SWKey *key) {
+void SWModule::filterBuffer(OptionFilterList *filters, SWBuf &buf, const SWKey *key) const {
OptionFilterList::iterator it;
for (it = filters->begin(); it != filters->end(); it++) {
(*it)->processText(buf, key, this);
@@ -1418,7 +1358,7 @@
* @param buf the buffer to filter
* @param key key location from where this buffer was extracted
*/
-void SWModule::filterBuffer(FilterList *filters, SWBuf &buf, const SWKey *key) {
+void SWModule::filterBuffer(FilterList *filters, SWBuf &buf, const SWKey *key) const {
FilterList::iterator it;
for (it = filters->begin(); it != filters->end(); it++) {
(*it)->processText(buf, key, this);
Modified: trunk/src/modules/texts/rawtext/rawtext.cpp
===================================================================
--- trunk/src/modules/texts/rawtext/rawtext.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/texts/rawtext/rawtext.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -71,7 +71,7 @@
}
-bool RawText::isWritable() {
+bool RawText::isWritable() const {
return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR));
}
@@ -83,16 +83,16 @@
* RET: string buffer with verse
*/
-SWBuf &RawText::getRawEntryBuf() {
+SWBuf &RawText::getRawEntryBuf() const {
long start = 0;
unsigned short size = 0;
VerseKey &key = getVerseKey();
- findOffset(key.Testament(), key.TestamentIndex(), &start, &size);
+ findOffset(key.getTestament(), key.getTestamentIndex(), &start, &size);
entrySize = size; // support getEntrySize call
entryBuf = "";
- readText(key.Testament(), start, size, entryBuf);
+ readText(key.getTestament(), start, size, entryBuf);
rawFilter(entryBuf, 0); // hack, decipher
rawFilter(entryBuf, &key);
@@ -106,14 +106,14 @@
void RawText::setEntry(const char *inbuf, long len) {
VerseKey &key = getVerseKey();
- doSetText(key.Testament(), key.TestamentIndex(), inbuf, len);
+ doSetText(key.getTestament(), key.getTestamentIndex(), inbuf, len);
}
void RawText::linkEntry(const SWKey *inkey) {
VerseKey &destkey = getVerseKey();
const VerseKey *srckey = &getVerseKey(inkey);
- doLinkEntry(destkey.Testament(), destkey.TestamentIndex(), srckey->TestamentIndex());
+ doLinkEntry(destkey.getTestament(), destkey.getTestamentIndex(), srckey->getTestamentIndex());
}
@@ -125,7 +125,7 @@
void RawText::deleteEntry() {
VerseKey &key = getVerseKey();
- doSetText(key.Testament(), key.TestamentIndex(), "");
+ doSetText(key.getTestament(), key.getTestamentIndex(), "");
}
/******************************************************************************
@@ -141,7 +141,7 @@
unsigned short size;
VerseKey *tmpkey = &getVerseKey();
- findOffset(tmpkey->Testament(), tmpkey->TestamentIndex(), &start, &size);
+ findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size);
SWKey lastgood = *tmpkey;
while (steps) {
@@ -151,12 +151,12 @@
(steps > 0) ? ++(*key) : --(*key);
tmpkey = &getVerseKey();
- if ((error = key->Error())) {
+ if ((error = key->popError())) {
*key = lastgood;
break;
}
- long index = tmpkey->TestamentIndex();
- findOffset(tmpkey->Testament(), index, &start, &size);
+ long index = tmpkey->getTestamentIndex();
+ findOffset(tmpkey->getTestament(), index, &start, &size);
if (
(((laststart != start) || (lastsize != size)) // we're a different entry
// && (start > 0)
@@ -174,10 +174,10 @@
unsigned short size1, size2;
VerseKey *vk1 = &getVerseKey(k1);
VerseKey *vk2 = &getVerseKey(k2);
- if (vk1->Testament() != vk2->Testament()) return false;
+ if (vk1->getTestament() != vk2->getTestament()) return false;
- findOffset(vk1->Testament(), vk1->TestamentIndex(), &start1, &size1);
- findOffset(vk2->Testament(), vk2->TestamentIndex(), &start2, &size2);
+ findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1);
+ findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2);
if (!size1 || !size2) return false;
return start1 == start2;
}
@@ -187,7 +187,7 @@
unsigned short size;
VerseKey *vk = &getVerseKey(k);
- findOffset(vk->Testament(), vk->TestamentIndex(), &start, &size);
+ findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size);
return size;
}
Modified: trunk/src/modules/texts/rawtext4/rawtext4.cpp
===================================================================
--- trunk/src/modules/texts/rawtext4/rawtext4.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/texts/rawtext4/rawtext4.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -71,7 +71,7 @@
}
-bool RawText4::isWritable() {
+bool RawText4::isWritable() const {
return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR));
}
@@ -83,16 +83,16 @@
* RET: string buffer with verse
*/
-SWBuf &RawText4::getRawEntryBuf() {
+SWBuf &RawText4::getRawEntryBuf() const {
long start = 0;
unsigned long size = 0;
VerseKey &key = getVerseKey();
- findOffset(key.Testament(), key.TestamentIndex(), &start, &size);
+ findOffset(key.getTestament(), key.getTestamentIndex(), &start, &size);
entrySize = size; // support getEntrySize call
entryBuf = "";
- readText(key.Testament(), start, size, entryBuf);
+ readText(key.getTestament(), start, size, entryBuf);
rawFilter(entryBuf, 0); // hack, decipher
rawFilter(entryBuf, &key);
@@ -106,14 +106,14 @@
void RawText4::setEntry(const char *inbuf, long len) {
VerseKey &key = getVerseKey();
- doSetText(key.Testament(), key.TestamentIndex(), inbuf, len);
+ doSetText(key.getTestament(), key.getTestamentIndex(), inbuf, len);
}
void RawText4::linkEntry(const SWKey *inkey) {
VerseKey &destkey = getVerseKey();
const VerseKey *srckey = &getVerseKey(inkey);
- doLinkEntry(destkey.Testament(), destkey.TestamentIndex(), srckey->TestamentIndex());
+ doLinkEntry(destkey.getTestament(), destkey.getTestamentIndex(), srckey->getTestamentIndex());
}
@@ -125,7 +125,7 @@
void RawText4::deleteEntry() {
VerseKey &key = getVerseKey();
- doSetText(key.Testament(), key.TestamentIndex(), "");
+ doSetText(key.getTestament(), key.getTestamentIndex(), "");
}
/******************************************************************************
@@ -141,7 +141,7 @@
unsigned long size;
VerseKey *tmpkey = &getVerseKey();
- findOffset(tmpkey->Testament(), tmpkey->TestamentIndex(), &start, &size);
+ findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size);
SWKey lastgood = *tmpkey;
while (steps) {
@@ -151,12 +151,12 @@
(steps > 0) ? ++(*key) : --(*key);
tmpkey = &getVerseKey();
- if ((error = key->Error())) {
+ if ((error = key->popError())) {
*key = lastgood;
break;
}
- long index = tmpkey->TestamentIndex();
- findOffset(tmpkey->Testament(), index, &start, &size);
+ long index = tmpkey->getTestamentIndex();
+ findOffset(tmpkey->getTestament(), index, &start, &size);
if (
(((laststart != start) || (lastsize != size)) // we're a different entry
// && (start > 0)
@@ -174,10 +174,10 @@
unsigned long size1, size2;
VerseKey *vk1 = &getVerseKey(k1);
VerseKey *vk2 = &getVerseKey(k2);
- if (vk1->Testament() != vk2->Testament()) return false;
+ if (vk1->getTestament() != vk2->getTestament()) return false;
- findOffset(vk1->Testament(), vk1->TestamentIndex(), &start1, &size1);
- findOffset(vk2->Testament(), vk2->TestamentIndex(), &start2, &size2);
+ findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1);
+ findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2);
return start1 == start2;
}
@@ -186,7 +186,7 @@
unsigned long size;
VerseKey *vk = &getVerseKey(k);
- findOffset(vk->Testament(), vk->TestamentIndex(), &start, &size);
+ findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size);
return size;
}
Modified: trunk/src/modules/texts/swtext.cpp
===================================================================
--- trunk/src/modules/texts/swtext.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/texts/swtext.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -38,9 +38,9 @@
this->versification = 0;
stdstr(&(this->versification), versification);
delete key;
- key = (VerseKey *)CreateKey();
- tmpVK1 = (VerseKey *)CreateKey();
- tmpVK2 = (VerseKey *)CreateKey();
+ key = (VerseKey *)createKey();
+ tmpVK1 = (VerseKey *)createKey();
+ tmpVK2 = (VerseKey *)createKey();
tmpSecond = false;
skipConsecutiveLinks = false;
}
@@ -58,10 +58,10 @@
/******************************************************************************
- * SWText CreateKey - Create the correct key (VerseKey) for use with SWText
+ * SWText createKey - Create the correct key (VerseKey) for use with SWText
*/
-SWKey *SWText::CreateKey() const {
+SWKey *SWText::createKey() const {
VerseKey *vk = new VerseKey();
vk->setVersificationSystem(versification);
@@ -80,7 +80,7 @@
void SWText::setIndex(long iindex) {
VerseKey *key = &getVerseKey();
- key->Testament(1);
+ key->setTestament(1);
key->setIndex(iindex);
if (key != this->key) {
Modified: trunk/src/modules/texts/ztext/ztext.cpp
===================================================================
--- trunk/src/modules/texts/ztext/ztext.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/src/modules/texts/ztext/ztext.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -65,7 +65,7 @@
}
-bool zText::isWritable() { return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR)); }
+bool zText::isWritable() const { return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR)); }
/******************************************************************************
@@ -74,18 +74,18 @@
* RET: buffer with verse
*/
-SWBuf &zText::getRawEntryBuf() {
+SWBuf &zText::getRawEntryBuf() const {
long start = 0;
unsigned short size = 0;
unsigned long buffnum = 0;
VerseKey &key = getVerseKey();
- findOffset(key.Testament(), key.TestamentIndex(), &start, &size, &buffnum);
+ findOffset(key.getTestament(), key.getTestamentIndex(), &start, &size, &buffnum);
entrySize = size; // support getEntrySize call
entryBuf = "";
- zReadText(key.Testament(), start, size, buffnum, entryBuf);
+ zReadText(key.getTestament(), start, size, buffnum, entryBuf);
rawFilter(entryBuf, &key);
// if (!isUnicode())
@@ -96,18 +96,18 @@
bool zText::sameBlock(VerseKey *k1, VerseKey *k2) {
- if (k1->Testament() != k2->Testament())
+ if (k1->getTestament() != k2->getTestament())
return false;
switch (blockType) {
case VERSEBLOCKS:
- if (k1->Verse() != k2->Verse())
+ if (k1->getVerse() != k2->getVerse())
return false;
case CHAPTERBLOCKS:
- if (k1->Chapter() != k2->Chapter())
+ if (k1->getChapter() != k2->getChapter())
return false;
case BOOKBLOCKS:
- if (k1->Book() != k2->Book())
+ if (k1->getBook() != k2->getBook())
return false;
}
return true;
@@ -125,7 +125,7 @@
delete lastWriteKey;
}
- doSetText(key.Testament(), key.TestamentIndex(), inbuf, len);
+ doSetText(key.getTestament(), key.getTestamentIndex(), inbuf, len);
lastWriteKey = (VerseKey *)key.clone(); // must delete
}
@@ -134,7 +134,7 @@
void zText::linkEntry(const SWKey *inkey) {
VerseKey &destkey = getVerseKey();
const VerseKey *srckey = &getVerseKey(inkey);
- doLinkEntry(destkey.Testament(), destkey.TestamentIndex(), srckey->TestamentIndex());
+ doLinkEntry(destkey.getTestament(), destkey.getTestamentIndex(), srckey->getTestamentIndex());
}
@@ -147,7 +147,7 @@
VerseKey &key = getVerseKey();
- doSetText(key.Testament(), key.TestamentIndex(), "");
+ doSetText(key.getTestament(), key.getTestamentIndex(), "");
}
@@ -164,7 +164,7 @@
unsigned long buffnum;
VerseKey *tmpkey = &getVerseKey();
- findOffset(tmpkey->Testament(), tmpkey->TestamentIndex(), &start, &size, &buffnum);
+ findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size, &buffnum);
SWKey lastgood = *tmpkey;
while (steps) {
@@ -174,12 +174,12 @@
(steps > 0) ? ++(*key) : --(*key);
tmpkey = &getVerseKey();
- if ((error = key->Error())) {
+ if ((error = key->popError())) {
*key = lastgood;
break;
}
- long index = tmpkey->TestamentIndex();
- findOffset(tmpkey->Testament(), index, &start, &size, &buffnum);
+ long index = tmpkey->getTestamentIndex();
+ findOffset(tmpkey->getTestament(), index, &start, &size, &buffnum);
if (
(((laststart != start) || (lastsize != size)) // we're a different entry
@@ -199,10 +199,10 @@
unsigned long buffnum1, buffnum2;
VerseKey *vk1 = &getVerseKey(k1);
VerseKey *vk2 = &getVerseKey(k2);
- if (vk1->Testament() != vk2->Testament()) return false;
+ if (vk1->getTestament() != vk2->getTestament()) return false;
- findOffset(vk1->Testament(), vk1->TestamentIndex(), &start1, &size1, &buffnum1);
- findOffset(vk2->Testament(), vk2->TestamentIndex(), &start2, &size2, &buffnum2);
+ findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1, &buffnum1);
+ findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2, &buffnum2);
return start1 == start2 && buffnum1 == buffnum2;
}
@@ -212,7 +212,7 @@
unsigned long buffnum;
VerseKey *vk = &getVerseKey(k);
- findOffset(vk->Testament(), vk->TestamentIndex(), &start, &size, &buffnum);
+ findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size, &buffnum);
return size;
}
Modified: trunk/tests/indextest.cpp
===================================================================
--- trunk/tests/indextest.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/tests/indextest.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -30,9 +30,9 @@
if (bbe) {
VerseKey vk;
- vk.Persist(1);
+ vk.setPersist(true);
bbe->setKey(vk);
- for (; !bbe->Error(); (*bbe)++ ) {
+ for (; !bbe->popError(); (*bbe)++ ) {
std::cout << vk.getIndex() << std::endl;
}
}
Modified: trunk/tests/introtest.cpp
===================================================================
--- trunk/tests/introtest.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/tests/introtest.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -30,79 +30,79 @@
RawText mod(".");
VerseKey vk;
- vk.Headings(1);
- vk.AutoNormalize(0);
- vk.Persist(1);
+ vk.setIntros(true);
+ vk.setAutoNormalize(false);
+ vk.setPersist(true);
mod.setKey(vk);
- vk.Verse(0);
- vk.Chapter(0);
- vk.Book(0);
- vk.Testament(0);
+ vk.setVerse(0);
+ vk.setChapter(0);
+ vk.setBook(0);
+ vk.setTestament(0);
mod << "Module heading text";
- vk.Verse(0);
- vk.Chapter(0);
- vk.Book(0);
- vk.Testament(1);
+ vk.setVerse(0);
+ vk.setChapter(0);
+ vk.setBook(0);
+ vk.setTestament(1);
mod << "OT heading text";
- vk.Testament(1);
- vk.Book(1);
- vk.Chapter(0);
- vk.Verse(0);
+ vk.setTestament(1);
+ vk.setBook(1);
+ vk.setChapter(0);
+ vk.setVerse(0);
mod << "Gen heading text";
- vk.Testament(1);
- vk.Book(1);
- vk.Chapter(1);
- vk.Verse(0);
+ vk.setTestament(1);
+ vk.setBook(1);
+ vk.setChapter(1);
+ vk.setVerse(0);
mod << "Gen 1 heading text";
- vk.Testament(1);
- vk.Book(1);
- vk.Chapter(1);
- vk.Verse(1);
+ vk.setTestament(1);
+ vk.setBook(1);
+ vk.setChapter(1);
+ vk.setVerse(1);
mod << "Gen 1:1 text";
- vk.Testament(0);
- vk.Book(0);
- vk.Chapter(0);
- vk.Verse(0);
+ vk.setTestament(0);
+ vk.setBook(0);
+ vk.setChapter(0);
+ vk.setVerse(0);
std::cout << "Module heading text ?= " << (const char*)mod << std::endl;
- vk.Testament(1);
- vk.Book(0);
- vk.Chapter(0);
- vk.Verse(0);
+ vk.setTestament(1);
+ vk.setBook(0);
+ vk.setChapter(0);
+ vk.setVerse(0);
std::cout << "OT heading text ?= " << (const char*)mod << std::endl;
- vk.Testament(1);
- vk.Book(1);
- vk.Chapter(0);
- vk.Verse(0);
+ vk.setTestament(1);
+ vk.setBook(1);
+ vk.setChapter(0);
+ vk.setVerse(0);
std::cout << "Gen heading text ?= " << (const char*)mod << std::endl;
- vk.Testament(1);
- vk.Book(1);
- vk.Chapter(1);
- vk.Verse(0);
+ vk.setTestament(1);
+ vk.setBook(1);
+ vk.setChapter(1);
+ vk.setVerse(0);
std::cout << "Gen 1 heading text ?= " << (const char*)mod << std::endl;
- vk.Testament(1);
- vk.Book(1);
- vk.Chapter(1);
- vk.Verse(1);
+ vk.setTestament(1);
+ vk.setBook(1);
+ vk.setChapter(1);
+ vk.setVerse(1);
std::cout << "Gen 1:1 text ?= " << (const char*)mod << std::endl;
@@ -111,9 +111,9 @@
if (mhc) {
VerseKey vk;
- vk.Headings(1);
- vk.AutoNormalize(0);
- vk.Persist(1);
+ vk.setIntros(true);
+ vk.setAutoNormalize(false);
+ vk.setPersist(true);
vk = "jas 0:0";
std::cout << vk << ":\n";
mhc->setKey(vk);
Modified: trunk/tests/keytest.cpp
===================================================================
--- trunk/tests/keytest.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/tests/keytest.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -47,7 +47,7 @@
bla = "James 1:19";
else bla = argv[2];
- std::cout << "\n Headings: " << (bool)bla.Headings() << "\n";
+ std::cout << "\n Headings: " << (bool)bla.isIntros() << "\n";
std::cout << " (.Index(Index()+1))\n";
max = (argc < 4) ? 10 : atoi(argv[3]);
@@ -73,29 +73,29 @@
}
std::cout << "-----------------\n";
- bla.Headings(true);
- std::cout << "\n Headings: " << (bool)bla.Headings() << "\n";
+ bla.setIntros(true);
+ std::cout << "\n Headings: " << (bool)bla.isIntros() << "\n";
std::cout << " key++\n";
if (argc < 2)
bla = "Matthew 1:5";
else bla = argv[2];
- for (loop = 0; loop < max && !bla.Error(); loop++,bla++) {
+ for (loop = 0; loop < max && !bla.popError(); loop++,bla++) {
index = bla.getIndex();
std::cout << (const char *)bla << "(" << index << ")\n";
}
std::cout << "-----------------\n";
- bla.Headings(true);
- std::cout << "\n Headings: " << (bool)bla.Headings() << "\n";
+ bla.setIntros(true);
+ std::cout << "\n Headings: " << (bool)bla.isIntros() << "\n";
std::cout << " key--\n";
if (argc < 2)
bla = "Matthew 1:5";
else bla = argv[2];
- for (loop = max; loop && !bla.Error(); loop--, bla--) {
+ for (loop = max; loop && !bla.popError(); loop--, bla--) {
index = bla.getIndex();
std::cout << (const char *)bla << "(" << index << ")\n";
}
@@ -137,7 +137,7 @@
std::cout << "-----------------\n";
std::cout << "-------- Headings ---------\n";
- bla.Headings(1);
+ bla.setIntros(true);
if (argc < 2)
bla = "Matthew 1:5";
@@ -187,22 +187,22 @@
bla = "Revelation of John 23:19";
std::cout << "bla = \"Revelation of John 23:19\"\n";
std::cout << "(const char *)bla = " << (const char *)bla << "\n";
- std::cout << "bla.Error() = " << (int)bla.Error() << " \n";
+ std::cout << "bla.popError() = " << (int)bla.popError() << " \n";
std::cout << "bla++ \n";
bla++;
- std::cout << "bla.Error() = " << (int)bla.Error() << " \n";
+ std::cout << "bla.popError() = " << (int)bla.popError() << " \n";
- bla.Headings(0);
- for (bla = BOTTOM; !bla.Error(); bla.Book(bla.Book()-1))
+ bla.setIntros(false);
+ for (bla = BOTTOM; !bla.popError(); bla.setBook(bla.getBook()-1))
std::cout << (const char *)bla << "\n";
- bla.Testament(1);
+ bla.setTestament(1);
bla = BOTTOM;
- std::cout << bla.TestamentIndex() << "\n";
+ std::cout << bla.getTestamentIndex() << "\n";
std::cout << bla.getIndex() << "\n";
std::cout << bla << "\n";
- bla.Testament(2);
+ bla.setTestament(2);
bla = BOTTOM;
- std::cout << bla.TestamentIndex() << "\n";
+ std::cout << bla.getTestamentIndex() << "\n";
std::cout << bla.getIndex() << "\n";
std::cout << bla << "\n";
return 0;
Modified: trunk/tests/listtest.cpp
===================================================================
--- trunk/tests/listtest.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/tests/listtest.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -31,15 +31,15 @@
SWKey text;
VerseKey vk("jn 1:1", "jn 1:12");
vk = "jas 1:19";
- cout << "\nError should be set: " << ((vk.Error()) ? "set":"not set");
+ cout << "\nError should be set: " << ((vk.popError()) ? "set":"not set");
text = (const char *)vk;
cout << "\nshould be jn 1.12: " << text << "\n";
vk = "mat 1:19";
- cout << "\nError should be set: " << ((vk.Error()) ? "set":"not set");
+ cout << "\nError should be set: " << ((vk.popError()) ? "set":"not set");
text = (const char *)vk;
cout << "\nshould be jn 1.1: " << text << "\n";
vk = "jn 1:7";
- cout << "\nError should not be set: " << ((vk.Error()) ? "set":"not set");
+ cout << "\nError should not be set: " << ((vk.popError()) ? "set":"not set");
text = (const char *)vk;
cout << "\nshould be jn 1.7: " << text << "\n";
@@ -59,13 +59,13 @@
lk2 << lk;
lk2 << vk2;
lk2 << "test2";
- for (lk2 = TOP; !lk2.Error(); lk2++) {
+ for (lk2 = TOP; !lk2.popError(); lk2++) {
cout << (const char *) lk2 << "\n";
}
cout << "\n\n---------\n";
- lk2 = VerseKey().ParseVerseList("1jn-2jn;mk1.9", 0, true);
+ lk2 = VerseKey().parseVerseList("1jn-2jn;mk1.9", 0, true);
// c-tor not bound setting, just parsing to jn.1.1
VerseKey yoyo("john");
@@ -91,23 +91,23 @@
*/
- for (lk2 = TOP; !lk2.Error(); lk2++)
+ for (lk2 = TOP; !lk2.popError(); lk2++)
cout << (const char *) lk2 << "\n";
lk.ClearList();
lk << "john 3:16";
cout << "\nCount should be 1: " << lk.Count();
- lk = vk.ParseVerseList("mat;mark;luke", vk, true);
+ lk = vk.parseVerseList("mat;mark;luke", vk, true);
lk = (VerseKey)"mark 3:16";
- cout << "\nError should not be set: " << ((lk.Error()) ? "set":"not set");
+ cout << "\nError should not be set: " << ((lk.popError()) ? "set":"not set");
lk = (VerseKey)"john 3:16";
- cout << "\nError should be set: " << ((lk.Error()) ? "set":"not set");
- lk = vk.ParseVerseList("mk 3:16", vk, true);
+ cout << "\nError should be set: " << ((lk.popError()) ? "set":"not set");
+ lk = vk.parseVerseList("mk 3:16", vk, true);
lk = (VerseKey)"john 3:16";
- cout << "\nError should be set: " << ((lk.Error()) ? "set":"not set");
+ cout << "\nError should be set: " << ((lk.popError()) ? "set":"not set");
lk = (VerseKey)"mark 3:16";
- cout << "\nError should not be set: " << ((lk.Error()) ? "set":"not set");
+ cout << "\nError should not be set: " << ((lk.popError()) ? "set":"not set");
cout << "\n\n";
return 0;
Modified: trunk/tests/mgrtest.cpp
===================================================================
--- trunk/tests/mgrtest.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/tests/mgrtest.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -41,10 +41,10 @@
ModMap::iterator it;
for (it = mymgr.Modules.begin(); it != mymgr.Modules.end(); it++) {
- std::cout << "[" << (*it).second->Name() << "] (Writable: " << (it->second->isWritable()?"Yes":"No") << ") [" << (*it).second->Description() << "]\n";
+ std::cout << "[" << (*it).second->getName() << "] (Writable: " << (it->second->isWritable()?"Yes":"No") << ") [" << (*it).second->getDescription() << "]\n";
std::cout << "AbsoluteDataPath = " << it->second->getConfigEntry("AbsoluteDataPath") << "\n";
std::cout << "Has Feature HebrewDef = " << it->second->getConfig().has("Feature", "HebrewDef") << "\n";
- if ((!strcmp((*it).second->Type(), "Biblical Texts")) || (!strcmp((*it).second->Type(), "Commentaries"))) {
+ if ((!strcmp((*it).second->getType(), "Biblical Texts")) || (!strcmp((*it).second->getType(), "Commentaries"))) {
it->second->setKey("James 1:19");
std::cout << (const char *) *(*it).second << "\n\n";
}
@@ -53,8 +53,8 @@
SWModule *mhc = mymgr.Modules["MHC"];
if (mhc) {
- std::cout << "MHC, Lang = " << mhc->Lang() << "\n\n";
- for (mhc->Key("Gen 1:1"); mhc->Key() < (VerseKey) "Gen 1:10"; (*mhc)++)
+ std::cout << "MHC, Lang = " << mhc->getLanguage() << "\n\n";
+ for (mhc->setKey("Gen 1:1"); *mhc->getKey() < (VerseKey) "Gen 1:10"; (*mhc)++)
std::cout << (const char *) *mhc << "\n";
}
Modified: trunk/tests/modtest.cpp
===================================================================
--- trunk/tests/modtest.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/tests/modtest.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -28,11 +28,11 @@
ModMap::iterator it;
SWModule *module = mymgr.Modules["KJV"];
VerseKey parser;
- ListKey lk = parser.ParseVerseList("mal4:6-rev", parser, true);
- lk.Persist(1);
- module->SetKey(lk);
+ ListKey lk = parser.parseVerseList("mal4:6-rev", parser, true);
+ lk.setPersist(true);
+ module->setKey(lk);
(*module) = TOP;
- std::cout << module->KeyText() << "\n";
+ std::cout << module->getKeyText() << "\n";
return 0;
}
Modified: trunk/tests/parsekey.cpp
===================================================================
--- trunk/tests/parsekey.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/tests/parsekey.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -47,7 +47,7 @@
DefaultVSKey = context;
- ListKey verses = DefaultVSKey.ParseVerseList(argv[1], DefaultVSKey, true);
+ ListKey verses = DefaultVSKey.parseVerseList(argv[1], DefaultVSKey, true);
if ((argc > 5) && (argv[5][0] == '1')) {
for (int i = 1; i < argc; i++) {
@@ -65,7 +65,7 @@
if (argc > 6) {
verses.setText(argv[4]);
- std::cout << "Verse is" << ((verses.Error()) ? " NOT" : "") << " in set.\n\n";
+ std::cout << "Verse is" << ((verses.popError()) ? " NOT" : "") << " in set.\n\n";
}
return 0;
Modified: trunk/tests/striptest.cpp
===================================================================
--- trunk/tests/striptest.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/tests/striptest.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -21,7 +21,7 @@
}
book->setKey(keyText.c_str());
SWBuf entryStripped = book->StripText();
- cout << "Module: " << book->Description() << "\t Key: " << book->getKeyText() << "\n";
+ cout << "Module: " << book->getDescription() << "\t Key: " << book->getKeyText() << "\n";
cout << "RawEntry:\n" << book->getRawEntry() << "\n";
cout << "StripText:\n" << entryStripped << "\n";
cout << "Search Target: " << searchText << "\n";
Modified: trunk/tests/testsuite/osis.good
===================================================================
--- trunk/tests/testsuite/osis.good 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/tests/testsuite/osis.good 2013-01-19 16:19:47 UTC (rev 2764)
@@ -7,13 +7,13 @@
<div sID="gen12" type="section"/> <title canonical="true" type="psalm">A Psalm of David, when he fled from Absalom his son.</title> <div sID="gen13" type="paragraph"/> <lg sID="gen14"/>
-------
Rendered Header:
-<div sID="gen12" type="section"/> <h3>A Psalm of David, when he fled from Absalom his son.</h3>
+<div sID="gen12" type="section"/> <h3>A Psalm of David, when he fled from Absalom his son.</h3> <br /> <br />
-------
CSS:
- .divineName { font-variant: small-caps; } .wordsOfJesus { color: red; }
+ .divineName { font-variant: small-caps; } .wordsOfJesus { color: red; } .transChangeSupplied { font-style: italic; }
-------
RenderText:
- Lord, how are they increased that trouble me! many are they that rise up against me.
+ <span class="divineName">Lord</span>, how are they increased that trouble me!<br /> many <span class="transChangeSupplied">are</span> they that rise up against me.<br />
-------
-------
@@ -25,10 +25,10 @@
<div sID="gen22" type="section"/> <title>The Beginning of the Ministry of Jesus</title> <title type="parallel">(<reference osisRef="Matt.4.12-Matt.4.22">Matt 4:12–22</reference>; <reference osisRef="Luke.4.14">Luke 4:14</reference>, <reference osisRef="Luke.4.15">15</reference>; <reference osisRef="Luke.5.1-Luke.5.11">5:1-11</reference>) </title> <div sID="gen23" type="paragraph"/>
-------
Rendered Header:
-<div sID="gen22" type="section"/> <h3>The Beginning of the Ministry of Jesus</h3> (Matt 4:12–22; Luke 4:14, 15; 5:1-11) <h3>The Beginning of the Ministry of Jesus</h3> <h3>(<a href="passagestudy.jsp?action=showRef&type=scripRef&value=Matt.4.12-Matt.4.22&module=">Matt 4:12–22</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.14&module=">Luke 4:14</a>, <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.15&module=">15</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.5.1-Luke.5.11&module=">5:1-11</a>) </h3>
+<div sID="gen22" type="section"/> <h3>The Beginning of the Ministry of Jesus</h3> <h3>(<a href="passagestudy.jsp?action=showRef&type=scripRef&value=Matt.4.12-Matt.4.22&module=">Matt 4:12–22</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.14&module=">Luke 4:14</a>, <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.15&module=">15</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.5.1-Luke.5.11&module=">5:1-11</a>) </h3> <br />
-------
CSS:
- .divineName { font-variant: small-caps; } .wordsOfJesus { color: red; }
+ .divineName { font-variant: small-caps; } .wordsOfJesus { color: red; } .transChangeSupplied { font-style: italic; }
-------
RenderText:
Now after that John was put in prison, Jesus came into Galilee, preaching the gospel of the kingdom of God,
Modified: trunk/tests/versekeytest.cpp
===================================================================
--- trunk/tests/versekeytest.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/tests/versekeytest.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -69,8 +69,8 @@
/*
VerseKey currentVerse;
-currentVerse.AutoNormalize(0);
-currentVerse.Headings(1);
+currentVerse.setAutoNormalize(true);
+currentVerse.setIntros(true);
currentVerse.Persist(1);
currentVerse = "jn2";
cout << currentVerse << endl;
@@ -80,15 +80,15 @@
*/
VerseKey *parser = new VerseKey(); //(VerseKey *)mod->CreateKey();
- ListKey scope = parser->ParseVerseList("amos 2:2", *parser, true);
+ ListKey scope = parser->parseVerseList("amos 2:2", *parser, true);
cout << ((scope++ == scope) ? "single" : "multiple") << "\n";
- scope = parser->ParseVerseList("amos", *parser, true);
+ scope = parser->parseVerseList("amos", *parser, true);
cout << ((scope++ == scope) ? "single" : "multiple") << "\n";
- scope = parser->ParseVerseList("amos", *parser, true);
+ scope = parser->parseVerseList("amos", *parser, true);
ListKey result;
@@ -112,28 +112,28 @@
std::cout << result.getText() << "\n";
const char *bounds = "lk,acts";
- scope = parser->ParseVerseList(bounds, *parser, true);
+ scope = parser->parseVerseList(bounds, *parser, true);
VerseKey boundTest("lk", "acts");
boundTest.setText("Is.1.13");
- std::cout << "Error: " << (int)boundTest.Error() << ": " << boundTest << "\n";
+ std::cout << "Error: " << (int)boundTest.popError() << ": " << boundTest << "\n";
boundTest.setText("1Sam.21.1");
- std::cout << "Error: " << (int)boundTest.Error() << ": " << boundTest << "\n";
+ std::cout << "Error: " << (int)boundTest.popError() << ": " << boundTest << "\n";
boundTest.setText("acts.5.1");
- std::cout << "Error: " << (int)boundTest.Error() << ": " << boundTest << "\n";
+ std::cout << "Error: " << (int)boundTest.popError() << ": " << boundTest << "\n";
boundTest.setText("rom.5.1");
- std::cout << "Error: " << (int)boundTest.Error() << ": " << boundTest << "\n";
+ std::cout << "Error: " << (int)boundTest.popError() << ": " << boundTest << "\n";
*x = "Is.1.13";
scope = *x;
// if (scope == x) std::cout << "Error restricting bounds: " << x.getText() << " is in " << bounds << "\n";
- if (!scope.Error()) std::cout << "Error restricting bounds: " << x->getText() << " is in " << bounds << "\n";
+ if (!scope.popError()) std::cout << "Error restricting bounds: " << x->getText() << " is in " << bounds << "\n";
*x = "1Sam.21.1";
scope = *x;
- if (!scope.Error()) std::cout << "Error restricting bounds: " << x->getText() << " is in " << bounds << "\n";
+ if (!scope.popError()) std::cout << "Error restricting bounds: " << x->getText() << " is in " << bounds << "\n";
/*
VerseKey *y = (VerseKey *)mod->CreateKey();
@@ -156,8 +156,8 @@
cout << "\nNormalization on; headings on ====\n\n";
- vk.AutoNormalize(1);
- vk.Headings(1);
+ vk.setAutoNormalize(true);
+ vk.setIntros(true);
vk = "jn3.50";
/* TODO: these report 1 number off from what I think they should report
@@ -178,8 +178,8 @@
cout << "\nNormalization off; headings on ====\n\n";
- vk.AutoNormalize(0);
- vk.Headings(1);
+ vk.setAutoNormalize(false);
+ vk.setIntros(true);
vk = "jn3.50";
cout << "jn.3.50: " << vk << "\n";
@@ -200,8 +200,8 @@
cout << "\nNormalization on; headings off ====\n\n";
- vk.AutoNormalize(1);
- vk.Headings(0);
+ vk.setAutoNormalize(true);
+ vk.setIntros(false);
vk = "jn3.50";
cout << "jn.3.50: " << vk << "\n";
@@ -220,8 +220,8 @@
cout << "\nNormalization off; headings off ====\n\n";
- vk.AutoNormalize(0);
- vk.Headings(0);
+ vk.setAutoNormalize(false);
+ vk.setIntros(false);
vk = "jn3.50";
cout << "jn.3.50: " << vk << "\n";
@@ -242,11 +242,11 @@
VerseKey yo = "jn.3.16";
VerseKey yo2 = yo++;
- cout << yo2 << ": " << (int)yo2.Error() << endl;
+ cout << yo2 << ": " << (int)yo2.popError() << endl;
VerseKey vkey;
VerseKey tmpkey = "1sam 1:1";
- vkey.AutoNormalize(1); // line 147
+ vkey.setAutoNormalize(true); // line 147
vkey = tmpkey;
int chapter = (vkey.getChapter()-1);
vkey.setChapter(chapter);
Modified: trunk/tests/vtreekeytest.cpp
===================================================================
--- trunk/tests/vtreekeytest.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/tests/vtreekeytest.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -36,12 +36,12 @@
SWMgr mgr;
SWModule *mod = mgr.getModule("KJVgb");
- VerseKey *key1 = (VerseKey *)mod->CreateKey();
+ VerseKey *key1 = (VerseKey *)mod->createKey();
- key1->Testament(2);
- key1->Book(4);
- key1->Chapter(2);
- key1->Verse(3);
+ key1->setTestament(2);
+ key1->setBook(4);
+ key1->setChapter(2);
+ key1->setVerse(3);
cout << "\n" << key1->getText() << ":\n\n";
@@ -54,7 +54,7 @@
cout << "\n" << keys2.getRangeText() << ":\n\n";
- keys = key1->ParseVerseList("Lk.4.5");
+ keys = key1->parseVerseList("Lk.4.5");
cout << "\n" << key1->getText() << ":\n\n";
@@ -70,18 +70,18 @@
cout << "\nListkey persist key iteration test\n\n";
- keys = key1->ParseVerseList("mat1", 0, true);
+ keys = key1->parseVerseList("mat1", 0, true);
- for (keys = TOP; !keys.Error(); keys++) {
+ for (keys = TOP; !keys.popError(); keys++) {
cout << "\n" << keys.getText() << ":\n" << endl;
}
- keys.Persist(1);
+ keys.setPersist(true);
mod->setKey(keys);
- for ((*mod) = TOP; !mod->Error(); (*mod)++) {
+ for ((*mod) = TOP; !mod->popError(); (*mod)++) {
cout << "\n" << mod->getKeyText() << ":\n" << endl;
}
Modified: trunk/utilities/addgb.cpp
===================================================================
--- trunk/utilities/addgb.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/addgb.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -81,7 +81,7 @@
// Do some initialization stuff
TreeKeyIdx *treeKey = new TreeKeyIdx(argv[2]);
- if (treeKey->Error()) {
+ if (treeKey->popError()) {
treeKey->create(argv[2]);
delete treeKey;
treeKey = new TreeKeyIdx(argv[2]);
Modified: trunk/utilities/addld.cpp
===================================================================
--- trunk/utilities/addld.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/addld.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -79,8 +79,8 @@
if (fourbyte) {
char buffer[1048576]; //this is the max size of any entry
RawLD4 mod(argv[2]); // open our datapath with our RawText driver.
- SWKey* key = mod.CreateKey();
- key->Persist(1); // the magical setting
+ SWKey* key = mod.createKey();
+ key->setPersist(true); // the magical setting
// Set our VerseKey
*key = argv[3];
@@ -99,8 +99,8 @@
#ifndef EXCLUDEZLIB
char buffer[1048576]; //this is the max size of any entry
zLD mod(argv[2], 0, 0, 200, new ZipCompress()); // open our datapath with our RawText driver.
- SWKey* key = mod.CreateKey();
- key->Persist(1); // the magical setting
+ SWKey* key = mod.createKey();
+ key->setPersist(true); // the magical setting
// Set our VerseKey
*key = argv[3];
@@ -122,8 +122,8 @@
else {
char buffer[65536]; //this is the max size of any entry
RawLD mod(argv[2]); // open our datapath with our RawText driver.
- SWKey* key = mod.CreateKey();
- key->Persist(1); // the magical setting
+ SWKey* key = mod.createKey();
+ key->setPersist(true); // the magical setting
// Set our VerseKey
*key = argv[3];
@@ -145,8 +145,8 @@
// Do some initialization stuff
if (fourbyte) {
RawLD4 mod(argv[2]); // open our datapath with our RawText driver.
- SWKey* key = mod.CreateKey();
- key->Persist(1); // the magical setting
+ SWKey* key = mod.createKey();
+ key->setPersist(true); // the magical setting
*key = argv[3];
mod.setKey(*key);
@@ -155,8 +155,8 @@
}
else if (compress) {
zLD mod(argv[2]); // open our datapath with our RawText driver.
- SWKey* key = mod.CreateKey();
- key->Persist(1); // the magical setting
+ SWKey* key = mod.createKey();
+ key->setPersist(true); // the magical setting
*key = argv[3];
mod.setKey(*key);
@@ -166,8 +166,8 @@
}
else {
RawLD mod(argv[2]); // open our datapath with our RawText driver.
- SWKey* key = mod.CreateKey();
- key->Persist(1); // the magical setting
+ SWKey* key = mod.createKey();
+ key->setPersist(true); // the magical setting
*key = argv[3];
mod.setKey(*key);
Modified: trunk/utilities/addvs.cpp
===================================================================
--- trunk/utilities/addvs.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/addvs.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -60,21 +60,21 @@
char buffer[65536]; //this is the max size of any entry
RawText * mod = new RawText(argv[2]); // open our datapath with our RawText driver.
VerseKey *vkey = new VerseKey;
- vkey->Headings(1);
- vkey->AutoNormalize(0);
- vkey->Persist(1); // the magical setting
+ vkey->setIntros(true);
+ vkey->setAutoNormalize(false);
+ vkey->setPersist(true); // the magical setting
*vkey = argv[3];
// Set our VerseKey
mod->setKey(*vkey);
- if (!vkey->Chapter()) {
+ if (!vkey->getChapter()) {
// bad hack >>
// 0:0 is Book intro
// (chapter):0 is Chapter intro
//
// 0:2 is Module intro
// 0:1 is Testament intro
- int backstep = vkey->Verse();
- vkey->Verse(0);
+ int backstep = vkey->getVerse();
+ vkey->setVerse(0);
*mod -= backstep;
// << bad hack
@@ -90,19 +90,19 @@
mod->setEntry(buffer, entrysize); // save text to module at current position
}
else {
- ListKey listkey = vkey->ParseVerseList(argv[3], "Gen1:1", true);
+ ListKey listkey = vkey->parseVerseList(argv[3], "Gen1:1", true);
int i;
bool havefirst = false;
VerseKey firstverse;
for (i = 0; i < listkey.Count(); i++) {
VerseKey *element = SWDYNAMIC_CAST(VerseKey, listkey.GetElement(i));
if (element) {
- mod->Key(element->LowerBound());
- VerseKey finalkey = element->UpperBound();
- std::cout << (const char*)mod->Key() << "-" << (const char*)finalkey << std::endl;
+ mod->setKey(element->getLowerBound());
+ VerseKey finalkey = element->getUpperBound();
+ std::cout << mod->getKeyText() << "-" << (const char*)finalkey << std::endl;
if (!havefirst) {
havefirst = true;
- firstverse = mod->Key();
+ firstverse = *mod->getKey();
FILE *infile;
// case: add from text file
//Open our data file and read its contents into the buffer
@@ -116,22 +116,22 @@
std::cout << "f" << (const char*)firstverse << std::endl;
(*mod)++;
}
- while (mod->Key() <= finalkey) {
- std::cout << (const char*)mod->Key() << std::endl;
+ while (*mod->getKey() <= finalkey) {
+ std::cout << mod->getKeyText() << std::endl;
*(SWModule*)mod << &firstverse;
(*mod)++;
}
}
else {
if (havefirst) {
- mod->Key(*listkey.GetElement(i));
+ mod->setKey(*listkey.getElement(i));
*(SWModule*)mod << &firstverse;
- std::cout << (const char*)mod->Key() << std::endl;
+ std::cout << mod->getKeyText() << std::endl;
}
else {
- mod->Key(*listkey.GetElement(i));
+ mod->setKey(*listkey.getElement(i));
havefirst = true;
- firstverse = mod->Key();
+ firstverse = *mod->getKey();
FILE *infile;
// case: add from text file
//Open our data file and read its contents into the buffer
@@ -163,15 +163,15 @@
else if (!strcmp(argv[1], "-d") && argc == 4) {
RawText mod(argv[2]); // open our datapath with our RawText driver.
VerseKey *vkey = new VerseKey;
- vkey->Headings(1);
- vkey->AutoNormalize(0);
- vkey->Persist(1); // the magical setting
+ vkey->setIntros(true);
+ vkey->setAutoNormalize(false);
+ vkey->setPersist(true); // the magical setting
// Set our VerseKey
mod.setKey(*vkey);
*vkey = argv[3];
- if (!vkey->Chapter())
+ if (!vkey->getChapter())
{
// bad hack >>
// 0:0 is Book intro
@@ -179,8 +179,8 @@
//
// 0:2 is Module intro
// 0:1 is Testament intro
- int backstep = vkey->Verse();
- vkey->Verse(0);
+ int backstep = vkey->getVerse();
+ vkey->setVerse(0);
mod -= backstep;
// << bad hack
}
Modified: trunk/utilities/cipherraw.cpp
===================================================================
--- trunk/utilities/cipherraw.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/cipherraw.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -79,18 +79,18 @@
write(oxfd[1], &lzoffset, 4);
write(oxfd[1], &lzsize, 2);
- key.AutoNormalize(0);
- key.Headings(1);
- for (key.setIndex(0); (!key.Error()); key++) {
- rawdrv->findOffset(key.Testament(), key.getIndex(), &offset, &size);
+ key.setAutoNormalize(false);
+ key.setIntros(true);
+ for (key.setIndex(0); (!key.popError()); key++) {
+ rawdrv->findOffset(key.getTestament(), key.getIndex(), &offset, &size);
printf("%s: OLD offset: %ld; size: %d\n", (const char *)key, offset, size);
if ((offset == loffset) && (size == lsize)) {
printf("using previous offset,size %d\n", size);
- offset = lseek(oxfd[key.Testament() - 1], 0, SEEK_CUR);
+ offset = lseek(oxfd[key.getTestament() - 1], 0, SEEK_CUR);
printf("%ld %ld %d \n", offset, lzoffset, lzsize);
- write(oxfd[key.Testament() - 1], &lzoffset, 4);
- write(oxfd[key.Testament() - 1], &lzsize, 2);
+ write(oxfd[key.getTestament() - 1], &lzoffset, 4);
+ write(oxfd[key.getTestament() - 1], &lzsize, 2);
}
else {
lsize = size;
@@ -98,22 +98,22 @@
if (size) {
SWBuf tmpbuf;
- rawdrv->readText(key.Testament(), offset, size, tmpbuf);
+ rawdrv->readText(key.getTestament(), offset, size, tmpbuf);
zobj->Buf(tmpbuf.c_str(), size);
unsigned long ulSize = size;
zobj->cipherBuf(&ulSize);
size = (unsigned int)ulSize;
}
- offset = lseek(ofd[key.Testament() - 1], 0, SEEK_CUR);
- tmpoff = lseek(oxfd[key.Testament() - 1], 0, SEEK_CUR);
+ offset = lseek(ofd[key.getTestament() - 1], 0, SEEK_CUR);
+ tmpoff = lseek(oxfd[key.getTestament() - 1], 0, SEEK_CUR);
printf("%s: (%ld) NEW offset: %ld; size: %d\n", (const char *)key, tmpoff, offset, size);
- write(oxfd[key.Testament() - 1], &offset, 4);
+ write(oxfd[key.getTestament() - 1], &offset, 4);
unsigned long ulSize = size;
if (size)
- write(ofd[key.Testament() - 1], zobj->cipherBuf(&ulSize), size);
+ write(ofd[key.getTestament() - 1], zobj->cipherBuf(&ulSize), size);
size = (unsigned int)ulSize;
lzoffset = offset;
- write(oxfd[key.Testament() - 1], &size, 2);
+ write(oxfd[key.getTestament() - 1], &size, 2);
lzsize = size;
}
}
Modified: trunk/utilities/diatheke/corediatheke.cpp
===================================================================
--- trunk/utilities/diatheke/corediatheke.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/diatheke/corediatheke.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -64,40 +64,40 @@
if (types) *output << "Biblical Texts:\n";
for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) {
target = it->second;
- if (!strcmp(target->Type(), "Biblical Texts")) {
- if (names) *output << target->Name();
+ if (!strcmp(target->getType(), "Biblical Texts")) {
+ if (names) *output << target->getName();
if (names && descriptions) *output << " : ";
- if (descriptions) *output << target->Description();
+ if (descriptions) *output << target->getDescription();
*output << endl;
}
}
if (types) *output << "Commentaries:\n";
for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) {
target = it->second;
- if (!strcmp(target->Type(), "Commentaries")) {
- if (names) *output << target->Name();
+ if (!strcmp(target->getType(), "Commentaries")) {
+ if (names) *output << target->getName();
if (names && descriptions) *output << " : ";
- if (descriptions) *output << target->Description();
+ if (descriptions) *output << target->getDescription();
*output << endl;
}
}
if (types) *output << "Dictionaries:\n";
for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) {
target = it->second;
- if (!strcmp(target->Type(), "Lexicons / Dictionaries")) {
- if (names) *output << target->Name();
+ if (!strcmp(target->getType(), "Lexicons / Dictionaries")) {
+ if (names) *output << target->getName();
if (names && descriptions) *output << " : ";
- if (descriptions) *output << target->Description();
+ if (descriptions) *output << target->getDescription();
*output << endl;
}
}
if (types) *output << "Generic books:\n";
for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) {
target = it->second;
- if (!strcmp(target->Type(), "Generic Books")) {
- if (names) *output << target->Name();
+ if (!strcmp(target->getType(), "Generic Books")) {
+ if (names) *output << target->getName();
if (names && descriptions) *output << " : ";
- if (descriptions) *output << target->Description();
+ if (descriptions) *output << target->getDescription();
*output << endl;
}
}
@@ -140,14 +140,14 @@
return;
}
target = (*it).second;
- SWKey *p = target->CreateKey();
+ SWKey *p = target->createKey();
VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p);
if (!parser) {
delete p;
parser = new VerseKey();
}
- if ((sit = manager.config->Sections.find((*it).second->Name())) != manager.config->Sections.end()) {
+ if ((sit = manager.config->Sections.find((*it).second->getName())) != manager.config->Sections.end()) {
if ((eit = (*sit).second.find("SourceType")) != (*sit).second.end()) {
if (!::stricmp((char *)(*eit).second.c_str(), "GBF"))
inputformat = FMT_GBF;
@@ -180,7 +180,7 @@
*output << "Other";
}
*output << ";";
- *output << target->Type();
+ *output << target->getType();
*output << ";";
delete parser;
return;
@@ -188,13 +188,13 @@
if (searchtype)
querytype = QT_SEARCH;
- else if (!strcmp(target->Type(), "Biblical Texts"))
+ else if (!strcmp(target->getType(), "Biblical Texts"))
querytype = QT_BIBLE;
- else if (!strcmp(target->Type(), "Commentaries"))
+ else if (!strcmp(target->getType(), "Commentaries"))
querytype = QT_COMM;
- else if (!strcmp(target->Type(), "Lexicons / Dictionaries"))
+ else if (!strcmp(target->getType(), "Lexicons / Dictionaries"))
querytype = QT_LD;
- else if (!strcmp(target->Type(), "Generic Books"))
+ else if (!strcmp(target->getType(), "Generic Books"))
querytype = QT_LD;
if (optionfilters & OP_FOOTNOTES)
@@ -258,13 +258,13 @@
if (querytype == QT_SEARCH) {
//this test is just to determine if we've got SWKeys or VerseKeys
- if (!strcmp(target->Type(), "Biblical Texts"))
+ if (!strcmp(target->getType(), "Biblical Texts"))
querytype = QT_BIBLE;
- else if (!strcmp(target->Type(), "Commentaries"))
+ else if (!strcmp(target->getType(), "Commentaries"))
querytype = QT_BIBLE;
- else if (!strcmp(target->Type(), "Lexicons / Dictionaries"))
+ else if (!strcmp(target->getType(), "Lexicons / Dictionaries"))
querytype = QT_LD;
- else if (!strcmp(target->Type(), "Generic Books"))
+ else if (!strcmp(target->getType(), "Generic Books"))
querytype = QT_LD;
//do search stuff
@@ -277,13 +277,13 @@
*output << "\"-- ";
if (range) {
- ListKey scope = parser->ParseVerseList(range, "Gen 1:1", true);
- listkey = target->Search(ref, st, REG_ICASE, &scope);
+ ListKey scope = parser->parseVerseList(range, "Gen 1:1", true);
+ listkey = target->search(ref, st, REG_ICASE, &scope);
}
- else listkey = target->Search(ref, st, REG_ICASE);
+ else listkey = target->search(ref, st, REG_ICASE);
if (strlen((const char*)listkey)) {
- if (!listkey.Error()) {
+ if (!listkey.popError()) {
if (outputformat == FMT_CGI) *output << "<entry>";
if (querytype == QT_BIBLE) {
*parser = listkey;
@@ -293,7 +293,7 @@
if (outputformat == FMT_CGI) *output << "</entry>";
}
listkey++;
- while (!listkey.Error()) {
+ while (!listkey.popError()) {
*output << " ; ";
if (outputformat == FMT_CGI) *output << "<entry>";
if (querytype == QT_BIBLE) {
@@ -312,12 +312,12 @@
delete [] temp;
*output << " matches total (";
- *output << target->Name();
+ *output << target->getName();
*output << ")\n";
}
else {
*output << "none (";
- *output << target->Name();
+ *output << target->getName();
*output << ")\n";
}
}
@@ -342,7 +342,7 @@
}
if (strlen(text)) {
- *output << (char*)target->KeyText();
+ *output << (char*)target->getKeyText();
if (font && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
*output << ": <font face=\"";
*output << font;
@@ -363,7 +363,7 @@
}
*output << "(";
- *output << target->Name();
+ *output << target->getName();
*output << ")\n";
}
@@ -376,14 +376,14 @@
else if (querytype == QT_BIBLE || querytype == QT_COMM) {
//do commentary/Bible stuff
- if ((sit = manager.config->Sections.find((*it).second->Name())) != manager.config->Sections.end()) {
+ if ((sit = manager.config->Sections.find((*it).second->getName())) != manager.config->Sections.end()) {
if ((eit = (*sit).second.find("Font")) != (*sit).second.end()) {
font = (char *)(*eit).second.c_str();
if (strlen(font) == 0) font = 0;
}
}
- listkey = parser->ParseVerseList(ref, "Gen1:1", true);
+ listkey = parser->parseVerseList(ref, "Gen1:1", true);
int i;
if (outputformat == FMT_RTF) {
@@ -401,10 +401,10 @@
for (i = 0; i < listkey.Count() && maxverses; i++) {
VerseKey *element = SWDYNAMIC_CAST(VerseKey, listkey.GetElement(i));
if (element && element->isBoundSet()) {
- target->Key(element->LowerBound());
- *parser = element->UpperBound();
- while (maxverses && target->Key() <= *parser) {
- *output << (char*)target->KeyText();
+ target->setKey(element->getLowerBound());
+ *parser = element->getUpperBound();
+ while (maxverses && *target->getKey() <= *parser) {
+ *output << (char*)target->getKeyText();
if (font && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
*output << ": <font face=\"";
*output << font;
@@ -435,15 +435,15 @@
*output << "\n";
- if (target->Key() == *parser)
+ if (*target->getKey() == *parser)
break;
maxverses--;
(*target)++;
}
}
else {
- target->Key(*listkey.GetElement(i));
- *output << (char*)target->KeyText();
+ target->setKey(*listkey.GetElement(i));
+ *output << (char*)target->getKeyText();
if (font && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
*output << ": <font face=\"";
*output << font;
@@ -478,7 +478,7 @@
}
*output << "(";
- *output << target->Name();
+ *output << target->getName();
*output << ")\n";
if (outputformat == FMT_RTF) {
Modified: trunk/utilities/diatheke/diafiltmgr.cpp
===================================================================
--- trunk/utilities/diatheke/diafiltmgr.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/diatheke/diafiltmgr.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -62,22 +62,22 @@
}
void DiathekeFilterMgr::AddRenderFilters(SWModule *module, ConfigEntMap §ion) {
- switch (module->Markup()) {
+ switch (module->getMarkup()) {
case FMT_THML:
if (fromthml)
- module->AddRenderFilter(fromthml);
+ module->addRenderFilter(fromthml);
break;
case FMT_GBF:
if (fromgbf)
- module->AddRenderFilter(fromgbf);
+ module->addRenderFilter(fromgbf);
break;
case FMT_PLAIN:
if (fromplain)
- module->AddRenderFilter(fromplain);
+ module->addRenderFilter(fromplain);
break;
case FMT_OSIS:
if (fromosis)
- module->AddRenderFilter(fromosis);
+ module->addRenderFilter(fromosis);
break;
}
EncodingFilterMgr::AddRenderFilters(module, section);
@@ -97,19 +97,19 @@
CreateFilters(markup);
for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); module++)
- switch (module->second->Markup()) {
+ switch (module->second->getMarkup()) {
case FMT_THML:
if (oldthml != fromthml) {
if (oldthml) {
if (!fromthml) {
- module->second->RemoveRenderFilter(oldthml);
+ module->second->removeRenderFilter(oldthml);
}
else {
- module->second->ReplaceRenderFilter(oldthml, fromthml);
+ module->second->replaceRenderFilter(oldthml, fromthml);
}
}
else if (fromthml) {
- module->second->AddRenderFilter(fromthml);
+ module->second->addRenderFilter(fromthml);
}
}
break;
@@ -117,14 +117,14 @@
if (oldgbf != fromgbf) {
if (oldgbf) {
if (!fromgbf) {
- module->second->RemoveRenderFilter(oldgbf);
+ module->second->removeRenderFilter(oldgbf);
}
else {
- module->second->ReplaceRenderFilter(oldgbf, fromgbf);
+ module->second->replaceRenderFilter(oldgbf, fromgbf);
}
}
else if (fromgbf) {
- module->second->AddRenderFilter(fromgbf);
+ module->second->addRenderFilter(fromgbf);
}
break;
}
@@ -132,14 +132,14 @@
if (oldplain != fromplain) {
if (oldplain) {
if (!fromplain) {
- module->second->RemoveRenderFilter(oldplain);
+ module->second->removeRenderFilter(oldplain);
}
else {
- module->second->ReplaceRenderFilter(oldplain, fromplain);
+ module->second->replaceRenderFilter(oldplain, fromplain);
}
}
else if (fromplain) {
- module->second->AddRenderFilter(fromplain);
+ module->second->addRenderFilter(fromplain);
}
break;
}
@@ -147,14 +147,14 @@
if (oldosis != fromosis) {
if (oldosis) {
if (!fromosis) {
- module->second->RemoveRenderFilter(oldosis);
+ module->second->removeRenderFilter(oldosis);
}
else {
- module->second->ReplaceRenderFilter(oldosis, fromosis);
+ module->second->replaceRenderFilter(oldosis, fromosis);
}
}
else if (fromosis) {
- module->second->AddRenderFilter(fromosis);
+ module->second->addRenderFilter(fromosis);
}
break;
}
Modified: trunk/utilities/diatheke/diathekemgr.cpp
===================================================================
--- trunk/utilities/diatheke/diathekemgr.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/diatheke/diathekemgr.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -79,10 +79,10 @@
#ifdef _ICU_
if (shape) {
- module->AddRenderFilter(arshaping);
+ module->addRenderFilter(arshaping);
}
if (bidi && rtl) {
- module->AddRenderFilter(bidireorder);
+ module->addRenderFilter(bidireorder);
}
#endif
SWMgr::AddRenderFilters(module, section);
@@ -103,7 +103,7 @@
SWMgr::AddGlobalOptions(module, section, start, end);
#ifdef _ICU_
- module->AddOptionFilter(transliterator);
+ module->addOptionFilter(transliterator);
#endif
};
Modified: trunk/utilities/diatheke/gbfcgi.cpp
===================================================================
--- trunk/utilities/diatheke/gbfcgi.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/diatheke/gbfcgi.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -23,10 +23,26 @@
#include <stdlib.h>
#include <string.h>
+#include <map>
#include "gbfcgi.h"
SWORD_NAMESPACE_START
+typedef std::map<SWBuf, SWBuf> DualStringMap;
+
+namespace {
+ class MyUserData : public BasicFilterUserData {
+ public:
+ MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {}
+ DualStringMap properties;
+ };
+}
+
+
+BasicFilterUserData *GBFCGI::createUserData(const SWModule *module, const SWKey *key) {
+ return new MyUserData(module, key);
+}
+
GBFCGI::GBFCGI() {
setTokenStart("<");
setTokenEnd(">");
@@ -64,7 +80,8 @@
}
-bool GBFCGI::handleToken(SWBuf &buf, const char *token, DualStringMap &userData) {
+bool GBFCGI::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *baseUserData) {
+ MyUserData *userData = (MyUserData *) baseUserData;
unsigned long i;
if (!substituteToken(buf, token)) {
if (!strncmp(token, "WG", 2) || !strncmp(token, "WH", 2)) { // strong's numbers
@@ -113,12 +130,12 @@
else if (!strncmp(token, "RB", 2)) {
buf += "<i>";
- userData["hasFootnotePreTag"] = "true";
+ userData->properties["hasFootnotePreTag"] = "true";
}
else if (!strncmp(token, "RF", 2)) {
- if(userData["hasFootnotePreTag"] == "true") {
- userData["hasFootnotePreTag"] = "false";
+ if(userData->properties["hasFootnotePreTag"] == "true") {
+ userData->properties["hasFootnotePreTag"] = "false";
buf += "</i> ";
}
buf += "<font color=\"#800000\"><small> (";
Modified: trunk/utilities/diatheke/gbfcgi.h
===================================================================
--- trunk/utilities/diatheke/gbfcgi.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/diatheke/gbfcgi.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -25,18 +25,16 @@
#define GBFCGI_H
#include <swbasicfilter.h>
-#include <swbuf.h>
#include <defs.h>
-#include <map>
SWORD_NAMESPACE_START
-typedef std::map<SWBuf, SWBuf> DualStringMap;
/** this filter converts GBF text to Diatheke/CGI format
*/
class GBFCGI : public SWBasicFilter {
protected:
- virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData);
+ virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key);
+ virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
public:
GBFCGI ();
};
Modified: trunk/utilities/diatheke/thmlcgi.cpp
===================================================================
--- trunk/utilities/diatheke/thmlcgi.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/diatheke/thmlcgi.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -23,11 +23,26 @@
#include <stdlib.h>
#include <string.h>
+#include <map>
+#include <utilstr.h>
#include "thmlcgi.h"
-#include <utilstr.h>
SWORD_NAMESPACE_START
+typedef std::map<SWBuf, SWBuf> DualStringMap;
+
+namespace {
+ class MyUserData : public BasicFilterUserData {
+ public:
+ MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {}
+ DualStringMap properties;
+ };
+}
+
+BasicFilterUserData *ThMLCGI::createUserData(const SWModule *module, const SWKey *key) {
+ return new MyUserData(module, key);
+}
+
ThMLCGI::ThMLCGI() {
setTokenStart("<");
setTokenEnd(">");
@@ -39,7 +54,8 @@
}
-bool ThMLCGI::handleToken(SWBuf &buf, const char *token, DualStringMap &userData) {
+bool ThMLCGI::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *baseUserData) {
+ MyUserData *userData = (MyUserData *) baseUserData;
unsigned long i;
if (!substituteToken(buf, token)) {
// manually process if it wasn't a simple substitution
@@ -109,7 +125,7 @@
}
else if (!strncmp(token, "scripRef p", 10) || !strncmp(token, "scripRef v", 10)) {
- userData["inscriptRef"] = "true";
+ userData->properties["inscriptRef"] = "true";
buf += "<a href=\"!DIATHEKE_URL!";
for (i = 9; i < strlen(token); i++) {
if (!strncmp(token+i, "version=\"", 9)) {
@@ -133,47 +149,47 @@
// we're starting a scripRef like "<scripRef>John 3:16</scripRef>"
else if (!strcmp(token, "scripRef")) {
- userData["inscriptRef"] = "false";
+ userData->properties["inscriptRef"] = "false";
// let's stop text from going to output
- userData["suspendTextPassThru"] = "true";
+ userData->properties["suspendTextPassThru"] = "true";
}
// we've ended a scripRef
else if (!strcmp(token, "/scripRef")) {
- if (userData["inscriptRef"] == "true") { // like "<scripRef passage="John 3:16">John 3:16</scripRef>"
- userData["inscriptRef"] = "false";
+ if (userData->properties["inscriptRef"] == "true") { // like "<scripRef passage="John 3:16">John 3:16</scripRef>"
+ userData->properties["inscriptRef"] = "false";
buf += "</a>";
}
else { // like "<scripRef>John 3:16</scripRef>"
buf += "<a href=\"!DIATHEKE_URL!verse=";
- char* vref = (char*)userData["lastTextNode"].c_str();
+ char* vref = (char*)userData->properties["lastTextNode"].c_str();
while (*vref) {
if (*vref == ' ') buf += '+';
else buf += *vref;
vref++;
}
buf += "\">";
- buf += userData["lastTextNode"].c_str();
+ buf += userData->properties["lastTextNode"].c_str();
// let's let text resume to output again
- userData["suspendTextPassThru"] = "false";
+ userData->properties["suspendTextPassThru"] = "false";
buf += "</a>";
}
}
else if (!strncmp(token, "div class=\"sechead\"", 19)) {
- userData["SecHead"] = "true";
+ userData->properties["SecHead"] = "true";
buf += "<br /><b><i>";
}
else if (!strncmp(token, "div class=\"title\"", 19)) {
- userData["SecHead"] = "true";
+ userData->properties["SecHead"] = "true";
buf += "<br /><b><i>";
}
else if (!strncmp(token, "/div", 4)) {
- if (userData["SecHead"] == "true") {
+ if (userData->properties["SecHead"] == "true") {
buf += "</i></b><br />";
- userData["SecHead"] = "false";
+ userData->properties["SecHead"] = "false";
}
}
Modified: trunk/utilities/diatheke/thmlcgi.h
===================================================================
--- trunk/utilities/diatheke/thmlcgi.h 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/diatheke/thmlcgi.h 2013-01-19 16:19:47 UTC (rev 2764)
@@ -25,18 +25,16 @@
#define THMLCGI_H
#include <swbasicfilter.h>
-#include <map>
-
#include <defs.h>
SWORD_NAMESPACE_START
-typedef std::map<SWBuf, SWBuf> DualStringMap;
/** this filter converts ThML text to Diatheke/CGI format
*/
class ThMLCGI : public SWBasicFilter {
protected:
- virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData);
+ virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key);
+ virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
public:
ThMLCGI();
};
Modified: trunk/utilities/emptyvss.cpp
===================================================================
--- trunk/utilities/emptyvss.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/emptyvss.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -62,13 +62,13 @@
exit(-3);
}
- vkey->Headings(1); // turn on mod/testmnt/book/chap headings
+ vkey->setIntros(false); // turn on mod/testmnt/book/chap headings
(*mod) = TOP;
- while (!mod->Error()) {
+ while (!mod->popError()) {
- if (vkey->Verse())
+ if (vkey->getVerse())
if (!strlen ((const char *)(*mod)))
std::cout << *vkey << std::endl;
(*mod)++;
Modified: trunk/utilities/gbfidx.cpp
===================================================================
--- trunk/utilities/gbfidx.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/gbfidx.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -61,9 +61,9 @@
openfiles(argv[1]);
- testmnt = key1.Testament();
- num1 = key1.Chapter();
- num2 = key1.Verse();
+ testmnt = key1.getTestament();
+ num1 = key1.getChapter();
+ num2 = key1.getVerse();
pos = 0;
write(bfp, &pos, 4); /* Book offset for testament intros */
pos = 4;
@@ -83,11 +83,11 @@
startflag = 1;
}
else {
- if (num2 < key2.Verse()) { // new chapter
- if (num1 <= key2.Chapter()) { // new book
- key2.Verse(1);
- key2.Chapter(1);
- key2.Book(key2.Book()+1);
+ if (num2 < key2.getVerse()) { // new chapter
+ if (num1 <= key2.getChapter()) { // new book
+ key2.setVerse(1);
+ key2.setChapter(1);
+ key2.setBook(key2.getBook()+1);
}
printf("Found Chapter Break: %d ('%s')\n", num1, (const char *)key2);
chapoffset = offset;
@@ -95,12 +95,12 @@
// continue;
}
}
- key2.Verse(1);
- key2.Chapter(num1);
- key2.Verse(num2);
+ key2.setVerse(1);
+ key2.setChapter(num1);
+ key2.setVerse(num2);
key3 = key2;
-// key3 += (rangemax - key3.Verse());
+// key3 += (rangemax - key3.getVerse());
writeidx(key1, key2, key3, offset, size);
}
@@ -123,9 +123,9 @@
long pos;
short tmp;
- for (; ((key1 <= key3) && (key1.Error() != KEYERR_OUTOFBOUNDS) && (key1.Testament() == testmnt)); key1+=1) {
- if (key1.Verse() == 1) { // new chapter
- if (key1.Chapter() == 1) { // new book
+ for (; ((key1 <= key3) && (key1.popError() != KEYERR_OUTOFBOUNDS) && (key1.getTestament() == testmnt)); key1+=1) {
+ if (key1.getVerse() == 1) { // new chapter
+ if (key1.getChapter() == 1) { // new book
pos = lseek(cfp, 0, SEEK_CUR);
write(bfp, &pos, 4);
pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
Modified: trunk/utilities/genbookutil.cpp
===================================================================
--- trunk/utilities/genbookutil.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/genbookutil.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -158,7 +158,7 @@
TreeKeyIdx *treeKey = new TreeKeyIdx(argv[1]);
- if (treeKey->Error()) {
+ if (treeKey->popError()) {
RawGenBook::createModule(argv[1]);
}
delete treeKey;
Modified: trunk/utilities/imp2gbs.cpp
===================================================================
--- trunk/utilities/imp2gbs.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/imp2gbs.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -203,7 +203,7 @@
book->setKey(keyBuffer.c_str());
// check to see if we already have an entry
- for (int i = 2; book->getKey()->Error() != KEYERR_OUTOFBOUNDS; i++) {
+ for (int i = 2; book->getKey()->popError() != KEYERR_OUTOFBOUNDS; i++) {
SWBuf key;
key.setFormatted("%s {%d}", keyBuffer.c_str(), i);
std::cout << "dup key, trying: " << key << std::endl;
Modified: trunk/utilities/imp2ld.cpp
===================================================================
--- trunk/utilities/imp2ld.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/imp2ld.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -168,9 +168,9 @@
- key = mod->CreateKey();
- linkKey = mod->CreateKey();
- key->Persist(1);
+ key = mod->createKey();
+ linkKey = mod->createKey();
+ key->setPersist(true);
mod->setKey(key);
while (!infile.eof()) {
Modified: trunk/utilities/imp2vs.cpp
===================================================================
--- trunk/utilities/imp2vs.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/imp2vs.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -194,10 +194,10 @@
// setup module key to allow full range of possible values, and then some
- VerseKey *vkey = (VerseKey *)module->CreateKey();
- vkey->Headings(1);
- vkey->AutoNormalize(0);
- vkey->Persist(1);
+ VerseKey *vkey = (VerseKey *)module->createKey();
+ vkey->setIntros(true);
+ vkey->setAutoNormalize(false);
+ vkey->setPersist(true);
module->setKey(*vkey);
// -----------------------------------------------------
@@ -241,12 +241,12 @@
if (key.size() && entry.size()) {
std::cout << "from file: " << key << std::endl;
VerseKey *vkey = (VerseKey *)module->getKey();
- VerseKey *linkMaster = (VerseKey *)module->CreateKey();
+ VerseKey *linkMaster = (VerseKey *)module->createKey();
- ListKey listKey = vkey->ParseVerseList(key.c_str(), "Gen1:1", true);
+ ListKey listKey = vkey->parseVerseList(key.c_str(), "Gen1:1", true);
bool first = true;
- for (listKey = TOP; !listKey.Error(); listKey++) {
+ for (listKey = TOP; !listKey.popError(); listKey++) {
*vkey = listKey;
if (first) {
*linkMaster = *vkey;
Modified: trunk/utilities/installmgr.cpp
===================================================================
--- trunk/utilities/installmgr.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/installmgr.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -203,7 +203,7 @@
finish(-2);
}
module = it->second;
- installMgr->removeModule(mgr, module->Name());
+ installMgr->removeModule(mgr, module->getName());
cout << "Removed module: [" << modName << "]\n";
}
@@ -248,7 +248,7 @@
if (it->second & InstallMgr::MODSTAT_UPDATED) status = "+";
if (!onlyNewAndUpdates || status == "*" || status == "+") {
- cout << status << "[" << module->Name() << "] \t(" << version << ") \t- " << module->Description() << "\n";
+ cout << status << "[" << module->getName() << "] \t(" << version << ") \t- " << module->getDescription() << "\n";
}
}
}
@@ -290,10 +290,10 @@
}
module = it->second;
- int error = installMgr->installModule(mgr, 0, module->Name(), is);
+ int error = installMgr->installModule(mgr, 0, module->getName(), is);
if (error) {
- cout << "\nError installing module: [" << module->Name() << "] (write permissions?)\n";
- } else cout << "\nInstalled module: [" << module->Name() << "]\n";
+ cout << "\nError installing module: [" << module->getName() << "] (write permissions?)\n";
+ } else cout << "\nInstalled module: [" << module->getName() << "]\n";
}
@@ -307,10 +307,10 @@
finish(-4);
}
module = it->second;
- int error = installMgr->installModule(mgr, dir, module->Name());
+ int error = installMgr->installModule(mgr, dir, module->getName());
if (error) {
- cout << "\nError installing module: [" << module->Name() << "] (write permissions?)\n";
- } else cout << "\nInstalled module: [" << module->Name() << "]\n";
+ cout << "\nError installing module: [" << module->getName() << "] (write permissions?)\n";
+ } else cout << "\nInstalled module: [" << module->getName() << "]\n";
}
Modified: trunk/utilities/mkfastmod.cpp
===================================================================
--- trunk/utilities/mkfastmod.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/mkfastmod.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -67,14 +67,14 @@
if (it == manager.Modules.end()) {
fprintf(stderr, "Could not find module [%s]. Available modules:\n", argv[1]);
for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) {
- fprintf(stderr, "[%s]\t - %s\n", (*it).second->Name(), (*it).second->Description());
+ fprintf(stderr, "[%s]\t - %s\n", (*it).second->getName(), (*it).second->getDescription());
}
exit(-1);
}
target = it->second;
if (!target->hasSearchFramework()) {
- fprintf(stderr, "%s: error: %s does not support a search framework.\n", *argv, it->second->Name());
+ fprintf(stderr, "%s: error: %s does not support a search framework.\n", *argv, it->second->getName());
exit(-2);
}
Modified: trunk/utilities/mod2imp.cpp
===================================================================
--- trunk/utilities/mod2imp.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/mod2imp.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -107,10 +107,10 @@
VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
if (vkey)
- vkey->Headings(1);
+ vkey->setIntros(true);
- for ((*module) = TOP; !module->Error(); (*module)++) {
- std::cout << "$$$" << module->KeyText() << std::endl;
+ for ((*module) = TOP; !module->popError(); (*module)++) {
+ std::cout << "$$$" << module->getKeyText() << std::endl;
std::cout << ((render) ? module->RenderText() : (strip) ? module->StripText() : module->getRawEntry()) << "\n";
}
Modified: trunk/utilities/mod2osis.cpp
===================================================================
--- trunk/utilities/mod2osis.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/mod2osis.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -116,7 +116,7 @@
exit(-1);
}
- vkey->Headings(0);
+ vkey->setIntros(false);
cout << "<?xml version=\"1.0\" ";
if (inModule->getConfigEntry("Encoding")) {
@@ -134,19 +134,19 @@
cout << " xsi:schemaLocation=\"http://www.bibletechnologies.net/2003/OSIS/namespace http://www.bibletechnologies.net/osisCore.2.1.1.xsd\">\n\n";
cout << "<osisText";
cout << " osisIDWork=\"";
- cout << inModule->Name() << "\"";
+ cout << inModule->getName() << "\"";
cout << " osisRefWork=\"defaultReferenceScheme\"";
- if (inModule->Lang()) {
- if (strlen(inModule->Lang()))
- cout << " xml:lang=\"" << inModule->Lang() << "\"";
+ if (inModule->getLanguage()) {
+ if (strlen(inModule->getLanguage()))
+ cout << " xml:lang=\"" << inModule->getLanguage() << "\"";
}
cout << ">\n\n";
cout << "\t<header>\n";
cout << "\t\t<work osisWork=\"";
- cout << inModule->Name() << "\">\n";
- cout << "\t\t\t<title>" << inModule->Description() << "</title>\n";
- cout << "\t\t\t<identifier type=\"OSIS\">Bible." << inModule->Name() << "</identifier>\n";
+ cout << inModule->getName() << "\">\n";
+ cout << "\t\t\t<title>" << inModule->getDescription() << "</title>\n";
+ cout << "\t\t\t<identifier type=\"OSIS\">Bible." << inModule->getName() << "</identifier>\n";
cout << "\t\t\t<refSystem>Bible.KJV</refSystem>\n";
cout << "\t\t</work>\n";
cout << "\t\t<work osisWork=\"defaultReferenceScheme\">\n";
@@ -157,7 +157,7 @@
(*inModule) = TOP;
- SWKey *p = inModule->CreateKey();
+ SWKey *p = inModule->createKey();
VerseKey *tmpKey = SWDYNAMIC_CAST(VerseKey, p);
if (!tmpKey) {
delete p;
@@ -165,10 +165,10 @@
}
*tmpKey = inModule->getKeyText();
- tmpKey->Headings(1);
- tmpKey->AutoNormalize(0);
+ tmpKey->setIntros(true);
+ tmpKey->setAutoNormalize(false);
- for ((*inModule) = TOP; !inModule->Error(); (*inModule)++) {
+ for ((*inModule) = TOP; !inModule->popError(); (*inModule)++) {
bool newTest = false;
bool newBook = false;
@@ -176,7 +176,7 @@
continue;
}
- if ((vkey->Testament() != lastTest)) {
+ if ((vkey->getTestament() != lastTest)) {
if (openchap)
cout << "\t</chapter>\n";
if (openbook)
@@ -187,7 +187,7 @@
opentest = true;
newTest = true;
}
- if ((vkey->Book() != lastBook) || newTest) {
+ if ((vkey->getBook() != lastBook) || newTest) {
if (!newTest) {
if (openchap)
cout << "\t</chapter>\n";
@@ -196,22 +196,22 @@
}
*buf = 0;
*tmpKey = *vkey;
- tmpKey->Chapter(0);
- tmpKey->Verse(0);
+ tmpKey->setChapter(0);
+ tmpKey->setVerse(0);
sprintf(buf, "\t<div type=\"book\" osisID=\"%s\">\n", tmpKey->getOSISRef());
// filter.ProcessText(buf, 200 - 3, &lastHeading, inModule);
cout << "" << buf << endl;
openbook = true;
newBook = true;
}
- if ((vkey->Chapter() != lastChap) || newBook) {
+ if ((vkey->getChapter() != lastChap) || newBook) {
if (!newBook) {
if (openchap)
cout << "\t</chapter>\n";
}
*buf = 0;
*tmpKey = *vkey;
- tmpKey->Verse(0);
+ tmpKey->setVerse(0);
sprintf(buf, "\t<chapter osisID=\"%s\">\n", tmpKey->getOSISRef());
// filter.ProcessText(buf, 200 - 3, &lastHeading, inModule);
cout << "" << buf;
@@ -220,9 +220,9 @@
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();
+ lastChap = vkey->getChapter();
+ lastBook = vkey->getBook();
+ lastTest = vkey->getTestament();
}
if (openchap)
cout << "\t</chapter>\n";
Modified: trunk/utilities/mod2vpl.cpp
===================================================================
--- trunk/utilities/mod2vpl.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/mod2vpl.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -85,11 +85,11 @@
exit(-3);
}
- vkey->Headings(1); // turn on mod/testmnt/book/chap headings
+ vkey->setIntros(true); // turn on mod/testmnt/book/chap headings
(*mod) = TOP;
- while (!mod->Error()) {
+ while (!mod->popError()) {
buffer = new char [ strlen ((const char *)(*mod)) + 1 ];
strcpy(buffer, (const char *)(*mod));
cleanbuf(buffer);
Modified: trunk/utilities/mod2zmod.cpp
===================================================================
--- trunk/utilities/mod2zmod.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/mod2zmod.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -109,9 +109,9 @@
#define COM 3
int modType = 0;
- if (!strcmp(inModule->Type(), "Biblical Texts")) modType = BIBLE;
- if (!strcmp(inModule->Type(), "Lexicons / Dictionaries")) modType = LEX;
- if (!strcmp(inModule->Type(), "Commentaries")) modType = COM;
+ if (!strcmp(inModule->getType(), "Biblical Texts")) modType = BIBLE;
+ if (!strcmp(inModule->getType(), "Lexicons / Dictionaries")) modType = LEX;
+ if (!strcmp(inModule->getType(), "Commentaries")) modType = COM;
switch (compType) { // these are deleted by zText
case 1: compressor = new LZSSCompress(); break;
@@ -145,7 +145,7 @@
outModule = new zText(argv[2], 0, 0, iType, compressor,
0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0,
vk->getVersificationSystem()); // open our datapath with our RawText driver.
- ((VerseKey *)(SWKey *)(*inModule))->Headings(1);
+ ((VerseKey *)(SWKey *)(*inModule))->setIntros(true);
break;
}
case LEX:
@@ -156,24 +156,24 @@
SWFilter *cipherFilter = 0;
if (!cipherKey.empty()) {
cipherFilter = new CipherFilter(cipherKey.c_str());
- outModule->AddRawFilter(cipherFilter);
+ outModule->addRawFilter(cipherFilter);
}
string lastBuffer = "Something that would never be first module entry";
SWKey bufferKey;
SWKey lastBufferKey;
- SWKey *outModuleKey = outModule->CreateKey();
+ SWKey *outModuleKey = outModule->createKey();
VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, outModuleKey);
- outModuleKey->Persist(1);
+ outModuleKey->setPersist(true);
if (vkey) {
- vkey->Headings(1);
- vkey->AutoNormalize(0);
+ vkey->setIntros(true);
+ vkey->setAutoNormalize(false);
}
outModule->setKey(*outModuleKey);
inModule->setSkipConsecutiveLinks(false);
(*inModule) = TOP;
- while (!inModule->Error()) {
+ while (!inModule->popError()) {
bufferKey = *(SWKey *)(*inModule);
// pseudo-check for link. Will get most common links.
if ((lastBuffer == inModule->getRawEntry()) &&(lastBuffer.length() > 0)) {
@@ -183,7 +183,7 @@
}
else {
lastBuffer = inModule->getRawEntry();
- lastBufferKey = inModule->KeyText();
+ lastBufferKey = inModule->getKeyText();
if (lastBuffer.length() > 0) {
cout << "Adding [" << bufferKey << "] new text.\n";
*outModuleKey = bufferKey;
Modified: trunk/utilities/osis2mod.cpp
===================================================================
--- trunk/utilities/osis2mod.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/osis2mod.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -352,13 +352,13 @@
// And set it to the reference under question
VerseKey before;
before.setVersificationSystem(currentVerse.getVersificationSystem());
- before.AutoNormalize(0);
- before.Headings(1);
+ before.setAutoNormalize(false);
+ before.setIntros(true);
before.setText(buf);
// If we are a heading we must bail
// These will autonormalize to the last verse of the prior chapter
- if (!before.Testament() || !before.Book() || !before.Chapter() || !before.Verse()) {
+ if (!before.getTestament() || !before.getBook() || !before.getChapter() || !before.getVerse()) {
return true;
}
@@ -366,7 +366,7 @@
// And set it to the reference under question
VerseKey after;
after.setVersificationSystem(currentVerse.getVersificationSystem());
- after.AutoNormalize(1);
+ after.setAutoNormalize(true);
after.setText(buf);
if (before == after)
@@ -410,22 +410,22 @@
void makeValidRef(VerseKey &key) {
VerseKey saveKey;
saveKey.setVersificationSystem(currentVerse.getVersificationSystem());
- saveKey.AutoNormalize(0);
- saveKey.Headings(1);
+ saveKey.setAutoNormalize(false);
+ saveKey.setIntros(true);
saveKey = currentVerse;
// Since isValidRef returned false constrain the key to the nearest prior reference.
// If we are past the last chapter set the reference to the last chapter
int chapterMax = key.getChapterMax();
- if (key.Chapter() > chapterMax) {
- key.Chapter(chapterMax);
+ if (key.getChapter() > chapterMax) {
+ key.setChapter(chapterMax);
}
// Either we set the chapter to the last chapter and now need to set to the last verse in the chapter
// Or the verse is beyond the end of the chapter.
// In any case we need to constrain the verse to it's chapter.
int verseMax = key.getVerseMax();
- key.Verse(verseMax);
+ key.setVerse(verseMax);
if (debug & DEBUG_REV11N) {
cout << "DEBUG(V11N) Chapter max:" << chapterMax << ", Verse Max:" << verseMax << endl;
@@ -448,7 +448,7 @@
// In this case we should re-versify Matt.7.30 as Matt.7.29.
// However, since this and 2) are ambiguous, we'll re-reversify to the last entry in the module.
- while (!key.Error() && !module->hasEntry(&key)) {
+ while (!key.popError() && !module->hasEntry(&key)) {
key.decrement(1);
}
@@ -477,13 +477,13 @@
static VerseKey lastKey;
lastKey.setVersificationSystem(currentVerse.getVersificationSystem());
- lastKey.AutoNormalize(0);
- lastKey.Headings(1);
+ lastKey.setAutoNormalize(0);
+ lastKey.setIntros(1);
VerseKey saveKey;
saveKey.setVersificationSystem(currentVerse.getVersificationSystem());
- saveKey.AutoNormalize(0);
- saveKey.Headings(1);
+ saveKey.setAutoNormalize(0);
+ saveKey.setIntros(1);
saveKey = currentVerse;
// If we have seen a verse and the supplied one is different then we output the collected one.
@@ -498,16 +498,16 @@
prepareSWText(activeOsisID, activeVerseText);
// Put the revision into the module
- int testmt = currentVerse.Testament();
+ int testmt = currentVerse.getTestament();
if ((testmt == 1 && firstOT) || (testmt == 2 && firstNT)) {
VerseKey t;
t.setVersificationSystem(currentVerse.getVersificationSystem());
- t.AutoNormalize(0);
- t.Headings(1);
+ t.setAutoNormalize(0);
+ t.setIntros(1);
t = currentVerse;
- currentVerse.Book(0);
- currentVerse.Chapter(0);
- currentVerse.Verse(0);
+ currentVerse.setBook(0);
+ currentVerse.setChapter(0);
+ currentVerse.setVerse(0);
module->setEntry(revision);
currentVerse = t;
switch (testmt) {
@@ -565,8 +565,8 @@
VerseKey saveKey;
saveKey.setVersificationSystem(currentVerse.getVersificationSystem());
- saveKey.AutoNormalize(0);
- saveKey.Headings(1);
+ saveKey.setAutoNormalize(0);
+ saveKey.setIntros(1);
saveKey = currentVerse;
currentVerse = linkKey;
@@ -675,15 +675,15 @@
cout << "\tinBookIntro = " << inBookIntro << endl;
}
- currentVerse.Testament(0);
- currentVerse.Book(0);
- currentVerse.Chapter(0);
- currentVerse.Verse(0);
+ currentVerse.setTestament(0);
+ currentVerse.setBook(0);
+ currentVerse.setChapter(0);
+ currentVerse.setVerse(0);
writeEntry(text);
}
currentVerse = token.getAttribute("osisID");
- currentVerse.Chapter(0);
- currentVerse.Verse(0);
+ currentVerse.setChapter(0);
+ currentVerse.setVerse(0);
strcpy(currentOsisID, currentVerse.getOSISRef());
sidBook = token.getAttribute("sID");
@@ -725,7 +725,7 @@
}
currentVerse = token.getAttribute("osisID");
- currentVerse.Verse(0);
+ currentVerse.setVerse(0);
if (debug & DEBUG_OTHER) {
cout << "DEBUG(FOUND): Current chapter is " << currentVerse.getOSISRef() << " (" << token.getAttribute("osisID") << ")" << endl;
@@ -782,14 +782,14 @@
// Get osisID for verse or annotateRef for commentary
SWBuf keyVal = token.getAttribute(tokenName == "verse" ? "osisID" : "annotateRef");
- // Massage the key into a form that ParseVerseList can accept
+ // Massage the key into a form that parseVerseList can accept
prepareSWVerseKey(keyVal);
// The osisID or annotateRef can be more than a single verse
// The first or only one is the currentVerse
// Use the last verse seen (i.e. the currentVerse) as the basis for recovering from bad parsing.
// This should never happen if the references are valid OSIS references
- ListKey verseKeys = currentVerse.ParseVerseList(keyVal, currentVerse, true);
+ ListKey verseKeys = currentVerse.parseVerseList(keyVal, currentVerse, true);
int memberKeyCount = verseKeys.Count();
if (memberKeyCount) {
currentVerse = verseKeys.getElement(0);
@@ -800,7 +800,7 @@
// if there is only one verse.
verseKeys.setPosition(TOP);
verseKeys.increment(1);
- if (!verseKeys.Error()) {
+ if (!verseKeys.popError()) {
linkedVerses.push_back(verseKeys);
}
}
@@ -1250,13 +1250,13 @@
// Link all the verses
VerseKey destKey;
destKey.setVersificationSystem(currentVerse.getVersificationSystem());
- destKey.AutoNormalize(0);
- destKey.Headings(1);
+ destKey.setAutoNormalize(0);
+ destKey.setIntros(1);
VerseKey linkKey;
linkKey.setVersificationSystem(currentVerse.getVersificationSystem());
- linkKey.AutoNormalize(0);
- linkKey.Headings(1);
+ linkKey.setAutoNormalize(0);
+ linkKey.setIntros(1);
for (unsigned int i = 0; i < linkedVerses.size(); i++) {
// The verseKeys is a list of verses
// where the first is the real verse
@@ -1266,7 +1266,7 @@
destKey = verseKeys.getElement();
verseKeys.increment(1);
- while (!verseKeys.Error()) {
+ while (!verseKeys.popError()) {
linkKey = verseKeys.getElement();
verseKeys.increment(1);
linkToEntry(linkKey, destKey);
@@ -1343,9 +1343,9 @@
strcpy(currentOsisID,"N/A");
currentVerse.setVersificationSystem(v11n);
- currentVerse.AutoNormalize(0);
- currentVerse.Headings(1); // turn on mod/testmnt/book/chap headings
- currentVerse.Persist(1);
+ currentVerse.setAutoNormalize(false);
+ currentVerse.setIntros(true); // turn on mod/testmnt/book/chap headings
+ currentVerse.setPersist(true);
module->setKey(currentVerse);
module->setPosition(TOP);
@@ -1694,7 +1694,7 @@
if (cipherKey.length()) {
fprintf(stderr, "Adding cipher filter with phrase: %s\n", cipherKey.c_str() );
cipherFilter = new CipherFilter(cipherKey.c_str());
- module->AddRawFilter(cipherFilter);
+ module->addRawFilter(cipherFilter);
}
if (!module->isWritable()) {
Modified: trunk/utilities/tei2mod.cpp
===================================================================
--- trunk/utilities/tei2mod.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/tei2mod.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -480,7 +480,7 @@
if (cipherKey.size()) {
fprintf(stderr, "Adding cipher filter with phrase: %s\n", cipherKey.c_str() );
cipherFilter = new CipherFilter(cipherKey.c_str());
- module->AddRawFilter(cipherFilter);
+ module->addRawFilter(cipherFilter);
}
if (!module->isWritable()) {
@@ -495,8 +495,8 @@
exit(-2);
}
- currentKey = module->CreateKey();
- currentKey->Persist(1);
+ currentKey = module->createKey();
+ currentKey->setPersist(true);
module->setKey(*currentKey);
(*module) = TOP;
Modified: trunk/utilities/treeidxutil.cpp
===================================================================
--- trunk/utilities/treeidxutil.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/treeidxutil.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -110,7 +110,7 @@
TreeKeyIdx *treeKey = new TreeKeyIdx(argv[1]);
- if (treeKey->Error()) {
+ if (treeKey->popError()) {
treeKey->create(argv[1]);
delete treeKey;
treeKey = new TreeKeyIdx(argv[1]);
Modified: trunk/utilities/vpl2mod.cpp
===================================================================
--- trunk/utilities/vpl2mod.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/vpl2mod.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -130,14 +130,14 @@
bool isKJVRef(const char *buf) {
VerseKey vk, test;
- vk.AutoNormalize(0);
- vk.Headings(1); // turn on mod/testmnt/book/chap headings
- vk.Persist(1);
+ vk.setAutoNormalize(false);
+ vk.setIntros(true); // turn on mod/testmnt/book/chap headings
+ vk.setPersist(true);
// lets do some tests on the verse --------------
vk = buf;
test = buf;
- if (vk.Testament() && vk.Book() && vk.Chapter() && vk.Verse()) { // if we're not a heading
+ if (vk.getTestament() && vk.getBook() && vk.getChapter() && vk.getVerse()) { // if we're not a heading
// std::cerr << (const char*)vk << " == " << (const char*)test << std::endl;
return (vk == test);
}
@@ -213,9 +213,9 @@
char *buffer = 0;
RawText mod(argv[2]); // open our datapath with our RawText driver.
VerseKey vk;
- vk.AutoNormalize(0);
- vk.Headings(1); // turn on mod/testmnt/book/chap headings
- vk.Persist(1);
+ vk.setAutoNormalize(false);
+ vk.setIntros(true); // turn on mod/testmnt/book/chap headings
+ vk.setPersist(true);
mod.setKey(vk);
@@ -225,7 +225,7 @@
if (ntonly) vk = "Matthew 1:1";
int successive = 0; //part of hack below
- while ((!mod.Error()) && (!readline(fd, &buffer))) {
+ while ((!mod.popError()) && (!readline(fd, &buffer))) {
if (*buffer == '|') // comments, ignore line
continue;
if (vref) {
@@ -236,7 +236,7 @@
}
vk = buffer;
- if (vk.Error()) {
+ if (vk.popError()) {
std::cerr << "Error parsing key: " << buffer << "\n";
exit(-5);
}
@@ -248,7 +248,7 @@
do {
vk--;
}
- while (!vk.Error() && !isKJVRef(vk)); */
+ while (!vk.popError() && !isKJVRef(vk)); */
//hack to replace above:
successive++;
vk -= successive;
Modified: trunk/utilities/vs2osisreftxt.cpp
===================================================================
--- trunk/utilities/vs2osisreftxt.cpp 2013-01-06 19:55:58 UTC (rev 2763)
+++ trunk/utilities/vs2osisreftxt.cpp 2013-01-19 16:19:47 UTC (rev 2764)
@@ -42,13 +42,13 @@
DefaultVSKey = "jas3:1";
- ListKey verses = DefaultVSKey.ParseVerseList(argv[1], DefaultVSKey, true);
+ ListKey verses = DefaultVSKey.parseVerseList(argv[1], DefaultVSKey, true);
std::cout << verses.getOSISRefRangeText() << "\n";
if (argc > 3) {
verses.setText(argv[3]);
- std::cout << "Verse is" << ((verses.Error()) ? " NOT" : "") << " in set.\n\n";
+ std::cout << "Verse is" << ((verses.popError()) ? " NOT" : "") << " in set.\n\n";
}
return 0;
More information about the sword-cvs
mailing list