Changeset 38234 for main/trunk/greenstone3

Timestamp:

2023-09-26T21:56:47+13:00 (8 months ago)

Author:

anupama

Message:

Removed most of the debugging statements when removing user comments. Added one console.log statement for feedback/informative purposes. Still one TODO needs checking: on error, I reload page as Dr Bainbridge specified, but want to ask Dr Bainbridge if there are any page parameters that may not get preserved but need preserving. Basically, I want to ask if a simple location.reload() suffices as I've chosen to do at present. This branch of the code is untested as there are no errors at present.

Location:

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

Files:

• javascript-global-functions.js (modified) (2 diffs)
• user_comments.js (modified) (5 diffs)

main/trunk/greenstone3/web/interfaces/default/js/javascript-global-functions.js

@@ -1029 +1029 @@
             where, successResponseFunction, forceSync, errorResponseFunction) 
 {
-    alert("in gs.functions.removeMetaArray START");
-    
     if( typeof errorResponseFunction === 'undefined' ) { errorResponseFunction = null; } // force error callback to be defined: either null or has value
 
@@ -1045 +1043 @@
     var response = gs.functions._callMetadataServer("Removing metadata from "+where, payload, successResponseFunction, errorResponseFunction, {"forceSync": forceSync, "requestMethod": "POST"});
 
-    console.log("in gs.functions.removeMetaArray: " + JSON.stringify(payload));
+    //console.log("in gs.functions.removeMetaArray: " + JSON.stringify(payload));
     
     return response;

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

@@ -327 +327 @@
     }
 
+    console.log("About to remove usercomments at metapositions: " + metadataPositions);
     
     gs.functions.removeMetadataArray(
@@ -339 +340 @@
     );
     
-
-    //console.log("username: " + opt_metaname_username + " - " + gs.usercomments.defaults.metaname_username);
-    console.log("metapositions to remove: " + metadataPositions);
-    console.log("docArray:\n" + JSON.stringify(docArray));
+    //console.log("metapositions to remove: " + metadataPositions);
+    //console.log("docArray:\n" + JSON.stringify(docArray));
 }
 
@@ -351 +350 @@
 
     // TODO, force a page reload so that the usercomments' state somewhat better reflects what's in DBs
+    location.reload();
 }
 
@@ -461 +461 @@
     var result = (data.responseText) ? data.responseText : data;        
 
-    //alert(result);
-    console.log("@@@ Done removing metadata:\n" + result);
+    //console.log("@@@ Done removing metadata:\n" + result);
     
     var userCommentsDiv = document.getElementById("usercomments");
@@ -495 +494 @@
 }
 
-
-/*
-gs.usercomments.removeUserComment = function (_usernames, _timestamps, _comments, _docid, doc,
-          opt_metaname_username, opt_metaname_usertimestamp, opt_metaname_usercomment)
-{
-    // Want to remove usernames, timestamps and comments from import/metadata.xml,
-    // archives/doc.xml and index/col.gdb.
-    
-    // Need to the add user comment meta of username, timestamp and comment to the
-    // topmost section of the document. So only get the docId up to any period mark:
-    var period = _docid.indexOf(".");
-    if(period != -1) {
-    _docid = _docid.substring(0, period);
-    }
-    
-    // Use the new JSON metatable format to remove list of usernames, their matching timestamps and comments meta for docid in one go
-    // For creating the JSON object that gets turned into a string, see
-    // http://msdn.microsoft.com/en-us/library/ie/cc836459%28v=vs.94%29.aspx
-    // http://jsfiddle.net/qmacro/W54hy/
-    
-    var username_rec = {
-    metaname: opt_metaname_username || gs.usercomments.defaults.metaname_username, // e.g. "username"
-    metavals: _usernames
-    };
-    
-    var timestamp_rec = {
-    metaname: opt_metaname_usertimestamp || gs.usercomments.defaults.metaname_usertimestamp, // e.g. "usertimestamp"
-    metavals: _timestamps
-    };
-    
-    var comment_rec = {
-    metaname: opt_metaname_usercomment || gs.usercomments.defaults.metaname_usercomment, // e.g. "usercomment"
-    metavals: _comments
-    };
-    
-    var doc_rec = {
-    docid: _docid,
-    metatable: [username_rec, timestamp_rec, comment_rec],
-    metamode: "accumulate" // TODO
-    };
-    
-    var docArray = [doc_rec];
-    
-    // Don't allow the user to submit further comments or delete comments
-    // until the metadata has been updated
-    document.getElementById("usercommentSubmitButton").disabled = true;
-    var delCommentsButton = document.getElementById("delCommentsButton");
-    if(delCommentsButton != undefined) {// should be defined when in this function
-    delCommentsButton.disabled = true;
-    }
-
-    // There is no remove array version yet!!!
-    
-    //var result = gs.functions.setMetadataArray(gs.variables["c"], gs.variables["site"], docArray, "accumulate", "import|archives|index");
-    gs.functions.removeMetadataArray(gs.variables["c"],
-    gs.variables["site"],
-    docArray, "accumulate",
-    "import|archives|index",
-    function(ajaxResult) { return gs.usercomments.doneUpdatingMetatada(ajaxResult, _username, _timestamp, _comment); },
-    true); // true for synchronous, meaning is opposite to explanation for addUserComment() function below   
-    
-}
-*/
 
 gs.usercomments.addUserComment = function(_username, _comment, _docid, doc,