[sword-svn] r3205 - in branches/sword-1-7-x: . src/modules/filters

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2014-04-30 19:31:28 -0700 (Wed, 30 Apr 2014)
New Revision: 3205

Modified:
   branches/sword-1-7-x/
   branches/sword-1-7-x/src/modules/filters/osisxhtml.cpp
   branches/sword-1-7-x/src/modules/filters/thmlxhtml.cpp
Log:
Merging r3203 - Remove spurious URL::encode.



Property changes on: branches/sword-1-7-x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:2989-2991,2997,3001-3004,3006,3010-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3135,3140,3144,3151,3153-3155,3190-3192,3198-3199,3202
   + /trunk:2989-2991,2997,3001-3004,3006,3010-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3135,3140,3144,3151,3153-3155,3190-3192,3198-3199,3202-3203

Modified: branches/sword-1-7-x/src/modules/filters/osisxhtml.cpp
===================================================================
--- branches/sword-1-7-x/src/modules/filters/osisxhtml.cpp	2014-05-01 02:30:58 UTC (rev 3204)
+++ branches/sword-1-7-x/src/modules/filters/osisxhtml.cpp	2014-05-01 02:31:28 UTC (rev 3205)
@@ -289,7 +289,7 @@
 								URL::encode(vkey->getText()).c_str(), 
 								ch,
 								ch, 
-								(renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : ""));
+								(renderNoteNumbers ? noteName.c_str() : ""));
 						}
 						else {
 							buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>",
@@ -299,7 +299,7 @@
 								URL::encode(u->key->getText()).c_str(),  
 								ch,
 								ch, 
-								(renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : ""));
+								(renderNoteNumbers ? noteName.c_str() : ""));
 						}
 					}
 				}

Modified: branches/sword-1-7-x/src/modules/filters/thmlxhtml.cpp
===================================================================
--- branches/sword-1-7-x/src/modules/filters/thmlxhtml.cpp	2014-05-01 02:30:58 UTC (rev 3204)
+++ branches/sword-1-7-x/src/modules/filters/thmlxhtml.cpp	2014-05-01 02:31:28 UTC (rev 3205)
@@ -230,7 +230,7 @@
 							URL::encode(vkey->getText()).c_str(), 
 							ch,
 							ch, 
-							(renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : ""));
+							(renderNoteNumbers ? noteName.c_str() : ""));
 					}
 					else {
 						char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
@@ -241,7 +241,7 @@
 							URL::encode(u->key->getText()).c_str(),  
 							ch,
 							ch, 
-							(renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : ""));
+							(renderNoteNumbers ? noteName.c_str() : ""));
 					}
 					u->suspendTextPassThru = true;
 				}
@@ -289,7 +289,7 @@
 							URL::encode(footnoteNumber.c_str()).c_str(), 
 							URL::encode(u->version.c_str()).c_str(),
 							URL::encode(vkey->getText()).c_str(), 
-							(renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : ""));
+							(renderNoteNumbers ? noteName.c_str() : ""));
 					}
 				}