Changeset 38351 for main/trunk/greenstone3/web

Timestamp:

2023-11-06T21:47:32+13:00 (7 months ago)

Author:

anupama

Message:

Only deleting user comments through the editor works, I can't get editing to work yet. So I've put a copy of the code back to supporting just the deletions and continue to work on editing.

Location:

main/trunk/greenstone3/web/interfaces/default

Files:

• js/documentedit_scripts.js (modified) (1 diff)
• js/documentedit_scripts_usercomments.js (added)
• js/documentedit_scripts_util.js (modified) (6 diffs)
• transform/pages/document.xsl (modified) (3 diffs)

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

@@ -241 +241 @@
         addEditMetadataLink(titleDivs[i]);
 
+        if(i == 0) { // root doc id, has no period-mark in it
+        // user comments are attached to document root
+        addEditUserCommentsLink(titleDivs[i]);
+        }
+        
         if (gs.variables.isMapGPSEditingAllowed == "1") {
         addEditMapGPSLink(titleDivs[i]);

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

@@ -295 +295 @@
         for (var j in editableLastStates) 
         {   
-            if (isNodeChanged(editableLastStates[j])) 
-            {
-                resultArray.push(editableLastStates[j].editableNode);
-            }
+                       if (isNodeChanged(editableLastStates[j])) 
+                       {
+                               resultArray.push(editableLastStates[j].editableNode);
+                       }            
         }
     }
@@ -357 +357 @@
     collection = gs.cgiParams.p_c;
   }
-  
+
     var sendBuildRequest = function()
     {
@@ -429 +429 @@
     } // end sendBuildRequest definition
 
-  var metadataChanges = new Array();
+    var metadataChanges = new Array();
+
+    var delCommentsMetapositions = [];
+    var userCommentsMetaFields = [];
+    var _docid;
   if (_deletedMetadata.length > 0) {
     //addCollectionToBuild(collection);
@@ -440 +444 @@
       var currentElem = currentRow;
       while((currentElem = currentElem.parentNode).tagName != "TABLE");
-      var docID = currentElem.getAttribute("id").substring(4);
-      
-      //Get metadata name
-      var cells = currentRow.getElementsByTagName("TD");
-    var nameCell = cells[0];
-    // metadata name cell might have the multivalue indicator in it, so just want the first word
-    var name = nameCell.innerHTML.split(" ")[0];
-      var valueCell = cells[1];
-    var value = valueCell.getElementsByTagName("TEXTAREA")[0].value;
-    if (value.length) {
-        // check for non empty value, in case all they have done is add a field then deleted it.
-        metadataChanges.push({type:'delete', docID:docID, name:name, value:value});
-        addCollectionToBuild(collection);
-    }
-      removeFromParent(currentRow);
+    
+    var docID;
+    if(currentElem.getAttribute("id").startsWith("usercomments-")) {
+        
+        docID = currentElem.getAttribute("id").substring("usercomments-".length);
+        _docid = docID;
+        
+        if(userCommentsMetaFields.length == 0) {
+        var headerRow = currentElem.firstElementChild; // tr
+        var headerCells = headerRow.querySelectorAll("th");
+        for(var th = 1; th < headerCells.length; th++) { // skip th index=0, which is metapos
+            userCommentsMetaFields.push(headerCells[th].textContent);
+            //console.log("userCommentsMetaFields:" + userCommentsMetaFields[th-1]);
+        }
+        }
+        
+        // get metapos; collumn names in first row are metanames
+        var metapos = currentRow.firstElementChild.textContent;
+        delCommentsMetapositions.push(metapos);
+        //console.log("docID : " + docID + " - metapos: " + metapos);
+    }
+    else {
+        docID = currentElem.getAttribute("id").substring(4); // <table> with id ="meta<docid>"
+        
+        //Get metadata name
+        var cells = currentRow.getElementsByTagName("TD");
+        var nameCell = cells[0];
+        // metadata name cell might have the multivalue indicator in it, so just want the first word
+        var name = nameCell.innerHTML.split(" ")[0];
+        var valueCell = cells[1];
+        var value = valueCell.getElementsByTagName("TEXTAREA")[0].value;
+        if (value.length) {
+        // check for non empty value, in case all they have done is add a field then deleted it.
+        metadataChanges.push({type:'delete', docID:docID, name:name, value:value});
+        addCollectionToBuild(collection);
+        }
+    }
+    removeFromParent(currentRow);
     }
