Changeset 27365 for main

Timestamp:

2013-05-16T19:45:16+12:00 (11 years ago)

Author:

ak19

Message:

Bugfixes: 1. handles locked collections (as happens when GLI has opened the collection) when attempting to set metadata. And also when a comment was empty, the username field should not be zeroed.

Location:

main/trunk/greenstone2

Files:

• macros/document.dm (modified) (2 diffs)
• web/script/gsajaxapi.js (modified) (1 diff)

main/trunk/greenstone2/macros/document.dm

@@ -183 +183 @@
 
         // http://stackoverflow.com/questions/498970/how-do-i-trim-a-string-in-javascript
-        var trimmed_username=_username.replace(/^\s+|\s+$/g, '');
+        //var trimmed_username=_username.replace(/^\s+|\s+$/g, '');
         var trimmed_comment = _comment.replace(/^\s+|\s+$/g, '');
         
-        if(!trimmed_username || !trimmed_comment) \{
-              doc.AddUserCommentForm.comment.value = "";
-              doc.AddUserCommentForm.username.value = "";
+        if(!trimmed_comment) \{ // || !trimmed_username
+              doc.AddUserCommentForm.comment.value = "";              
+              //doc.AddUserCommentForm.username.value = "";
               doc.getElementById("usercommentfeedback").innerHTML = "_text-is-empty_";
               return;
@@ -262 +262 @@
 
         // GSAPI already knows the collection
-        gsapi.setMetadataArray(docArray, "accumulate", "import|archives|index");
+        var result = gsapi.setMetadataArray(docArray, "accumulate", "import|archives|index");
 
         // clear the comment field as it has now been submitted, but not the username field
         // as the user is logged in, so they should be able to commit again under their username.
         doc.AddUserCommentForm.comment.value = ""; 
-        doc.getElementById("usercommentfeedback").innerHTML = "_textcommentsubmitted_";
-
-        // update display of existing user comments to show the newly added comment
-        var usercommentdiv = document.getElementById("usercomments");
-        if(usercommentdiv != undefined) \{
+
+        // check for locked collection error
+        var errorIndex = result.indexOf("ERROR");
+        if(errorIndex != -1) \{
+           var endIndex = result.indexOf("\\n");
+           var error = result.substring(errorIndex,endIndex);
+           errormessage="Unable to add comment. " + error;
+           doc.getElementById("usercommentfeedback").innerHTML = errormessage;
+           //alert("Result: " + result);
+        \} else \{
+           doc.getElementById("usercommentfeedback").innerHTML = "_textcommentsubmitted_";      
+
+           // update display of existing user comments to show the newly added comment
+           var usercommentdiv = document.getElementById("usercomments");
+           if(usercommentdiv != undefined) \{
              displayInUserCommentList(usercommentdiv, _username, _timestamp, _comment);
-        \}
+               \}
+        \}     
     \}
 </script>

main/trunk/greenstone2/web/script/gsajaxapi.js

@@ -344 +344 @@
     
     //this.urlGetSync(mdserver + "?" + params);
-    this.urlPostSync(mdserver,params);  
+    return this.urlPostSync(mdserver,params);   
     }