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

Timestamp:

2019-11-14T14:14:28+13:00 (4 years ago)

Author:

kjdon

Message:

modified slightly so that the error messages come from the dictionary (ServiceRack.properties) instead of hard wired in the code

File:

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

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

@@ -63 +63 @@
  * perl scripts
  * 
- * @author Katherine Don
  */
 public class GS2Construct extends ServiceRack
@@ -71 +70 @@
 
     // default error message
-    private static final String NO_PERMISSIONS_ERROR = "This user does not have the required permissions to perform this action.";
-
+    private static final String NO_PERMISSIONS_ERROR = "auth.error.no_permissions";
+  private static final String NO_METADATA_PERMISSIONS_ERROR = "auth.error.no_metadata_permissions";
+  
     // services offered
     private static final String NEW_SERVICE = "NewCollection";
@@ -166 +166 @@
     protected Element processNewCollection(Element request)
     {
+      
         if (!userHasCollectionEditPermissions(request)) {
-        return errorResponse("processNewCollection", NO_PERMISSIONS_ERROR);
+          String lang = request.getAttribute(GSXML.LANG_ATT);
+          return errorResponse("processNewCollection", NO_PERMISSIONS_ERROR, lang);
         }
         return runCommand(request, GS2PerlConstructor.NEW);
@@ -176 +178 @@
     {
         if (!userHasCollectionEditPermissions(request)) {
-        return errorResponse("processAddDocument", NO_PERMISSIONS_ERROR);
+          String lang = request.getAttribute(GSXML.LANG_ATT);
+        return errorResponse("processAddDocument", NO_PERMISSIONS_ERROR, lang);
         }
 
@@ -198 +201 @@
         // check permissions
         if (!userHasCollectionEditPermissions(request)) {
-        return errorResponse("processBuildAndActivateCollection", NO_PERMISSIONS_ERROR);
+          String lang = request.getAttribute(GSXML.LANG_ATT);
+          return errorResponse("processBuildAndActivateCollection", NO_PERMISSIONS_ERROR, lang);
         }
 
@@ -237 +241 @@
     {
         if (!userHasCollectionEditPermissions(request)) {
-        return errorResponse("processImportCollection", NO_PERMISSIONS_ERROR);
+          String lang = request.getAttribute(GSXML.LANG_ATT);
+          return errorResponse("processImportCollection", NO_PERMISSIONS_ERROR, lang);
         }
 
@@ -304 +309 @@
     {
         if (!userHasCollectionEditPermissions(request)) {
-        return errorResponse("processBuildCollection", NO_PERMISSIONS_ERROR);
+          String lang = request.getAttribute(GSXML.LANG_ATT);
+          return errorResponse("processBuildCollection", NO_PERMISSIONS_ERROR, lang);
         }
 
@@ -341 +347 @@
 
         UserContext context = new UserContext(request);
+        String lang = request.getAttribute(GSXML.LANG_ATT);
         if (context.getUsername().equals("")) {
             
-            return errorResponse("processModifyMetadata", "Cannot modify any metadata when not logged in.");
+            return errorResponse("processModifyMetadata", NO_METADATA_PERMISSIONS_ERROR, lang);
         } else { // User is logged in at least, see whether they can do any restricted set-meta ops
             // that are open to regular users (those without permissions to edit this collection).
@@ -366 +373 @@
             if(!isAddingUserComments) { // logged in user is attempting to set meta outside restricted set,
                  // In this case, they're attempting to set meta not related to user comments
-            return errorResponse("processModifyMetadata", NO_PERMISSIONS_ERROR);
+              return errorResponse("processModifyMetadata", NO_PERMISSIONS_ERROR, lang);
             }
         }
@@ -433 +440 @@
     {
 
+      String lang = request.getAttribute(GSXML.LANG_ATT);
         if (!userHasCollectionEditPermissions(request)) {
-        return errorResponse("processActivateCollection", NO_PERMISSIONS_ERROR);
+          return errorResponse("processActivateCollection", NO_PERMISSIONS_ERROR, lang);
         }
 
@@ -442 +450 @@
         HashMap<String, Serializable> params = GSXML.extractParams(param_list, false);
         String coll_name = (String) params.get(COL_PARAM);
-        String lang = request.getAttribute(GSXML.LANG_ATT);
+        
 
         UserContext userContext = new UserContext(request);
@@ -508 +516 @@
     protected Element processDeleteCollection(Element request)
     {
+      
         if (!userHasCollectionEditPermissions(request)) {
-        return errorResponse("processDeleteCollection", NO_PERMISSIONS_ERROR);
+          String lang = request.getAttribute(GSXML.LANG_ATT);
+        return errorResponse("processDeleteCollection", NO_PERMISSIONS_ERROR, lang);
         }
 
@@ -570 +580 @@
     {
         if (!userHasCollectionEditPermissions(request)) {
-        return errorResponse("processReloadCollection", NO_PERMISSIONS_ERROR);
+          String lang = request.getAttribute(GSXML.LANG_ATT);
+          return errorResponse("processReloadCollection", NO_PERMISSIONS_ERROR, lang);
         }
 
@@ -1162 +1173 @@
     }
 
-    protected Element errorResponse(String serviceName, String errorMsg) {
+    protected Element errorResponse(String serviceName, String errorKey, String lang) {
+      String error_message = getTextString(errorKey, lang, "ServiceRack");
     Document result_doc = XMLConverter.newDOM();
     Element result = GSXML.createBasicResponse(result_doc, serviceName);
-    GSXML.addError(result, errorMsg);
+    GSXML.addError(result, error_message);
     return result;
     }