Author: ssmiweve
Date: 2007-06-25 08:15:53 +0200 (Mon, 25 Jun 2007)
New Revision: 5378
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java
trunk/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/CommandConfig.java
trunk/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/SearchConfiguration.java
Log:
SEARCH-2890 - AbstractSearchCommand's execution enable/disable cleanup
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java
2007-06-21 11:39:19 UTC (rev 5377)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java
2007-06-25 06:15:53 UTC (rev 5378)
@@ -439,11 +439,11 @@
final Map<String, Object> parameters =
datamodel.getJunkYard().getValues();
+ boolean executeQuery = queryToUse.getQueryString().length() > 0 ||
getSearchConfiguration().isRunBlank();
+
// -->> FIXME SEARCH-2890 Clean all this bullshit up. EG move it
to the individual command subclass.
- boolean executeQuery = queryToUse.getQueryString().length() > 0;
executeQuery |= null != parameters.get("contentsource");
- executeQuery |= null != parameters.get("newscountry")
- && (parameters.get("c").equals("m") ||
parameters.get("c").equals("l"));
+ executeQuery |= null != parameters.get("newscountry") &&
(parameters.get("c").equals("m") || parameters.get("c").equals("l"));
executeQuery |= null != parameters.get("c") &&
parameters.get("c").equals("n");
executeQuery |= null != parameters.get("c") &&
parameters.get("c").equals("nn");
executeQuery |= null != parameters.get("c") &&
parameters.get("c").equals("wt") && getSearchConfiguration().isAlwaysRun();
Modified:
trunk/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/CommandConfig.java
===================================================================
---
trunk/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/CommandConfig.java
2007-06-21 11:39:19 UTC (rev 5377)
+++
trunk/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/CommandConfig.java
2007-06-25 06:15:53 UTC (rev 5378)
@@ -51,19 +51,18 @@
private String name;
private final List<QueryTransformerConfig> queryTransformers = new
ArrayList<QueryTransformerConfig>();
private final List<ResultHandlerConfig> resultHandlers = new
ArrayList<ResultHandlerConfig>();
-// private int pageSize = DEFAULT_DOCUMENTS_TO_RETURN;
+
private final Map<String,String> resultFields = new
HashMap<String,String>();
private int resultsToReturn;
private boolean paging = false;
-// private boolean child = false;
- private String rule;
- private int ruleThreshold = -1;
+
private String queryParameter;
private boolean alwaysRun = false;
+ private boolean runBlank = false;
private String statisticalName;
- /** TODO comment me. *
+ /**
* @param sc
*/
public CommandConfig(){}
@@ -114,27 +113,13 @@
return name;
}
- /** TODO comment me. *
+ /**
* @param name
*/
public final void setName(final String name) {
this.name = name;
}
-// /** TODO comment me. *
-// * @return
-// */
-// public final int getPageSize() {
-// return pageSize;
-// }
-
-// /** TODO comment me. *
-// * @param pageSize
-// */
-// public final void setPageSize(final int pageSize) {
-// this.pageSize = pageSize;
-// }
-
/** [EMAIL PROTECTED] **/
public final boolean isPaging() {
return paging;
@@ -177,14 +162,28 @@
return alwaysRun;
}
- /** TODO comment me. *
+ /**
* @param enable
*/
public void setAlwaysRun(final boolean enable){
alwaysRun = enable;
}
- /** TODO comment me. *
+ /** [EMAIL PROTECTED] *
+ * @return
+ */
+ public boolean isRunBlank() {
+ return runBlank;
+ }
+
+ /**
+ * @param enable
+ */
+ public void setRunBlank(final boolean enable){
+ runBlank = enable;
+ }
+
+ /**
* @param useParameterAsQuery
*/
public void setQueryParameter(final String useParameterAsQuery) {
@@ -196,7 +195,7 @@
return statisticalName;
}
- /** TODO comment me. *
+ /**
* @param name
*/
public void setStatisticalName(final String name){
@@ -213,7 +212,7 @@
*/
private final Map<String,String> fieldFilters = new
HashMap<String,String>();
- /** TODO comment me. *
+ /**
* @param field
*/
public void addFieldFilter(final String field, final String filter){
@@ -252,6 +251,7 @@
setName(element.getAttribute("id"));
AbstractDocumentFactory.fillBeanProperty(this, inherit, "alwaysRun",
ParseType.Boolean, element, "false");
+ AbstractDocumentFactory.fillBeanProperty(this, inherit, "runBlank",
ParseType.Boolean, element, "false");
// field-filters
if(null!=inherit){
Modified:
trunk/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/SearchConfiguration.java
===================================================================
---
trunk/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/SearchConfiguration.java
2007-06-21 11:39:19 UTC (rev 5377)
+++
trunk/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/SearchConfiguration.java
2007-06-25 06:15:53 UTC (rev 5378)
@@ -89,23 +89,29 @@
*/
void setResultsToReturn(int numberOfResults);
-// /** TODO comment me. *
+// /**
// * @return
// */
// boolean isChild();
- /** TODO comment me. *
+ /**
* @return
*/
public String getQueryParameter();
- /** TODO comment me. *
+ /**
* @return
*/
boolean isAlwaysRun();
- /** TODO comment me. *
+
+ /**
* @return
*/
+ boolean isRunBlank();
+
+ /**
+ * @return
+ */
String getStatisticalName();
/**
@@ -115,10 +121,10 @@
*/
Map<String, String> getFieldFilters();
- /** TODO comment me. **/
+ /***/
void clearQueryTransformers();
- /** TODO comment me. **/
+ /***/
void clearResultHandlers();
/**
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
