Changeset 29110

Timestamp:

2014-06-26T11:32:03+12:00 (10 years ago)

Author:

kjdon

Message:

encodeURI doesn't seem to be needed??? why??? have removed it for now. may need to add back in. fixed up the remove metadata processing. Need to put them into the processing loop with call backs. otherwise it will send off the requests to remove the metadata, and then rebuild before those requests have finished. Inside the loop, the next change request is only called once the first one is finished.

File:

• main/trunk/greenstone3/web/interfaces/default/js/documentmaker_scripts_util.js (modified) (5 diffs)

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

@@ -176 +176 @@
 }
 
-function save()
-{
-    //This works in most cases but will not work when taking a doc from one collection to another, will need to be fixed at some point
-    var collection;
-    if(gs.cgiParams.c && gs.cgiParams.c != "")
-    {
-        collection = gs.cgiParams.c
-    }
-    else
-    {
-        collection = gs.cgiParams.p_c
-    }
-
-    for(var i = 0; i < _deletedMetadata.length; i++)
-    {
-        var currentRow = _deletedMetadata[i];
-
-        //Get document ID
-        var currentElem = currentRow;
-        while((currentElem = currentElem.parentNode).tagName != "TABLE");
-        var docID = currentElem.getAttribute("id").substring(4);
-
-        //Get metadata name
-        var cells = currentRow.getElementsByTagName("TD");
-        var nameCell = cells[0];
-        var name = nameCell.innerHTML;
-        var valueCell = cells[1];
-        var value = valueCell.innerHTML;
-        
-        gs.functions.removeArchivesMetadata(collection, gs.xsltParams.site_name, docID, name, null, value, function(){console.log("REMOVED ARCHIVES");});
-        addCollectionToBuild(collection);
-        
-        removeFromParent(currentRow);
-    }
-
+function save() 
+{
+//This works in most cases but will not work when taking a doc from one collection to another, will need to be fixed at some point
+  var collection;
+  if(gs.cgiParams.c && gs.cgiParams.c != "") {
+    
+    collection = gs.cgiParams.c;
+  }
+  else {
+    collection = gs.cgiParams.p_c;
+  }
+  
     var sendBuildRequest = function()
     {
@@ -271 +248 @@
     }
 
-    var changes = de.Changes.getChangedEditableSections();
-    var metadataChanges = new Array();
-    if (changes.length == 0) {
-      sendBuildRequest();
-      return;
-    }
-    
+  var metadataChanges = new Array();
+  if (_deletedMetadata.length > 0) {
+    addCollectionToBuild(collection);
+
+    for(var i = 0; i < _deletedMetadata.length; i++) {
+      
+      var currentRow = _deletedMetadata[i];
+      
+      //Get document ID
+      var currentElem = currentRow;
+      while((currentElem = currentElem.parentNode).tagName != "TABLE");
+      var docID = currentElem.getAttribute("id").substring(4);
+      
+      //Get metadata name
+      var cells = currentRow.getElementsByTagName("TD");
+      var nameCell = cells[0];
+      var name = nameCell.innerHTML;
+      var valueCell = cells[1];
+      var value = valueCell.innerHTML;
+      metadataChanges.push({type:'delete', docID:docID, name:name, value:value});
+      removeFromParent(currentRow);
+    }
+  }
+
+  var changes = de.Changes.getChangedEditableSections();
     for(var i = 0; i < changes.length; i++)
     {
@@ -297 +292 @@
             var value = changedElem.innerHTML;
             value = value.replace(/&nbsp;/g, " ");
-            value = encodeURI(value);
 
             var orig = changedElem.originalValue;
             if (orig) {
               orig = orig.replace(/&nbsp;/g, " ");
-              orig = encodeURI(orig);
-            }
-            //changedElem.originalValue = changedElem.innerHTML;
-            //metadataChanges.push({collection:collection, docID:docID, name:name, value:value, orig:changedElem.originalValue});
+            }
             metadataChanges.push({collection:collection, docID:docID, name:name, value:value, orig:orig});
             changedElem.originalValue = changedElem.innerHTML;
-            //changedElem.originalValue = value;
             addCollectionToBuild(collection);
         }
@@ -326 +316 @@
         }
     }
-    
-    
-    
-    var setMetadataLoop = function(index)
+
+    
+    var processChangesLoop = function(index)
     {
       
@@ -341 +330 @@
         else
         {
-            callbackFunction = function(){setMetadataLoop(index + 1)};
-        }
-        
-        if(change.orig)
-        {
-            gs.functions.setArchivesMetadata(change.collection, gs.xsltParams.site_name, change.docID, change.name, null, change.value, change.orig, "override", function(){callbackFunction();});
-        }
-        else
-        {
-            gs.functions.setArchivesMetadata(change.collection, gs.xsltParams.site_name, change.docID, change.name, null, change.value, null, "accumulate", function(){callbackFunction();});
-        }
-    }
-    setMetadataLoop(0);
-}
+            callbackFunction = function(){processChangesLoop(index + 1)};
+        }
+        if (change.type == "delete") {
+          gs.functions.removeArchivesMetadata(collection, gs.xsltParams.site_name, change.docID, change.name, null, change.value, function(){callbackFunction();});
+        } else {
+          if(change.orig)
+            {
+              gs.functions.setArchivesMetadata(change.collection, gs.xsltParams.site_name, change.docID, change.name, null, change.value, change.orig, "override", function(){callbackFunction();});
+            }
+          else
+            {
+              gs.functions.setArchivesMetadata(change.collection, gs.xsltParams.site_name, change.docID, change.name, null, change.value, null, "accumulate", function(){callbackFunction();});
+            }
+        }
+    }
+    processChangesLoop(0);
+
+}
+
 
 function buildCollections(collections, documents, callback)