Author: ssmiweve
Date: 2008-11-21 19:34:36 +0100 (Fri, 21 Nov 2008)
New Revision: 6973
Modified:
branches/2.18/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/PlatefoodPPCSearchCommand.java
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/querybuilder/SesamSyntaxQueryBuilder.java
Log:
SEARCH-5165 Search Command's Displayable Query contains technical filters
SKER2149 Divide & Conquer AbstractSearchCommand to delegates
Modified:
branches/2.18/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/PlatefoodPPCSearchCommand.java
===================================================================
---
branches/2.18/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/PlatefoodPPCSearchCommand.java
2008-11-21 17:40:38 UTC (rev 6972)
+++
branches/2.18/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/PlatefoodPPCSearchCommand.java
2008-11-21 18:34:36 UTC (rev 6973)
@@ -107,6 +107,7 @@
return url.toString();
}
});
+
final PlatefoodPpcCommandConfig conf =
(PlatefoodPpcCommandConfig)cxt.getSearchConfiguration();
final SiteConfiguration siteConf =
cxt.getDataModel().getSite().getSiteConfiguration();
@@ -255,4 +256,9 @@
}
}
+ @Override
+ protected String getParameter(String paramName) {
+ return super.getParameter(paramName);
+ }
+
}
Modified:
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/querybuilder/SesamSyntaxQueryBuilder.java
===================================================================
---
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/querybuilder/SesamSyntaxQueryBuilder.java
2008-11-21 17:40:38 UTC (rev 6972)
+++
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/querybuilder/SesamSyntaxQueryBuilder.java
2008-11-21 18:34:36 UTC (rev 6973)
@@ -80,7 +80,7 @@
String transformedClause = getEscapedTransformedTerm(clause);
- if(null == clause.getField() &&
transformedClause.matches("[^\\]:")){
+ if(null == clause.getField() && transformedClause.contains(":") &&
!transformedClause.contains("\\:")){
final String field =
transformedClause.substring(0,transformedClause.indexOf(':'));
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
