Changeset 36001

Timestamp:

2022-01-14T10:14:57+13:00 (2 years ago)

Author:

cstephen

Message:

Surface cookie consent parameter as XML param.
Use commons StringUtils in XSLTUtil#getInterfaceStringsAsJavascript

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• core/TransformingReceptionist.java (modified) (1 diff)
• util/GSConstants.java (modified) (1 diff)
• util/XSLTUtil.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

@@ -650 +650 @@
             GSXML.addParameter2ToList(xslt_params, "interface_name", (String) config_params.get(GSConstants.INTERFACE_NAME));
             GSXML.addParameter2ToList(xslt_params, "site_name", (String) config_params.get(GSConstants.SITE_NAME));
+            GSXML.addParameter2ToList(xslt_params, "cookie_consent", (String) config_params.get(GSConstants.COOKIE_CONSENT));
             Boolean useClientXSLT = (Boolean) config_params.get(GSConstants.USE_CLIENT_SIDE_XSLT);
             GSXML.addParameter2ToList(xslt_params, "use_client_side_xslt", useClientXSLT.toString());

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSConstants.java

@@ -45 +45 @@
     public static final String UTF8="UTF-8";
     // The default encoding Greenstone expects when reading in its XML files
-    public static final String XML_FILE_ENCODING=UTF8;
+    public static final String XML_FILE_ENCODING = UTF8;
+    
+    /**
+     * Gets the name of the cookie consent servlet parameter.
+     */
+    public static final String COOKIE_CONSENT = "cookie_consent";
 }

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XSLTUtil.java

@@ -17 +17 @@
  *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
+/**
+ * Note (cstephen):
+ * Use of org.apache.commons.lang3.StringUtils can likely be removed when compiling
+ * for Java 1.13+, due to performance improvements in the standard library.
+ * https://stackoverflow.com/questions/16228992/commons-lang-stringutils-replace-performance-vs-string-replace
+ */
+
 package org.greenstone.gsdl3.util;
 
@@ -882 +890 @@
                 if (key.startsWith(prefix))
                 {
-                    int lastDotIndex = key.lastIndexOf(".");
+                    int lastDotIndex = StringUtils.lastIndexOf(key, '.');
                     // If this is true, the key is nested under nodes that we might have to construct
                     if (lastDotIndex > 0) {
@@ -890 +898 @@
                         buildJSObjectGraph(
                             outputStr,
-                            prependToPrefix + "." + key.substring(0, lastDotIndex), // Strip the actual key from the path
+                            prependToPrefix + "." + StringUtils.substring(key, 0, lastDotIndex), // Strip the actual key from the path
                             initialisedNodes
                         );
@@ -943 +951 @@
         }
 
-        String[] nodes = objectGraph.split("\\.");
+        String[] nodes = StringUtils.split(objectGraph, '.');
 
         if (!preBuiltNodes.contains(nodes[0])) {