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

Timestamp:

2017-03-27T18:01:36+13:00 (7 years ago)

Author:

ak19

Message:

Some commits ahead of further changes: 1. Kathy came up with better name for GS2Construct.java method (to be refactored) that's more descriptive of the multiple tasks it performs. Removed unused paramter. 2. Javascript user_comments.js displays the heading for the comments section only when appropriate, which is when there is a comment history or when the form to add a comment is shown. Otherwise only the Add Comment link will be shown. 3. Changed core.css colours of links and headings in comments section to better match GS3. 4. document.xsl needs to display usercomments section not just for simple docs but also for wrapped docs.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java (modified) (2 diffs)

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

@@ -331 +331 @@
         // If a user is only adding comments, they don't need to have editing powers over a collection
         // but they need to be logged in
-        String[] docids = isAddingUserComments(request, params);
+        String[] docids = getDocIDsifAddingUserComments(params); //isAddingUserComments(request, params);
         boolean isAddingUserComments = (docids == null) ? false : true;
 
@@ -1021 +1021 @@
     }
 
-
-    protected String[] isAddingUserComments(Element request, HashMap<String, Serializable> params) {
+    // getDocIdsWithOptFilter(JSONArray json, Pattern filterFields, boolean strictOrPermissible)
+    protected String[] getDocIDsifAddingUserComments(HashMap<String, Serializable> params) {
 
     String metaserver_command = (String) params.get("a"); // e.g. set-archives-metadata or set-metadata-array