--- lib/Grep/Search.pm	2007/02/21 12:52:41	48
+++ lib/Grep/Search.pm	2007/02/21 13:01:34	49
@@ -13,18 +13,35 @@
 
 my $debug = 0;
 
-sub reopen_index {
-	my $self = shift;
+sub create {
 
-	$analyzer ||= new Lucene::Analysis::Standard::StandardAnalyzer();
 	my $create = 0;
 	if (! -e "$index_path/segments") {
 		$create = 1;
-		Jifty->log->debug("creating index $index_path") unless ($store);
+		Jifty->log->debug("create index $index_path") unless ($store);
 	} else {
-		Jifty->log->debug("using index: $index_path") unless ($store);
+		Jifty->log->debug("open index: $index_path") unless ($store);
 	}
-	$store ||= Lucene::Store::FSDirectory->getDirectory( $index_path, $create );
+	return $create;
+}
+
+sub analyzer {
+	my $self = shift;
+	$analyzer ||= new Lucene::Analysis::Standard::StandardAnalyzer();
+	return $analyzer;
+}
+
+sub store {
+	my $self = shift;
+
+	$store ||= Lucene::Store::FSDirectory->getDirectory( $index_path, $self->create );
+	return $store;
+}
+
+sub writer {
+	my $self = shift;
+	$writer ||= new Lucene::Index::IndexWriter( $self->store, $self->analyzer, $self->create );
+	return $writer;
 }
 
 =head2 add
@@ -40,10 +57,6 @@
 
 	die "record not Jifty::Record but ", ref $i unless ($i->isa('Jifty::Record'));
 
-	$self->reopen_index;
-
-	$writer ||= new Lucene::Index::IndexWriter( $store, $analyzer, 0 );
-
 	my $pk = { $i->primary_keys };
 
 	my $doc = new Lucene::Document;
@@ -81,7 +94,7 @@
 		}
 	}
 
-	$writer->addDocument($doc);
+	$self->writer->addDocument($doc);
 
 	Jifty->log->debug("added ", $i->id, " to index");
 }
@@ -97,10 +110,8 @@
 
 	my $q = shift or die "no q?";
 
-	$self->reopen_index;
-
-	my $searcher = new Lucene::Search::IndexSearcher($store);
-	my $parser = new Lucene::QueryParser("content", $analyzer);
+	my $searcher = new Lucene::Search::IndexSearcher($self->store);
+	my $parser = new Lucene::QueryParser("content", $self->analyzer);
 	my $query = $parser->parse( $q );
 
 	Jifty->log->debug("searching for '$q'");