Author: ssmiweve
Date: 2007-08-13 14:30:18 +0200 (Mon, 13 Aug 2007)
New Revision: 5603
Modified:
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/run/QueryFactoryImpl.java
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/run/RunningQueryImpl.java
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/run/RunningWebQuery.java
Log:
SEARCH-3213 - "resultsider" links must be fixed to remain within the /katalog/
directory
Modified:
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java
===================================================================
---
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java
2007-08-13 10:59:44 UTC (rev 5602)
+++
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java
2007-08-13 12:30:18 UTC (rev 5603)
@@ -521,7 +521,7 @@
final Object v = parameters.get("offset");
if (null != v && getSearchConfiguration().isPaging()) {
- return i + Integer.parseInt(v instanceof String[] && ((String[])
v).length == 1
+ return i + Integer.parseInt(v instanceof String[]
? ((String[]) v)[0]
: (String) v);
} else {
Modified:
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/run/QueryFactoryImpl.java
===================================================================
---
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/run/QueryFactoryImpl.java
2007-08-13 10:59:44 UTC (rev 5602)
+++
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/run/QueryFactoryImpl.java
2007-08-13 12:30:18 UTC (rev 5603)
@@ -80,7 +80,7 @@
for (Cookie cookie : cookies) {
if ("myNews".equals(cookie.getName().trim())) {
LOG.debug("Adding cookie: " + cookie.getName() +
"=" + cookie.getValue());
- query.addParameter("myNews", cookie.getValue());
+ datamodel.getJunkYard().getValues().put("myNews",
cookie.getValue());
}
}
}
@@ -89,7 +89,7 @@
if (cookies != null) {
for (Cookie cookie : cookies) {
if ("myChannels".equals(cookie.getName())) {
- query.addParameter("myChannels",
cookie.getValue());
+
datamodel.getJunkYard().getValues().put("myChannels", cookie.getValue());
}
}
}
Modified:
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/run/RunningQueryImpl.java
===================================================================
---
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/run/RunningQueryImpl.java
2007-08-13 10:59:44 UTC (rev 5602)
+++
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/run/RunningQueryImpl.java
2007-08-13 12:30:18 UTC (rev 5603)
@@ -474,12 +474,6 @@
}
}
-
- /** TODO comment me. **/
- protected void addParameter(final String key, final Object obj) {
- datamodel.getJunkYard().getValues().put(key, obj);
- }
-
/** [EMAIL PROTECTED] **/
public Locale getLocale() {
Modified:
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/run/RunningWebQuery.java
===================================================================
---
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/run/RunningWebQuery.java
2007-08-13 10:59:44 UTC (rev 5602)
+++
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/run/RunningWebQuery.java
2007-08-13 12:30:18 UTC (rev 5603)
@@ -58,23 +58,29 @@
super(cxt, query);
+ this.request = request;
+ this.response = response;
+
if (LOG.isTraceEnabled()) {
LOG.trace("RunningWebQuery(mode, " + query + ", request,
response)");
}
+ // XXX The rest is redundant code!! stop using junkyard!
+ final Map<String,Object> parameters =
datamodel.getJunkYard().getValues();
+
// Add all request parameters
/* SEE "Add all request attributes" below */
- for (String parameterName :
(Set<String>)request.getParameterMap().keySet()) {
+
+ for (String key : datamodel.getParameters().getValues().keySet()) {
- final String[] parameterValues =
request.getParameterValues(parameterName);
- addParameter(parameterName, parameterValues.length>1 ?
parameterValues : parameterValues[0]);
+ final String value =
datamodel.getParameters().getValue(key).getString();
+ parameters.put(key, value);
if (LOG.isTraceEnabled()) {
- LOG.trace("Added " + parameterName + ", values: " +
StringUtils.join(parameterValues, ", "));
+ LOG.trace("Added " + key + ", value: " + value + ", ");
}
}
- final Map<String,Object> parameters =
datamodel.getJunkYard().getValues();
// Hack to keep vg site search working. Dependent on old query
// parameters. Remove when vg has been reimplented a proper site
search.
if (parameters.containsKey("nav_newspaperNames")) {
@@ -101,7 +107,7 @@
* this has now been changed. request parameters are first put
into the parameters map and
* are overwritten with request attributes. this is a basic
attempt to prevent parameter injection.
*/
- addParameter(attrName, request.getAttribute(attrName));
+ parameters.put(attrName, request.getAttribute(attrName));
if (LOG.isTraceEnabled()) {
LOG.trace("Added " + attrName + ", value: " +
request.getAttribute(attrName));
}
@@ -109,7 +115,7 @@
for (final String attrName : ATTRS_TO_COPY) {
if (request.getAttribute(attrName) != null) {
- addParameter(attrName, request.getAttribute(attrName));
+ parameters.put(attrName, request.getAttribute(attrName));
if (LOG.isTraceEnabled()) {
LOG.trace("Added(Manually) " + attrName + ", value: " +
request.getAttribute(attrName));
@@ -119,7 +125,7 @@
for (final String header : HEADERS_TO_COPY) {
if (request.getHeader(header) != null) {
- addParameter(header, request.getHeader(header));
+ parameters.put(header, request.getHeader(header));
if (LOG.isTraceEnabled()) {
LOG.trace("Added HTTP header " + header + ", value: " +
request.getHeader(header));
@@ -127,14 +133,13 @@
}
}
- this.request = request;
- this.response = response;
- addParameter("request", request);
- addParameter("response", response);
+ parameters.put("request", request);
+ parameters.put("response", response);
}
+ @Override
public void run() throws InterruptedException{
super.run();
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
