Changeset 32838 for main/trunk/greenstone3/web/interfaces/default/js/documentedit_scripts.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.js (modified) (1 diff)

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

@@ -117 +117 @@
 
 var gsmap_store = {};
+var gps_metadata_name = "GPS.mapOverlay";
 
 // Called by documentedit_scripts_util.js when saving and rebuilding.
 // This function should return all the doc sections' map overlay data so that
 // setArchivesMetadata can be called for each and the entire collection rebuilt with the changes
-function getDocMapsEditDataForSaving() {
+function getDocMapsEditDataForSaving(collName) {
     var map_editors_array = Object.values(gsmap_store);
     var modifiedMaps = []; // the array that is the return value: an array of only all the modified maps
     
-    // get collection name
-    var coll = gs.cgiParams.c;
-
     
     for(var i = 0; i < map_editors_array.length; i++) {
         var map_editor = map_editors_array[i];
-        var oldMapData = map_editor.savedOverlays;
-        var newMapData = JSON.stringify(ShapesUtil.overlayToJSON(map_editor.overlays));
+        var oldMapData = map_editor.savedOverlays; // stringified JSON shape
+        var newMapData = JSON.stringify(ShapesUtil.overlayToJSON(map_editor.overlays)); // stringified JSON shape too
         
-        if(oldMapData !== newMapData) {
+        // We only consider a map editor's map data to have been modified in the following cases:
+        // - if oldMapData is null, new mapData should not be empty array
+        // - OR oldMapData had some value and it's not the same as newMapData
+        if(!oldMapData && newMapData !== "[]" /*|| oldMapData && oldMapData !== newMapData*/) {
+            var nodeID = map_editors_array[i].id;
+            console.log("old vs new mapdata for nodeID " + nodeID);
+            console.log(oldMapData);
+            console.log(newMapData);
             
-            var nodeID = map_editors_array[i].id;
-            var val = map_editors_array[i].overlays;
             modifiedMaps.push({
-                collection: coll,
+                collection: collName,
                 docID: nodeID,
-                name:"GSP.mapOverlay",
-                pos: 0,
+                name:gps_metadata_name,
+                metapos: 0,
                 value:newMapData                
             });