Author: ssmiweve
Date: 2008-09-30 13:06:15 +0200 (Tue, 30 Sep 2008)
New Revision: 6856
Modified:
branches/2.17/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java
branches/2.17/generic.sesam/war/src/main/conf/configuration.properties
Log:
OPS-368 - Lots of downtime measured in September
OPS-344 - Store problemer med 404'er p?\195?\165 omskrevne URL:er
OPS-335 - Too many pingdom alerts to vakt phone to be taken seriously
Issue SKER4711: (S?\195?\184k p?\195?\165 lange s?\195?\184kestrenger tar lang
tid i eksekvere)
Modified:
branches/2.17/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java
===================================================================
---
branches/2.17/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java
2008-09-30 09:53:28 UTC (rev 6855)
+++
branches/2.17/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java
2008-09-30 11:06:15 UTC (rev 6856)
@@ -148,7 +148,7 @@
LOG.trace("RunningQuery(cxt," + query + ')');
- final String queryStr = trimDuplicateSpaces(query);
+ final String queryStr = truncate(trimDuplicateSpaces(query));
final SiteContext siteCxt = new SiteContext(){
public Site getSite() {
@@ -429,6 +429,18 @@
// Private -------------------------------------------------------
+ /** Truncates string to an acceptable length. **/
+ private String truncate(final String query){
+
+ // generic.sesam defines a default value of 256
+ final int length = Integer.parseInt(
+
context.getDataModel().getSite().getSiteConfiguration().getProperty("sesat.query.characterLimit"));
+
+ return length < query.length()
+ ? query.substring(0, length)
+ : query;
+ }
+
private boolean useEnrichment(
final EnrichmentHint eHint,
final SearchConfiguration config,
Modified: branches/2.17/generic.sesam/war/src/main/conf/configuration.properties
===================================================================
--- branches/2.17/generic.sesam/war/src/main/conf/configuration.properties
2008-09-30 09:53:28 UTC (rev 6855)
+++ branches/2.17/generic.sesam/war/src/main/conf/configuration.properties
2008-09-30 11:06:15 UTC (rev 6856)
@@ -1,6 +1,9 @@
# Default Locale. Shouldn't ever be used at this level.
site.locale.default=no
+# Default character limit on query string
+sesat.query.characterLimit=256
+
# Default mail host
[EMAIL PROTECTED]@
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
