Changeset 32448 for main/trunk
- Timestamp:
- 2018-09-13T14:05:59+12:00 (6 years ago)
- Location:
- main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/Action.java
r32063 r32448 87 87 88 88 /** 89 * tell the param class what its arguments are if an action has its own 90 * arguments, this should add them to the params object - particularly 91 * important for args that should not be saved 89 * tell the param class what its arguments are. 90 * if an action has its own arguments, this should add them to 91 * the params object - particularly 92 * important for args that need to be saved to the session 92 93 */ 93 94 public boolean addActionParameters(GSParams params) -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DepositorAction.java
r28964 r32448 21 21 import org.greenstone.gsdl3.util.DerbyWrapper; 22 22 import org.greenstone.gsdl3.util.GSConstants; 23 import org.greenstone.gsdl3.util.GSParams; 23 24 import org.greenstone.gsdl3.util.GSXML; 24 25 import org.greenstone.gsdl3.util.GSXSLT; … … 40 41 private final String DE_CLEAR_DATABASE = "cleardatabase"; 41 42 43 // cgi args 44 private final String DE_PAGE_ARG = "dePage"; 45 private final String CURRENT_PAGE_ARG = "currentPage"; 46 private final String FILE_TO_ADD_ARG = "fileToAdd"; 47 42 48 public Node process(Node message) 43 49 { … … 55 61 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 56 62 57 String collection = (String) params.get( "c");63 String collection = (String) params.get(GSParams.COLLECTION); 58 64 59 65 int pageNum = -1; … … 61 67 try 62 68 { 63 pageNum = Integer.parseInt(((String) params.get( "dePage")));69 pageNum = Integer.parseInt(((String) params.get(DE_PAGE_ARG))); 64 70 } 65 71 catch (Exception ex) … … 72 78 try 73 79 { 74 prevPageNum = Integer.parseInt((String) params.get( "currentPage"));80 prevPageNum = Integer.parseInt((String) params.get(CURRENT_PAGE_ARG)); 75 81 } 76 82 catch (Exception ex) … … 125 131 { 126 132 String paramName = paramIter.next(); 127 if (paramName.startsWith( "md___"))133 if (paramName.startsWith(GSParams.MD_PREFIX)) 128 134 { 129 135 Object paramValue = params.get(paramName); … … 270 276 else if (subaction.toLowerCase().equals(DE_DEPOSIT_FILE)) 271 277 { 272 String fileToAdd = (String) params.get( "fileToAdd");278 String fileToAdd = (String) params.get(FILE_TO_ADD_ARG); 273 279 File tempFile = new File(GlobalProperties.getGSDL3Home() + File.separator + "tmp" + File.separator + fileToAdd); 274 280 if (tempFile.exists()) -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java
r32348 r32448 803 803 } 804 804 805 /**806 * tell the param class what its arguments are if an action has its own807 * arguments, this should add them to the params object - particularly808 * important for args that should not be saved809 */810 public boolean addActionParameters(GSParams params)811 {812 params.addParameter(GOTO_PAGE_ARG, false);813 params.addParameter(ENRICH_DOC_ARG, false);814 params.addParameter(EXPAND_DOCUMENT_ARG, false);815 params.addParameter(EXPAND_CONTENTS_ARG, false);816 params.addParameter(REALISTIC_BOOK_ARG, false);817 818 return true;819 }820 805 821 806 private boolean needSectionContent(HashMap<String, Serializable> params) { -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/FormatAction.java
r28964 r32448 33 33 34 34 static Logger logger = Logger.getLogger(org.greenstone.gsdl3.action.FormatAction.class.getName()); 35 36 public static final String CLASSIFIER_ARG = "cl"; 37 public static final String DATA_ARG = "data"; 38 35 39 XMLTransformer transformer = null; 36 40 … … 56 60 String coll = (String)params.get(GSParams.COLLECTION); //SYSTEM_CLUSTER); 57 61 String service = (String)params.get(GSParams.SERVICE); 58 String classifier = (String)params.get( "cl");62 String classifier = (String)params.get(CLASSIFIER_ARG); 59 63 60 64 String to = ""; … … 73 77 mr_request_message.appendChild(mr_request); 74 78 75 String format_string = (String)params.get( "data");79 String format_string = (String)params.get(DATA_ARG); 76 80 77 81 Element page_response = doc.createElement(GSXML.RESPONSE_ELEM); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/GeneralAction.java
r28964 r32448 27 27 { 28 28 29 public static final String CONFIG_CHANGE_NAME_ARG = "configChangeName"; 30 public static final String CONFIG_CHANGE_VALUE_ARG = "configChangeValue"; 31 29 32 /** process a request */ 30 33 public Node process(Node message_node) … … 48 51 HashMap<String, Serializable> params = GSXML.extractParams(cgi_param_list, false); 49 52 50 if (params.get( "configChangeName") != null && params.get("configChangeValue") != null)51 { 52 String optionName = (String) params.get( "configChangeName");53 String optionValue = (String) params.get( "configChangeValue");53 if (params.get(CONFIG_CHANGE_NAME_ARG) != null && params.get(CONFIG_CHANGE_VALUE_ARG) != null) 54 { 55 String optionName = (String) params.get(CONFIG_CHANGE_NAME_ARG); 56 String optionValue = (String) params.get(CONFIG_CHANGE_VALUE_ARG); 54 57 55 58 changeConfig(optionName, optionValue); … … 100 103 Element param_list = null; 101 104 // add in the service params - except the ones only used by the action 102 HashMap service_params = (HashMap) params.get( "s1");105 HashMap service_params = (HashMap) params.get(GSParams.SERVICE_PREFIX); 103 106 if (service_params != null) 104 107 { -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/NoCollQueryAction.java
r28964 r32448 97 97 98 98 // service paramList 99 HashMap service_params = (HashMap) params.get( "s1");99 HashMap service_params = (HashMap) params.get(GSParams.SERVICE_PREFIX); 100 100 if (service_params == null) 101 101 { // no query -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/ProcessAction.java
r28964 r32448 86 86 request_type_att = GSXML.REQUEST_TYPE_PROCESS; 87 87 // add in the service params - except the ones only used by the action 88 HashMap service_params = (HashMap) params.get( "s1");88 HashMap service_params = (HashMap) params.get(GSParams.SERVICE_PREFIX); 89 89 if (service_params != null) 90 90 { -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/QueryAction.java
r31774 r32448 21 21 { 22 22 23 public static final String HITS_PER_PAGE = "hitsPerPage";23 public static final String HITS_PER_PAGE_ARG = "hitsPerPage"; 24 24 static Logger logger = Logger.getLogger(org.greenstone.gsdl3.action.QueryAction.class.getName()); 25 26 /** 27 * tell the param class what its arguments are. 28 * if an action has its own arguments, this should add them to 29 * the params object - particularly 30 * important for args that need to be saved to the session 31 */ 32 public boolean addActionParameters(GSParams params) 33 { 34 // some query services don't do paging themselves, in shich case we do it here. Let tell servlet to save the param just in case nothing else is doing that. 35 params.addServiceParameter(HITS_PER_PAGE_ARG, "20", true, false); 36 return true; 37 } 25 38 26 39 /** … … 351 364 { 352 365 353 String hits_pp = (String) service_params.get(HITS_PER_PAGE );366 String hits_pp = (String) service_params.get(HITS_PER_PAGE_ARG); 354 367 355 368 int hits = 20; … … 427 440 protected boolean addHitsParamToService(Document doc, Element service_description, String lang) { 428 441 Element param_list = (Element)GSXML.getChildByTagName(service_description, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER); 429 Element param = GSXML.createParameterDescription(doc, HITS_PER_PAGE , getTextString("param." + HITS_PER_PAGE, lang, "ServiceRack", null), GSXML.PARAM_TYPE_INTEGER, "20", null, null);442 Element param = GSXML.createParameterDescription(doc, HITS_PER_PAGE_ARG, getTextString("param." + HITS_PER_PAGE_ARG, lang, "ServiceRack", null), GSXML.PARAM_TYPE_INTEGER, "20", null, null); 430 443 Element query_param = GSXML.getNamedElement(param_list, GSXML.PARAM_ELEM, GSXML.NAME_ATT, "query"); 431 444 if (query_param != null) {
Note:
See TracChangeset
for help on using the changeset viewer.