[Archive-access-cvs] SF.net SVN: archive-access:[2946] tags/nutchwax-0_12_9/archive/src/nutch/ src/java/org/apache/nutch/searcher/FetchedSegments.java

[<bi...@us...>]

Revision: 2946
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2946&view=rev
Author:   binzino
Date:     2010-01-13 00:14:06 +0000 (Wed, 13 Jan 2010)

Log Message:
-----------
Completed fix for WAX-68.

Modified Paths:
--------------
    tags/nutchwax-0_12_9/archive/src/nutch/src/java/org/apache/nutch/searcher/FetchedSegments.java

Modified: tags/nutchwax-0_12_9/archive/src/nutch/src/java/org/apache/nutch/searcher/FetchedSegments.java
===================================================================
--- tags/nutchwax-0_12_9/archive/src/nutch/src/java/org/apache/nutch/searcher/FetchedSegments.java	2010-01-12 22:27:18 UTC (rev 2945)
+++ tags/nutchwax-0_12_9/archive/src/nutch/src/java/org/apache/nutch/searcher/FetchedSegments.java	2010-01-13 00:14:06 UTC (rev 2946)
@@ -233,20 +233,25 @@
           }
 
         String version = fields[1];
-        if ( ! ( "10".equals( version ) || "12".equals( version ) ) )
+        if ( "10".equals( version ) )
           {
-            LOG.warn( "Malformed versions line, invalid version ("+version+"): " + version );
-            continue;
+            LOG.info( "Version: " + fields[0] + " : " + fields[1] );
+            if ( this.oldFormatSegments == null )
+              {
+                this.oldFormatSegments = new HashSet( );
+              }
+            
+            this.oldFormatSegments.add( segment );
           }
-
-        LOG.info( "Version: " + fields[0] + " : " + fields[1] );
-
-        if ( this.oldFormatSegments == null )
+        else if ( "12".equals( version ) )
           {
-            this.oldFormatSegments = new HashSet( );
+            LOG.info( "Version: " + fields[0] + " : " + fields[1] );
+            // For version 12, nothing to do.
           }
-        
-        this.oldFormatSegments.add( segment );
+        else
+          {
+            LOG.warn( "Malformed versions line, invalid version ("+version+"): " + line );
+          }
       }
   }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.