[sword-cvs] swordweb dailydevotion.jsp,1.2,1.3 fulllibrary.jsp,1.1,1.2 powersearch.jsp,1.2,1.3

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/swordweb
In directory www:/tmp/cvs-serv17230

Modified Files:
	dailydevotion.jsp fulllibrary.jsp powersearch.jsp 
Log Message:



Index: dailydevotion.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/dailydevotion.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dailydevotion.jsp	23 May 2003 18:31:01 -0000	1.2
+++ dailydevotion.jsp	20 Aug 2003 21:24:49 -0000	1.3
@@ -20,13 +20,12 @@
 		<ul>
 		<%
 			for (int i = 0; i < modInfo.length; i++) {
-				if (modInfo[i].type.equals(SwordOrb.LEXDICT)) {
-					SWModule module = mgr.getModuleByName(modInfo[i].name);
-					if ("Daily Devotional".equals(module.getConfigEntry("Category"))) {
-		%>
-				<li><a href="dailydevotion.jsp?mod=<%= URLEncoder.encode(modInfo[i].name) %>" title="Add <%= module.getDescription().replaceAll("&", "&amp;") %>"><%= module.getDescription().replaceAll("&", "&amp;") %></a></li>
-		<%
-					}
+				SWModule module = mgr.getModuleByName(modInfo[i].name);
+				if (("Daily Devotional".equals(modInfo[i].type)) ||
+					 ("Daily Devotional".equals(module.getConfigEntry("Category")))) {
+	%>
+			<li><a href="dailydevotion.jsp?mod=<%= URLEncoder.encode(modInfo[i].name) %>" title="Add <%= module.getDescription().replaceAll("&", "&amp;") %>"><%= module.getDescription().replaceAll("&", "&amp;") %></a></li>
+	<%
 				}
 			}
 			formatter = new SimpleDateFormat("MM.dd");

Index: fulllibrary.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/fulllibrary.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fulllibrary.jsp	19 Aug 2003 23:15:03 -0000	1.1
+++ fulllibrary.jsp	20 Aug 2003 21:24:49 -0000	1.2
@@ -94,7 +94,7 @@
 					about = rtfRegex.substituteAll(about, "");
 				}
 				String type = module.getConfigEntry("Category");
-				if ((type == null) || (type.length() > 0))
+				if ((type == null) || (type.length() < 2))
 					type = module.getType();
 				String targetURL = "";
 				if ((SwordOrb.BIBLES.equals(type)) || (SwordOrb.COMMENTARIES.equals(type))) {
@@ -109,6 +109,7 @@
 %>
 	<h2><a href="<%= targetURL %>"><%= module.getDescription() %></a></h2>
 	<%= about %>
+	<%= type %>
 <%
 
 			}

Index: powersearch.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/powersearch.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- powersearch.jsp	23 May 2003 18:31:01 -0000	1.2
+++ powersearch.jsp	20 Aug 2003 21:24:49 -0000	1.3
@@ -67,7 +67,7 @@
 		<form action="wordsearchresults.jsp">
 			<fieldset>
 				<b>Search Term:</b><br/>
-				<input type="text" name="searchTerm" class="textinput" size="50" value="" /><br/><br/>
+				<input type="text" name="searchTerm" class="textinput" value="" /><br/><br/>
 
 				<b>Search Type:</b><br/>
 				<input type="radio" name="stype" value="M" checked="true" />All Words or Word Fragments<br/>
@@ -75,7 +75,7 @@
 				<input type="radio" name="stype" value="R" />Advanced- Regular Exression<br/><br/>
 				<input type="checkbox" name="icase" value="1" checked="true"/>Ignore Case (UPPER/lower isn't strictly matched)<br/><br/>
 				<b>Limit Search to Range:</b><br/>
-				<input type="text" name="range" class="textinput" size="50" value="" /><br/>(most syntax works, e.g.  mat-jn;rom;rev 1-5)<br/><br/>
+				<input type="text" name="range" class="textinput" value="" /><br/>(most syntax works, e.g.  mat-jn;rom;rev 1-5)<br/><br/>
 
 				<input type="submit" class="searchbutton" value=" Search " />
 			</fieldset>