[sword-svn] r453 - trunk/webapp

[scribe at crosswire.org]

Author: scribe
Date: 2018-08-20 10:42:00 -0700 (Mon, 20 Aug 2018)
New Revision: 453

Modified:
   trunk/webapp/fetchdata.jsp
Log:
updated to actually work with format=plain, now that we're using getRawEntry() + filter


Modified: trunk/webapp/fetchdata.jsp
===================================================================
--- trunk/webapp/fetchdata.jsp	2018-07-27 10:10:18 UTC (rev 452)
+++ trunk/webapp/fetchdata.jsp	2018-08-20 17:42:00 UTC (rev 453)
@@ -447,7 +447,20 @@
 								else if ("plain".equals(format)) {
 									String raw = book.getRawEntry();
 // assume our modules are OSIS for now (should change output format of mgr or have a second mgr for this one.
+//
+// TODO: this doesn't work, but should.  Find out why this crashes
+//									raw = mgr.filterText("Strong's Numbers", raw);
+//									raw = mgr.filterText("Morphological Tags", raw);
+//
 									raw = mgr.filterText("OSISPlain", raw);
+									raw = raw.replaceAll("\\([^)]*\\)", "");
+									raw = raw.replaceAll("\\<[^>]*\\>", "");
+									raw = raw.replaceAll("  ", " ");
+									raw = raw.replaceAll("  ", " ");
+									raw = raw.replaceAll("  ", " ");
+									raw = raw.replaceAll("  ", " ");
+									raw = raw.replaceAll("  ", " ");
+									
 %>
 <%= raw %>
 <%