Changeset 27713

Timestamp:

2013-06-27T16:52:08+12:00 (11 years ago)

Author:

sjm84

Message:

Fixing collectionConfig templates being incorrect

Location:

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

Files:

• debug_scripts.js (modified) (10 diffs)
• formateditor (added)
• formateditor/format_browse.js (moved) (moved from main/trunk/greenstone3/web/interfaces/default/js/format_browse.js )
• formateditor/format_document.js (moved) (moved from main/trunk/greenstone3/web/interfaces/default/js/format_document.js )
• formateditor/format_jquery_prototypes.js (moved) (moved from main/trunk/greenstone3/web/interfaces/default/js/format_jquery_prototypes.js )
• formateditor/format_util.js (moved) (moved from main/trunk/greenstone3/web/interfaces/default/js/format_util.js )
• formateditor/gui_div.js (moved) (moved from main/trunk/greenstone3/web/interfaces/default/js/gui_div.js )
• formateditor/innerxhtml.js (moved) (moved from main/trunk/greenstone3/web/interfaces/default/js/innerxhtml.js )
• formateditor/jquery.selectboxes.js (moved) (moved from main/trunk/greenstone3/web/interfaces/default/js/jquery.selectboxes.js )
• formateditor/jquery.xml.js (moved) (moved from main/trunk/greenstone3/web/interfaces/default/js/jquery.xml.js )
• formateditor/ui.nestedSortable.js (moved) (moved from main/trunk/greenstone3/web/interfaces/default/js/ui.nestedSortable.js )
• javascript-global-functions.js (modified) (9 diffs)
• visual-xml-editor.js (modified) (2 diffs)

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

@@ -122 +122 @@
     var _currentMatch;
     var _currentNamespace;
+    var _currentXPath;
     var _isVisualEditor = true;
 
@@ -322 +323 @@
                 if(_currentName && _currentName.length > 0){parameters["s1.name"] = _currentName;}
                 if(_currentMatch && _currentMatch.length > 0){parameters["s1.match"] = _currentMatch;}
+                if(_currentXPath && _currentXPath.length > 0){parameters["s1.xpath"] = _currentXPath}
 
                 _saveButton.button("option", "disabled", true);
@@ -610 +612 @@
             var templateListStart = templateResponse.indexOf("<templateList>") + "<templateList>".length;
             var templateListEnd = templateResponse.indexOf("</templateList>");
+            
+            if(templateListStart == "<templateList>".length - 1)
+            {
+                return;
+            }
+            
             var templateListString = templateResponse.substring(templateListStart, templateListEnd).replace(/&quot;/g, "\"");
             var templateList = eval(templateListString);
@@ -625 +633 @@
                 var name = templateList[i].name;
                 var match = templateList[i].match;
+                var xpath = templateList[i].xpath;
 
                 if(name)
@@ -639 +648 @@
                 _elements.push(infoContainer);
 
-                addChangeEventToInfoContainer(infoContainer, filename, location, nodename, namespace, name, match);
+                addChangeEventToInfoContainer(infoContainer, filename, location, nodename, namespace, name, match, xpath);
 
                 if(name && name.length > 0)
                 {
-                    infoContainer.text(name);
+                    infoContainer.text(name + ((xpath) ? (" (" + xpath + ")") : ""));
                 }
                 if(match && match.length > 0)
                 {
-                    infoContainer.text(match);
+                    infoContainer.text(match + ((xpath) ? (" (" + xpath + ")") : ""));
                 }
 
@@ -662 +671 @@
 
     //Change the current template in the XML and Visual editor
