Changeset 27277 for main/trunk/greenstone2/macros/document.dm

Timestamp:

2013-04-29T20:25:28+12:00 (11 years ago)

Author:

ak19

Message:

Adding an Ajax Synchronous Post method to gsajaxapi.js which is then used by the setMetadataArray() that is called from document.dm. Also corrected a variable misspelling in baseaction (authenication changed to authentication) so that locating perl code that deals with authentication may become easier.

File:

• main/trunk/greenstone2/macros/document.dm (modified) (4 diffs)

main/trunk/greenstone2/macros/document.dm

@@ -151 +151 @@
 <script type="text/javascript">  
 
-    // http://stackoverflow.com/questions/3830244/get-current-date-time-in-seconds
+    // Unused. Replaced in favour of call to escape() in setMetaArray function that calls urlPostSync
+    // http://stackoverflow.com/questions/6020714/escape-html-using-jquery
     function safeHTML(str) \{
          return str.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace('"',"&quot;").replace("'","&#x27;").replace("/", "&#x2F;"); //"\\""
     \} 
+
 
     function addUserComment(_username, _comment, _docid, doc) \{
@@ -163 +165 @@
             _docid = _docid.substring(0, period);
         \}
-        
-        // Entity encode the values before storing (at least <, >, /. And single and double quote, ampersand)
-        // http://stackoverflow.com/questions/6020714/escape-html-using-jquery
-        _username = safeHTML(_username);
-        _comment = safeHTML(_comment);      
+
 
         // Want to store username, timestamp and comment in import/metadata.xml, archives/doc.xml
@@ -183 +181 @@
 
 
-        // To make individual api calls to set username meta, then timestamp then comment meta:
+        // Entity encode the values before storing (at least <, >, /. And single and double quote, ampersand)
+        // http://stackoverflow.com/questions/6020714/escape-html-using-jquery
+        // setMetadataArray escapes the entire JSON, is that better than escaping individually here?
+        //_docid = escape(_docid);
+        //_timestamp = escape(_timestamp);
+        //_username = escape(_username); //safeHTML(_username);
+        //_comment = escape(_comment); //safeHTML(_comment);
+
+        // Use this if making individual api calls to set username meta, then timestamp then comment meta
         // GSAPI already knows the collection
         //gsapi.setMetadata(_docid, "username", null, _username, "accumulate", "import|archives|index");
@@ -222 +228 @@
 
         // GSAPI already knows the collection
-        gsapi.setMetadataArray(docArray, "accumulate","import|archives|index");
-        //doc.AddUserCommentForm.comment.value = "submitted";
-        doc.getElementById("usercommentfeedback").innerHTML = "_textcommentsubmitted_"; //"submitted"; // <p id="feedback"></p>
+        gsapi.setMetadataArray(docArray, "accumulate", "import|archives|index");        
+        doc.AddUserCommentForm.comment.value = "";
+        doc.AddUserCommentForm.username.value = "";
+        doc.getElementById("usercommentfeedback").innerHTML = "_textcommentsubmitted_";
     \}
 </script>