Author: jnioche
Date: Tue Jan 4 16:50:12 2011
New Revision: 1055100
URL: http://svn.apache.org/viewvc?rev=1055100&view=rev
Log:
applied NUTCH-787 to 1.3
Modified:
nutch/branches/branch-1.3/CHANGES.txt
nutch/branches/branch-1.3/src/plugin/scoring-link/src/java/org/apache/nutch/scoring/link/LinkAnalysisScoringFilter.java
nutch/branches/branch-1.3/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java
Modified: nutch/branches/branch-1.3/CHANGES.txt
URL:
http://svn.apache.org/viewvc/nutch/branches/branch-1.3/CHANGES.txt?rev=1055100&r1=1055099&r2=1055100&view=diff
==============================================================================
--- nutch/branches/branch-1.3/CHANGES.txt (original)
+++ nutch/branches/branch-1.3/CHANGES.txt Tue Jan 4 16:50:12 2011
@@ -2,6 +2,8 @@ Nutch Change Log
Release 1.3 - Current Development
+* NUTCH-787 ScoringFilters should not override the injected score (jnioche)
+
* NUTCH-949 Conflicting ANT jars in classpath (jnioche)
* NUTCH-862 HttpClient null pointer exception (Sebastian Nagel via ab)
Modified:
nutch/branches/branch-1.3/src/plugin/scoring-link/src/java/org/apache/nutch/scoring/link/LinkAnalysisScoringFilter.java
URL:
http://svn.apache.org/viewvc/nutch/branches/branch-1.3/src/plugin/scoring-link/src/java/org/apache/nutch/scoring/link/LinkAnalysisScoringFilter.java?rev=1055100&r1=1055099&r2=1055100&view=diff
==============================================================================
---
nutch/branches/branch-1.3/src/plugin/scoring-link/src/java/org/apache/nutch/scoring/link/LinkAnalysisScoringFilter.java
(original)
+++
nutch/branches/branch-1.3/src/plugin/scoring-link/src/java/org/apache/nutch/scoring/link/LinkAnalysisScoringFilter.java
Tue Jan 4 16:50:12 2011
@@ -36,7 +36,6 @@ public class LinkAnalysisScoringFilter
implements ScoringFilter {
private Configuration conf;
- private float scoreInjected = 0.001f;
private float normalizedScore = 1.00f;
public LinkAnalysisScoringFilter() {
@@ -50,7 +49,6 @@ public class LinkAnalysisScoringFilter
public void setConf(Configuration conf) {
this.conf = conf;
normalizedScore = conf.getFloat("link.analyze.normalize.score", 1.00f);
- scoreInjected = conf.getFloat("link.analyze.injected.score", 1.00f);
}
public CrawlDatum distributeScoreToOutlinks(Text fromUrl,
@@ -78,7 +76,6 @@ public class LinkAnalysisScoringFilter
public void injectedScore(Text url, CrawlDatum datum)
throws ScoringFilterException {
- datum.setScore(scoreInjected);
}
public void passScoreAfterParsing(Text url, Content content, Parse parse)
Modified:
nutch/branches/branch-1.3/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java
URL:
http://svn.apache.org/viewvc/nutch/branches/branch-1.3/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java?rev=1055100&r1=1055099&r2=1055100&view=diff
==============================================================================
---
nutch/branches/branch-1.3/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java
(original)
+++
nutch/branches/branch-1.3/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java
Tue Jan 4 16:50:12 2011
@@ -67,16 +67,13 @@ public class OPICScoringFilter implement
public void setConf(Configuration conf) {
this.conf = conf;
- scoreInjected = conf.getFloat("db.score.injected", 1.0f);
scorePower = conf.getFloat("indexer.score.power", 0.5f);
internalScoreFactor = conf.getFloat("db.score.link.internal", 1.0f);
externalScoreFactor = conf.getFloat("db.score.link.external", 1.0f);
countFiltered = conf.getBoolean("db.score.count.filtered", false);
}
- /** Set to the value defined in config, 1.0f by default. */
public void injectedScore(Text url, CrawlDatum datum) throws
ScoringFilterException {
- datum.setScore(scoreInjected);
}
/** Set to 0.0f (unknown value) - inlink contributions will bring it to
