Author: ssmiweve
Date: 2008-03-27 12:24:18 +0100 (Thu, 27 Mar 2008)
New Revision: 6277
Modified:
branches/2.16.0/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
Log:
partial backport of 6227
Modified:
branches/2.16.0/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
===================================================================
---
branches/2.16.0/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-03-26 20:45:46 UTC (rev 6276)
+++
branches/2.16.0/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-03-27 11:24:18 UTC (rev 6277)
@@ -636,18 +636,8 @@
*/
protected String getParameter(final String paramName) {
- final Map<String, Object> parameters =
datamodel.getJunkYard().getValues();
- if (parameters.containsKey(paramName)) {
- if (parameters.get(paramName) instanceof String[]) {
- final String[] val = (String[]) parameters.get(paramName);
- if (val.length > 0 && val[0].length() > 0) {
- return val[0];
- }
- } else if (parameters.get(paramName) instanceof String) {
- return (String) parameters.get(paramName);
- }
- }
- return "";
+ final Map<String, StringDataObject> parameters =
datamodel.getParameters().getValues();
+ return parameters.containsKey(paramName) ?
parameters.get(paramName).getString() : null;
}
// <-- Query Representation state methods (useful while the inbuilt
visitor is in operation)
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
