Mercurial > hg > batmud > maputils

changeset 2119:5b0fd5ee79a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Unify some error handling in the mapsearch front-end javascript code.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 10 Sep 2019 22:30:26 +0300
parents 995c45c244ed
children 1f1f07313eae
files www/search.js
diffstat 1 files changed, 15 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/www/search.js	Tue Sep 10 21:15:25 2019 +0300
+++ b/www/search.js	Tue Sep 10 22:30:26 2019 +0300
@@ -84,13 +84,6 @@
 }
 
 
-function mapCleanData(str)
-{
-  // TODO
-  return str;
-}
-
-
 function mapResult(msg)
 {
   var elem = document.getElementById("results");
@@ -178,6 +171,18 @@
 }
 
 
+function mapHandleError(str)
+{
+  if (str.substr(0, 6) == "ERROR:")
+  {
+    mapResult("ERROR! "+ str.substr(6).trim());
+    return false;
+  }
+  else
+    return true;
+}
+
+
 function mapGetData()
 {
   var dataWS = mapSetupWebSocket();
@@ -191,11 +196,7 @@
 
   dataWS.onmessage = function(evt)
   {
-    if (evt.data.substr(0, 6) == "ERROR:")
-    {
-      mapResult("ERROR! "+ mapCleanData(evt.data.substr(6)));
-    }
-    else
+    if (mapHandleError(evt.data))
     if (evt.data.substr(0, 5) == "MAPS:" && evt.data.length > 8)
     {
       var results = mapValidateJSON(evt.data.substr(5), 3, 3);
@@ -320,11 +321,7 @@
   // Register events
   mapWS.onmessage = function(evt)
   {
-    if (evt.data.substr(0, 6) == "ERROR:")
-    {
-      mapResult("ERROR! "+ mapCleanData(evt.data.substr(6)));
-    }
-    else
+    if (mapHandleError(evt.data))
     if (evt.data.substr(0, 7) == "RESULT:" && evt.data.length >= 9)
     {
       var results = mapValidateJSON(evt.data.substr(7), 7, 5);
@@ -413,11 +410,7 @@
   // Register events
   locWS.onmessage = function(evt)
   {
-    if (evt.data.substr(0, 6) == "ERROR:")
-    {
-      mapResult("ERROR! "+ mapCleanData(evt.data.substr(6)));
-    }
-    else
+    if (mapHandleError(evt.data))
     if (evt.data.substr(0, 7) == "RESULT:" && evt.data.length >= 9)
     {
       var results = mapValidateJSON(evt.data.substr(7), 2, 9);