Changeset 32838 for main/trunk/greenstone3/web/interfaces/default/js/documentedit_scripts_util.js

Timestamp:

2019-03-02T19:41:08+13:00 (5 years ago)

Author:

ak19

Message:

Save and rebuild works with map, but as with save shortcut key on map editor, the metamode ends up as accumulate still in doc.xml. Some other issues (not related to saveandrebuild) need fixing up like a popup about unsaved changes appearing even after save and rebuild has finished and possibly more things).

File:

• main/trunk/greenstone3/web/interfaces/default/js/documentedit_scripts_util.js (modified) (3 diffs)

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

@@ -447 +447 @@
 
   var changes = changesToUpdate();
+  
   //Clean changes
   editableInitStates = editableLastStates;
+  
     for(var i = 0; i < changes.length; i++)
     {
         var changedElem = changes[i];
-        //Save metadata     
+        //Save metadata
+        
         if(gs.functions.hasClass(changedElem, "metaTableCellArea")) 
         {
@@ -514 +517 @@
     }
 
+    // Check for changes to any map editors in the document
+    var modified_map_editors_data = getDocMapsEditDataForSaving(gs.cgiParams.c); // collection  
+    for(var i = 0; i < modified_map_editors_data.length; i++) {     
+        metadataChanges.push(modified_map_editors_data[i]); // of the form { collection: gs.cgiParams.c, docID: nodeID, name:"GSP.mapOverlay", metapos: 0, value: <stringifiedJSON> }
+        addCollectionToBuild(gs.cgiParams.c); // collection
+    }
+
+    
     
     var processChangesLoop = function(index)
     {
-      
         var change = metadataChanges[index];
-        
+                
         var callbackFunction;
         if(index + 1 == metadataChanges.length)
@@ -532 +542 @@
             gs.functions.removeArchivesMetadata(collection, gs.xsltParams.site_name, change.docID, change.name, null, encodeDelimiters(change.value), function(){callbackFunction();});
         } else {
-          if(change.orig)
+          // Checking "if(change.metapos)" doesn't work for us as it becomes false when the property doesn't exist AND when the property is 0. But metapos IS 0 for us.
+          // https://ultimatecourses.com/blog/methods-to-determine-if-an-object-has-a-given-property
+          if('metapos' in change && change.metapos === 0) {// && change.metapos === 0) { // for maps
+                
+                // collection, site, documentID, metadataName, metadataPosition, metadataValue, prevMetadataValue, metamode, responseFunction               
+                //console.log("@@@ metapos! change: ", change);
+                gs.functions.setArchivesMetadata(change.collection, gs.xsltParams.site_name, change.docID, change.name, change.metapos, change.value /*TODO: encodeDelimiters(change.value)*/, null, "override", function(){callbackFunction();});
+            }
+          else if(change.orig)
             {
             gs.functions.setArchivesMetadata(change.collection, gs.xsltParams.site_name, change.docID, change.name, null, encodeDelimiters(change.value), encodeDelimiters(change.orig), "override", function(){callbackFunction();});