Changeset 25104 for main

Timestamp:

2012-02-20T16:42:15+13:00 (12 years ago)

Author:

sjm84

Message:

Added the ability to remove metadata

Location:

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

Files:

• documentmaker_scripts.js (modified) (1 diff)
• documentmaker_scripts_util.js (modified) (6 diffs)
• javascript-global-functions.js (modified) (1 diff)

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

@@ -5 +5 @@
 var _indexCounter = 0;
 var _deletedSections = new Array();
+var _deletedMetadata = new Array();
 var _undoOperations = new Array();
 var _baseURL;

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

@@ -148 +148 @@
         updateFromTop();
     }
+    else if(undoOp.op == "display")
+    {
+        undoOp.srcElem.style.display = undoOp.subOp;
+    }
+    
+    if(undoOp.removeDeletedMetadata)
+    {
+        _deletedMetadata.pop();
+    }
 
     if(undoOp.removeTransaction)
@@ -169 +178 @@
 function save()
 {
+    for(var i = 0; i < _deletedMetadata.length; i++)
+    {
+        var currentRow = _deletedMetadata[i];
+        console.log(currentRow.parentNode);
+        //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(gs.cgiParams.p_c /*bad*/, "localsite" /*bad*/, docID, name, null, value, function(){console.log("REMOVED ARCHIVES");});
+        addCollectionToBuild(gs.cgiParams.p_c);
+        
+        removeFromParent(currentRow);
+    }
+
     var changes = de.Changes.getChangedEditableSections();
-    var metaBuild = false;
     
     for(var i = 0; i < changes.length; i++)
@@ -193 +223 @@
             changedElem.originalValue = changedElem.innerHTML;
             addCollectionToBuild(gs.cgiParams.p_c);
-            metaBuild = true;
         }
         //Save content
@@ -210 +239 @@
         if(i != _transactions.length - 1)
         {
-            request +=",";
+            request += ",";
         }
     }
@@ -243 +272 @@
         }
     }
-    
-    if(metaBuild || request != "[]")
+
+    if(_collectionsToBuild.length > 0)
     {
         var saveButton = document.getElementById("saveButton");
@@ -630 +659 @@
     {
         var undo = new Array();
-        var prev = getPrevSiblingOfType(row, "tr");
-        var next = getNextSiblingOfType(row, "tr");
-        var parent = row.parentNode;
-        if(prev)
-        {
-            undo.op = "mva";
-            undo.refElem = prev;
-        }
-        else if(next)
-        {
-            undo.op = "mvb";
-            undo.refElem = next;
-        }
-        else
-        {
-            undo.op = "mvi";
-            undo.refElem = parent;
-        }
         undo.srcElem = row;
-        undo.removeTransaction = true;
+        undo.op = "display";
+        undo.subOp = "table-row";
+        undo.removeDeletedMetadata = true;
         _undoOperations.push(undo);
-
-        /*
-        saveTransaction('{"operation":"deleteMetadata", "collection":"' + section.collection + '", "oid":"' + section.nodeID + '"}');
-        addCollectionToBuild(section.collection);
-        */
-
-        _deletedSections.push(row);
-        removeFromParent(row);
+        _deletedMetadata.push(row);
+        row.style.display = "none";
     }
     newCell.appendChild(removeLink);

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

@@ -310 +310 @@
     if(metadataPosition != null)
     {
-        callMetadataServer("removeArchiveMetadata", "cgi-bin/metadata-server.pl?a=remove-archive-metadata&c=" + collection + "&site=" + site + "&d=" + documentID + "&metaname=" + metadataName + "&metapos=" + metadataPosition, responseFunction);
+        callMetadataServer("removeArchiveMetadata", "cgi-bin/metadata-server.pl?a=remove-archives-metadata&c=" + collection + "&site=" + site + "&d=" + documentID + "&metaname=" + metadataName + "&metapos=" + metadataPosition, responseFunction);
     }
     else if(metadataValue != null)
     {
-        callMetadataServer("removeArchiveMetadata", "cgi-bin/metadata-server.pl?a=remove-archive-metadata&c=" + collection + "&site=" + site + "&d=" + documentID + "&metaname=" + metadataName + "&metavalue=" + metadataValue, responseFunction);
+        callMetadataServer("removeArchiveMetadata", "cgi-bin/metadata-server.pl?a=remove-archives-metadata&c=" + collection + "&site=" + site + "&d=" + documentID + "&metaname=" + metadataName + "&metavalue=" + metadataValue, responseFunction);
     }
 }