Author: sshafroi
Date: 2008-03-28 14:49:12 +0100 (Fri, 28 Mar 2008)
New Revision: 6300
Modified:
branches/2.16/generic.sesam/query-transform-config/src/main/java/no/sesat/search/query/transform/TokenMaskQueryTransformerConfig.java
branches/2.16/generic.sesam/query-transform-control/src/main/java/no/sesat/search/query/transform/TokenMaskQueryTransformer.java
branches/2.16/generic.sesam/result-handler-config/src/main/java/no/sesat/search/result/handler/AgeCalculatorResultHandlerConfig.java
branches/2.16/generic.sesam/result-handler-config/src/main/java/no/sesat/search/result/handler/DateFormatResultHandlerConfig.java
branches/2.16/generic.sesam/result-handler-config/src/main/java/no/sesat/search/result/handler/FieldChooserResultHandlerConfig.java
branches/2.16/generic.sesam/result-handler-config/src/main/java/no/sesat/search/result/handler/FieldFilterResultHandlerConfig.java
branches/2.16/generic.sesam/result-handler-control/src/main/java/no/sesat/search/result/handler/AgeCalculatorResultHandler.java
branches/2.16/generic.sesam/result-handler-control/src/main/java/no/sesat/search/result/handler/DateFormatHandler.java
branches/2.16/generic.sesam/result-handler-control/src/main/java/no/sesat/search/result/handler/FieldChooser.java
branches/2.16/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/FastCommandConfig.java
branches/2.16/query-transform-config-spi/src/main/java/no/sesat/search/query/transform/NewsCaseQueryTransformerConfig.java
branches/2.16/query-transform-config-spi/src/main/java/no/sesat/search/query/transform/NewsClusterQueryTransformerConfig.java
branches/2.16/query-transform-config-spi/src/main/java/no/sesat/search/query/transform/NewsMyNewsQueryTransformerConfig.java
branches/2.16/query-transform-control-spi/src/main/java/no/sesat/search/query/transform/NewsCaseQueryTransformer.java
Log:
SEARCH-4403 Implement setters for all configurable variables used in the search
mode config files.
This is the changes that I needed to get an error free validation of the
modes.xml in generic.sesam
Modified:
branches/2.16/generic.sesam/query-transform-config/src/main/java/no/sesat/search/query/transform/TokenMaskQueryTransformerConfig.java
===================================================================
---
branches/2.16/generic.sesam/query-transform-config/src/main/java/no/sesat/search/query/transform/TokenMaskQueryTransformerConfig.java
2008-03-28 12:26:32 UTC (rev 6299)
+++
branches/2.16/generic.sesam/query-transform-config/src/main/java/no/sesat/search/query/transform/TokenMaskQueryTransformerConfig.java
2008-03-28 13:49:12 UTC (rev 6300)
@@ -100,7 +100,7 @@
super.readQueryTransformer(qt);
addPredicates(qt.getAttribute("predicates").split(","));
if(qt.getAttribute("match").length() > 0){
-
setMatch(Position.valueOf(qt.getAttribute("position").toUpperCase()));
+
setPosition(Position.valueOf(qt.getAttribute("position").toUpperCase()));
}
if(qt.getAttribute("mask").length() >0){
setMask(Mask.valueOf(qt.getAttribute("mask").toUpperCase()));
@@ -121,7 +121,7 @@
*
* @return Value of property position.
*/
- public Position getMatch() {
+ public Position getPosition() {
return position;
}
@@ -130,7 +130,7 @@
*
* @param position New value of property position.
*/
- public void setMatch(final Position position) {
+ public void setPosition(final Position position) {
this.position = position;
}
Modified:
branches/2.16/generic.sesam/query-transform-control/src/main/java/no/sesat/search/query/transform/TokenMaskQueryTransformer.java
===================================================================
---
branches/2.16/generic.sesam/query-transform-control/src/main/java/no/sesat/search/query/transform/TokenMaskQueryTransformer.java
2008-03-28 12:26:32 UTC (rev 6299)
+++
branches/2.16/generic.sesam/query-transform-control/src/main/java/no/sesat/search/query/transform/TokenMaskQueryTransformer.java
2008-03-28 13:49:12 UTC (rev 6300)
@@ -77,7 +77,7 @@
clause.getFirstClause().accept(this);
- if(Position.ANY == config.getMatch() || Mask.INCLUDE ==
config.getMask()){
+ if(Position.ANY == config.getPosition() || Mask.INCLUDE ==
config.getMask()){
clause.getSecondClause().accept(this);
}
}
@@ -97,7 +97,7 @@
clause.getFirstClause().accept(this);
- if(Position.ANY == config.getMatch() || Mask.INCLUDE ==
config.getMask()){
+ if(Position.ANY == config.getPosition() || Mask.INCLUDE ==
config.getMask()){
clause.getSecondClause().accept(this);
}
}
@@ -137,8 +137,8 @@
boolean transform = false;
- boolean check = Position.ANY == config.getMatch();
- check |= Position.PREFIX == config.getMatch() && clause ==
getContext().getQuery().getFirstLeafClause();
+ boolean check = Position.ANY == config.getPosition();
+ check |= Position.PREFIX == config.getPosition() && clause ==
getContext().getQuery().getFirstLeafClause();
if (check) {
final TokenEvaluationEngine engine =
getContext().getTokenEvaluationEngine();
@@ -160,8 +160,8 @@
boolean transform = false;
- boolean check = Position.ANY == config.getMatch();
- check |= Position.PREFIX == config.getMatch() && clause ==
getContext().getQuery().getFirstLeafClause();
+ boolean check = Position.ANY == config.getPosition();
+ check |= Position.PREFIX == config.getPosition() && clause ==
getContext().getQuery().getFirstLeafClause();
if (check) {
final TokenEvaluationEngine engine =
getContext().getTokenEvaluationEngine();
Modified:
branches/2.16/generic.sesam/result-handler-config/src/main/java/no/sesat/search/result/handler/AgeCalculatorResultHandlerConfig.java
===================================================================
---
branches/2.16/generic.sesam/result-handler-config/src/main/java/no/sesat/search/result/handler/AgeCalculatorResultHandlerConfig.java
2008-03-28 12:26:32 UTC (rev 6299)
+++
branches/2.16/generic.sesam/result-handler-config/src/main/java/no/sesat/search/result/handler/AgeCalculatorResultHandlerConfig.java
2008-03-28 13:49:12 UTC (rev 6300)
@@ -61,7 +61,7 @@
/**
* @return
*/
- public String getTargetField() {
+ public String getTarget() {
return targetField;
}
@@ -69,7 +69,7 @@
/**
* @param targetField
*/
- public void setTargetField(final String targetField) {
+ public void setTarget(final String targetField) {
this.targetField = targetField;
}
@@ -77,14 +77,14 @@
/**
* @param string
*/
- public void setSourceField(final String string) {
+ public void setSource(final String string) {
sourceField = string;
}
/**
* @return
*/
- public String getSourceField() {
+ public String getSource() {
return sourceField;
}
@@ -115,8 +115,8 @@
super.readResultHandler(element);
- setTargetField(element.getAttribute("target"));
- setSourceField(element.getAttribute("source"));
+ setTarget(element.getAttribute("target"));
+ setSource(element.getAttribute("source"));
AbstractDocumentFactory.fillBeanProperty(this, null, "asDate",
ParseType.Boolean, element, "false");
AbstractDocumentFactory.fillBeanProperty(this, null, "recursiveField",
ParseType.String, element, null);
AbstractDocumentFactory.fillBeanProperty(this, null, "ageFormatKey",
ParseType.String, element, "age");
Modified:
branches/2.16/generic.sesam/result-handler-config/src/main/java/no/sesat/search/result/handler/DateFormatResultHandlerConfig.java
===================================================================
---
branches/2.16/generic.sesam/result-handler-config/src/main/java/no/sesat/search/result/handler/DateFormatResultHandlerConfig.java
2008-03-28 12:26:32 UTC (rev 6299)
+++
branches/2.16/generic.sesam/result-handler-config/src/main/java/no/sesat/search/result/handler/DateFormatResultHandlerConfig.java
2008-03-28 13:49:12 UTC (rev 6300)
@@ -38,7 +38,7 @@
*
* @return
*/
- public String getFieldPrefix() {
+ public String getPrefix() {
return fieldPrefix;
}
@@ -46,7 +46,7 @@
*
* @param fieldPrefix
*/
- public void setFieldPrefix(final String fieldPrefix) {
+ public void setPrefix(final String fieldPrefix) {
this.fieldPrefix = fieldPrefix;
}
@@ -54,7 +54,7 @@
*
* @param sourceField
*/
- public void setSourceField(final String sourceField) {
+ public void setSource(final String sourceField) {
this.sourceField = sourceField;
}
@@ -62,7 +62,7 @@
*
* @return
*/
- public String getSourceField() {
+ public String getSource() {
return sourceField;
}
@@ -72,9 +72,9 @@
super.readResultHandler(element);
if (element.hasAttribute("prefix")) {
- setFieldPrefix(element.getAttribute("prefix"));
+ setPrefix(element.getAttribute("prefix"));
}
- setSourceField(element.getAttribute("source"));
+ setSource(element.getAttribute("source"));
return this;
}
Modified:
branches/2.16/generic.sesam/result-handler-config/src/main/java/no/sesat/search/result/handler/FieldChooserResultHandlerConfig.java
===================================================================
---
branches/2.16/generic.sesam/result-handler-config/src/main/java/no/sesat/search/result/handler/FieldChooserResultHandlerConfig.java
2008-03-28 12:26:32 UTC (rev 6299)
+++
branches/2.16/generic.sesam/result-handler-config/src/main/java/no/sesat/search/result/handler/FieldChooserResultHandlerConfig.java
2008-03-28 13:49:12 UTC (rev 6300)
@@ -44,6 +44,12 @@
public void addField(final String fieldName) {
fields.add(fieldName);
}
+
+ public void addFields(final String[] fieldNames) {
+ for (int i = 0; i < fieldNames.length; i++) {
+ addField(fieldNames[i]);
+ }
+ }
/**
* @return
@@ -55,14 +61,14 @@
/**
* @param fieldName
*/
- public void setTargetField(final String fieldName) {
+ public void setTarget(final String fieldName) {
targetField = fieldName;
}
/**
* @return
*/
- public String getTargetField() {
+ public String getTarget() {
return targetField;
}
@@ -88,7 +94,7 @@
super.readResultHandler(element);
- setTargetField(element.getAttribute("target"));
+ setTarget(element.getAttribute("target"));
String optAttr = element.getAttribute("recursive-field");
if (optAttr != null && optAttr.length() > 0) {
recursiveField = optAttr;
Modified:
branches/2.16/generic.sesam/result-handler-config/src/main/java/no/sesat/search/result/handler/FieldFilterResultHandlerConfig.java
===================================================================
---
branches/2.16/generic.sesam/result-handler-config/src/main/java/no/sesat/search/result/handler/FieldFilterResultHandlerConfig.java
2008-03-28 12:26:32 UTC (rev 6299)
+++
branches/2.16/generic.sesam/result-handler-config/src/main/java/no/sesat/search/result/handler/FieldFilterResultHandlerConfig.java
2008-03-28 13:49:12 UTC (rev 6300)
@@ -41,10 +41,18 @@
return recursiveField;
}
+ public void setRecursiveField(String string) {
+ recursiveField = string;
+ }
+
public String getFilterSrc() {
return filterSrc;
}
+ public void setFilterSrc(String string) {
+ filterSrc = string;
+ }
+
public Set<String> getMatchListSet() {
if (matchListSet == null) {
matchListSet = new HashSet<String>();
@@ -75,12 +83,28 @@
public String getMatchList() {
return matchList;
}
+
+ public void setMatchList(String string) {
+ matchList = string;
+ }
public String getRemoveFields() {
return removeFields;
}
- @Override
+ public void setRemoveFields(String string) {
+ removeFields = string;
+ }
+
+ public String getSrcPrefixes() {
+ return srcPrefixes;
+ }
+
+ public void setSrcPrefixes(String srcPrefixes) {
+ this.srcPrefixes = srcPrefixes;
+ }
+
+ @Override
public AbstractResultHandlerConfig readResultHandler(final Element
element) {
recursiveField = element.getAttribute("recursive-field");
filterSrc = element.getAttribute("filter-src");
Modified:
branches/2.16/generic.sesam/result-handler-control/src/main/java/no/sesat/search/result/handler/AgeCalculatorResultHandler.java
===================================================================
---
branches/2.16/generic.sesam/result-handler-control/src/main/java/no/sesat/search/result/handler/AgeCalculatorResultHandler.java
2008-03-28 12:26:32 UTC (rev 6299)
+++
branches/2.16/generic.sesam/result-handler-control/src/main/java/no/sesat/search/result/handler/AgeCalculatorResultHandler.java
2008-03-28 13:49:12 UTC (rev 6300)
@@ -97,7 +97,7 @@
final Context cxt,
final String ageFormatKey) {
- final String docTime = item.getField(config.getSourceField());
+ final String docTime = item.getField(config.getSource());
if (docTime != null) {
@@ -159,7 +159,7 @@
LOG.trace("Resulting age string is " + ageString);
if (stamp > 0) {
- item = item.addField(config.getTargetField(), ageString);
+ item = item.addField(config.getTarget(), ageString);
}
} catch (ParseException e) {
Modified:
branches/2.16/generic.sesam/result-handler-control/src/main/java/no/sesat/search/result/handler/DateFormatHandler.java
===================================================================
---
branches/2.16/generic.sesam/result-handler-control/src/main/java/no/sesat/search/result/handler/DateFormatHandler.java
2008-03-28 12:26:32 UTC (rev 6299)
+++
branches/2.16/generic.sesam/result-handler-control/src/main/java/no/sesat/search/result/handler/DateFormatHandler.java
2008-03-28 13:49:12 UTC (rev 6300)
@@ -76,7 +76,7 @@
for (final ResultItem item : cxt.getSearchResult().getResults()) {
- final String docDateTime = item.getField(config.getSourceField());
+ final String docDateTime = item.getField(config.getSource());
if (docDateTime != null) {
@@ -88,12 +88,12 @@
final String second = docDateTime.substring(17, 19);
cxt.getSearchResult().replaceResult(item,
- item.addField(config.getFieldPrefix() +
Fields.YEAR.name(), year)
- .addField(config.getFieldPrefix() +
Fields.MONTH.name(), month)
- .addField(config.getFieldPrefix() +
Fields.DAY.name(), day)
- .addField(config.getFieldPrefix() +
Fields.HOUR.name(), hour)
- .addField(config.getFieldPrefix() +
Fields.MINUTE.name(), minute)
- .addField(config.getFieldPrefix() +
Fields.SECOND.name(), second)
+ item.addField(config.getPrefix() + Fields.YEAR.name(),
year)
+ .addField(config.getPrefix() +
Fields.MONTH.name(), month)
+ .addField(config.getPrefix() + Fields.DAY.name(),
day)
+ .addField(config.getPrefix() + Fields.HOUR.name(),
hour)
+ .addField(config.getPrefix() +
Fields.MINUTE.name(), minute)
+ .addField(config.getPrefix() +
Fields.SECOND.name(), second)
);
}
Modified:
branches/2.16/generic.sesam/result-handler-control/src/main/java/no/sesat/search/result/handler/FieldChooser.java
===================================================================
---
branches/2.16/generic.sesam/result-handler-control/src/main/java/no/sesat/search/result/handler/FieldChooser.java
2008-03-28 12:26:32 UTC (rev 6299)
+++
branches/2.16/generic.sesam/result-handler-control/src/main/java/no/sesat/search/result/handler/FieldChooser.java
2008-03-28 13:49:12 UTC (rev 6300)
@@ -62,13 +62,13 @@
for (String field : fields) {
if (item.getField(field) != null) {
- item = item.addField(config.getTargetField(),
item.getField(field));
+ item = item.addField(config.getTarget(),
item.getField(field));
break;
}
}
- if (config.getDefaultValue() != null &&
item.getField(config.getTargetField()) == null) {
- item = item.addField(config.getTargetField(),
config.getDefaultValue());
+ if (config.getDefaultValue() != null &&
item.getField(config.getTarget()) == null) {
+ item = item.addField(config.getTarget(),
config.getDefaultValue());
}
if (item instanceof ResultList<?>) {
Modified:
branches/2.16/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/FastCommandConfig.java
===================================================================
---
branches/2.16/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/FastCommandConfig.java
2008-03-28 12:26:32 UTC (rev 6299)
+++
branches/2.16/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/FastCommandConfig.java
2008-03-28 13:49:12 UTC (rev 6300)
@@ -446,7 +446,7 @@
this.project = project;
}
- void setSpamScoreLimit(final int i) {
+ public void setSpamScoreLimit(final int i) {
spamScoreLimit = i;
}
@@ -464,7 +464,7 @@
* @param collectionFilterString New value of property
collectionFilterString.
*/
public void setCollectionFilterString(final String collectionFilterString)
{
- this.collectionString = collectionString;
+ this.collectionString = collectionFilterString;
}
/**
Modified:
branches/2.16/query-transform-config-spi/src/main/java/no/sesat/search/query/transform/NewsCaseQueryTransformerConfig.java
===================================================================
---
branches/2.16/query-transform-config-spi/src/main/java/no/sesat/search/query/transform/NewsCaseQueryTransformerConfig.java
2008-03-28 12:26:32 UTC (rev 6299)
+++
branches/2.16/query-transform-config-spi/src/main/java/no/sesat/search/query/transform/NewsCaseQueryTransformerConfig.java
2008-03-28 13:49:12 UTC (rev 6300)
@@ -72,14 +72,26 @@
return queryType;
}
+ public void setQueryType(String string) {
+ queryType = string;
+ }
+
public String getQueryParameter() {
return queryParameter;
}
+ public void setQueryParameter(String string) {
+ queryParameter = string;
+ }
+
public String getTypeParameter() {
return typeParameter;
}
+ public void setTypeParameter(String type) {
+ typeParameter = type;
+ }
+
public Map<String, String[]> getTypeConversions() {
return typeConversions;
}
@@ -88,20 +100,29 @@
return defaultType;
}
+ public void setDefaultType(String string) {
+ defaultType = string;
+ }
+
public int getAggregatorId() {
-
return aggregatorId;
}
-
-
- public boolean isUnclusteredDelayFilter() {
+ public boolean isUnclusteredDelay() {
return unclusteredDelayFilter;
}
+
+ public void setUnclusteredDelay(boolean filtered) {
+ unclusteredDelayFilter = filtered;
+ }
public int getUnclusteredDelayInMinutes() {
return unclusteredDelayInMinutes;
}
+
+ public void setUnclusteredDelayInMinutes(int minutes){
+ unclusteredDelayInMinutes = minutes;
+ }
public String getTimeZone() {
return timeZone;
Modified:
branches/2.16/query-transform-config-spi/src/main/java/no/sesat/search/query/transform/NewsClusterQueryTransformerConfig.java
===================================================================
---
branches/2.16/query-transform-config-spi/src/main/java/no/sesat/search/query/transform/NewsClusterQueryTransformerConfig.java
2008-03-28 12:26:32 UTC (rev 6299)
+++
branches/2.16/query-transform-config-spi/src/main/java/no/sesat/search/query/transform/NewsClusterQueryTransformerConfig.java
2008-03-28 13:49:12 UTC (rev 6300)
@@ -53,14 +53,26 @@
return paramFields;
}
+ public void setParamFields(String[] paramFields) {
+ this.paramFields = paramFields;
+ }
+
public String getTimestampField() {
return timestampField;
}
+ public void setTimestampField(String timestampField) {
+ this.timestampField = timestampField;
+ }
+
public String getClusterField() {
return clusterField;
}
+ public void setClusterField(String clusterField) {
+ this.clusterField = clusterField;
+ }
+
public String getClusterIdField() {
return clusterIdField;
}
Modified:
branches/2.16/query-transform-config-spi/src/main/java/no/sesat/search/query/transform/NewsMyNewsQueryTransformerConfig.java
===================================================================
---
branches/2.16/query-transform-config-spi/src/main/java/no/sesat/search/query/transform/NewsMyNewsQueryTransformerConfig.java
2008-03-28 12:26:32 UTC (rev 6299)
+++
branches/2.16/query-transform-config-spi/src/main/java/no/sesat/search/query/transform/NewsMyNewsQueryTransformerConfig.java
2008-03-28 13:49:12 UTC (rev 6300)
@@ -58,6 +58,10 @@
return queryParameter;
}
+ public void setQueryParameter(String string) {
+ queryParameter = string;
+ }
+
@Override
public NewsMyNewsQueryTransformerConfig readQueryTransformer(final Element
element) {
type = element.getAttribute(TYPE);
Modified:
branches/2.16/query-transform-control-spi/src/main/java/no/sesat/search/query/transform/NewsCaseQueryTransformer.java
===================================================================
---
branches/2.16/query-transform-control-spi/src/main/java/no/sesat/search/query/transform/NewsCaseQueryTransformer.java
2008-03-28 12:26:32 UTC (rev 6299)
+++
branches/2.16/query-transform-control-spi/src/main/java/no/sesat/search/query/transform/NewsCaseQueryTransformer.java
2008-03-28 13:49:12 UTC (rev 6300)
@@ -71,7 +71,7 @@
for (Clause keyClause :
getContext().getTransformedTerms().keySet()) {
getContext().getTransformedTerms().put(keyClause, "");
}
- if (config.isUnclusteredDelayFilter()) {
+ if (config.isUnclusteredDelay()) {
transformedQuery = addUnclusteredDelayFilter(transformedQuery);
}
LOG.debug("New query is: '" + transformedQuery + "'");
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
