Author: sshafroi
Date: 2008-10-29 16:31:09 +0100 (Wed, 29 Oct 2008)
New Revision: 6900
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/AbstractXmlSearchConfiguration.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/AbstractYahooSearchConfiguration.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/BlendingNewsCommandConfig.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/ClusteringEspFastCommandConfig.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/EspFastCommandConfig.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/FastCommandConfig.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/MobileCommandConfig.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/NewsAggregatorCommandConfig.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/NewsEspCommandConfig.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/OverturePpcCommandConfig.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/PictureCommandConfig.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/PlatefoodPpcCommandConfig.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/SolrCommandConfig.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YahooIdpCommandConfig.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YahooMediaCommandConfig.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YahooWebCommandConfig.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YoutubeCommandConfig.java
Log:
Issue SKER4404: (Automatically assign config settings in
readSearchConfiguration where there is a setter)
Remove old implementation
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/AbstractXmlSearchConfiguration.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/AbstractXmlSearchConfiguration.java
2008-10-29 15:26:25 UTC (rev 6899)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/AbstractXmlSearchConfiguration.java
2008-10-29 15:31:09 UTC (rev 6900)
@@ -132,24 +132,6 @@
this.hostHeader = hostHeader;
}
- @Override
- public AbstractXmlSearchConfiguration readSearchConfiguration(
- final Element element,
- final SearchConfiguration inherit,
- final Context context) {
-
- super.readSearchConfiguration(element, inherit, context);
-
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "encoding",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "host",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "port",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "hostHeader",
ParseType.String, element, "");
-
- return this;
- }
-
-
-
// Z implementation ----------------------------------------------
// Y overrides ---------------------------------------------------
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/AbstractYahooSearchConfiguration.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/AbstractYahooSearchConfiguration.java
2008-10-29 15:26:25 UTC (rev 6899)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/AbstractYahooSearchConfiguration.java
2008-10-29 15:31:09 UTC (rev 6900)
@@ -66,21 +66,6 @@
partnerId = partner;
}
- @Override
- public AbstractYahooSearchConfiguration readSearchConfiguration(
- final Element element,
- final SearchConfiguration inherit,
- final Context context) {
-
- super.readSearchConfiguration(element, inherit, context);
-
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "partnerId",
ParseType.String, element, "");
-
- return this;
- }
-
-
-
// Z implementation ----------------------------------------------
// Y overrides ---------------------------------------------------
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/BlendingNewsCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/BlendingNewsCommandConfig.java
2008-10-29 15:26:25 UTC (rev 6899)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/BlendingNewsCommandConfig.java
2008-10-29 15:31:09 UTC (rev 6900)
@@ -1,4 +1,4 @@
-/* Copyright (2007) Schibsted Søk AS
+/* Copyright (2007-2008) Schibsted Søk AS
* This file is part of SESAT.
*
* SESAT is free software: you can redistribute it and/or modify
@@ -70,30 +70,4 @@
public void setFiltersToBlend(final List<String> filtersToBlend) {
this.filtersToBlend = filtersToBlend;
}
-
- @Override
- public FastCommandConfig readSearchConfiguration(
- final Element element,
- final SearchConfiguration inherit,
- final Context context) {
-
- super.readSearchConfiguration(element, inherit, context);
-
- // TODO use fillBeanProperty pattern instead
- final String[] filters = element.getAttribute("filters").split(",");
-
- final List<String> filterList = new ArrayList<String>();
-
- for (String filter : filters) {
- filterList.add(filter.trim());
- }
-
- setFiltersToBlend(filterList);
-
setDocumentsPerFilter(Integer.parseInt(element.getAttribute("documentsPerFilter")));
-
- return this;
- }
-
-
-
}
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/ClusteringEspFastCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/ClusteringEspFastCommandConfig.java
2008-10-29 15:26:25 UTC (rev 6899)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/ClusteringEspFastCommandConfig.java
2008-10-29 15:31:09 UTC (rev 6900)
@@ -93,23 +93,4 @@
public void setClusterField(final String clusterField) {
this.clusterField = clusterField;
}
-
-
- @Override
- public FastCommandConfig readSearchConfiguration(
- final Element element,
- final SearchConfiguration inherit,
- final Context context) {
-
- super.readSearchConfiguration(element, inherit, context);
-
- AbstractDocumentFactory
- .fillBeanProperty(this, inherit, "clusterIdParameter",
ParseType.String, element, "clusterId");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"resultsPerCluster", ParseType.Int, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"clusterField", ParseType.String, element, "cluster");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"clusteringDisabled", ParseType.Boolean, element, "false");
- return this;
- }
-
-
}
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/EspFastCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/EspFastCommandConfig.java
2008-10-29 15:26:25 UTC (rev 6899)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/EspFastCommandConfig.java
2008-10-29 15:31:09 UTC (rev 6900)
@@ -247,55 +247,16 @@
}
@Override
- public FastCommandConfig readSearchConfiguration(
- final Element element,
- final SearchConfiguration inherit,
- final Context context) {
-
+ public SearchConfiguration readSearchConfiguration(final Element element,
final SearchConfiguration inherit, Context context) {
super.readSearchConfiguration(element, inherit, context);
-
-
- final EspFastCommandConfig ascInherit = inherit instanceof
EspFastCommandConfig
- ? (EspFastCommandConfig) inherit
+ final EspFastCommandConfig efscInherit = inherit instanceof
EspFastCommandConfig ? (EspFastCommandConfig) inherit
: null;
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "view",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "sortBy",
ParseType.String, element, "default");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"alternativeSortBy", ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"collapsingRemoves", ParseType.Boolean, element, "false");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"collapsingEnabled", ParseType.Boolean, element, "false");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"expansionEnabled", ParseType.Boolean, element, "false");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "qtPipeline",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "lemmatize",
ParseType.Boolean, element, "false");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "queryServer",
ParseType.String, element, "");
if (null != getQueryServer() &&
getQueryServer().startsWith("http://";)) {
throw new IllegalArgumentException(ERR_FAST_EPS_QR_SERVER +
getQueryServer());
}
- // navigators
- if (ascInherit != null && ascInherit.getNavigators() != null) {
-
- navigators.putAll(ascInherit.getNavigators());
- }
-
- final NodeList nList = element.getElementsByTagName("navigators");
- for (int i = 0; i < nList.getLength(); ++i) {
- final Collection<Navigator> navigators = parseNavigators((Element)
nList.item(i));
- for (Navigator navigator : navigators) {
- addNavigator(navigator, navigator.getId());
- }
- }
-
- return this;
- }
-
- @Override
- public SearchConfiguration readSearchConfiguration(final Element element,
final SearchConfiguration inherit) {
- super.readSearchConfiguration(element, inherit);
- final EspFastCommandConfig efscInherit = inherit instanceof
EspFastCommandConfig ? (EspFastCommandConfig) inherit
- : null;
-
if (efscInherit != null && efscInherit.getNavigators() != null) {
navigators.putAll(efscInherit.getNavigators());
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/FastCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/FastCommandConfig.java
2008-10-29 15:26:25 UTC (rev 6899)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/FastCommandConfig.java
2008-10-29 15:31:09 UTC (rev 6900)
@@ -523,81 +523,9 @@
}
@Override
- public FastCommandConfig readSearchConfiguration(
- final Element element,
- final SearchConfiguration inherit,
- final Context context) {
-
+ public SearchConfiguration readSearchConfiguration(final Element element,
final SearchConfiguration inherit, Context context) {
super.readSearchConfiguration(element, inherit, context);
- final FastCommandConfig fscInherit = inherit instanceof
FastCommandConfig
- ? (FastCommandConfig) inherit
- : null;
-
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "clustering",
ParseType.Boolean, element, "false");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "collapsing",
ParseType.Boolean, element, "false");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "expansion",
ParseType.Boolean, element, "false");
-
- // collections
- if (element.getAttribute("collections").length() > 0) {
- addCollections(element.getAttribute("collections").split(","));
- }else if(null != fscInherit){
- for(String collection : fscInherit.getCollections()) {
- collections.add(collection);
- }
- }
-
- // search parameters
- if(null != fscInherit){
- searchParameters.putAll(fscInherit.getSearchParameterMap());
- }
- if (element.getAttribute("search-parameters").length() > 0) {
-
setSearchParameters(element.getAttribute("search-parameters").split(","));
- }
-
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "filter",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "project",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "project",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "filtertype",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"ignoreNavigation", ParseType.Boolean, element, "false");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"offensiveScoreLimit", ParseType.Int, element, "-1");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "qtPipeline",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"queryServerUrl", ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"relevantQueries", ParseType.Boolean, element, "false");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "sortBy",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"alternativeSortBy", ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"spamScoreLimit", ParseType.Int, element, "-1");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "spellcheck",
ParseType.Boolean, element, "false");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"spellchecklanguage", ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "lemmatise",
ParseType.Boolean, element, "false");
-
- if (getQueryServerUrl() == null || "".equals(getQueryServerUrl())) {
- LOG.debug("queryServerURL is empty for " + getId());
- }
-
- // navigators
- if (fscInherit != null && fscInherit.getNavigators() != null) {
-
- navigators.putAll(fscInherit.getNavigators());
- }
-
- final NodeList nList = element.getElementsByTagName("navigators");
-
- for (int i = 0; i < nList.getLength(); ++i) {
- final Collection<Navigator> navigators = parseNavigators((Element)
nList.item(i));
- for (Navigator navigator : navigators) {
- addNavigator(navigator, navigator.getId());
- }
-
- }
-
- return this;
- }
-
- @Override
- public SearchConfiguration readSearchConfiguration(final Element element,
final SearchConfiguration inherit) {
- super.readSearchConfiguration(element, inherit);
-
final FastCommandConfig fscInherit = inherit instanceof
FastCommandConfig ? (FastCommandConfig) inherit : null;
if (getQueryServerUrl() == null || "".equals(getQueryServerUrl())) {
LOG.debug("queryServerURL is empty for " + getId());
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/MobileCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/MobileCommandConfig.java
2008-10-29 15:26:25 UTC (rev 6899)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/MobileCommandConfig.java
2008-10-29 15:31:09 UTC (rev 6900)
@@ -1,4 +1,4 @@
-/* Copyright (2007) Schibsted Søk AS
+/* Copyright (2007-2008) Schibsted Søk AS
* This file is part of SESAT.
*
* SESAT is free software: you can redistribute it and/or modify
@@ -120,33 +120,4 @@
public String getFilter() {
return filter;
}
-
- @Override
- public CommandConfig readSearchConfiguration(
- final Element element,
- final SearchConfiguration inherit,
- final Context context) {
-
- super.readSearchConfiguration(element, inherit, context);
-
- // TODO use fillBeanProperty pattern instead
-
- if(inherit != null && inherit instanceof MobileCommandConfig){
- final MobileCommandConfig cfg = (MobileCommandConfig) inherit;
- source = cfg.source;
- personalizationGroup = cfg.personalizationGroup;
- telenorPersonalizationGroup = cfg.telenorPersonalizationGroup;
- sortBy = cfg.sortBy;
- filter = cfg.filter;
- }
- setPersonalizationGroup(element.getAttribute("personalization-group"));
-
setTelenorPersonalizationGroup(element.getAttribute("telenor-personalization-group"));
- setSortBy(element.getAttribute("sort-by"));
- setSource(element.getAttribute("source"));
- setFilter(element.getAttribute("filter"));
-
- return this;
- }
-
-
}
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/NewsAggregatorCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/NewsAggregatorCommandConfig.java
2008-10-29 15:26:25 UTC (rev 6899)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/NewsAggregatorCommandConfig.java
2008-10-29 15:31:09 UTC (rev 6900)
@@ -154,23 +154,4 @@
public String[] getGeographicFieldArray() {
return geographicFields.split(",");
}
-
- @Override
- public FastCommandConfig readSearchConfiguration(
- final Element element,
- final SearchConfiguration inherit,
- final Context context) {
-
- super.readSearchConfiguration(element, inherit, context);
-
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "xmlSource",
ParseType.String, element, "");
- AbstractDocumentFactory
- .fillBeanProperty(this, inherit, "xmlMainFile",
ParseType.String, element, "fp_main_main.xml");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"geographicFields", ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"categoryFields", ParseType.String, element, "");
-
- return this;
- }
-
-
}
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/NewsEspCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/NewsEspCommandConfig.java
2008-10-29 15:26:25 UTC (rev 6899)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/NewsEspCommandConfig.java
2008-10-29 15:31:09 UTC (rev 6900)
@@ -267,59 +267,13 @@
}
@Override
- public FastCommandConfig readSearchConfiguration(
- final Element element,
- final SearchConfiguration inherit,
- final Context context) {
-
+ public SearchConfiguration readSearchConfiguration(final Element element,
final SearchConfiguration inherit, Context context) {
super.readSearchConfiguration(element, inherit, context);
-
- AbstractDocumentFactory.fillBeanProperty(
- this, inherit, "mediumPrefix", ParseType.String, element,
"medium");
- AbstractDocumentFactory.fillBeanProperty(
- this, inherit, "defaultMedium", ParseType.String, element,
"webnewsarticle");
- AbstractDocumentFactory.fillBeanProperty(
- this, inherit, "mediumParameter", ParseType.String, element,
"medium");
- AbstractDocumentFactory.fillBeanProperty(
- this, inherit, "nestedResultsField", ParseType.String,
element, "entries");
- AbstractDocumentFactory.fillBeanProperty(
- this, inherit, "collapsingMaxFetch", ParseType.Int, element,
"10");
-
- AbstractDocumentFactory.fillBeanProperty(
- this, inherit, "sortField", ParseType.String, element,
"publishedtime");
- AbstractDocumentFactory.fillBeanProperty(
- this, inherit, "defaultSort", ParseType.String, element,
"descending");
- AbstractDocumentFactory.fillBeanProperty(
- this, inherit, "userSortParameter", ParseType.String, element,
"sort");
- AbstractDocumentFactory.fillBeanProperty(
- this, inherit, "relevanceSortField", ParseType.String,
element, "freshnessprofile");
- AbstractDocumentFactory.fillBeanProperty(
- this, inherit, "relevanceSingleTermSortField",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(
- this, inherit, "relevanceMultipleTermSortField",
ParseType.String, element, "");
-
- AbstractDocumentFactory.fillBeanProperty(
- this, inherit, "maxAge", ParseType.String, element, null);
- AbstractDocumentFactory.fillBeanProperty(
- this, inherit, "ageField", ParseType.String, element,
"publishedtime");
-
// maxAge is of the format 10h (for 10 hours).
if (maxAge != null) {
ageSymbol = maxAge.charAt(maxAge.length() - 1);
maxAgeAmount = Integer.parseInt(maxAge.substring(0,
maxAge.length() - 1));
}
-
return this;
}
-
- @Override
- public SearchConfiguration readSearchConfiguration(final Element element,
final SearchConfiguration inherit) {
- super.readSearchConfiguration(element, inherit);
- // maxAge is of the format 10h (for 10 hours).
- if (maxAge != null) {
- ageSymbol = maxAge.charAt(maxAge.length() - 1);
- maxAgeAmount = Integer.parseInt(maxAge.substring(0,
maxAge.length() - 1));
- }
- return this;
- }
}
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/OverturePpcCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/OverturePpcCommandConfig.java
2008-10-29 15:26:25 UTC (rev 6899)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/OverturePpcCommandConfig.java
2008-10-29 15:31:09 UTC (rev 6900)
@@ -73,20 +73,4 @@
public void setType(final String type) {
this.type = type;
}
-
- @Override
- public AbstractYahooSearchConfiguration readSearchConfiguration(
- final Element element,
- final SearchConfiguration inherit,
- final Context context) {
-
- super.readSearchConfiguration(element, inherit, context);
-
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "url",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "type",
ParseType.String, element, "");
-
- return this;
- }
-
-
}
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/PictureCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/PictureCommandConfig.java
2008-10-29 15:26:25 UTC (rev 6899)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/PictureCommandConfig.java
2008-10-29 15:31:09 UTC (rev 6900)
@@ -151,26 +151,4 @@
public void setDomainBoost(String domainBoost) {
this.domainBoost = domainBoost;
}
-
- @Override
- public CommandConfig readSearchConfiguration(
- final Element element,
- final SearchConfiguration inherit,
- final Context context) {
-
- super.readSearchConfiguration(element, inherit, context);
-
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"queryServerHost", ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"queryServerPort", ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "country",
ParseType.String, element, "no");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "filter",
ParseType.String, element, "medium");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "customerId",
ParseType.String, element, "558735");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "site",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "domainBoost",
ParseType.String, element, "");
-
- LOG.debug("customerid " + getCustomerId());
-
- return this;
- }
-
}
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/PlatefoodPpcCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/PlatefoodPpcCommandConfig.java
2008-10-29 15:26:25 UTC (rev 6899)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/PlatefoodPpcCommandConfig.java
2008-10-29 15:31:09 UTC (rev 6900)
@@ -81,21 +81,4 @@
public void setTop3BackfillBlock(String top3BackfillBlock) {
this.top3BackfillBlock = top3BackfillBlock;
}
-
- @Override
- public AbstractYahooSearchConfiguration readSearchConfiguration(
- final Element element,
- final SearchConfiguration inherit,
- final Context context) {
-
- super.readSearchConfiguration(element, inherit, context);
-
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "url",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"resultsOnTop", ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit,
"top3BackfillBlock", ParseType.String, element, "");
-
- return this;
- }
-
-
}
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/SolrCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/SolrCommandConfig.java
2008-10-29 15:26:25 UTC (rev 6899)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/SolrCommandConfig.java
2008-10-29 15:31:09 UTC (rev 6900)
@@ -83,22 +83,6 @@
this.querySuffix = querySuffix;
}
- @Override
- public SolrCommandConfig readSearchConfiguration(
- final Element element,
- final SearchConfiguration inherit,
- final Context context) {
-
- super.readSearchConfiguration(element, inherit, context);
-
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "serverUrl",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "querySuffix",
ParseType.String, element, "");
-
- return this;
- }
-
-
-
// Z implementation ----------------------------------------------
// Y overrides ---------------------------------------------------
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YahooIdpCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YahooIdpCommandConfig.java
2008-10-29 15:26:25 UTC (rev 6899)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YahooIdpCommandConfig.java
2008-10-29 15:31:09 UTC (rev 6900)
@@ -240,29 +240,4 @@
public void setLanguageMix(String languageMix) {
this.languageMix = languageMix;
}
-
- @Override
- public AbstractYahooSearchConfiguration readSearchConfiguration(
- final Element element,
- final SearchConfiguration inherit,
- final Context context) {
-
- super.readSearchConfiguration(element, inherit, context);
-
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "database",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "dateRange",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "filter",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "hideDomain",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "language",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "languageMix",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "region",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "regionMix",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "spellState",
ParseType.String, element, "");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "unique",
ParseType.String, element, "");
-
- return this;
- }
-
-
-
}
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YahooMediaCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YahooMediaCommandConfig.java
2008-10-29 15:26:25 UTC (rev 6899)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YahooMediaCommandConfig.java
2008-10-29 15:31:09 UTC (rev 6900)
@@ -96,24 +96,4 @@
public void setOcr(final String ocr) {
this.ocr = ocr;
}
-
- @Override
- public AbstractYahooSearchConfiguration readSearchConfiguration(
- final Element element,
- final SearchConfiguration inherit,
- final Context context) {
-
- super.readSearchConfiguration(element, inherit, context);
-
-
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "catalog",
ParseType.String, element,
- YahooMediaCommandConfig.DEFAULT_CATALOG);
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "ocr",
ParseType.String, element,
- YahooMediaCommandConfig.DEFAULT_OCR);
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "site",
ParseType.String, element, "");
-
- return this;
- }
-
-
}
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YahooWebCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YahooWebCommandConfig.java
2008-10-29 15:26:25 UTC (rev 6899)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YahooWebCommandConfig.java
2008-10-29 15:31:09 UTC (rev 6900)
@@ -182,27 +182,8 @@
}
@Override
- public YahooWebCommandConfig readSearchConfiguration(
- final Element element,
- final SearchConfiguration inherit,
- final Context context) {
-
+ public SearchConfiguration readSearchConfiguration(final Element element,
final SearchConfiguration inherit, Context context) {
super.readSearchConfiguration(element, inherit, context);
-
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "appid",
ParseType.String, element, "YahooDemo");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "format",
ParseType.String, element, "any");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "adult_ok",
ParseType.Boolean, element, "false");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "similar_ok",
ParseType.Boolean, element, "false");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "language",
ParseType.String, element, "en");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "country",
ParseType.String, element, null);
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "site",
ParseType.String, element, null);
-
- return this;
- }
-
- @Override
- public SearchConfiguration readSearchConfiguration(final Element element,
final SearchConfiguration inherit) {
- super.readSearchConfiguration(element, inherit);
setPartnerId(getAppid());
return this;
}
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YoutubeCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YoutubeCommandConfig.java
2008-10-29 15:26:25 UTC (rev 6899)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YoutubeCommandConfig.java
2008-10-29 15:31:09 UTC (rev 6900)
@@ -53,16 +53,4 @@
public String getSortBy() {
return sortBy;
}
-
- @Override
- public YoutubeCommandConfig readSearchConfiguration(
- final Element element,
- final SearchConfiguration inherit,
- final Context context) {
- super.readSearchConfiguration(element, inherit, context);
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "format",
ParseType.String, element, "5");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "racy",
ParseType.String, element, "exclude");
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "sortBy",
ParseType.String, element, "relevance");
- return this;
- }
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
