Changeset 38411 for main/trunk

Timestamp:

2023-11-20T21:13:41+13:00 (7 months ago)

Author:

anupama

Message:

Store the usercomments edits and deletes in a hashmap keyed by docid, as in theory we can make edits/deletes over multiple documents using the doc editor before rebuilding the collection. Another problem has surfaced: doing both deletes and edits to a doc before a single rebuild will shift metapos, as deletes are processed first before edits. Needs some thinking to optimally fix this.

Location:

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

Files:

• documentedit_scripts_usercomments.js (modified) (4 diffs)
• documentedit_scripts_util.js (modified) (6 diffs)

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

@@ -4 +4 @@
 // This function should return all the doc sections' (actually only root section's) usercomments data so that
 // setArchivesMetadata can be called for root section and the entire collection rebuilt with the changes
-function getUserCommentsEditDataForSaving(userCommentsMetaFields, userCommentsRowsChanged) {    
-    var docArray = [];
-
+function getUserCommentsEditDataForSaving(userCommentsMetaFields, userCommentsRowsChanged) {
+    // https://medium.com/@martin.crabtree/javascript-tracking-key-value-pairs-using-hashmaps-7de6df598257
+    // Just using JS object. Not using Map in case it's not always compatible with older
+    // browsers we still support on 32 bit linux.
+    var docIDs_to_metatable_map = {};    
+
+    
     var i = 0;
     for (i = 0; i < userCommentsRowsChanged.length; i++) {
@@ -15 +19 @@
     
     var metaval = changedElem.value; //changedElem.textContent; // gets orig value
-    metaval = metaval.replace(/&nbsp;/g, " ");
+    metaval = metaval.replace(/&nbsp;/g, " "); // copied from docedit_scripts_utl, when procsesing the array called changes.
     
     var currentElem = changedElem;
@@ -37 +41 @@
     //alert("docid: " + docID + " metaname: " + metaname + " metaval: " + metaval + " metapos: " + metapos);
 
+    // https://dmitripavlutin.com/check-if-object-has-property-javascript/
+    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/null
+    if(docIDs_to_metatable_map[docID] === undefined) {
+        docIDs_to_metatable_map[docID] = [];        
+    }
+    docIDs_to_metatable_map[docID].push({metaname:metaname,metavalue:metaval,metapos:metapos});
+    }
+    
+    var docids = Object.keys(docIDs_to_metatable_map);
+    i = 0;
+    var docArray = [];
+    for(i = 0; i < docids.length; i++) {
+    var docid = docids[i];
+    var metatable = docIDs_to_metatable_map[docid];
     docArray.push({
-        docid:docID,
-        metatable:[{metaname:metaname,metavalue:metaval,metapos:metapos}],
+        docid:docid,
+        metatable:metatable,
         metamode:"override"
     });
     }
-
+    
     return docArray;
 }
@@ -50 +68 @@
     cell = $(cell);
     var doc_id = cell.attr("id").substring(6);
-//console.log("HERE I AM: id = " + doc_id);
     
     var edit_usercomments_table = document.getElementById("usercomments-"+doc_id);   

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

@@ -445 +445 @@
     var metadataChanges = new Array();
 
-    var delCommentsMetapositions = [];
+    var docids_to_delCommentsMetapositions = {};
+    
+    //var delCommentsMetapositions = [];
     var userCommentsMetaFields = [];
     var _docid;
@@ -451 +453 @@
     //addCollectionToBuild(collection);
 
-    for(var i = 0; i < _deletedMetadata.length; i++) {
+      var i;
+    for(i = 0; i < _deletedMetadata.length; i++) {
       
       var currentRow = _deletedMetadata[i];
@@ -471 +474 @@
         // get metapos; collumn names in first row are metanames
         var metapos = currentRow.firstElementChild.textContent;
-        delCommentsMetapositions.push(metapos);
+        if(docids_to_delCommentsMetapositions[docID] === undefined) {
+        docids_to_delCommentsMetapositions[docID] = [];
+        }
+        //delCommentsMetapositions.push(metapos);
+        docids_to_delCommentsMetapositions[docID].push(metapos);
+        
+        
         //console.log("docID : " + docID + " - metapos: " + metapos);
     }
@@ -492 +501 @@
     removeFromParent(currentRow);
     }
+
+    var docids = Object.keys(docids_to_delCommentsMetapositions);
+    var docArray = [];
+    for(i = 0; i < docids.length; i++) { //if(docids.length > 0) {
+      var _docid = docids[i];
+      var delCommentsMetapositions = docids_to_delCommentsMetapositions[_docid];
+      
 
       // build up the data structure for all the usercomments to be deleted
@@ -512 +528 @@
       var doc_rec = {
           docid: _docid,
-          metatable: [username_rec, timestamp_rec, comment_rec],
-          //metamode: "accumulate"
+          metatable: [username_rec, timestamp_rec, comment_rec]
       };
-    
-      var docArray = [doc_rec];
-      metadataChanges.push({type:'deleteUserComments', docID:docID, docArray:docArray});
-      addCollectionToBuild(collection);  
+
+      docArray.push(doc_rec);    
       }
+    }
+
+    if(docArray.length > 0) {// or if(docids.length > 0)
+    metadataChanges.push({type:'deleteUserComments', docArray:docArray});
+    addCollectionToBuild(collection);
+    }
+    // clear used up vars https://bobbyhadz.com/blog/javascript-clear-object-delete-all-properties
+    docArray = [];
+    docids_to_delCommentsMetapositions = {};
+    docids = [];
   }
 
@@ -611 +634 @@
     metadataChanges.push({type:'editUserComments',collection:collection,docArray:docArray});
     addCollectionToBuild(collection);
+    docArray = []; // clear it
     }