Changeset 25546

Timestamp:

2012-05-08T15:19:32+12:00 (12 years ago)

Author:

sjm84

Message:

Some more fixes to document creation

File:

• main/trunk/greenstone3/web/interfaces/oran/js/documentmaker_scripts_util.js (modified) (10 diffs)

main/trunk/greenstone3/web/interfaces/oran/js/documentmaker_scripts_util.js

@@ -230 +230 @@
             var nameCell = cells[0];
             var name = nameCell.innerHTML;
+            var value = changedElem.innerHTML;
+            value = value.replace(/ /g, " ");
+            value = escape(value);
 
             if(changedElem.originalValue)
             {
-                gs.functions.setArchivesMetadata(collection, gs.xsltParams.site_name, docID, name, null, changedElem.innerHTML, changedElem.originalValue, "override", function(){console.log("SAVED ARCHIVES");});
+                gs.functions.setArchivesMetadata(collection, gs.xsltParams.site_name, docID, name, null, value, changedElem.originalValue, "override", function(){console.log("SAVED ARCHIVES");});
             }
             else
             {
-                gs.functions.setArchivesMetadata(collection, gs.xsltParams.site_name, docID, name, null, changedElem.innerHTML, null, "accumulate", function(){console.log("SAVED ARCHIVES");});
+                gs.functions.setArchivesMetadata(collection, gs.xsltParams.site_name, docID, name, null, value, null, "accumulate", function(){console.log("SAVED ARCHIVES");});
             }
             changedElem.originalValue = changedElem.innerHTML;
@@ -268 +271 @@
     }
     request += "]";
-    
+
     var statusID;
     var ajax = new gs.functions.ajaxRequest();
-    ajax.open("POST", _baseURL, true);
+    ajax.open("POST", gs.xsltParams.library_name, true);
     ajax.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
     ajax.onreadystatechange = function()
@@ -309 +312 @@
 }
 
-function buildCollections(collections)
+function buildCollections(collections, documents, callback)
 {
     var saveButton = document.getElementById("saveButton");
@@ -319 +322 @@
         return;
     }
+    
+    var docs = "";
+    var buildOperation = "";
+    if(documents)
+    {
+        buildOperation = "ImportCollection";
+        docs += "&s1.documents=";
+        for(var i = 0; i < documents.length; i++)
+        {
+            docs += documents[i];
+            if(i < documents.length - 1)
+            {           
+                docs += ",";
+            }
+        }
+    }
+    else
+    {
+        buildOperation = "BuildAndActivateCollection";
+    }
 
     var counter = 0;
@@ -325 +348 @@
     {
         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", _baseURL + "?a=g&rt=r&ro=1&s=" + buildOperation + "&s1.collection=" + collections[counter] + docs);
         ajax.onreadystatechange = function()
         {
@@ -347 +370 @@
                 var pid = status.getAttribute("pid");
 
-                startCheckLoop(pid, "BuildCollection", statusID, function()
+                startCheckLoop(pid, buildOperation, statusID, function()
                 {
+                    /*
                     var localAjax = new gs.functions.ajaxRequest();
                     localAjax.open("GET", _baseURL + "?a=g&rt=r&ro=1&s=ActivateCollection&s1.collection=" + collections[counter], true);
@@ -375 +399 @@
                                 startCheckLoop(localPID, "ActivateCollection", statusID, function()
                                 {
+                                */
                                     if(counter == collections.length - 1)
                                     {
                                         removeCollectionsFromBuildList(collections);
+                                        if(callback)
+                                        {
+                                            callback();
+                                        }
                                     }
                                     else
@@ -390 +419 @@
                                     saveButton.innerHTML = gs.text.dse.save_changes;
                                     saveButton.disabled = false;
+                                /*
                                 });
                             }
@@ -396 +426 @@
                     _statusBar.changeStatus(statusID, gs.text.dse.activating + " " + collections[counter] + "...");
                     localAjax.send();
+                    */
                 });
             }
@@ -754 +785 @@
     newDocButton.innerHTML = gs.text.dse.create_new_document;
     newDocButton.setAttribute("onclick", "createNewDocumentArea();");
+    newDocButton.setAttribute("id", "createNewDocumentButton");
     newDocCell.appendChild(newDocButton);