svn commit: r425936 - in /maven/repository-manager/trunk: maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/ maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/

[brett]

Author: brett
Date: Wed Jul 26 20:03:48 2006
New Revision: 425936

URL: http://svn.apache.org/viewvc?rev=425936&view=rev
Log:
[MNG-127] notes, and skip indexing of null records

Modified:
    
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java
    
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndex.java

Modified: 
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java
URL: 
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java?rev=425936&r1=425935&r2=425936&view=diff
==============================================================================
--- 
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java
 (original)
+++ 
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java
 Wed Jul 26 20:03:48 2006
@@ -151,11 +151,12 @@
     }
 
     /**
-     * Builds a RepositoryMetadata object from a Metadata object and its path
+     * Builds a RepositoryMetadata object from a Metadata object and its path.
      *
      * @param m            Metadata
      * @param metadataPath path
      * @return RepositoryMetadata if the parameters represent one; null if not
+     * @todo should we just be using the path information, and loading it 
later when it is needed? (for reporting, etc)
      */
     private RepositoryMetadata buildMetadata( Metadata m, String metadataPath )
     {

Modified: 
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndex.java
URL: 
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndex.java?rev=425936&r1=425935&r2=425936&view=diff
==============================================================================
--- 
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndex.java
 (original)
+++ 
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndex.java
 Wed Jul 26 20:03:48 2006
@@ -94,10 +94,14 @@
             {
                 RepositoryIndexRecord record = (RepositoryIndexRecord) 
i.next();
 
-                Document document = converter.convert( record );
-                document.add( new Field( FLD_PK, record.getPrimaryKey(), 
Field.Store.NO, Field.Index.UN_TOKENIZED ) );
+                if ( record != null )
+                {
+                    Document document = converter.convert( record );
+                    document.add(
+                        new Field( FLD_PK, record.getPrimaryKey(), 
Field.Store.NO, Field.Index.UN_TOKENIZED ) );
 
-                indexWriter.addDocument( document );
+                    indexWriter.addDocument( document );
+                }
             }
         }
         catch ( IOException e )
@@ -128,7 +132,7 @@
 
     private Analyzer getAnalyzer()
     {
-        // TODO: investigate why changed in original!
+        // TODO: investigate why changed in original! Probably for MD5 and 
number querying.
         return new StandardAnalyzer();
     }
 
@@ -146,9 +150,12 @@
                 {
                     RepositoryIndexRecord record = (RepositoryIndexRecord) 
artifacts.next();
 
-                    Term term = new Term( FLD_PK, record.getPrimaryKey() );
+                    if ( record != null )
+                    {
+                        Term term = new Term( FLD_PK, record.getPrimaryKey() );
 
-                    indexReader.deleteDocuments( term );
+                        indexReader.deleteDocuments( term );
+                    }
                 }
             }
             finally