[sword-svn] r2026 - trunk/src/modules/filters

[tbiggs at www.crosswire.org]

Author: tbiggs
Date: 2007-02-01 09:24:04 -0700 (Thu, 01 Feb 2007)
New Revision: 2026

Modified:
   trunk/src/modules/filters/osishtmlhref.cpp
   trunk/src/modules/filters/thmlhtmlhref.cpp
Log:
patch osishtmlhref.cpp and thmlhtmlhref.cpp to handle footnotes in genbooks

Modified: trunk/src/modules/filters/osishtmlhref.cpp
===================================================================
--- trunk/src/modules/filters/osishtmlhref.cpp	2006-12-10 20:47:13 UTC (rev 2025)
+++ trunk/src/modules/filters/osishtmlhref.cpp	2007-02-01 16:24:04 UTC (rev 2026)
@@ -218,6 +218,15 @@
 								URL::encode(vkey->getText()).c_str(), 
 								ch);
 						}
+						else {
+							char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
+							buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup>*%c</sup></small></a> ", 
+							ch, 
+							URL::encode(footnoteNumber.c_str()).c_str(), 
+							URL::encode(u->version.c_str()).c_str(), 
+							URL::encode(u->key->getText()).c_str(),  
+							ch);
+						}
 					}
 				}
 				u->suspendTextPassThru = (++u->suspendLevel);

Modified: trunk/src/modules/filters/thmlhtmlhref.cpp
===================================================================
--- trunk/src/modules/filters/thmlhtmlhref.cpp	2006-12-10 20:47:13 UTC (rev 2025)
+++ trunk/src/modules/filters/thmlhtmlhref.cpp	2007-02-01 16:24:04 UTC (rev 2026)
@@ -13,7 +13,6 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-
 #include <stdlib.h>
 #include <thmlhtmlhref.h>
 #include <swmodule.h>
@@ -215,6 +214,15 @@
 							URL::encode(vkey->getText()).c_str(), 
 							ch);
 					}
+					else {
+						char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
+						buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup>*%c</sup></small></a> ", 
+							ch, 
+							URL::encode(footnoteNumber.c_str()).c_str(), 
+							URL::encode(u->version.c_str()).c_str(), 
+							URL::encode(u->key->getText()).c_str(),  
+							ch);
+					}
 					u->suspendTextPassThru = true;
 				}
 			}