Author: ssmiweve
Date: 2008-11-16 22:53:07 +0100 (Sun, 16 Nov 2008)
New Revision: 6936
Modified:
trunk/generic.sesam/war/src/main/conf/configuration.properties
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchMode.java
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchModeFactory.java
Log:
following up h?\195?\165vard's suggestion to create a proper method to disable
the UserFilter and it's jndi lookup whch in cases can lead to a 5 second delay
in the request
Modified: trunk/generic.sesam/war/src/main/conf/configuration.properties
===================================================================
--- trunk/generic.sesam/war/src/main/conf/configuration.properties
2008-11-15 17:01:23 UTC (rev 6935)
+++ trunk/generic.sesam/war/src/main/conf/configuration.properties
2008-11-16 21:53:07 UTC (rev 6936)
@@ -10,6 +10,9 @@
# DataModel implementation
sesam.datamodel.impl=no.sesat.search.datamodel.DataModelFactoryImpl
+# Is UserFilter and user sessions enabled
+sesat.userservice.enabled=true
+
# Velocity Directives
velocity.directives.0=no.sesat.search.view.velocity.UrlEncodeDirective,no.sesat.search.view.velocity.HtmlEscapeDirective,no.sesat.search.view.velocity.CapitalizeWordsDirective,no.sesat.search.view.velocity.ChopStringDirective,no.sesat.search.view.velocity.PublishDirective,no.sesat.search.view.velocity.XmlEscapeDirective,no.sesat.search.view.velocity.MailEncodeDirective,no.sesat.search.view.velocity.WikiDirective,no.sesat.search.view.velocity.UpperCaseDirective,no.sesat.search.view.velocity.WeekdayDirective,no.sesat.search.view.velocity.MD5ParameterDirective,no.sesat.search.view.velocity.TopDomainDirective,no.sesat.search.view.velocity.DateFormattingDirective,no.sesat.search.view.velocity.BoldWordDirective,no.sesat.search.view.velocity.RemovePrefixDirective,no.sesat.search.view.velocity.SlashTrimStringDirective,no.sesat.search.view.velocity.XPathDirective,no.sesat.search.view.velocity.XPathForeachDirective,no.sesat.search.view.velocity.HitCountDirective,no.sesat.search.view.v
elocity.CssDirective,no.sesat.search.view.velocity.JavaScriptDirective,no.sesat.search.view.velocity.FaviconDirective,no.sesat.search.view.velocity.ImageDirective,no.sesat.search.view.velocity.AllParametersDirective
Modified:
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchMode.java
===================================================================
---
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchMode.java
2008-11-15 17:01:23 UTC (rev 6935)
+++
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchMode.java
2008-11-16 21:53:07 UTC (rev 6936)
@@ -77,6 +77,7 @@
private Collection<SearchConfiguration> searchConfigurations;
private SearchMode parentSearchMode;
+ private boolean queryEvaluationEnabled = true;
private boolean queryAnalysisEnabled = false;
private boolean autoBroadening = true;
private String parentMode;
@@ -103,6 +104,7 @@
if( inherit != null ){
parentSearchMode = inherit;
parentMode = inherit.parentMode;
+ queryEvaluationEnabled = inherit.queryEvaluationEnabled;
queryAnalysisEnabled = inherit.queryAnalysisEnabled;
searchCommandExecutor = inherit.searchCommandExecutor;
autoBroadening = inherit.autoBroadening;
@@ -186,11 +188,12 @@
/**
* Get the queryAnalysisEnabled.
+ * To return true isEvaluation() must also return true.
*
* @return the queryAnalysisEnabled.
*/
public boolean isAnalysis() {
- return queryAnalysisEnabled;
+ return queryEvaluationEnabled && queryAnalysisEnabled;
}
/**
@@ -203,6 +206,24 @@
}
/**
+ * Get the queryEvaluationEnabled.
+ *
+ * @return the queryEvaluationEnabled.
+ */
+ public boolean isEvaluation() {
+ return queryEvaluationEnabled;
+ }
+
+ /**
+ * Set the queryEvaluationEnabled.
+ *
+ * @param queryEvaluationEnabled The queryEvaluationEnabled to set.
+ */
+ public void setEvaluation(boolean queryEvaluationEnabled) {
+ this.queryEvaluationEnabled = queryEvaluationEnabled;
+ }
+
+ /**
* Getter for property parentMode.
* @return Value of property parentMode.
*/
Modified:
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchModeFactory.java
===================================================================
---
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchModeFactory.java
2008-11-15 17:01:23 UTC (rev 6935)
+++
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchModeFactory.java
2008-11-16 21:53:07 UTC (rev 6936)
@@ -277,6 +277,7 @@
modeE.getAttribute("executor"),
inherit != null ? inherit.getExecutor() :
SearchMode.SearchCommandExecutorConfig.SEQUENTIAL));
+ fillBeanProperty(mode, inherit, "evaluation",
ParseType.Boolean, modeE, "true");
fillBeanProperty(mode, inherit, "analysis", ParseType.Boolean,
modeE, "false");
fillBeanProperty(mode, inherit, "autoBroadening",
ParseType.Boolean, modeE, "true");
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
