[sword-svn] r419 - trunk/webapp

[scribe at crosswire.org]

Author: scribe
Date: 2014-08-23 03:03:44 -0700 (Sat, 23 Aug 2014)
New Revision: 419

Modified:
   trunk/webapp/fetchdata.jsp
   trunk/webapp/simplegadget.jsp
   trunk/webapp/wordsearchresults.jsp
Log:
updated for M?\195?\188nster's normalization of parameters to camelCase
other small adjustments


Modified: trunk/webapp/fetchdata.jsp
===================================================================
--- trunk/webapp/fetchdata.jsp	2014-07-09 00:08:06 UTC (rev 418)
+++ trunk/webapp/fetchdata.jsp	2014-08-23 10:03:44 UTC (rev 419)
@@ -102,10 +102,10 @@
 					XMLBlock manuscripts = new XMLBlock(vmrResponse.toString());
 %>
 					<p><b>Some Manuscript Witnesses for <%=vk[0]%></b></p>
-					<div id="tableContainer" class="tableContainer">
-					<table border="0" cellpadding="0" cellspacing="0" width="100%" class="scrollTable">
+					<div id="tableContainer" class="tableContainer" style="width:100%;">
+					<table border="0" cellpadding="0" cellspacing="0" style="width:100%;" class="scrollTable">
 					<thead class="fixedHeader">
-						<tr><th>Manuscript</th><th>Century</th><th>Folio</th><th>Content</th><th>Image</th></tr>
+						<tr style="font-size:80%;"><th>Ms</th><th>Century</th><th>Folio</th><th>Content</th><th>&nbsp;</th></tr>
 					</thead>
 					<tbody class="scrollContent">
 <%
@@ -118,8 +118,8 @@
 							if (block != null) {
 								block = block.getBlock("image");
 								if (block != null) {
-									thumbURL = block.getAttribute("thumburl");
-									imageURL = block.getAttribute("webfriendlyurl");
+									thumbURL = block.getAttribute("thumbURL");
+									imageURL = block.getAttribute("webFriendlyURL");
 								}
 							}
 							block = p.getBlock("transcriptions");
@@ -129,11 +129,11 @@
 									transURL = block.getAttribute("uri");
 								}
 							}
-							String mssURL = "http://ntvmr.uni-muenster.de/manuscript-workspace?docid=" + m.getAttribute("docid")+"&pageid="+p.getAttribute("pageid");
+							String mssURL = "http://ntvmr.uni-muenster.de/manuscript-workspace?docID=" + m.getAttribute("docID")+"&pageID="+p.getAttribute("pageID");
 %>
 							<tr>
 								<td><a href="<%=mssURL%>" target="NTVMR">
-									<%=m.getAttribute("ganum")%>
+									<%=m.getAttribute("gaNum")%>
 								</a></td>
 								<td><%=m.getValue("originYear")%></td>
 								<td><%=p.getAttribute("folio")%></td>
@@ -145,7 +145,7 @@
 <%
 							}
 %>
-										<%=p.getAttribute("biblicalcontent")%>
+										<%=p.getAttribute("biblicalContent")%>
 <%
 							if (transURL != null) {
 %>

Modified: trunk/webapp/simplegadget.jsp
===================================================================
--- trunk/webapp/simplegadget.jsp	2014-07-09 00:08:06 UTC (rev 418)
+++ trunk/webapp/simplegadget.jsp	2014-08-23 10:03:44 UTC (rev 419)
@@ -260,6 +260,8 @@
 		chosenModule = mod;
 	}
 	var key = getURLParams()['key'];
+	if (!key) key = getURLParams()['biblicalContent'];
+	if (!key) key = getURLParams()['verse'];
 	if (key != null) {
 		lookup(key);
 	}
@@ -271,8 +273,8 @@
 			swordModule = specialModules[data.lang];
 		else swordModule = chosenModule;
 	}
-	if (data.bibcont != null && data.bibcont.length > 0) {
-		lookup(data.bibcont);
+	if (data.indexContent != null && data.indexContent.length > 0) {
+		lookup(data.indexContent);
 	}
 }
 

Modified: trunk/webapp/wordsearchresults.jsp
===================================================================
--- trunk/webapp/wordsearchresults.jsp	2014-07-09 00:08:06 UTC (rev 418)
+++ trunk/webapp/wordsearchresults.jsp	2014-08-23 10:03:44 UTC (rev 419)
@@ -66,6 +66,11 @@
 		itmp = 0;	// default to NOT ignore case
 	}
 	soptions = itmp;
+
+	String specialFont = activeModule.getConfigEntry("Font");
+	if (specialFont.equalsIgnoreCase("<swnull>")) {
+		specialFont = null;
+	}
 %>
 <tiles:insert beanName="basic" flush="true" >
 	<tiles:put name="title" type="string">
@@ -118,12 +123,6 @@
 
 	<tiles:put name="content" type="string">
 	<div id="searchresults">
-<%
-			String specialFont = activeModule.getConfigEntry("Font");
-			if (specialFont.equalsIgnoreCase("<swnull>")) {
-				specialFont = null;
-			}
-%>
 		<h2><t:t>Results for</t:t> <em style="<%= specialFont != null ? "font-family:"+specialFont : "" %>"><%= activeSearchTerm %></em></h2>
 		<%
 			SearchHit[] results = null;