Author: gttersen
Date: 2007-06-01 12:19:54 +0200 (Fri, 01 Jun 2007)
New Revision: 5248
Modified:
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsEspSearchCommand.java
Log:
Bugfix: SEARCH-2688
Modified:
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsEspSearchCommand.java
===================================================================
---
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsEspSearchCommand.java
2007-06-01 10:17:35 UTC (rev 5247)
+++
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsEspSearchCommand.java
2007-06-01 10:19:54 UTC (rev 5248)
@@ -31,7 +31,7 @@
import java.util.Map;
/**
- * @author
+ * @author Geir H. Pettersen (T-Rank)
* @version $Id$
*/
public class NewsEspSearchCommand extends NavigatableESPFastCommand {
@@ -116,17 +116,25 @@
if (medium == null || medium.length() == 0) {
medium = config.getDefaultMedium();
}
- if (!NewsEspCommandConfig.ALL_MEDIUMS.equals(medium) &&
getQueryRepresentationLength() > 0) {
- insertToQueryRepresentation(0, "and(");
- appendToQueryRepresentation(',');
- appendToQueryRepresentation(config.getMediumPrefix());
- appendToQueryRepresentation(':');
- appendToQueryRepresentation(medium);
- appendToQueryRepresentation(')');
- LOG.debug("Added medium");
- } else {
- LOG.debug("Did not add medium on rootclause: medium=" + medium
+ ", transformedQuery=" + getQueryRepresentationLength());
+ if (!NewsEspCommandConfig.ALL_MEDIUMS.equals(medium)) {
+ if (getQueryRepresentationLength() > 0) {
+ insertToQueryRepresentation(0, "and(");
+ appendToQueryRepresentation(',');
+ appendToQueryRepresentation(config.getMediumPrefix());
+ appendToQueryRepresentation(':');
+ appendToQueryRepresentation(medium);
+ appendToQueryRepresentation(')');
+ LOG.debug("Added medium");
+ return;
+ } else if (getQuery().getQueryString() != null &&
getQuery().getQueryString().trim().equals("*")) {
+ appendToQueryRepresentation(config.getMediumPrefix());
+ appendToQueryRepresentation(':');
+ appendToQueryRepresentation(medium);
+ LOG.debug("Added medium");
+ return;
+ }
}
+ LOG.debug("Did not add medium on rootclause: medium=" + medium +
", queryLength=" + getQueryRepresentationLength());
}
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
