Changeset 24005 for main/trunk/greenstone2/macros/seaweed.dm

Timestamp:

2011-05-06T12:18:03+12:00 (13 years ago)

Author:

davidb

Message:

Further improvements.

File:

• main/trunk/greenstone2/macros/seaweed.dm (modified) (6 diffs)

main/trunk/greenstone2/macros/seaweed.dm

@@ -1 +1 @@
 package Global
+
+_busyicon_ {<img border="0" src="_httpimages_/busy.gif" width="30" height="30">}
 
 _seaweedscript_ {
@@ -189 +191 @@
   \}
 
-  function saveMetadata() 
+  var savedMetadata = false;
+
+  function _saveMetadata(confirmSave) 
   \{
       var editedArray = de.Changes.getChangedEditableSections();
@@ -195 +199 @@
 
       if (editedArray.length>0) \{
-          var commitChanges = confirm("Commit edited metadata?");
+          var commitChanges = true;
+      if (confirmSave) \{ 
+          commitChanges = confirm("Commit edited metadata?");
+      \}
+
       if (commitChanges) \{
-        for (i=0; i<editedArray.length; i++)
-          \{
-                saveMetadataElement(editedArray[i]);
-          \}
-
+        savedMetadata = true;
+        for (i=0; i<editedArray.length; i++) \{
+            saveMetadataElement(editedArray[i],confirmSave);
+        \}
       \}
 
@@ -211 +218 @@
   \}
 
-
-    
+  function saveMetadata() 
+  \{
+      _saveMetadata(true);
+  \}
+
+  function unpromptedSaveMetadata() 
+  \{
+      _saveMetadata(false);
+      alert("Save Completed");
+  \}
+
+  function saveAsDraftDocument(docid,toCollect) 
+  \{
+    gsapi.cloneDocument(docid,toCollect);
+
+    var storeCollect = gsapi.setCollect(toCollect);
+    seaweedReindexCollection("incremental",seaweedReindexCallback);
+    gsapi.setCollect(storeCollect);
+
+    alert("Draft Saved and Collection Reindex");
+  \}
+
+
+
   function seaweedReindexCollection() \{
     var arc = document.getElementById("seaweedRC");
-    arc.innerHTML = "Reindexing ...";
+    arc.innerHTML = "Reindexing: " + '_busyicon_';
     gsapi.reindexCollection("incremental",seaweedReindexCallback);
   \}
@@ -222 +251 @@
     var arc = document.getElementById("seaweedRC");
     arc.innerHTML = "Reindexing done.";
+    setTimeout("seaweedReindexDelayedCallback()",2000);
   \}            
     
+  function seaweedReindexDelayedCallback() \{
+    var arc = document.getElementById("seaweedRC");
+    arc.innerHTML = "Reindex";
+  \}            
+    
 
 </script>
@@ -229 +264 @@
 }
 
-_first-metadata-spanwrap_ {<span metapos="0" metaname="_1_" docoid="_2_" class="editable-metadata">}
-_/first-metadata-spanwrap_ {</span>}
+
+_first-metadata-spanwrap_ {<div><span metapos="0" metaname="_1_" docoid="_2_" class="editable-metadata">}
+_/first-metadata-spanwrap_ {</span></div>}
 
 _first-metadata-divwrap_ {<div metapos="0" metaname="_1_" docoid="_2_" class="editable-metadata">}