[sword-cvs] sword/src/modules/filters osisplain.cpp,1.9,1.10 osisrtf.cpp,1.18,1.19 swbasicfilter.cpp,1.27,1.28

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/src/modules/filters
In directory www:/tmp/cvs-serv27036/src/modules/filters

Modified Files:
	osisplain.cpp osisrtf.cpp swbasicfilter.cpp 
Log Message:


Index: osisplain.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisplain.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- osisplain.cpp	30 Jul 2003 01:32:20 -0000	1.9
+++ osisplain.cpp	30 Jul 2003 02:03:45 -0000	1.10
@@ -48,15 +48,14 @@
 }
 
 
-bool OSISPlain::processStage(char stage, SWBuf &text, const char *&from, UserData *userData) {
+bool OSISPlain::processStage(char stage, SWBuf &text, char *&from, UserData *userData) {
 	switch (stage) {
 	PRECHAR:
 		if ((strchr(" \t\n\r", *from))) {
 			while (*(from+1) && (strchr(" \t\n\r", *(from+1)))) {
 				from++;
 			}
-			text += " ";
-			return true;
+			*from = ' ';
 		}
 	}
 	return false;

Index: osisrtf.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisrtf.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- osisrtf.cpp	30 Jul 2003 01:32:20 -0000	1.18
+++ osisrtf.cpp	30 Jul 2003 02:03:45 -0000	1.19
@@ -49,15 +49,14 @@
 }
 
 
-bool OSISRTF::processStage(char stage, SWBuf &text, const char *&from, UserData *userData) {
+bool OSISRTF::processStage(char stage, SWBuf &text, char *&from, UserData *userData) {
 	switch (stage) {
 	PRECHAR:
 		if ((strchr(" \t\n\r", *from))) {
 			while (*(from+1) && (strchr(" \t\n\r", *(from+1)))) {
 				from++;
 			}
-			text += " ";
-			return true;
+			*from = ' ';
 		}
 	}
 	return false;

Index: swbasicfilter.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/swbasicfilter.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- swbasicfilter.cpp	30 Jul 2003 01:32:20 -0000	1.27
+++ swbasicfilter.cpp	30 Jul 2003 02:03:45 -0000	1.28
@@ -204,7 +204,7 @@
 
 
 char SWBasicFilter::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-        const char *from;
+        char *from;
         char token[4096];
 	int tokpos = 0;
 	bool intoken = false;
@@ -215,7 +215,7 @@
 	UserData *userData = createUserData(module, key);
 
 	SWBuf orig = text;
-	from = orig.c_str();
+	from = orig.getRawData();
 	text = "";
 
 	if (processStages & INITIALIZE) {