[sword-svn] r245 - trunk/webapp

[scribe at crosswire.org]

Author: scribe
Date: 2006-04-21 23:48:15 -0700 (Fri, 21 Apr 2006)
New Revision: 245

Modified:
   trunk/webapp/bookdisplay.jsp
   trunk/webapp/index.jsp
   trunk/webapp/parallelstudy.jsp
Log:
added del=all to parallel, changed "Palm" to "PDA", and added filtering for preverse headers


Modified: trunk/webapp/bookdisplay.jsp
===================================================================
--- trunk/webapp/bookdisplay.jsp	2006-01-30 04:22:11 UTC (rev 244)
+++ trunk/webapp/bookdisplay.jsp	2006-04-22 06:48:15 UTC (rev 245)
@@ -145,7 +145,7 @@
 								String k = parent + "/" + children[i];
 								module.setKeyText(k);
 								k = module.getKeyText();
-								String[] heads = module.getEntryAttribute("Heading", "Preverse", "0");
+								String[] heads = module.getEntryAttribute("Heading", "Preverse", "0", true);
 								if (heads.length > 0) {
 			%>
 					<tr><td colspan="2"><div <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (k.equals(gbsEntry)) ? "currentverse" : "verse" %>">

Modified: trunk/webapp/index.jsp
===================================================================
--- trunk/webapp/index.jsp	2006-01-30 04:22:11 UTC (rev 244)
+++ trunk/webapp/index.jsp	2006-04-22 06:48:15 UTC (rev 245)
@@ -88,7 +88,7 @@
 	</p>
 
 	<h2><t:t>DOWNLOADS</t:t></h2>
-	<p><t:t>We offer a number of free Bible software downloads for Windows, Mac, Linux and Palm produced by CrossWire Bible Society. </t:t><a href="index.jsp?section=downloads"><t:t>Learn More...</t:t></a>
+	<p><t:t>We offer a number of free Bible software downloads for Windows, Mac, Linux, and PDAs, produced by CrossWire Bible Society. </t:t><a href="index.jsp?section=downloads"><t:t>Learn More...</t:t></a>
 	</p>
 
 	<h2><t:t>UPLOAD TEXTS</t:t></h2>

Modified: trunk/webapp/parallelstudy.jsp
===================================================================
--- trunk/webapp/parallelstudy.jsp	2006-01-30 04:22:11 UTC (rev 244)
+++ trunk/webapp/parallelstudy.jsp	2006-04-22 06:48:15 UTC (rev 245)
@@ -2,13 +2,28 @@
 
 <%
 	session.setAttribute("lastModType", "Bible");
+
+	String []delMods = request.getParameterValues("del");
+	if (delMods != null) {
+		for (int i = 0; i < delMods.length; i++) {
+			String delModule = delMods[i];
+			if ("all".equals(delModule)) {
+				parDispModules.clear();
+				break;
+			}
+			if ( (delModule != null) && parDispModules.contains(delModule)) {
+				parDispModules.remove(delModule);
+			}
+		}
+	}
+
 	String []addMods = request.getParameterValues("add");
 	if (addMods != null) {
 		for (int i = 0; i < addMods.length; i++) {
 			String addModule = addMods[i];
 			if (addModule != null) {
 				SWModule m = mgr.getModuleByName(addModule);
-				if (m != null) {
+				if (!"<SWNULL>".equals(m.getName())) {
 					parDispModules.remove(addModule);
 					parDispModules.add(parDispModules.size(), addModule);
 				}
@@ -16,11 +31,6 @@
 		}
 	}
 
-	String delModule = (String)request.getParameter("del");
-	if ( (delModule != null) && parDispModules.contains(delModule)) {
-		parDispModules.remove(delModule);
-	}
-
 	if (parDispModules.size() == 0) {
 		parDispModules.add(0, defaultBible); //our standard, fallback module
 	}