[Ils-source] r1364 - trunk/webapp

[scribe at crosswire.org]

Author: scribe
Date: 2015-12-17 11:45:30 -0700 (Thu, 17 Dec 2015)
New Revision: 1364

Modified:
   trunk/webapp/SQL.jsp
Log:
Fixed bug in dupcheck logic which didn't count rows if no output was requested


Modified: trunk/webapp/SQL.jsp
===================================================================
--- trunk/webapp/SQL.jsp	2015-12-17 18:24:12 UTC (rev 1363)
+++ trunk/webapp/SQL.jsp	2015-12-17 18:45:30 UTC (rev 1364)
@@ -637,7 +637,7 @@
 	        }
 	        if (outputLevel >= 5) {
 	        while (rs.next()) {
-		  retVal++;
+		  ++retVal;
 	          if (outputLevel > 5) {
 	              if (outputLevel >= 7) out.print("<tr> <th>" + rs.getRow() + "</th>");
 	              else if (outputLevel >= 5) out.print("<b>" + rs.getRow() + "</b>");
@@ -666,8 +666,18 @@
 	        }
 	        if (outputLevel >= 7) out.println("</table>");
 	        }
+		else {
+			while (rs.next()) {
+			  ++retVal;
+			}
+		}
 	      }
       }	// out != null
+		else {
+			while (rs.next()) {
+			  ++retVal;
+			}
+		}
     }
     catch (Exception e) {
       e.printStackTrace();