[sword-cvs] sword/src/modules/filters gbfwebif.cpp,1.7,1.8 osiswebif.cpp,1.2,1.3 thmlwebif.cpp,1.8,1.9

[sword@www.crosswire.org]

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

Modified Files:
	gbfwebif.cpp osiswebif.cpp thmlwebif.cpp 
Log Message:
Changed WEBIF stuff to not use key, but showStrong and showMorph


Index: gbfwebif.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/gbfwebif.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gbfwebif.cpp	24 Oct 2003 02:43:46 -0000	1.7
+++ gbfwebif.cpp	29 Oct 2003 08:46:14 -0000	1.8
@@ -51,7 +51,7 @@
 					for (tok = val; *tok; tok++) {
 						url += *tok;
 					}
-					buf.appendFormatted("<a href=\"%s?key=%s\">", passageStudyURL.c_str(), encodeURL(url).c_str());
+					buf.appendFormatted("<a href=\"%s?showStrong=%s\">", passageStudyURL.c_str(), encodeURL(url).c_str());
 
 					for (tok = (!isdigit(*val))?val+1:val; *tok; tok++) {
 						buf += *tok;
@@ -71,7 +71,7 @@
 				// normal robinsons tense
 					buf += *tok;
 				}
-				buf.appendFormatted("<a href=\"%s?key=%s\">", passageStudyURL.c_str(), encodeURL(url).c_str());
+				buf.appendFormatted("<a href=\"%s?showMorph=%s\">", passageStudyURL.c_str(), encodeURL(url).c_str());
 
 				for (tok = val; *tok; tok++) {
 					buf += *tok;
@@ -87,7 +87,7 @@
 			for (tok = token+1; *tok; tok++) {
 				url += *tok;
 			}
-			buf.appendFormatted("<a href=\"%s?key=%s\">", passageStudyURL.c_str(), encodeURL(url).c_str());
+			buf.appendFormatted("<a href=\"%s?showStrong=%s\">", passageStudyURL.c_str(), encodeURL(url).c_str());
 
 			for (tok = token + 2; *tok; tok++) {
 				buf += *tok;
@@ -102,7 +102,7 @@
 				if(*tok != '\"')
 					url += *tok;
 			}
-			buf.appendFormatted("<a href=\"%s?key=%s\">", passageStudyURL.c_str(), encodeURL(url).c_str());
+			buf.appendFormatted("<a href=\"%s?showStrong=%s\">", passageStudyURL.c_str(), encodeURL(url).c_str());
 
 			for (tok = token + 3; *tok; tok++)
 				if(*tok != '\"')
@@ -116,7 +116,7 @@
 				if(*tok != '\"')
 					buf += *tok;
 			}
-			buf.appendFormatted("<a href=\"%s?key=%s\">", passageStudyURL.c_str(), encodeURL(url).c_str());
+			buf.appendFormatted("<a href=\"%s?showMorph=%s\">", passageStudyURL.c_str(), encodeURL(url).c_str());
 
 			for (tok = token + 2; *tok; tok++) {
 				if(*tok != '\"')
@@ -136,7 +136,7 @@
 			  }
 			}
 
-			buf.appendFormatted("a href=\"%s?key=%s\">", passageStudyURL.c_str(), encodeURL(url).c_str());
+			buf.appendFormatted("a href=\"%s?key=%s#cv\">", passageStudyURL.c_str(), encodeURL(url).c_str());
 		}
 
 		else {

Index: osiswebif.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/osiswebif.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- osiswebif.cpp	24 Oct 2003 02:51:56 -0000	1.2
+++ osiswebif.cpp	29 Oct 2003 08:46:14 -0000	1.3
@@ -80,7 +80,7 @@
 							val2++;
 						if ((!strcmp(val2, "3588")) && (lastText.length() < 1))
 							show = false;
-						else	buf.appendFormatted(" <small><em>&lt;<a href=\"%s?key=%s\">%s</a>&gt;</em></small> ", passageStudyURL.c_str(), encodeURL(val2).c_str(), val2);
+						else	buf.appendFormatted(" <small><em>&lt;<a href=\"%s?showStrong=%s\">%s</a>&gt;</em></small> ", passageStudyURL.c_str(), encodeURL(val2).c_str(), val2);
 					} while (++i < count);
 				}
 				if ((attrib = tag.getAttribute("morph")) && (show)) {
@@ -98,7 +98,7 @@
 							const char *val2 = val;
 							if ((*val == 'T') && (strchr("GH", val[1])) && (isdigit(val[2])))
 								val2+=2;
-							buf.appendFormatted(" <small><em>(<a href=\"%s?key=%s\">%s</a>)</em></small> ", passageStudyURL.c_str(), encodeURL(val2).c_str(), val2);
+							buf.appendFormatted(" <small><em>(<a href=\"%s?showMorph=%s\">%s</a>)</em></small> ", passageStudyURL.c_str(), encodeURL(val2).c_str(), val2);
 						} while (++i < count);
 					}
 				}

Index: thmlwebif.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlwebif.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- thmlwebif.cpp	12 Aug 2003 05:36:30 -0000	1.8
+++ thmlwebif.cpp	29 Oct 2003 08:46:14 -0000	1.9
@@ -49,7 +49,7 @@
 				buf += "<small><em> &lt;";
 			}
 
-			buf.appendFormatted("<a href=\"%s?key=%s\">", passageStudyURL.c_str(), encodeURL(url).c_str() );
+			buf.appendFormatted("<a href=\"%s?showStrong=%s\">", passageStudyURL.c_str(), encodeURL(url).c_str() );
 			buf += value;
 			buf += "</a>";