Mercurial > hg > batmud > maputils

changeset 1804:f498299ff758

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve error and results handling.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 29 Oct 2017 22:57:04 +0200
parents 88406bf2d1e5
children 3964d87a2f8a
files www/search.js
diffstat 1 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/www/search.js	Sun Oct 29 22:30:24 2017 +0200
+++ b/www/search.js	Sun Oct 29 22:57:04 2017 +0200
@@ -113,16 +113,19 @@
   {
     if (evt.data.substr(0, 6) == "ERROR:")
     {
-      mapLog("ERROR! "+ evt.data.substr(6));
+      var str = "ERROR! "+ evt.data.substr(6);
+      mapLog(str);
+      fieldRes.innerHTML = str;
     }
     else
     if (evt.data.substr(0, 7) == "RESULT:" && evt.data.length >= 9)
     {
       var results = JSON.parse(evt.data.substr(7));
+      var str = "";
       mapLog("Receiving results.");
+
       if (results)
       {
-        var str = "";
         for (var i = 0; i < results.length; i++)
         {
           var res = results[i];
@@ -137,14 +140,12 @@
         }
 
         if (str.length == 0)
-          str = "<div>No matches found.</div>";
-        else
-          str = "<div>"+ str +"</div>";
-
-        fieldRes.innerHTML = str;
+          str = "No matches found.";
       }
       else
-        fieldRes.innerHTML = "ERROR!";
+        str = "ERROR: Could not parse result dataset."
+
+      fieldRes.innerHTML = str;
     }
     else
     if (evt.data.substr(0, 9) == "PROGRESS:")