Changeset 25550

Show
Ignore:
Timestamp:
09.05.2012 13:50:37 (7 years ago)
Author:
sjm84
Message:

Changing the word action to operation so it is more clear

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

    r25540 r25550  
    430430     * "delete" or "reload" response will be put into the status element 
    431431     */ 
    432     protected void systemRequest(String action_name, String coll_name, Element status, UserContext userContext) 
     432    protected void systemRequest(String operation, String coll_name, Element status, UserContext userContext) 
    433433    { 
    434434        // send the request to the MR 
     
    441441        command.setAttribute(GSXML.SYSTEM_MODULE_NAME_ATT, coll_name); 
    442442 
    443         if (action_name.equals("delete")) 
     443        if (operation.equals("delete")) 
    444444        { 
    445445            command.setAttribute(GSXML.TYPE_ATT, GSXML.SYSTEM_TYPE_DEACTIVATE); 
    446446        } 
    447         else if (action_name.equals("reload")) 
     447        else if (operation.equals("reload")) 
    448448        { 
    449449            command.setAttribute(GSXML.TYPE_ATT, GSXML.SYSTEM_TYPE_ACTIVATE); 
     
    451451        else 
    452452        { 
    453             logger.error("invalid action name passed to systemRequest:" + action_name); 
     453            logger.error("invalid action name passed to systemRequest:" + operation); 
    454454            return; 
    455455        } 
     
    463463            if (response == null) 
    464464            { 
    465                 t = this.doc.createTextNode(getTextString(action_name + ".configure_error", userContext.getLanguage(), args)); 
     465                t = this.doc.createTextNode(getTextString(operation + ".configure_error", userContext.getLanguage(), args)); 
    466466                status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR)); 
    467467                status.appendChild(t); 
     
    470470 
    471471            // if we got here, we have succeeded! 
    472             t = this.doc.createTextNode(getTextString(action_name + ".success", userContext.getLanguage(), args)); 
     472            t = this.doc.createTextNode(getTextString(operation + ".success", userContext.getLanguage(), args)); 
    473473            status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.SUCCESS)); 
    474474            status.appendChild(t);