Changeset 37480 for main/trunk/greenstone3/web/interfaces/default/js/debug_scripts.js

Timestamp:

2023-03-13T15:06:58+13:00 (14 months ago)

Author:

davidb

Message:

Changes to get Greenbug back up and running. Theis commit targets two areas: we now need to explicitly specify 'o=xml' in our calls to general action with 'sa' as things like 'XSLTGetTemplateListFromFile'; we now also need to set the AJAX calls explicitly so they return string-type as their response (even if fundamentally the message is XML for example), which is done with dataType: 'text' in the jquery-based AJAX call. We are now using jquery v3.x and it looks like the newer versions of the library auto-sense the return time, where as the older jquery we were using did not to this, hence the reason for the change. In the long run it would be better to keep the returned response in XML, and use browser API to access XML to get to the data we want, however the decision for now was to explicitly set things so it is handled as a string, thereby allowing all our currently written code to operate as it used to.

File:

• main/trunk/greenstone3/web/interfaces/default/js/debug_scripts.js (modified) (9 diffs)

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

@@ -130 +130 @@
     var partialPageReload = function(callback)
     {
-        $.ajax(document.URL)
+        $.ajax(document.URL, { dataType: "text" })
         .done(function(response)
         {
@@ -319 +319 @@
 
                 var url = gs.xsltParams.library_name;
-                var parameters = {"a":"g", "rt":"r", "s":"SaveXMLTemplateToFile", "s1.locationName":_currentLocation, "s1.fileName":_currentFileName, "s1.interfaceName":gs.xsltParams.interface_name, "s1.siteName":gs.xsltParams.site_name, "s1.collectionName":gs.cgiParams.c, "s1.namespace":_currentNamespace, "s1.nodename":_currentNodename, "s1.xml":xmlString};
+                var parameters = {"o": "xml", "a":"g", "rt":"r", "s":"SaveXMLTemplateToFile", "s1.locationName":_currentLocation, "s1.fileName":_currentFileName, "s1.interfaceName":gs.xsltParams.interface_name, "s1.siteName":gs.xsltParams.site_name, "s1.collectionName":gs.cgiParams.c, "s1.namespace":_currentNamespace, "s1.nodename":_currentNodename, "s1.xml":xmlString};
 
                 if(_currentName && _currentName.length > 0){parameters["s1.name"] = _currentName;}
@@ -328 +328 @@
                 $.blockUI({message:'<div class="ui-state-active">Saving, please wait...</div>'});
 
-                $.post(url, parameters)
+                $.ajax(url, { method: "POST", dataType: "text" , data: parameters })
                 .done(function()
                 {
@@ -495 +495 @@
 
         //Populate the file selector
-        var url = gs.xsltParams.library_name + "?a=g&rt=r&o=xml&s=GetXSLTFilesForCollection&s1.interfaceName=" + gs.xsltParams.interface_name + "&s1.siteName=" + gs.xsltParams.site_name + "&s1.collectionName=" + gs.cgiParams.c;
-        $.ajax(url,
-                   {
-                       dataType: 'text'
-                   }
-                  )
+        var url = gs.xsltParams.library_name + "?o=xml&a=g&rt=r&s=GetXSLTFilesForCollection&s1.interfaceName=" + gs.xsltParams.interface_name + "&s1.siteName=" + gs.xsltParams.site_name + "&s1.collectionName=" + gs.cgiParams.c;
+        $.ajax(url, { dataType: "text" })
         .done(function(response)
         {
@@ -610 +606 @@
     this.populateTemplateSelectorFromFile = function(filename, location, callback)
     {
-        var getURL = gs.xsltParams.library_name + "?a=g&rt=r&s=GetTemplateListFromFile&s1.fileName=" + filename + "&s1.locationName=" + location + "&s1.interfaceName=" + gs.xsltParams.interface_name + "&s1.siteName=" + gs.xsltParams.site_name + "&s1.collectionName=" + gs.cgiParams.c;
-        $.ajax(getURL)
+        var getURL = gs.xsltParams.library_name + "?o=xml&a=g&rt=r&s=GetTemplateListFromFile&s1.fileName=" + filename + "&s1.locationName=" + location + "&s1.interfaceName=" + gs.xsltParams.interface_name + "&s1.siteName=" + gs.xsltParams.site_name + "&s1.collectionName=" + gs.cgiParams.c;
+        $.ajax(getURL, { dataType: "text" })
         .done(function(templateResponse)
         {
@@ -618 +614 @@
             
             if(templateListStart == "<templateList>".length - 1)
-            {
-                return;
+                {
+                console.error("Error retrieving '" + filename + "' templates");
+                return;
             }
             
@@ -688 +685 @@
 
         var url = gs.xsltParams.library_name;
-        var params = {"a":"g", "rt":"r", "s":"GetXMLTemplateFromFile", "s1.fileName":filename, "s1.interfaceName":gs.xsltParams.interface_name, "s1.siteName":gs.xsltParams.site_name, "s1.collectionName":gs.cgiParams.c, "s1.locationName":location, "s1.namespace":namespace, "s1.nodename":nodename};
+        var params = {"o": "xml", "a":"g", "rt":"r", "s":"GetXMLTemplateFromFile", "s1.fileName":filename, "s1.interfaceName":gs.xsltParams.interface_name, "s1.siteName":gs.xsltParams.site_name, "s1.collectionName":gs.cgiParams.c, "s1.locationName":location, "s1.namespace":namespace, "s1.nodename":nodename};
 
         if(match && match.length > 0){params["s1.match"] = match; responseName = "requestedMatchTemplate";}
@@ -694 +691 @@
         if(name && name.length > 0){params["s1.name"] = name;}
 
-        $.post(url, params)
+        $.ajax(url, { method: "POST", dataType: "text" , "data": params})
         .done(function(response)
         {
@@ -705 +702 @@
             }
             else
-            {
-                return;
+                {
+                console.error("Failed to find '" + responseName + "' in POST response");
+                return;
             }