svn commit: r983311 - in /nutch/branches/branch-1.2: CHANGES.txt src/java/org/apache/nutch/crawl/Injector.java

[mattmann]

Author: mattmann
Date: Sat Aug  7 21:22:18 2010
New Revision: 983311

URL: http://svn.apache.org/viewvc?rev=983311&view=rev
Log:
fix for NUTCH-870 Injector should add the metadata before calling injectedScore.

Modified:
    nutch/branches/branch-1.2/CHANGES.txt
    nutch/branches/branch-1.2/src/java/org/apache/nutch/crawl/Injector.java

Modified: nutch/branches/branch-1.2/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/nutch/branches/branch-1.2/CHANGES.txt?rev=983311&r1=983310&r2=983311&view=diff
==============================================================================
--- nutch/branches/branch-1.2/CHANGES.txt (original)
+++ nutch/branches/branch-1.2/CHANGES.txt Sat Aug  7 21:22:18 2010
@@ -2,6 +2,8 @@ Nutch Change Log
 
 Release 1.2 - Current Development
 
+* NUTCH-870 Injector should add the metadata before calling injectedScore 
(jnioche via mattmann)
+
 * NUTCH-858 No longer able to set per-field boosts on lucene documents (ab)
 
 * NUTCH-869 Add parse-html back (jnioche)

Modified: 
nutch/branches/branch-1.2/src/java/org/apache/nutch/crawl/Injector.java
URL: 
http://svn.apache.org/viewvc/nutch/branches/branch-1.2/src/java/org/apache/nutch/crawl/Injector.java?rev=983311&r1=983310&r2=983311&view=diff
==============================================================================
--- nutch/branches/branch-1.2/src/java/org/apache/nutch/crawl/Injector.java 
(original)
+++ nutch/branches/branch-1.2/src/java/org/apache/nutch/crawl/Injector.java Sat 
Aug  7 21:22:18 2010
@@ -128,19 +128,6 @@ public class Injector extends Configured
         value.set(url);                           // collect it
         CrawlDatum datum = new CrawlDatum(CrawlDatum.STATUS_INJECTED, 
customInterval);
         datum.setFetchTime(curTime);
-        if (customScore != -1) datum.setScore(customScore);
-        else {
-          datum.setScore(scoreInjected);
-          try {
-            scfilters.injectedScore(value, datum);
-          } catch (ScoringFilterException e) {
-            if (LOG.isWarnEnabled()) {
-              LOG.warn("Cannot filter injected score for url " + url
-                  + ", using default (" + e.getMessage() + ")");
-            }
-            datum.setScore(scoreInjected);
-          }
-        }
         // now add the metadata
         Iterator<String> keysIter = metadata.keySet().iterator();
         while (keysIter.hasNext()){
@@ -148,6 +135,16 @@ public class Injector extends Configured
                String valuemd = metadata.get(keymd);
                datum.getMetaData().put(new Text(keymd), new Text(valuemd));
         }
+        if (customScore != -1) datum.setScore(customScore);
+        else datum.setScore(scoreInjected);
+        try {
+               scfilters.injectedScore(value, datum);
+        } catch (ScoringFilterException e) {
+               if (LOG.isWarnEnabled()) {
+                       LOG.warn("Cannot filter injected score for url " + url
+                                       + ", using default (" + e.getMessage() 
+ ")");
+               }
+        }
         output.collect(value, datum);
       }
     }