Changeset 38431

Timestamp:

2023-11-25T19:06:30+13:00 (6 months ago)

Author:

anupama

Message:

1. For editing user comments with the document editor, I want to set metamode to override just once instead of for each docid (that is, for each docrecord). This didn't work before because the perl code didn't allow it as optional argument, although the actual set-metadata-array() perl subroutines were coded for it. 2. The Java code needs to allow an array of document records, without requiring that each docrecord contains a metatable field (a sub array of meta records). This is because the perl code set-metadata-array() subroutines allowed for this, but when set-metadata functionality started needing authentication/user editing powers (authentication goes through java, which then relays the command to perl), this pre-existing, optional way of setting metadata in the perl code wasn't opened up through java.

Location:

main/trunk

Files:

• greenstone2/perllib/cgiactions/modmetadataaction.pm (modified) (2 diffs)
• greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java (modified) (3 diffs)
• greenstone3/web/interfaces/default/js/documentedit_scripts_usercomments.js (modified) (1 diff)

main/trunk/greenstone2/perllib/cgiactions/modmetadataaction.pm

@@ -83 +83 @@
     "set-metadata-array" => { 
         'compulsory-args' => [ "where", "json" ],
-        'optional-args'   => [ ],
+        'optional-args'   => [ "metamode" ],
         'help-string' => [
         'A simple example: metadata-server.pl?a=set-metadata-array&where=archives|index|import&c=demo&json=[{"docid":"HASHc5bce2d6d3e5b04e470ec9","metaname":"Title","metavalue":"Tralalala","metamode":"accumulate"},{"docid":"HASHbe483fa4df4e096335d1c8","metaname":"Title","metavalue":"Lala was here","metapos":0, "metamode":"override"}]', 
@@ -97 +97 @@
     "set-archives-metadata-array" => { 
         'compulsory-args' => [ "json" ],
-        'optional-args'   => [ ] },
+        'optional-args'   => [ "metamode" ] },
         
     "set-import-metadata-array" => {
         'compulsory-args' => [ "json" ],
-        'optional-args'   => [ ] },
+        'optional-args'   => [ "metamode" ] },
 
     "set-index-metadata-array" => {
         'compulsory-args' => [ "json" ],
-        'optional-args'   => [ ] },
+        'optional-args'   => [ "metamode" ] },
     
     "set-live-metadata-array" => {

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

@@ -907 +907 @@
             
             constructor.setQueryString(querystring.toString());
+            //logger.info("@@@@ perl querystring: " + querystring.toString());
         }
 
@@ -1176 +1177 @@
             }
             }
+        } else {
+            // can also have set-metadatat-array without metatable field, like
+            // json=[{"docid":"HASHc5bce2d6d3e5b04e470ec9","metaname":"Title","metavalue":"Tralalala","metamode":"accumulate"},{"docid":"HASHbe483fa4df4e096335d1c8","metaname":"Title","metavalue":"Lala was here","metapos":0, "metamode":"override"}]
+            // though we use the metatable way for setting user comments meta.
+            // The alternative way is described as example usage in perllib/cgiactions/modmetadataaction.pm
+            // and also the way it's already coded up there, so we need to allow it here.
+            docids[index] = docInfo.getString("docid");
+            String metaname = docInfo.getString("metaname");
+            if(!isAllowedToModifyMeta(metaname, filterFields)) {
+            return null;
+            }
         }
         }
@@ -1187 +1199 @@
     // meaning that the setmeta operation was a valid user comment operation.
     // In that case, we have a docid for which we need to add a user comment 
-    // set-metadata-array can take more docids, but doesn't happen for a user comment. And one comment
-    // is added at a time, but 3 meta fields are set for each comment: username, usercomment and timestamp
-    // hence the use of set-meta-array.
+    // set-metadata-array can take more docids, but that doesn't happen when creating a user
+    // comment (though it now happens when editing existing user comments). And one comment is
+    // added at a time, but 3 meta fields are set for each comment: username, usercomment and 
+    // timestamp, hence the use of set-meta-array.
     return docids;
 

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

@@ -68 +68 @@
     docArray.push({
         docid:docid,
-        metatable:metatable,
-        metamode:"override"
+        metatable:metatable/*,
+        metamode:"override"*/ // metamode set universally to override in
+              // documentedit_scripts_util.js::processChangesLoop when change.type=editUserComments
     });
     }