[sword-cvs] sword/src/modules/filters cipherfil.cpp,1.19,1.20 gbfhtml.cpp,1.28,1.29 gbfhtmlhref.cpp,1.19,1.20 gbfwebif.cpp,1.5,1.6 osishtmlhref.cpp,1.13,1.14 osisplain.cpp,1.12,1.13 osisrtf.cpp,1.23,1.24 swbasicfilter.cpp,1.31,1.32 thmlhtml.cpp,1.29,1.30 thmlhtmlhref.cpp,1.36,1.37 thmlrtf.cpp,1.36,1.37 thmlwebif.cpp,1.7,1.8
sword@www.crosswire.org
sword@www.crosswire.org
Mon, 11 Aug 2003 22:36:34 -0700
- Previous message: [sword-cvs] sword/include gbfhtml.h,1.13,1.14 gbfhtmlhref.h,1.6,1.7 gbfwebif.h,1.4,1.5 osishtmlhref.h,1.5,1.6 osisplain.h,1.9,1.10 osisrtf.h,1.9,1.10 swbasicfilter.h,1.21,1.22 swbuf.h,1.23,1.24 thmlhtml.h,1.11,1.12 thmlhtmlhref.h,1.6,1.7 thmlrtf.h,1.10,1.11 thmlwebif.h,1.4,1.5 zstr.h,1.7,1.8 zverse.h,1.13,1.14
- Next message: [sword-cvs] sword/src/modules/common zstr.cpp,1.22,1.23 zverse.cpp,1.32,1.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /usr/local/cvsroot/sword/src/modules/filters
In directory www:/tmp/cvs-serv1419/src/modules/filters
Modified Files:
cipherfil.cpp gbfhtml.cpp gbfhtmlhref.cpp gbfwebif.cpp
osishtmlhref.cpp osisplain.cpp osisrtf.cpp swbasicfilter.cpp
thmlhtml.cpp thmlhtmlhref.cpp thmlrtf.cpp thmlwebif.cpp
Log Message:
no message
Index: cipherfil.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/cipherfil.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- cipherfil.cpp 27 Jun 2003 06:13:16 -0000 1.19
+++ cipherfil.cpp 12 Aug 2003 05:36:30 -0000 1.20
@@ -26,7 +26,7 @@
char CipherFilter::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
if (text.length() > 2) { //check if it's large enough to substract 2 in the next step.
- unsigned int len = text.length() - 2;
+ unsigned int len = text.length();
if (!key) { // hack, using key to determine encipher, or decipher
cipher->cipherBuf(&len, text); //set buffer to enciphered text
//memcpy(text, cipher->Buf(), (len < (unsigned int)(maxlen)) ? len : maxlen);
Index: gbfhtml.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/gbfhtml.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- gbfhtml.cpp 7 Aug 2003 23:23:32 -0000 1.28
+++ gbfhtml.cpp 12 Aug 2003 05:36:30 -0000 1.29
@@ -58,7 +58,7 @@
}
-bool GBFHTML::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
+bool GBFHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
const char *tok;
char val[128];
char *valto;
Index: gbfhtmlhref.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/gbfhtmlhref.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- gbfhtmlhref.cpp 7 Aug 2003 23:23:32 -0000 1.19
+++ gbfhtmlhref.cpp 12 Aug 2003 05:36:30 -0000 1.20
@@ -58,7 +58,7 @@
}
-bool GBFHTMLHREF::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
+bool GBFHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
const char *tok;
char val[128];
char *valto;
Index: gbfwebif.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/gbfwebif.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gbfwebif.cpp 7 Aug 2003 23:23:32 -0000 1.5
+++ gbfwebif.cpp 12 Aug 2003 05:36:30 -0000 1.6
@@ -25,7 +25,7 @@
//all is done in GBFHTMLHREF since it inherits form this class
}
-bool GBFWEBIF::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
+bool GBFWEBIF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
const char *tok;
char val[128];
char *valto;
Index: osishtmlhref.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/osishtmlhref.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- osishtmlhref.cpp 7 Aug 2003 23:23:32 -0000 1.13
+++ osishtmlhref.cpp 12 Aug 2003 05:36:30 -0000 1.14
@@ -23,7 +23,7 @@
SWORD_NAMESPACE_START
-OSISHTMLHref::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : SWFilterUserData(module, key) {
+OSISHTMLHref::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false")));
}
@@ -47,7 +47,7 @@
setTokenCaseSensitive(true);
}
-bool OSISHTMLHref::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
+bool OSISHTMLHref::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
// manually process if it wasn't a simple substitution
if (!substituteToken(buf, token)) {
MyUserData *u = (MyUserData *)userData;
Index: osisplain.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisplain.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- osisplain.cpp 7 Aug 2003 23:23:32 -0000 1.12
+++ osisplain.cpp 12 Aug 2003 05:36:30 -0000 1.13
@@ -47,7 +47,7 @@
}
-bool OSISPlain::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
+bool OSISPlain::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
// manually process if it wasn't a simple substitution
if (!substituteToken(buf, token)) {
MyUserData *u = (MyUserData *)userData;
Index: osisrtf.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisrtf.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- osisrtf.cpp 8 Aug 2003 06:58:22 -0000 1.23
+++ osisrtf.cpp 12 Aug 2003 05:36:30 -0000 1.24
@@ -23,7 +23,7 @@
SWORD_NAMESPACE_START
-OSISRTF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : SWFilterUserData(module, key) {
+OSISRTF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false")));
}
@@ -48,7 +48,7 @@
}
-bool OSISRTF::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
+bool OSISRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
// manually process if it wasn't a simple substitution
if (!substituteToken(buf, token)) {
MyUserData *u = (MyUserData *)userData;
Index: swbasicfilter.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/swbasicfilter.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- swbasicfilter.cpp 7 Aug 2003 23:23:32 -0000 1.31
+++ swbasicfilter.cpp 12 Aug 2003 05:36:30 -0000 1.32
@@ -169,12 +169,12 @@
}
-bool SWBasicFilter::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
+bool SWBasicFilter::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
return substituteToken(buf, token);
}
-bool SWBasicFilter::handleEscapeString(SWBuf &buf, const char *escString, SWFilterUserData *userData) {
+bool SWBasicFilter::handleEscapeString(SWBuf &buf, const char *escString, BasicFilterUserData *userData) {
return substituteEscapeString(buf, escString);
}
@@ -212,7 +212,7 @@
char escStartPos = 0, escEndPos = 0;
char tokenStartPos = 0, tokenEndPos = 0;
SWBuf lastTextNode;
- SWFilterUserData *userData = createUserData(module, key);
+ BasicFilterUserData *userData = createUserData(module, key);
SWBuf orig = text;
from = orig.getRawData();
Index: thmlhtml.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlhtml.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- thmlhtml.cpp 7 Aug 2003 23:23:32 -0000 1.29
+++ thmlhtml.cpp 12 Aug 2003 05:36:30 -0000 1.30
@@ -134,7 +134,7 @@
}
-bool ThMLHTML::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
+bool ThMLHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
MyUserData *u = (MyUserData *)userData;
XMLTag tag(token);
Index: thmlhtmlhref.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlhtmlhref.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- thmlhtmlhref.cpp 7 Aug 2003 23:23:32 -0000 1.36
+++ thmlhtmlhref.cpp 12 Aug 2003 05:36:30 -0000 1.37
@@ -135,7 +135,7 @@
}
-bool ThMLHTMLHREF::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
+bool ThMLHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
const char *tok;
if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
MyUserData *u = (MyUserData *)userData;
Index: thmlrtf.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlrtf.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- thmlrtf.cpp 7 Aug 2003 23:23:32 -0000 1.36
+++ thmlrtf.cpp 12 Aug 2003 05:36:30 -0000 1.37
@@ -170,7 +170,7 @@
return 0;
}
-bool ThMLRTF::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
+bool ThMLRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
MyUserData *u = (MyUserData *)userData;
if (!substituteToken(buf, token)) {
// manually process if it wasn't a simple substitution
Index: thmlwebif.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlwebif.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- thmlwebif.cpp 7 Aug 2003 23:23:32 -0000 1.7
+++ thmlwebif.cpp 12 Aug 2003 05:36:30 -0000 1.8
@@ -26,7 +26,7 @@
//all's done in ThMLHTMLHREF
}
-bool ThMLWEBIF::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
+bool ThMLWEBIF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
const char *tok;
if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
- Previous message: [sword-cvs] sword/include gbfhtml.h,1.13,1.14 gbfhtmlhref.h,1.6,1.7 gbfwebif.h,1.4,1.5 osishtmlhref.h,1.5,1.6 osisplain.h,1.9,1.10 osisrtf.h,1.9,1.10 swbasicfilter.h,1.21,1.22 swbuf.h,1.23,1.24 thmlhtml.h,1.11,1.12 thmlhtmlhref.h,1.6,1.7 thmlrtf.h,1.10,1.11 thmlwebif.h,1.4,1.5 zstr.h,1.7,1.8 zverse.h,1.13,1.14
- Next message: [sword-cvs] sword/src/modules/common zstr.cpp,1.22,1.23 zverse.cpp,1.32,1.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]