[sword-svn] r2773 - in trunk: bindings bindings/corba/omniorbcpp bindings/java-jni/jni examples/classes examples/cmdline include src/modules tests utilities
scribe at crosswire.org
scribe at crosswire.org
Thu Jan 24 11:14:45 MST 2013
Author: scribe
Date: 2013-01-24 11:14:45 -0700 (Thu, 24 Jan 2013)
New Revision: 2773
Modified:
trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp
trunk/bindings/flatapi.cpp
trunk/bindings/java-jni/jni/swordstub.cpp
trunk/examples/classes/lastVerseInChapter.cpp
trunk/examples/cmdline/lookup.cpp
trunk/examples/cmdline/outplain.cpp
trunk/examples/cmdline/outrender.cpp
trunk/examples/cmdline/search.cpp
trunk/examples/cmdline/verserangeparse.cpp
trunk/include/stringmgr.h
trunk/include/swmodule.h
trunk/src/modules/swmodule.cpp
trunk/tests/osistest.cpp
trunk/tests/striptest.cpp
trunk/tests/webiftest.cpp
trunk/utilities/genbookutil.cpp
trunk/utilities/mod2imp.cpp
trunk/utilities/mod2osis.cpp
Log:
updated more deprecated warning, including 2 new methods missed in the first pass RenderText and StripText
Modified: trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp
===================================================================
--- trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp 2013-01-21 14:58:12 UTC (rev 2772)
+++ trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp 2013-01-24 18:14:45 UTC (rev 2773)
@@ -101,7 +101,7 @@
}
swordorb::StringList* swordorb_SWModule_i::getEntryAttribute(const char* level1, const char* level2, const char* level3, ::CORBA::Boolean filtered){
- delegate->RenderText(); // force parse
+ delegate->renderText(); // force parse
std::vector<SWBuf> results;
swordorb::StringList *retVal = new swordorb::StringList;
@@ -155,7 +155,7 @@
retVal->length(results.size());
for (int i = 0; i < results.size(); i++) {
if (filtered) {
- (*retVal)[i] = CORBA::string_dup(assureValidUTF8(delegate->RenderText(results[i].c_str())));
+ (*retVal)[i] = CORBA::string_dup(assureValidUTF8(delegate->renderText(results[i].c_str())));
}
else {
(*retVal)[i] = CORBA::string_dup(assureValidUTF8(results[i].c_str()));
@@ -324,11 +324,11 @@
}
char* swordorb_SWModule_i::getStripText(){
- return CORBA::string_dup(assureValidUTF8((char *)delegate->StripText()));
+ return CORBA::string_dup(assureValidUTF8((char *)delegate->stripText()));
}
char* swordorb_SWModule_i::getRenderText(){
- return CORBA::string_dup(assureValidUTF8((char *)delegate->RenderText()));
+ return CORBA::string_dup(assureValidUTF8((char *)delegate->renderText()));
}
char* swordorb_SWModule_i::getRawEntry(){
Modified: trunk/bindings/flatapi.cpp
===================================================================
--- trunk/bindings/flatapi.cpp 2013-01-21 14:58:12 UTC (rev 2772)
+++ trunk/bindings/flatapi.cpp 2013-01-24 18:14:45 UTC (rev 2773)
@@ -257,19 +257,19 @@
const char *SWModule_getStripText(SWHANDLE hmodule) {
SWModule *module = (SWModule *)hmodule;
- return (const char *)((module) ? module->StripText() : 0);
+ return (const char *)((module) ? module->stripText() : 0);
}
const char *SWModule_getRenderText(SWHANDLE hmodule) {
SWModule *module = (SWModule *)hmodule;
- return (const char *)((module) ? module->RenderText() : 0);
+ return (const char *)((module) ? module->renderText() : 0);
}
const char *SWModule_getEntryAttributes(SWHANDLE hmodule, const char *level1, const char *level2, const char *level3) {
SWModule *module = (SWModule *)hmodule;
static SWBuf retval;
- module->RenderText();
+ module->renderText();
retval = module->getEntryAttributes()[level1][level2][level3].c_str();
return (retval.length()) ? (const char*)retval.c_str() : NULL;
}
@@ -280,7 +280,7 @@
char buf[12];
sprintf(buf, "%i", pvHeading);
module->setKey(key);
- module->RenderText();
+ module->renderText();
preverseHeading = module->getEntryAttributes()["Heading"]["Preverse"][buf].c_str();
return (preverseHeading.length()) ? (const char*)preverseHeading.c_str() : NULL;
}
@@ -290,7 +290,7 @@
static SWBuf type;
module->popError();
module->setKey(key);
- module->RenderText();
+ module->renderText();
type = module->getEntryAttributes()["Footnote"][note]["type"].c_str();
return (type) ? (const char*)type.c_str() : NULL;
}
@@ -300,7 +300,7 @@
static SWBuf body;
module->popError();
module->setKey(key);
- module->RenderText();
+ module->renderText();
body = module->getEntryAttributes()["Footnote"][note]["body"].c_str();
SWKey *keybuf = module->getKey();;
module->renderFilter(body, keybuf);
@@ -312,7 +312,7 @@
static SWBuf refList;
module->popError();
module->setKey(key);
- module->RenderText();
+ module->renderText();
refList = module->getEntryAttributes()["Footnote"][note]["refList"].c_str();
return (refList) ? (const char*)refList.c_str() : NULL;
}
Modified: trunk/bindings/java-jni/jni/swordstub.cpp
===================================================================
--- trunk/bindings/java-jni/jni/swordstub.cpp 2013-01-21 14:58:12 UTC (rev 2772)
+++ trunk/bindings/java-jni/jni/swordstub.cpp 2013-01-24 18:14:45 UTC (rev 2773)
@@ -184,10 +184,10 @@
jobject modInfo = env->AllocObject(clazzModInfo);
jstring val;
- val = env->NewStringUTF(assureValidUTF8(module->Name())); env->SetObjectField(modInfo, nameID , val); env->DeleteLocalRef(val);
- val = env->NewStringUTF(assureValidUTF8(module->Description())); env->SetObjectField(modInfo, descID , val); env->DeleteLocalRef(val);
+ val = env->NewStringUTF(assureValidUTF8(module->getName())); env->SetObjectField(modInfo, nameID , val); env->DeleteLocalRef(val);
+ val = env->NewStringUTF(assureValidUTF8(module->getDescription())); env->SetObjectField(modInfo, descID , val); env->DeleteLocalRef(val);
val = env->NewStringUTF(assureValidUTF8(type.c_str())); env->SetObjectField(modInfo, catID , val); env->DeleteLocalRef(val);
- val = env->NewStringUTF(assureValidUTF8(module->Lang())); env->SetObjectField(modInfo, langID , val); env->DeleteLocalRef(val);
+ val = env->NewStringUTF(assureValidUTF8(module->getLanguage())); env->SetObjectField(modInfo, langID , val); env->DeleteLocalRef(val);
val = env->NewStringUTF(assureValidUTF8(version.c_str())); env->SetObjectField(modInfo, versionID, val); env->DeleteLocalRef(val);
val = env->NewStringUTF(assureValidUTF8("")); env->SetObjectField(modInfo, deltaID , val); env->DeleteLocalRef(val);
@@ -223,8 +223,8 @@
jfieldID fieldID;
jclass clazzSWModule = env->FindClass("org/crosswire/android/sword/SWModule");
retVal = env->AllocObject(clazzSWModule);
- fieldID = env->GetFieldID(clazzSWModule, "name", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->Name())));
- fieldID = env->GetFieldID(clazzSWModule, "description", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->Description())));
+ fieldID = env->GetFieldID(clazzSWModule, "name", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->getName())));
+ fieldID = env->GetFieldID(clazzSWModule, "description", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->getDescription())));
fieldID = env->GetFieldID(clazzSWModule, "category", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(type.c_str())));
}
return retVal;
@@ -499,7 +499,7 @@
if (module) {
const char *keyText = env->GetStringUTFChars(keyTextJS, NULL);
-SWLog::getSystemLog()->logDebug("setKeyText(%s, %s)", module->Name(), keyText);
+SWLog::getSystemLog()->logDebug("setKeyText(%s, %s)", module->getName(), keyText);
sword::SWKey *key = module->getKey();
sword::VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
if (vkey && (*keyText=='+' ||*keyText=='-')) {
@@ -515,7 +515,7 @@
}
}
- module->KeyText(keyText);
+ module->setKey(keyText);
env->ReleaseStringUTFChars(keyTextJS, keyText);
}
}
@@ -555,7 +555,7 @@
jstring retVal = 0;
if (module) {
- retVal = env->NewStringUTF(assureValidUTF8(module->RenderText()));
+ retVal = env->NewStringUTF(assureValidUTF8(module->renderText()));
}
return retVal;
}
@@ -633,7 +633,7 @@
if (module) {
- module->RenderText(); // force parse
+ module->renderText(); // force parse
vector<SWBuf> results;
sword::AttributeTypeList &entryAttribs = module->getEntryAttributes();
@@ -689,7 +689,7 @@
for (int i = 0; i < results.size(); i++) {
if (filtered) {
- env->SetObjectArrayElement(ret, i, env->NewStringUTF(assureValidUTF8(module->RenderText(results[i].c_str()))));
+ env->SetObjectArrayElement(ret, i, env->NewStringUTF(assureValidUTF8(module->renderText(results[i].c_str()))));
}
else {
env->SetObjectArrayElement(ret, i, env->NewStringUTF(assureValidUTF8(results[i].c_str())));
@@ -947,7 +947,7 @@
SWModule *module = getModule(env, me);
if (module) {
- retVal = module->StripText();
+ retVal = module->stripText();
}
return env->NewStringUTF(assureValidUTF8(retVal));
@@ -1160,7 +1160,7 @@
result.sort();
int i = 0;
- jstring modName = env->NewStringUTF(assureValidUTF8(module->Name()));
+ jstring modName = env->NewStringUTF(assureValidUTF8(module->getName()));
jfieldID fieldIDModName = env->GetFieldID(clazzSearchHit, "modName", "Ljava/lang/String;");
jfieldID fieldIDKey = env->GetFieldID(clazzSearchHit, "key" , "Ljava/lang/String;");
jfieldID fieldIDScore = env->GetFieldID(clazzSearchHit, "score" , "J");
@@ -1240,7 +1240,7 @@
return -2;
}
module = it->second;
- installMgr->removeModule(mgr, module->Name());
+ installMgr->removeModule(mgr, module->getName());
env->ReleaseStringUTFChars(modNameJS, modName);
@@ -1355,10 +1355,10 @@
jobject modInfo = env->AllocObject(clazzModInfo);
jstring val;
- val = env->NewStringUTF(assureValidUTF8(module->Name())); env->SetObjectField(modInfo, nameID , val); env->DeleteLocalRef(val);
- val = env->NewStringUTF(assureValidUTF8(module->Description())); env->SetObjectField(modInfo, descID , val); env->DeleteLocalRef(val);
+ val = env->NewStringUTF(assureValidUTF8(module->getName())); env->SetObjectField(modInfo, nameID , val); env->DeleteLocalRef(val);
+ val = env->NewStringUTF(assureValidUTF8(module->getDescription())); env->SetObjectField(modInfo, descID , val); env->DeleteLocalRef(val);
val = env->NewStringUTF(assureValidUTF8(type.c_str())); env->SetObjectField(modInfo, catID , val); env->DeleteLocalRef(val);
- val = env->NewStringUTF(assureValidUTF8(module->Lang())); env->SetObjectField(modInfo, langID , val); env->DeleteLocalRef(val);
+ val = env->NewStringUTF(assureValidUTF8(module->getLanguage())); env->SetObjectField(modInfo, langID , val); env->DeleteLocalRef(val);
val = env->NewStringUTF(assureValidUTF8(version.c_str())); env->SetObjectField(modInfo, versionID, val); env->DeleteLocalRef(val);
val = env->NewStringUTF(assureValidUTF8(statusString.c_str())); env->SetObjectField(modInfo, deltaID , val); env->DeleteLocalRef(val);
@@ -1407,7 +1407,7 @@
module = it->second;
- int error = installMgr->installModule(mgr, 0, module->Name(), is);
+ int error = installMgr->installModule(mgr, 0, module->getName(), is);
return error;
}
@@ -1448,8 +1448,8 @@
jfieldID fieldID;
jclass clazzSWModule = env->FindClass("org/crosswire/android/sword/SWModule");
retVal = env->AllocObject(clazzSWModule);
- fieldID = env->GetFieldID(clazzSWModule, "name", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->Name())));
- fieldID = env->GetFieldID(clazzSWModule, "description", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->Description())));
+ fieldID = env->GetFieldID(clazzSWModule, "name", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->getName())));
+ fieldID = env->GetFieldID(clazzSWModule, "description", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->getDescription())));
fieldID = env->GetFieldID(clazzSWModule, "category", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(type.c_str())));
fieldID = env->GetFieldID(clazzSWModule, "remoteSourceName", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, sourceNameJS);
}
Modified: trunk/examples/classes/lastVerseInChapter.cpp
===================================================================
--- trunk/examples/classes/lastVerseInChapter.cpp 2013-01-21 14:58:12 UTC (rev 2772)
+++ trunk/examples/classes/lastVerseInChapter.cpp 2013-01-24 18:14:45 UTC (rev 2773)
@@ -41,7 +41,7 @@
VerseKey *vk = (VerseKey *) book->getKey();
for (;!vk->popError();vk->setChapter(vk->getChapter()+1)) {
vk->setVerse(vk->getVerseMax());
- SWBuf text = book->StripText();
+ SWBuf text = book->stripText();
text = text.trim();
if (text.endsWith(",")) {
cout << vk->getText() << ":\n\n";
Modified: trunk/examples/cmdline/lookup.cpp
===================================================================
--- trunk/examples/cmdline/lookup.cpp 2013-01-21 14:58:12 UTC (rev 2772)
+++ trunk/examples/cmdline/lookup.cpp 2013-01-24 18:14:45 UTC (rev 2773)
@@ -82,7 +82,7 @@
target->setKey(argv[2]);
}
- target->RenderText(); // force an entry lookup to resolve key to something in the index
+ target->renderText(); // force an entry lookup to resolve key to something in the index
std::cout << "==Raw=Entry===============\n";
std::cout << target->getKeyText() << ":\n";
@@ -91,7 +91,7 @@
std::cout << "==Render=Entry============\n";
std::cout << target->getRenderHeader();
std::cout << "\n";
- std::cout << target->RenderText();
+ std::cout << target->renderText();
std::cout << "\n";
std::cout << "==========================\n";
std::cout << "Entry Attributes:\n\n";
Modified: trunk/examples/cmdline/outplain.cpp
===================================================================
--- trunk/examples/cmdline/outplain.cpp 2013-01-21 14:58:12 UTC (rev 2772)
+++ trunk/examples/cmdline/outplain.cpp 2013-01-24 18:14:45 UTC (rev 2773)
@@ -61,6 +61,6 @@
cout << "$$$";
if (vk) cout << vk->getOSISRef();
else cout << book.getKeyText();
- cout << "\n" << book.StripText() << "\n\n";
+ cout << "\n" << book.stripText() << "\n\n";
}
}
Modified: trunk/examples/cmdline/outrender.cpp
===================================================================
--- trunk/examples/cmdline/outrender.cpp 2013-01-21 14:58:12 UTC (rev 2772)
+++ trunk/examples/cmdline/outrender.cpp 2013-01-24 18:14:45 UTC (rev 2773)
@@ -47,6 +47,6 @@
cout << "$$$";
if (vk) cout << vk->getOSISRef();
else cout << book.getKeyText();
- cout << "\n" << book.RenderText() << "\n\n";
+ cout << "\n" << book.renderText() << "\n\n";
}
}
Modified: trunk/examples/cmdline/search.cpp
===================================================================
--- trunk/examples/cmdline/search.cpp 2013-01-21 14:58:12 UTC (rev 2772)
+++ trunk/examples/cmdline/search.cpp 2013-01-24 18:14:45 UTC (rev 2773)
@@ -100,7 +100,7 @@
VerseKey kjvParser;
if (!parser) parser = &kjvParser; // use standard KJV parsing as fallback
scope = parser->parseVerseList(argv[3], *parser, true);
- scope.setPersist(1);
+ scope.setPersist(true);
target->setKey(scope);
}
@@ -110,7 +110,7 @@
std::cerr << std::endl;
if (argc > 4) { // if min / max specified
scope = listkey;
- scope.setPersist(1);
+ scope.setPersist(true);
target->setKey(scope);
printed = 0;
std::cerr << " ";
Modified: trunk/examples/cmdline/verserangeparse.cpp
===================================================================
--- trunk/examples/cmdline/verserangeparse.cpp 2013-01-21 14:58:12 UTC (rev 2772)
+++ trunk/examples/cmdline/verserangeparse.cpp 2013-01-24 18:14:45 UTC (rev 2773)
@@ -64,7 +64,7 @@
// now let's iterate the book and display
for ((*book) = TOP; !book->popError(); (*book)++) {
- cout << "*** " << book->getKeyText() << ": " << book->RenderText() << "\n";
+ cout << "*** " << book->getKeyText() << ": " << book->renderText() << "\n";
}
// Since we've told our result key to persist in book, we can reuse our
Modified: trunk/include/stringmgr.h
===================================================================
--- trunk/include/stringmgr.h 2013-01-21 14:58:12 UTC (rev 2772)
+++ trunk/include/stringmgr.h 2013-01-24 18:14:45 UTC (rev 2773)
@@ -108,7 +108,7 @@
inline SWBuf &toupperstr(SWBuf &b) {
char *utf8 = 0;
stdstr(&utf8, b.c_str(), 2);
- toupperstr(utf8, strlen(utf8)*2);
+ toupperstr(utf8, (unsigned int)strlen(utf8)*2);
b = utf8;
delete [] utf8;
return b;
Modified: trunk/include/swmodule.h
===================================================================
--- trunk/include/swmodule.h 2013-01-21 14:58:12 UTC (rev 2772)
+++ trunk/include/swmodule.h 2013-01-24 18:14:45 UTC (rev 2773)
@@ -43,7 +43,7 @@
#define SEARCHFLAG_MATCHWHOLEENTRY 4096
#define SWMODULE_OPERATORS \
- operator const char *() { return RenderText(); } \
+ operator const char *() { return renderText(); } \
operator SWKey &() { return *getKey(); } \
operator SWKey *() { return getKey(); } \
SWModule &operator <<(const char *inbuf) { setEntry(inbuf); return *this; } \
@@ -405,7 +405,7 @@
*/
virtual SWBuf &getRawEntryBuf() const = 0;
- virtual const char *getRawEntry() { return getRawEntryBuf().c_str(); }
+ const char *getRawEntry() const { return getRawEntryBuf().c_str(); }
// write interface ----------------------------
/** Is the module writable? :)
@@ -648,7 +648,8 @@
* @param len max len to process
* @return result buffer
*/
- virtual const char *StripText(const char *buf = 0, int len = -1);
+ virtual const char *stripText(const char *buf = 0, int len = -1);
+ SWDEPRECATED const char *StripText(const char *buf = 0, int len = -1) { return stripText(buf, len); }
/** Produces renderable text of the current module entry or supplied text
*
@@ -658,7 +659,8 @@
* @param render for internal use
* @return result buffer
*/
- virtual const char *RenderText(const char *buf = 0, int len = -1, bool render = true);
+ virtual const char *renderText(const char *buf = 0, int len = -1, bool render = true);
+ SWDEPRECATED const char *RenderText(const char *buf = 0, int len = -1, bool render = true) { return renderText(buf, len, render); }
/** Produces any header data which might be useful which associated with the
* processing done with this filter. A typical example is a suggested
@@ -670,13 +672,13 @@
* @param tmpKey desired module entry
* @return result buffer
*/
- virtual const char *StripText(const SWKey *tmpKey);
+ virtual const char *stripText(const SWKey *tmpKey);
/** Produces renderable text of the module entry at the supplied key
* @param tmpKey key to use to grab text
* @return this module's text at specified key location massaged by Render filters
*/
- virtual const char *RenderText(const SWKey *tmpKey);
+ virtual const char *renderText(const SWKey *tmpKey);
/** Whether or not to only hit one entry when iterating encounters
* consecutive links when iterating
Modified: trunk/src/modules/swmodule.cpp
===================================================================
--- trunk/src/modules/swmodule.cpp 2013-01-21 14:58:12 UTC (rev 2772)
+++ trunk/src/modules/swmodule.cpp 2013-01-24 18:14:45 UTC (rev 2773)
@@ -559,7 +559,7 @@
#endif
}
if (searchType >= 0) {
- if (!regexec(&preg, StripText(), 0, 0, 0)) {
+ if (!regexec(&preg, stripText(), 0, 0, 0)) {
*resultKey = *getKey();
resultKey->clearBound();
listKey << *resultKey;
@@ -573,10 +573,10 @@
// phrase
case -1:
- textBuf = StripText();
+ textBuf = stripText();
if ((flags & REG_ICASE) == REG_ICASE) toupperstr(textBuf);
sres = strstr(textBuf.c_str(), term.c_str());
- if (sres) { //it's also in the StripText(), so we have a valid search result item now
+ if (sres) { //it's also in the stripText(), so we have a valid search result item now
*resultKey = *getKey();
resultKey->clearBound();
listKey << *resultKey;
@@ -588,7 +588,7 @@
int loopCount = 0;
unsigned int foundWords = 0;
do {
- textBuf = ((loopCount == 0)&&(!specialStrips)) ? getRawEntry() : StripText();
+ textBuf = ((loopCount == 0)&&(!specialStrips)) ? getRawEntry() : stripText();
foundWords = 0;
for (unsigned int i = 0; i < words.size(); i++) {
@@ -613,7 +613,7 @@
// entry attributes
case -3: {
- RenderText(); // force parse
+ renderText(); // force parse
AttributeTypeList &entryAttribs = getEntryAttributes();
AttributeTypeList::iterator i1Start, i1End;
AttributeList::iterator i2Start, i2End;
@@ -766,7 +766,7 @@
/******************************************************************************
- * SWModule::StripText() - calls all stripfilters on current text
+ * SWModule::stripText() - calls all stripfilters on current text
*
* ENT: buf - buf to massage instead of this modules current text
* len - max len of buf
@@ -774,8 +774,8 @@
* RET: this module's text at current key location massaged by Strip filters
*/
-const char *SWModule::StripText(const char *buf, int len) {
- return RenderText(buf, len, false);
+const char *SWModule::stripText(const char *buf, int len) {
+ return renderText(buf, len, false);
}
@@ -794,14 +794,14 @@
/******************************************************************************
- * SWModule::RenderText - calls all renderfilters on current text
+ * SWModule::renderText - calls all renderfilters on current text
*
* ENT: buf - buffer to Render instead of current module position
*
- * RET: this module's text at current key location massaged by RenderText filters
+ * RET: this module's text at current key location massaged by renderText filters
*/
- const char *SWModule::RenderText(const char *buf, int len, bool render) {
+ const char *SWModule::renderText(const char *buf, int len, bool render) {
bool savePEA = isProcessEntryAttributes();
if (!buf) {
entryAttributes.clear();
@@ -843,14 +843,14 @@
/******************************************************************************
- * SWModule::RenderText - calls all renderfilters on current text
+ * SWModule::renderText - calls all renderfilters on current text
*
* ENT: tmpKey - key to use to grab text
*
* RET: this module's text at current key location massaged by RenderFilers
*/
- const char *SWModule::RenderText(const SWKey *tmpKey) {
+ const char *SWModule::renderText(const SWKey *tmpKey) {
SWKey *saveKey;
const char *retVal;
@@ -862,7 +862,7 @@
setKey(*tmpKey);
- retVal = RenderText();
+ retVal = renderText();
setKey(*saveKey);
@@ -874,14 +874,14 @@
/******************************************************************************
- * SWModule::StripText - calls all StripTextFilters on current text
+ * SWModule::stripText - calls all StripTextFilters on current text
*
* ENT: tmpKey - key to use to grab text
*
* RET: this module's text at specified key location massaged by Strip filters
*/
-const char *SWModule::StripText(const SWKey *tmpKey) {
+const char *SWModule::stripText(const SWKey *tmpKey) {
SWKey *saveKey;
const char *retVal;
@@ -893,7 +893,7 @@
setKey(*tmpKey);
- retVal = StripText();
+ retVal = stripText();
setKey(*saveKey);
@@ -1051,7 +1051,7 @@
}
// get "content" field
- const char *content = StripText();
+ const char *content = stripText();
bool good = false;
@@ -1135,7 +1135,7 @@
//printf("building proxBuf from (%s).\nproxBuf.c_str(): %s\n", (const char *)*key, proxBuf.c_str());
//printf("building proxBuf from (%s).\n", (const char *)*key);
- content = StripText();
+ content = stripText();
if (content && *content) {
// build "strong" field
strong = "";
@@ -1200,7 +1200,7 @@
//printf("building proxBuf from (%s).\n", (const char *)*key);
//fflush(stdout);
- content = StripText();
+ content = stripText();
if (content && *content) {
// build "strong" field
strong = "";
Modified: trunk/tests/osistest.cpp
===================================================================
--- trunk/tests/osistest.cpp 2013-01-21 14:58:12 UTC (rev 2772)
+++ trunk/tests/osistest.cpp 2013-01-24 18:14:45 UTC (rev 2773)
@@ -10,7 +10,7 @@
void outputCurrentVerse(SWModule *module) {
- module->RenderText();
+ module->renderText();
cout << "Key:\n";
cout << module->getKeyText() << "\n";
@@ -21,13 +21,13 @@
cout << header << endl;
cout << "-------\n";
cout << "Rendered Header:\n";
- cout << module->RenderText(header) << endl;
+ cout << module->renderText(header) << endl;
cout << "-------\n";
cout << "CSS:\n";
cout << module->getRenderHeader() << endl;
cout << "-------\n";
cout << "RenderText:\n";
- cout << module->RenderText() << endl;
+ cout << module->renderText() << endl;
cout << "-------\n";
cout << "-------\n\n";
}
Modified: trunk/tests/striptest.cpp
===================================================================
--- trunk/tests/striptest.cpp 2013-01-21 14:58:12 UTC (rev 2772)
+++ trunk/tests/striptest.cpp 2013-01-24 18:14:45 UTC (rev 2773)
@@ -20,13 +20,13 @@
library.setGlobalOption(*it, "Off");
}
book->setKey(keyText.c_str());
- SWBuf entryStripped = book->StripText();
+ SWBuf entryStripped = book->stripText();
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";
- cout << "Search Target StripText: " << book->StripText(searchText) << "\n";
- cout << "Found: " << ((strstr(entryStripped.c_str(), book->StripText(searchText))) ? "true":"false") << endl;
+ cout << "Search Target StripText: " << book->stripText(searchText) << "\n";
+ cout << "Found: " << ((strstr(entryStripped.c_str(), book->stripText(searchText))) ? "true":"false") << endl;
return 0;
}
Modified: trunk/tests/webiftest.cpp
===================================================================
--- trunk/tests/webiftest.cpp 2013-01-21 14:58:12 UTC (rev 2772)
+++ trunk/tests/webiftest.cpp 2013-01-24 18:14:45 UTC (rev 2773)
@@ -53,7 +53,7 @@
module = mgr.Modules.begin()->second;
}
module->setKey(keyName);
- std::cout << module->RenderText() << std::endl<< std::endl<< std::endl;
+ std::cout << module->renderText() << std::endl<< std::endl<< std::endl;
//------------------------
@@ -66,7 +66,7 @@
}
module->setKey(keyName);
- std::cout << module->RenderText() << std::endl;
+ std::cout << module->renderText() << std::endl;
return 0;
}
Modified: trunk/utilities/genbookutil.cpp
===================================================================
--- trunk/utilities/genbookutil.cpp 2013-01-21 14:58:12 UTC (rev 2772)
+++ trunk/utilities/genbookutil.cpp 2013-01-24 18:14:45 UTC (rev 2773)
@@ -82,7 +82,7 @@
void viewEntryText(RawGenBook *book) {
std::cout << "\n";
- std::cout << book->RenderText();
+ std::cout << book->renderText();
std::cout << "\n";
}
Modified: trunk/utilities/mod2imp.cpp
===================================================================
--- trunk/utilities/mod2imp.cpp 2013-01-21 14:58:12 UTC (rev 2772)
+++ trunk/utilities/mod2imp.cpp 2013-01-24 18:14:45 UTC (rev 2773)
@@ -111,7 +111,7 @@
for ((*module) = TOP; !module->popError(); (*module)++) {
std::cout << "$$$" << module->getKeyText() << std::endl;
- std::cout << ((render) ? module->RenderText() : (strip) ? module->StripText() : module->getRawEntry()) << "\n";
+ std::cout << ((render) ? module->renderText() : (strip) ? module->stripText() : module->getRawEntry()) << "\n";
}
cout << endl;
Modified: trunk/utilities/mod2osis.cpp
===================================================================
--- trunk/utilities/mod2osis.cpp 2013-01-21 14:58:12 UTC (rev 2772)
+++ trunk/utilities/mod2osis.cpp 2013-01-24 18:14:45 UTC (rev 2773)
@@ -172,7 +172,7 @@
bool newTest = false;
bool newBook = false;
- if (!strlen(inModule->RenderText())) {
+ if (!strlen(inModule->renderText())) {
continue;
}
More information about the sword-cvs
mailing list