Changeset 38410 for main/trunk/greenstone3/web

Timestamp:

2023-11-20T18:43:55+13:00 (7 months ago)

Author:

anupama

Message:

Moved the user comment editing code into the documentedit_scripts_usercomments.js file so it will hopefully be less confusing when coding.

Location:

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

Files:

• documentedit_scripts_usercomments.js (modified) (1 diff)
• documentedit_scripts_util.js (modified) (2 diffs)

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

@@ -1 +1 @@
 /** Javascript file for editing and especially deleting user comments in a documentediting situation */
 
+// Skeleton function that may be called by documentedit_scripts_util.js when saving and rebuilding.
+// 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 = [];
 
+    var i = 0;
+    for (i = 0; i < userCommentsRowsChanged.length; i++) {
+    // need docID, metaname, metaval, metapos, and set metamode to override
+    
+    var changedElem = userCommentsRowsChanged[i];
+    //console.dir(changedElem);
+    
+    var metaval = changedElem.value; //changedElem.textContent; // gets orig value
+    metaval = metaval.replace(/&nbsp;/g, " ");
+    
+    var currentElem = changedElem;
+    while((currentElem = currentElem.parentNode).tagName != "TABLE");       
+    var docID = currentElem.getAttribute("id").substring("usercomments-".length);
+    
+    currentElem = changedElem;
+    while((currentElem = currentElem.parentNode).tagName != "TR");
+    var metapos = currentElem.firstElementChild.textContent;        
+    
+    //currentElem = changedElem.parentNode; //TD
+    currentElem = changedElem;
+    while((currentElem = currentElem.parentNode).tagName != "TD");      
+    // count number of previous siblings
+    var th = 0;
+    while((currentElem = currentElem.previousSibling) != null) {
+        th++;
+    }
+    var metaname = userCommentsMetaFields[th-1]; // first column is invisible metapos col
+    
+    //alert("docid: " + docID + " metaname: " + metaname + " metaval: " + metaval + " metapos: " + metapos);
+
+    docArray.push({
+        docid:docID,
+        metatable:[{metaname:metaname,metavalue:metaval,metapos:metapos}],
+        metamode:"override"
+    });
+    }
+
+    return docArray;
+}
 
 function addEditUserCommentsLink(cell) {
     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

@@ -543 +543 @@
             if(currentElem.getAttribute("id").startsWith("usercomments-")) {
             userCommentsRowsChanged.push(changedElem);
-            continue;
+            continue; // we'll process edited user comments separately
             }
             var docID = currentElem.getAttribute("id").substring(4);
@@ -602 +602 @@
     
     if(userCommentsRowsChanged.length > 0) {
-    var docArray = [];
-    //var metatable = [];
     if(userCommentsMetaFields.length == 0) {
         fillUserCommentTableColumnNames(userCommentsRowsChanged[0], userCommentsMetaFields);
     }
     //alert("Usercomments colnames: " + userCommentsMetaFields);
-    
-    var i = 0;
-    for (i = 0; i < userCommentsRowsChanged.length; i++) {
-        // need docID, metaname, metaval, metapos, and set metamode to override
-        
-        var changedElem = userCommentsRowsChanged[i];
-        //console.dir(changedElem);
-        
-        var metaval = changedElem.value; //changedElem.textContent; // gets orig value
-        //metaval = metaval.replace(/&nbsp;/g, " ");
-        
-        var currentElem = changedElem;
-        while((currentElem = currentElem.parentNode).tagName != "TABLE");       
-        var docID = currentElem.getAttribute("id").substring("usercomments-".length);
-        
-        currentElem = changedElem;
-        while((currentElem = currentElem.parentNode).tagName != "TR");
-        var metapos = currentElem.firstElementChild.textContent;        
-
-        //currentElem = changedElem.parentNode; //TD
-        currentElem = changedElem;
-        while((currentElem = currentElem.parentNode).tagName != "TD");      
-        // count number of previous siblings
-        var th = 0;
-        while((currentElem = currentElem.previousSibling) != null) {
-        th++;
-        }
-        var metaname = userCommentsMetaFields[th-1]; // first column is invisible metapos col
-
-        //alert("docid: " + docID + " metaname: " + metaname + " metaval: " + metaval + " metapos: " + metapos);
-
-        //metatable.push({metaname:metaname,metavalue:metaval,metapos:metapos});
-        
-        docArray.push({
-        docid:docID,
-        metatable:[{metaname:metaname,metavalue:metaval,metapos:metapos}],
-        metamode:"override"
-        });
-    }
+    var docArray = getUserCommentsEditDataForSaving(
+        userCommentsMetaFields, userCommentsRowsChanged);
+    
     metadataChanges.push({type:'editUserComments',collection:collection,docArray:docArray});
     addCollectionToBuild(collection);