[Ils-source] r1363 - trunk/webapp

[scribe at crosswire.org]

Author: scribe
Date: 2015-12-17 11:24:12 -0700 (Thu, 17 Dec 2015)
New Revision: 1363

Modified:
   trunk/webapp/SQL.jsp
Log:
sync'd SQL runner to community version with small bug fixes


Modified: trunk/webapp/SQL.jsp
===================================================================
--- trunk/webapp/SQL.jsp	2015-12-17 17:57:31 UTC (rev 1362)
+++ trunk/webapp/SQL.jsp	2015-12-17 18:24:12 UTC (rev 1363)
@@ -637,8 +637,8 @@
 	        }
 	        if (outputLevel >= 5) {
 	        while (rs.next()) {
+		  retVal++;
 	          if (outputLevel > 5) {
-		          retVal++;
 	              if (outputLevel >= 7) out.print("<tr> <th>" + rs.getRow() + "</th>");
 	              else if (outputLevel >= 5) out.print("<b>" + rs.getRow() + "</b>");
 	              String colVals = "";
@@ -880,13 +880,13 @@
 		      boolean execute = true;
 		      if (importDupCheck != null) {
 		          MessageFormat format = new MessageFormat(importDupCheck);
-		          String dcSQL = format.format(fields);
+		          String dcSQL = format.format(fields.toArray());
 		          execute = (runSQL(dcSQL, null, 0, 0, null) == 0);
 		      }
 	          if (execute) {
 			    String rSQL = specialFunctions(insertSQL, fields.toArray());
 	              MessageFormat format = new MessageFormat(rSQL);
-	              rSQL  = format.format(fields);
+	              rSQL  = format.format(fields.toArray());
 	              runSQL(rSQL, null, 0, 0, errOut, outputLevel, ignoreException);
 	          }
 		}