Changeset 38238

Timestamp:

2023-09-27T21:02:34+13:00 (8 months ago)

Author:

anupama

Message:

Moving the handling of the silent gsdl_cgi errors (that result in perl die statements, but yet do not cause ajax error functions to be called, and the ajax success callback function is still called instead) to be processed at toplevel when first encountered: in javascript_global_functions.js::_callMetadataServer() and gsajaxapi.js::urlPostAsync and gsajaxapi.js::urlPostSync(). The latter two are untested, but I think (something like) this is needed there as well. Basically, if no errorcallback is registered, we see an alert message popup with the otherwise silent error message displayed. If an error callback is registered, then the silent error message is at least printed to console, and the errorcallback can handle the rest as the coder chooses.

Location:

main/trunk/greenstone3/web/interfaces/default/js

Files:

• gsajaxapi.js (modified) (3 diffs)
• javascript-global-functions.js (modified) (3 diffs)
• user_comments.js (modified) (2 diffs)

main/trunk/greenstone3/web/interfaces/default/js/gsajaxapi.js

@@ -203 +203 @@
     //alert(scriptURL + "?" + params);
     //alert(xmlHttp.responseText); // if synchronous, process xmlHttp.responseText AFTER send() call
+    if(xmlHttp.status != 200
+       || xmlHttp.responseText.indexOf("ERROR: ") !== -1
+       || xmlHttp.responseText.indexOf("<Error>") !== -1)
+    {
+        var errorMsg = "callingFunction Failed with";
+        if(xmlHttp.status == 200) {
+        errorMsg += " gsdlCGI error";
+        }
+        errorMsg += ":\n" + xmlHttp.responseText;
+        
+        console.log(errorMsg);
+    }
+    
     return xmlHttp.responseText;
     }
@@ -208 +221 @@
     // New, an Ajax Asynchronous Post method.
     // For helpful links, see the urlPostSync() method above
-    this.urlPostAsync = function(scriptURL, params, callback) {
+    this.urlPostAsync = function(scriptURL, params, callback, errorCallback) {
     var xmlHttp=false;
     try {
@@ -264 +277 @@
         xmlHttp.onreadystatechange=function() {
         if(xmlHttp.readyState==4) {
-            callback(xmlHttp); // e.g. this might do: updatepage(xmlHttp.responseText);
+            // Original behaviour of this block was just this single line:
+            //callback(xmlHttp); // e.g. this might do: updatepage(xmlHttp.responseText)
+
+            var errorMsg = "callingFunction Failed with";
+            
+            // if a proper ajax error is detected, then call any errorCallback
+            if(xmlHttp.status != 200 && errorCallback != null) {
+            errorMsg += ":\n" + xmlHttp.responseText;
+            alert(errorMsg);
+            console.log(errorMsgPrefix);
+            
+            errorCallback(xmlHttp);
+            }
+            
+            // Check for silent errors (gsdl_cgi->generate_error causes a silent die)
+            // and alert user then call any errorCallback
+            else if(xmlHttp.responseText.indexOf("ERROR: ") !== -1
+               || xmlHttp.responseText.indexOf("<Error>") !== -1)
+            {
+            errorMsg += " gsdlCGI error:\n" + xmlHttp.responseText;
+            alert(errorMsg);
+            console.log(errorMsg);
+            
+            if(errorCallback != null) {             
+                errorCallback(xmlHttp);
+            } else { // if silent error and no errorCallback, resort to sole callback
+                 callback(xmlHttp);
+            }
+            }
+
+            else {
+            // if either success, Or error status but there's no error callback,
+            // or if no silent die on error, then call default callback
+            callback(xmlHttp); // e.g. this might do: updatepage(xmlHttp.responseText);
+            }
         }
         }

main/trunk/greenstone3/web/interfaces/default/js/javascript-global-functions.js

@@ -555 +555 @@
         //var xml = $.parseXML(response);
         //console.log(xml);
+
+
+        // Handle the otherwise silent die statement of gsdl_cgi->generate_error(),
+        // forcing the errorResponseFunction route in such a case
+        if(response.indexOf("ERROR: ") !== -1 || response.indexOf("<Error>") !== -1) {
+            if(errorResponseFunction != null) {         
+            console.log("(" + callingFunction + ") Failed with gsdlcgi error:\n" + response);
+            errorResponseFunction(response);
+            } else {
+            alert("(" + callingFunction + ") Failed\n" + response);
+            console.log("(" + callingFunction + ") Failed\n" + response);
+            }
+            
+        }
         
-        if(successResponseFunction != null) {
+        else if(successResponseFunction != null) {
             //console.log("XXXX callMetaServer - Got response: " + response);
             successResponseFunction(response);
@@ -563 +577 @@
         .fail(function(response) {
             if(errorResponseFunction != null) { 
-                errorResponseFunction(response);
+                console.log("(" + callingFunction + ") Failed\n" + response);   
+                errorResponseFunction(response);
             } else {
-                console.log("(" + callingFunction + ") Failed");
+                    alert("(" + callingFunction + ") Failed\n" + response);
+                console.log("(" + callingFunction + ") Failed\n" + response);
             }
         });
@@ -584 +600 @@
     
     if(async_setting) {
-        gsapi.urlPostAsync(url, params, successResponseFunction);
+        gsapi.urlPostAsync(url, params, successResponseFunction, errorResponseFunction);
     } else {
         ajaxResponse = gsapi.urlPostSync(url, params);
-        ajaxResponse = ajaxResponse;
+        //ajaxResponse = ajaxResponse;
     }
     

main/trunk/greenstone3/web/interfaces/default/js/user_comments.js

@@ -461 +461 @@
     var result = (data.responseText) ? data.responseText : data;        
 
+    /*
     // check for gsdl_cgi->generate_error() result, which ends up in a silent die statement
     // unless we look for it in the "success" result, in the form of a message starting
@@ -468 +469 @@
     return;
     }
+    */
     
     //console.log("@@@ Done removing metadata:\n" + result);