serverStatus display and geolocaleTaxaPresent flagging. Specimen XML …

…logging change.

doc/release.txt

@@ -1,3 +1,9 @@
+Release 8.62.1
+  serverStatus display
+  geolocaleTaxaPresent flagging. 
+  Specimen XML logging change.
+
+
 Release 8.62
   Fix css column display for Show Specimen Taxa feature.
   Regional data upload refinements.

src/org/calacademy/antweb/SpecimenXML.java

@@ -38,7 +38,8 @@ public String isInvalid(String xmlString) {
             }
             if (xmlString.contains(" ")) message = "Is file in UTF? Do not use UTF - With BOM. ";
          */
-            s_log.error("isInvalid() " + message + " e:" + e + " for xmlString:" + xmlString + ". FILE COULD BE SAVED AS UTF8 with BOM?");
+            s_log.error("isInvalid() " + message + " e:" + e + ". FILE COULD BE SAVED AS UTF8 with BOM?");
+            s_log.info("isInvalid() " + message + " e:" + e + " for xmlString:" + xmlString + ". FILE COULD BE SAVED AS UTF8 with BOM?");
             isInvalid = message + e.toString() + ". Could file have been erroneously saved as UTF8 with BOM?";
         } catch (Exception e) {
             String message = "";

src/org/calacademy/antweb/util/Queries.java

@@ -216,10 +216,10 @@ private static ArrayList<NamedQuery> getTaxaNamedQueries() {
         // SHould be over 57000 records from: select count(*) from geolocale_taxon gt, geolocale g where gt.geolocale_id = g.id and g.georank = 'country';
         queries.add(new NamedQuery(
             "geolocaleTaxaPresent"
-          , "Geolocale Taxa Present: Aught to be at least 50,000 geolocale_taxa country records. Row will be returned if less, and that is a problem. Check literature records."
+          , "Geolocale Taxa Present: Aught to be at least 50,000 geolocale_taxa country records. If not 0 is returned, that is a problem. Check literature records."
           , ""
-          //, "select count(*) from geolocale_taxon gt, geolocale g where gt.geolocale_id = g.id and g.georank = 'country' having count(*) > 50000;"
-            , "select if (count(*) < 50000, 'records missing!', 0) isLow from geolocale_taxon gt, geolocale g where gt.geolocale_id = g.id and g.georank = 'country'"
+          // The concat is because the resullts are scanned for "records missing"
+            , "select if (count(*) < 50000, concat('records', ' missing!'), 0) isLow from geolocale_taxon gt, geolocale g where gt.geolocale_id = g.id and g.georank = 'country'"
         ));
 
         queries.add(new NamedQuery(

web/documentation/releaseNum.jsp

@@ -1 +1 @@
-<% antwebRelease = "8.62"; %>
+<% antwebRelease = "8.63"; %>

web/error.jsp

@@ -49,7 +49,7 @@ if (exception != null) {
 
   String shortStack = "No stacktrace.";
   if (exception instanceof Exception) {
-    shortStack = AntwebUtil.getAntwebStackTrace((Exception) exception);
+    //shortStack = AntwebUtil.getAntwebStackTrace((Exception) exception);
   }
   out.print(shortStack);
 

web/util/serverStatus-body.jsp

@@ -131,7 +131,11 @@ String serverDetails = (String) request.getAttribute("serverDetails");
  <%  //HttpSession session = request.getSession();
      for (Enumeration e = session.getAttributeNames() ; e.hasMoreElements() ;) {
        String name = (String) e.nextElement();
-       out.println("<br>name:<b>" + name + "</b> value:" + session.getAttribute(name));
+       if (!"dummyForm".equals(name)) {
+         out.println("<br>name:<b>" + name + "</b> value:" + session.getAttribute(name));
+       } else {
+         out.println("<br>name:<b>dummyForm</b>");
+       }
      }
  %>  
 <br><br><br>