[Ils-source] r1296 - branches/1.6/webapp

[scribe at crosswire.org]

Author: scribe
Date: 2015-01-13 17:00:19 -0700 (Tue, 13 Jan 2015)
New Revision: 1296

Modified:
   branches/1.6/webapp/SQL.jsp
Log:
updated to give better output for export


Modified: branches/1.6/webapp/SQL.jsp
===================================================================
--- branches/1.6/webapp/SQL.jsp	2015-01-13 21:50:51 UTC (rev 1295)
+++ branches/1.6/webapp/SQL.jsp	2015-01-14 00:00:19 UTC (rev 1296)
@@ -506,8 +506,7 @@
 	        result = e1.toString();
 	      }
 	      if (errOut != null) {
-	          errOut.write("<table border=\"1\"> <tr> <th>Executing SQL</th> <td>"
-	          + testSQL + "</td> </tr>");
+	          errOut.write("<table border=\"1\"> <tr> <th>Executing SQL</th> <td>" + testSQL + "</td> </tr>");
 	          if (rs == null) {
 	              errOut.println("<tr> <td>Result</td> <td>"
 	              + result + "</td> </tr>");
@@ -517,7 +516,6 @@
 	                  errOut.println("</td> </tr>");
 	              }
 	          }
-	          errOut.println("</table><br />");
 	      }
 	      if (rs != null) {
 	        ResultSetMetaData meta = rs.getMetaData();
@@ -538,14 +536,16 @@
 	              for (int i = 0; i < colCount; i++) {
 	                  Object o = rs.getObject(i + 1);
 	                  String colVal = (o != null) ? o.toString() : "";
-	                  colVal = URLEncoder.encode(colVal, "UTF-8");
+//	                  colVal = URLEncoder.encode(colVal, "UTF-8");
                       out.write(colVal);
 	                  if (i + 1 < colCount) out.write("|");
 	              }
 	              out.write("\n");
 	          }
 	        }
+	        errOut.write("<tr> <th>Result</th><td>Exported Users: " + retVal + "</td></tr>");
 	      }
+	      errOut.println("</table><br />");
 	    }
 	    catch (Exception e) {
 	      e.printStackTrace();