Changeset 33176 for main

Timestamp:

2019-06-21T14:24:37+12:00 (5 years ago)

Author:

kjdon

Message:

changing some strings for constants

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java

@@ -326 +326 @@
         String defaultAccess = securityBlock.getAttribute(GSXML.DEFAULT_ACCESS_ATT);
 
-        if (defaultAccess.toLowerCase().equals("public"))
+        if (defaultAccess.toLowerCase().equals(GSXML.ACCESS_PUBLIC))
         {
             _publicAccess = true;
         }
-        else if (defaultAccess.toLowerCase().equals("private"))
+        else if (defaultAccess.toLowerCase().equals(GSXML.ACCESS_PRIVATE))
         {
             _publicAccess = false;
@@ -339 +339 @@
         }
 
-        String humanVerify = securityBlock.getAttribute("humanVerify");
+        String humanVerify = securityBlock.getAttribute(GSXML.VERIFY_ATT);
         if (humanVerify.equals("true")) {
           _humanVerify = true;
         }
 
-        String useRecaptcha = securityBlock.getAttribute("useRecaptcha");
+        String useRecaptcha = securityBlock.getAttribute(GSXML.USE_RECAPTCHA_ATT);
         if (useRecaptcha.equals("true")) {
 
@@ -361 +361 @@
           }
         }
-        if (scope.toLowerCase().equals("collection"))
+        if (scope.toLowerCase().equals(GSXML.SCOPE_COLLECTION))
         {
             _securityScopeCollection = true;
         }
-        else if (scope.toLowerCase().equals("documents") || scope.toLowerCase().equals("document"))
+        else if (scope.toLowerCase().equals(GSXML.SCOPE_DOCUMENT))
         {
             _securityScopeCollection = false;