Mailing-List: contact lucy-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: lucy-dev@incubator.apache.org
Received-SPF: neutral (athena.apache.org: local policy)
Message-ID: <4F3427E4.4030100@aevum.de>
Date: Thu, 09 Feb 2012 21:09:08 +0100
From: Nick Wellnhofer <wellnhofer@aevum.de>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:9.0) Gecko/20111222 Thunderbird/9.0.1
MIME-Version: 1.0
To: lucy-dev@incubator.apache.org
References: <20111220220532.A7C4023888CD@eris.apache.org>
 <20111222051556.GA15440@rectangular.com> <4EF3AFB9.5010602@aevum.de>
 <20111223031833.GA30962@rectangular.com> <4F329D28.7080107@aevum.de>
 <20120209014952.GA7383@rectangular.com> <4F33C12E.4020203@aevum.de>
 <20120209174951.GA22340@rectangular.com>
In-Reply-To: <20120209174951.GA22340@rectangular.com>
Content-Type: multipart/mixed;
 boundary="------------050707090000080505090101"
Subject: Re: [lucy-dev] Promoting new analysis components

--------------050707090000080505090101
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

On 09/02/2012 18:49, Marvin Humphrey wrote:
> Rehashing our short exchange on IRC for the benefit of the list... I suggest
> using PolyReader#open for this, since it returns NULL rather than throwing an
> exception on failure.  If open() is successful, the resulting reader can be
> used as an argument to IndexSearcher#new:

Actually, PolyReader#open doesn't return NULL if the index is empty. But 
the list of seg_readers will be empty, so we can test for that.

See the attached patch for my second attempt.

Nick

--------------050707090000080505090101
Content-Type: text/plain;
 name="lucy-simple-v2.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="lucy-simple-v2.patch"

diff --git a/perl/lib/Lucy/Simple.pm b/perl/lib/Lucy/Simple.pm
index aeb92c4..f09301b 100644
--- a/perl/lib/Lucy/Simple.pm
+++ b/perl/lib/Lucy/Simple.pm
@@ -50,7 +50,6 @@ sub new {
     # Get type and schema.
     my $analyzer = Lucy::Analysis::EasyAnalyzer->new( language => $language );
     $self->{type} = Lucy::Plan::FullTextType->new( analyzer => $analyzer, );
-    my $schema = $self->{schema} = Lucy::Plan::Schema->new;
 
     # Cache the object for later clean-up.
     weaken( $obj_cache{ refaddr $self } = $self );
@@ -61,6 +60,15 @@ sub new {
 sub _lazily_create_indexer {
     my $self = shift;
     if ( !defined $self->{indexer} ) {
+        my $reader = Lucy::Index::PolyReader->open( index => $self->{path} );
+        if ( ! @{ $reader->seg_readers } ) {
+            # index is empty, create new schema
+            $self->{schema} = Lucy::Plan::Schema->new;
+        }
+        else {
+            # get schema from reader
+            $self->{schema} = $reader->get_schema;
+        }
         $self->{indexer} = Lucy::Index::Indexer->new(
             schema => $self->{schema},
             index  => $self->{path},
@@ -70,11 +78,11 @@ sub _lazily_create_indexer {
 
 sub add_doc {
     my ( $self, $hashref ) = @_;
-    my $schema = $self->{schema};
     my $type   = $self->{type};
     croak("add_doc requires exactly one argument: a hashref")
         unless ( @_ == 2 and reftype($hashref) eq 'HASH' );
     $self->_lazily_create_indexer;
+    my $schema = $self->{schema};
     $schema->spec_field( name => $_, type => $type ) for keys %$hashref;
     $self->{indexer}->add_doc($hashref);
 }

--------------050707090000080505090101--