Author: ssmiweve
Date: 2008-03-05 12:16:27 +0100 (Wed, 05 Mar 2008)
New Revision: 6227
Modified:
branches/2.16/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/OverturePPCSearchCommand.java
branches/2.16/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/YahooIdpSearchCommand.java
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractESPFastSearchCommand.java
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractSimpleFastSearchCommand.java
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/MobileSearchCommand.java
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
Log:
Upgrading deprecated methods to use ParametersDataObject from the datamodel
instead of the junkyard.
Modified:
branches/2.16/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/OverturePPCSearchCommand.java
===================================================================
---
branches/2.16/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/OverturePPCSearchCommand.java
2008-03-05 09:46:44 UTC (rev 6226)
+++
branches/2.16/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/OverturePPCSearchCommand.java
2008-03-05 11:16:27 UTC (rev 6227)
@@ -1,5 +1,5 @@
/*
- * Copyright (2005-2007) Schibsted Søk AS
+ * Copyright (2005-2008) Schibsted Søk AS
* This file is part of SESAT.
*
* SESAT is free software: you can redistribute it and/or modify
@@ -180,7 +180,7 @@
// FIXME. When the site searches have their own context
// remove this and use the property partnerId of
OverturePPCConfiguration
// instead.
- return getParameters().containsKey("ss")
+ return null != getParameter("ss")
? SITE_SEARCH_OVERTURE_PARTNER_ID
: super.getPartnerId();
}
Modified:
branches/2.16/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/YahooIdpSearchCommand.java
===================================================================
---
branches/2.16/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/YahooIdpSearchCommand.java
2008-03-05 09:46:44 UTC (rev 6226)
+++
branches/2.16/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/YahooIdpSearchCommand.java
2008-03-05 11:16:27 UTC (rev 6227)
@@ -208,7 +208,7 @@
conf.getLanguageMix(),
conf.getEncoding(),
fields.toString(),
- this.getParameters().get("unique") != null ? "" :
conf.getUnique(),
+ getParameter("unique") != null ? "" : conf.getUnique(),
conf.getFilter(),
URLEncoder.encode(wrappedTransformedQuery, "UTF-8"),
getAffilDataParameter()
Modified:
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractESPFastSearchCommand.java
===================================================================
---
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractESPFastSearchCommand.java
2008-03-05 09:46:44 UTC (rev 6226)
+++
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractESPFastSearchCommand.java
2008-03-05 11:16:27 UTC (rev 6227)
@@ -246,7 +246,7 @@
protected String getSortBy() {
String sortBy = cfg.getSortBy();
- if (getParameters().containsKey("userSortBy")) {
+ if (null != getParameter("userSortBy")) {
final String userSortBy = getParameter("userSortBy");
LOG.debug("execute: SortBy " + userSortBy);
Modified:
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractSimpleFastSearchCommand.java
===================================================================
---
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractSimpleFastSearchCommand.java
2008-03-05 09:46:44 UTC (rev 6226)
+++
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractSimpleFastSearchCommand.java
2008-03-05 11:16:27 UTC (rev 6227)
@@ -252,7 +252,7 @@
}
- if (getSearchConfiguration().isRelevantQueries() &&
!getParameters().containsKey("qs")) {
+ if (getSearchConfiguration().isRelevantQueries() && null ==
getParameter("qs")) {
collectRelevantQueries(result, searchResult);
}
@@ -559,10 +559,8 @@
String queryString = getTransformedQuery();
if (getSearchConfiguration().isKeywordClusteringEnabled()) {
- if (getParameters().containsKey("kw")) {
- kwString = getParameters().get("kw") instanceof String[]
- ? StringUtils.join((String[])
getParameters().get("kw"), " ")
- : getParameter("kw");
+ if (null != getParameter("kw")) {
+ kwString = getParameter("kw");
}
if (!kwString.equals("")) {
@@ -683,12 +681,12 @@
}
}
- if (getParameters().containsKey("rank")) {
+ if (null != getParameter("rank")) {
params.setParameter(new SearchParameter(BaseParameter.SORT_BY,
getParameter("rank")));
}
// This now uses sort order from canfiguration, old ones still here
for backwards compability untill all are uppdated
- if (getParameters().containsKey("userSortBy")) {
+ if (null != getParameter("userSortBy")) {
final String sortBy = getParameter("userSortBy");
LOG.debug("createQuery: SortBy " + sortBy);
Modified:
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/MobileSearchCommand.java
===================================================================
---
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/MobileSearchCommand.java
2008-03-05 09:46:44 UTC (rev 6226)
+++
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/MobileSearchCommand.java
2008-03-05 11:16:27 UTC (rev 6227)
@@ -13,9 +13,7 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with SESAT. If not, see <http://www.gnu.org/licenses/>.
-
- */
-/*
+ *
* MobileSearchCommand.java
*
* Created on March 10, 2006, 2:22 PM
@@ -98,9 +96,9 @@
if (getParameter("msite") != null) {
String filter = "+(";
String [] arr = getParameter("msite").split(";");
- for (int i=0;i<arr.length;i++)
+ for (int i=0;i<arr.length;i++){
filter = filter + " domain:" + arr[i];
-
+ }
filter = filter + ")";
params.setParameter(new SearchParameter(
BaseParameter.FILTER, filter ));
@@ -184,7 +182,7 @@
IDeviceCapabilities cap = null;
- if (getParameters().containsKey(USER_AGENT_PARAMETER)) {
+ if (null != getParameter(USER_AGENT_PARAMETER)) {
final String userAgent = (getParameter(USER_AGENT_PARAMETER));
cap = DeviceCapabilitiesFactory.getDeviceCapabilities();
cap.setUserAgent(userAgent);
Modified:
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
===================================================================
---
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-03-05 09:46:44 UTC (rev 6226)
+++
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-03-05 11:16:27 UTC (rev 6227)
@@ -612,40 +612,16 @@
}
/**
- * TODO comment me.
+ * Returns parameter value.
+ * Changed since 2.16.1 so that only request parameters are searched.
*
- * @return
- * @deprecated because it uses the junkyard
+ * @param paramName the name of the parameter to look for.
+ * @return the parameter value, unescaped, or null if parameter does not
exist.
*/
- protected Map<String, Object> getParameters() {
-
- final Map<String, Object> parameters =
datamodel.getJunkYard().getValues();
- return parameters;
- }
-
- /**
- * Returns parameter value. In case the parameter is multi-valued only the
- * first value is returned. If the parameter does not exist or is empty
- * the empty string is returned.
- *
- * @param paramName
- *
- * @deprecated because it uses the junkyard
- */
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