-    this.changeCurrentTemplate = function(location, filename, nodename, namespace, name, match)
+    this.changeCurrentTemplate = function(location, filename, nodename, namespace, name, match, xpath)
     {
         _currentFileName = filename;
@@ -670 +679 @@
         _currentName = name;
         _currentMatch = match;
-    
+        _currentXPath = xpath;
+
         var responseName = "requestedNameTemplate";
 
-        var url = gs.xsltParams.library_name + "?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){url += "&s1.match=" + match; responseName = "requestedMatchTemplate";}
-        if(name && name.length > 0){url += "&s1.name=" + name;}
-
-        $.ajax(url)
+        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};
+
+        if(match && match.length > 0){params["s1.match"] = match; responseName = "requestedMatchTemplate";}
+        if(name && name.length > 0){params["s1.name"] = name;}
+        if(xpath && xpath.length > 0){params["s1.xpath"] = xpath}
+
+        $.post(url, params)
         .success(function(response)
         {
@@ -748 +761 @@
 
     //Store the function that is called when this template is selected from the list
-    var addChangeEventToInfoContainer = function(infoContainer, filename, location, nodename, namespace, name, match)
+    var addChangeEventToInfoContainer = function(infoContainer, filename, location, nodename, namespace, name, match, xpath)
     {
         infoContainer.data("changeFunction", function()
         {
-            _greenbug.changeCurrentTemplate(location, filename, nodename, namespace, name, match);
+            _greenbug.changeCurrentTemplate(location, filename, nodename, namespace, name, match, xpath);
         });
     }
@@ -864 +877 @@
                     var name = $(this).attr("name");
                     var match = $(this).attr("match");
+                    var xpath = $(this).attr("xpath");
 
                     var file = _greenbug.fileNameToLocationAndName(filepath);
@@ -871 +885 @@
                     _elements.push(infoContainer);
 
-                    addChangeEventToInfoContainer(infoContainer, file.filename, file.location, nodename, namespace, name, match);
+                    addChangeEventToInfoContainer(infoContainer, file.filename, file.location, nodename, namespace, name, match, xpath);
 
                     if(name && name.length > 0)
                     {
-                        infoContainer.text(name);
+                        infoContainer.text(name + ((xpath) ? (" (" + xpath + ")") : ""));
                     }
                     if(match && match.length > 0)
                     {
-                        infoContainer.text(match);
+                        infoContainer.text(match + ((xpath) ? (" (" + xpath + ")") : ""));
                     }
 

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

@@ +1 @@
+var SUCCESS = 1;
+var ACCEPTED = 2;
+var ERROR = 3;
+var CONTINUING = 10;
+var COMPLETED = 11;
+var HALTED = 12;
+
 gs.functions = new Array();
 
@@ -93 +100 @@
 }
 
+gs.functions.checkForErrors = function(xml)
+{
+    var errorElems = xml.getElementsByTagName("error");
+    
+    if(errorElems && errorElems.length > 0)
+    {
+        var errorString = gs.text.dse.error_saving_changes + ": ";
+        for(var i = 0; i < errorElems.length; i++)
+        {
+            errorString += " " + errorElems.item(i).firstChild.nodeValue;
+        }
+        alert(errorString);
+        return true;
+    }
+    return false; //No errors
+}
+
+gs.functions.validateXML = function(txt)
+{
+    // code for IE
+    if (window.ActiveXObject)
+    {
+        var xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
+        xmlDoc.async = "false";
+        xmlDoc.loadXML(document.all(txt).value);
+
+        if(xmlDoc.parseError.errorCode!=0)
+        {
+            txt = dse.error_code + ": " + xmlDoc.parseError.errorCode + "\n";
+            txt = txt + dse.error_reason + ": " + xmlDoc.parseError.reason;
+            txt = txt + dse.error_line + ": " + xmlDoc.parseError.line;
+            console.log(txt);
+            return null;
+        }
+        
+        return xmlDoc;
+    }
+    // code for Mozilla, Firefox, Opera, etc.
+    else if (document.implementation.createDocument)
+    {
+        var parser = new DOMParser();
+        var xmlDoc = parser.parseFromString(txt,"text/xml");
+
+        if (xmlDoc.getElementsByTagName("parsererror").length > 0)
+        {
+            console.log(gs.text.dse.xml_error);
+            return null;
+        }
+        
+        return xmlDoc;
+    }
+    else
+    {
+        console.log(gs.text.dse.browse_cannot_validate_xml);
+    }
+    return null;
+}
+
 gs.functions.buildCollections = function(collections, finalFunction)
 {
@@ -105 +170 @@
     {
         var ajax = new gs.functions.ajaxRequest();
-        ajax.open("GET", _baseURL + "?a=g&rt=r&ro=1&s=BuildCollection&s1.collection=" + collections[counter]);
+        ajax.open("GET", gs.xsltParams.library_name + "?a=g&rt=r&ro=1&s=BuildCollection&s1.collection=" + collections[counter]);
         ajax.onreadystatechange = function()
         {
@@ -111 +176 @@
             {
                 var text = ajax.responseText;
-                var xml = validateXML(text);
-
-                if(!xml || checkForErrors(xml))
+                var xml = gs.functions.validateXML(text);
+
+                if(!xml || gs.functions.checkForErrors(xml))
                 {
                     console.log("Could not build collection -> " + collections[counter] + ", aborting");
@@ -122 +187 @@
                 var pid = status.getAttribute("pid");
 
-                startCheckLoop(pid, "BuildCollection", function()
+                gs.functions.startCheckLoop(pid, "BuildCollection", function()
                 {
                     var localAjax = new gs.functions.ajaxRequest();
-                    localAjax.open("GET", _baseURL + "?a=g&rt=r&ro=1&s=ActivateCollection&s1.collection=" + collections[counter], true);
+                    localAjax.open("GET", gs.xsltParams.library_name + "?a=g&rt=r&ro=1&s=ActivateCollection&s1.collection=" + collections[counter], true);
                     localAjax.onreadystatechange = function()
                     {
@@ -131 +196 @@
                         {
                             var localText = localAjax.responseText;
-                            var localXML = validateXML(localText);
+                            var localXML = gs.functions.validateXML(localText);
                             
-                            if(!xml || checkForErrors(xml))
+                            if(!xml || gs.functions.checkForErrors(xml))
                             {
                                 console.log("Could not activate collection -> " + collections[counter] + ", aborting");
@@ -143 +208 @@
                             {
                                 var localPID = localStatus.getAttribute("pid");
-                                startCheckLoop(localPID, "ActivateCollection", function()
+                                gs.functions.startCheckLoop(localPID, "ActivateCollection", function()
                                 {
-                                    if (++counter == _collections.length)
+                                    if (++counter == collections.length)
                                     {
                                         //Run this function once we are done building all the collections
@@ -167 +232 @@
 }
 
-function startCheckLoop(pid, serverFunction, callbackFunction)
+gs.functions.startCheckLoop = function(pid, serverFunction, callbackFunction)
 {
     var ajaxFunction = function()
     {
         var ajax = new gs.functions.ajaxRequest();
-        ajax.open("GET", _baseURL + "?a=g&rt=s&ro=1&s=" + serverFunction + "&s1.pid=" + pid, true);
+        ajax.open("GET", gs.xsltParams.library_name + "?a=g&rt=s&ro=1&s=" + serverFunction + "&s1.pid=" + pid, true);
         ajax.onreadystatechange = function()
         {
@@ -178 +243 @@
             {
                 var text = ajax.responseText;
-                var xml = validateXML(text);
+                var xml = gs.functions.validateXML(text);
                 
-                if(!xml || checkForErrors(xml))
+                if(!xml || gs.functions.checkForErrors(xml))
                 {
                     console.log("Could not check status of " + serverFunction + ", there was an error in the XML, aborting");       

main/trunk/greenstone3/web/interfaces/default/js/visual-xml-editor.js

@@ -1151 +1151 @@
         {
             var url = gs.xsltParams.library_name + "?a=g&rt=r&s=ResolveCallTemplate&s1.interfaceName=" + gs.xsltParams.interface_name + "&s1.siteName=" + gs.xsltParams.site_name + "&s1.collectionName=" + gs.cgiParams.c + "&s1.fileName=" + _fileName + "&s1.templateName=" + _xmlNode.getAttribute("name");
-            $.ajax(url)
-            .success(function(response)
+        
+            var successFunction = function(response)
             {
                 var startIndex = response.indexOf("<requestedTemplate>") + ("<requestedTemplate>").length;
@@ -1171 +1171 @@
                     _greenbug.changeCurrentTemplate("interface", "gslib.xsl", "template", "xsl", _xmlNode.getAttribute("name"), null);
                 }
-            });
+            }
+            
+            var errorFunction = function()
+            {
+                $.ajax(url).success(successFunction).error(errorFunction);
+            }
+            
+            $.ajax(url).success(successFunction).error(errorFunction);
         }