+
+      // build up the data structure for all the usercomments to be deleted
+      if(delCommentsMetapositions.length > 0) {
+      //console.log("About to delete position: " + delCommentsMetapositions);
+      var timestamp_rec = {
+          metaname: userCommentsMetaFields[0],
+          metapositions: delCommentsMetapositions
+      };
+      var username_rec = {
+          metaname: userCommentsMetaFields[1],
+          metapositions: delCommentsMetapositions
+      };    
+      var comment_rec = {
+          metaname: userCommentsMetaFields[2],
+          metapositions: delCommentsMetapositions
+      };
+    
+    
+      var doc_rec = {
+          docid: _docid,
+          metatable: [username_rec, timestamp_rec, comment_rec],
+          //metamode: "accumulate"
+      };
+    
+      var docArray = [doc_rec];
+      metadataChanges.push({type:'deleteUserComments', docID:docID, docArray:docArray});
+      addCollectionToBuild(collection);  
+      }
   }
 
-  var changes = changesToUpdate();
+    var changes = changesToUpdate();
   
   //Clean changes
@@ -476 +531 @@
             var currentElem = changedElem;
             while((currentElem = currentElem.parentNode).tagName != "TABLE");
-            var docID = currentElem.getAttribute("id").substring(4);
+                var docID = currentElem.getAttribute("id").substring(4);
             
             //Get metadata name
@@ -590 +645 @@
         if (change.type == "delete") {
             gs.functions.removeArchivesMetadata(collection, gs.xsltParams.site_name, change.docID, change.name, null, encodeDelimiters(change.value), function(){callbackFunction();});
+        } else if (change.type === "deleteUserComments") {
+            
+            //alert("deleteUserComments" + JSON.stringify(change.docArray));
+            gs.functions.removeMetadataArray(
+            collection,
+            gs.xsltParams.site_name,
+            change.docArray,
+            null, //metamode
+            "import|archives|index",
+            function(ajaxResult) {
+                console.log("Comments deleted from import/archives/index");
+                callbackFunction(); // move on to processing next & eventually rebuild
+            },
+            false, // false for asynchronous, see comment in gs.usercomments.addUserComment()
+            function(ajaxError) {
+                var errData = (ajaxError.responseText) ? ajaxError.responseText : ajaxError;
+                alert("Remove failed. Got: " + errData);                
+            }
+            );          
+
         } else {
           // 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.

main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl

@@ -243 +243 @@
         
             <xsl:choose>
-              <xsl:when test="$canDoEditing = 'true' and $editingTurnedOn = 'true'"> 
+              <xsl:when test="$canDoEditing = 'true' and $editingTurnedOn = 'true'">
+                <!-- only docroot nodes can have a usercomments table-->
+                <xsl:if test="not(contains(@nodeID, '.'))">
+                  <table id="usercomments-{@nodeID}">
+                    <xsl:attribute name="style">
+                        <xsl:choose>
+                            <xsl:when test="/page/pageRequest/paramList/param[@name = 'dmd']/@value = 'true'">
+                                <xsl:text>display:block;</xsl:text>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:text>display:none;</xsl:text>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:attribute>                
+                </table>
+                </xsl:if>
                 <table id="meta{@nodeID}">
                     <xsl:attribute name="style">
@@ -257 +272 @@
                     <xsl:value-of select="util:clearMetadataStorage()"/>
                     <xsl:for-each select="metadataList/metadata">
-                        <xsl:sort select="@name"/>
-                            <tr>
+                      <xsl:sort select="@name"/>
+                      <tr>
                                 <td class="metaTableCellName"><xsl:value-of select="@name"/></td>
                                 <td class="metaTableCell"> <textarea autocomplete="off"><xsl:attribute name="class">metaTableCellArea <xsl:value-of select="translate(@name, '.-', '')"/></xsl:attribute><xsl:value-of select="."/></textarea></td>
-                            </tr>
+                          </tr>
                     </xsl:for-each>
                 </table>
@@ -378 +393 @@
             <script type="text/javascript" src="interfaces/{$interface_name}/js/documentedit_scripts.js"><xsl:text> </xsl:text></script>
             <script type="text/javascript" src="interfaces/{$interface_name}/js/documentedit_scripts_util.js"><xsl:text> </xsl:text></script>
+            <script type="text/javascript" src="interfaces/{$interface_name}/js/documentedit_scripts_usercomments.js"><xsl:text> </xsl:text></script>
             <script type="text/javascript">
               <xsl:text disable-output-escaping="yes">gs.variables.isMapGPSEditingAllowed = "</xsl:text><xsl:value-of select="$isMapGPSEditingAllowed"/><xsl:text disable-output-escaping="yes">";</xsl:text></script>