--- trunk/run.pl	2005/12/05 17:48:23	221
+++ trunk/run.pl	2005/12/20 00:03:04	307
@@ -7,20 +7,65 @@
 use Data::Dumper;
 use lib './lib';
 
+use WebPAC::Common 0.02;
 use WebPAC::Lookup;
-use WebPAC::Input::ISIS;
+use WebPAC::Input 0.03;
 use WebPAC::Store 0.03;
 use WebPAC::Normalize::XML;
 use WebPAC::Output::TT;
-use WebPAC::Output::Estraier 0.02;
+use WebPAC::Output::Estraier 0.08;
 use YAML qw/LoadFile/;
-use LWP::Simple;
+use Getopt::Long;
+use File::Path;
 
-my $limit = shift @ARGV;
+=head1 NAME
 
-my $config = LoadFile('conf/config.yml');
+run.pl - start WebPAC indexing
 
-print "config = ",Dumper($config);
+B<this command will probably go away. Don't get used to it!>
+
+Options:
+
+=over 4
+
+=item --offset 42
+
+start loading (all) databases at offset 42
+
+=item --limit 100
+
+limit loading to 100 records
+
+=item --clean
+
+remove database and Hyper Estraier index before indexing
+
+=item --config conf/config.yml
+
+path to YAML configuration file
+
+=back
+
+=cut
+
+my $offset;
+my $limit;
+
+my $clean = 0;
+my $config = 'conf/config.yml';
+my $debug = 0;
+
+GetOptions(
+	"limit=i" => \$limit,
+	"offset=i" => \$offset,
+	"clean" => \$clean,
+	"config" => \$config,
+	"debug" => \$debug,
+);
+
+$config = LoadFile($config);
+
+print "config = ",Dumper($config) if ($debug);
 
 die "no databases in config file!\n" unless ($config->{databases});
 
@@ -28,37 +73,39 @@
 
 while (my ($database, $db_config) = each %{ $config->{databases} }) {
 
-	my $type = lc($db_config->{input}->{type});
+	my $log = _new WebPAC::Common()->_get_logger();
+
+	#
+	# open Hyper Estraier database
+	#
+
+	my $est_config = $config->{hyperestraier} || $log->logdie("can't find 'hyperestraier' part in confguration");
+	$est_config->{database} = $database;
+	$est_config->{clean} = $clean;
 
-	die "I know only how to handle input type isis, not '$type'!\n" unless ($type eq 'isis');
+	my $est = new WebPAC::Output::Estraier( %{ $est_config } );
 
+	#
+	# now WebPAC::Store
+	#
 	my $abs_path = abs_path($0);
 	$abs_path =~ s#/[^/]*$#/#;
 
-	my $lookup = new WebPAC::Lookup(
-		lookup_file => $db_config->{input}->{lookup},
-	);
-
 	my $db_path = $config->{webpac}->{db_path} . '/' . $database;
 
-
-	my $log = $lookup->_get_logger;
-	$log->info("working on $database in $db_path");
+	if ($clean) {
+		$log->info("creating new database $database in $db_path");
+		rmtree( $db_path ) || $log->warn("can't remove $db_path: $!");
+	} else {
+		$log->info("working on $database in $db_path");
+	}
 
 	my $db = new WebPAC::Store(
 		path => $db_path,
 		database => $database,
-		debug => 1,
+		debug => $debug,
 	);
 
-	my $est_config = $config->{hyperestraier} || $log->logdie("can't find 'hyperestraier' part in confguration");
-	$est_config->{database} = $database;
-
-	$log->info("using HyperEstraier URL $est_config->{masterurl}");
-
-	my $est = new WebPAC::Output::Estraier(
-		%{ $est_config },
-	);
 
 	#
 	# now, iterate through input formats
@@ -67,20 +114,39 @@
 	my @inputs;
 	if (ref($db_config->{input}) eq 'ARRAY') {
 		@inputs = @{ $db_config->{input} };
-	} else {
+	} elsif ($db_config->{input}) {
 		push @inputs, $db_config->{input};
+	} else {
+		$log->info("database $database doesn't have inputs defined");
 	}
 
+	my @supported_inputs = keys %{ $config->{webpac}->{inputs} };
+
 	foreach my $input (@inputs) {
-		$log->info("working on input $input->{path} [$input->{type}]");
 
-		my $isis = new WebPAC::Input::ISIS(
+		my $type = lc($input->{type});
+
+		die "I know only how to handle input types ", join(",", @supported_inputs), " not '$type'!\n" unless (grep(/$type/, @supported_inputs));
+
+		my $lookup = new WebPAC::Lookup(
+			lookup_file => $input->{lookup},
+		);
+
+		my $input_module = $config->{webpac}->{inputs}->{$type};
+
+		$log->info("working on input $input->{path} [$input->{type}] using $input_module");
+
+		my $input_db = new WebPAC::Input(
+			module => $input_module,
 			code_page => $config->{webpac}->{webpac_encoding},
-			limit_mfn => $input->{limit},
+			limit => $limit || $input->{limit},
+			offset => $offset,
+			lookup => $lookup,
 		);
+		$log->logdie("can't create input using $input_module") unless ($input);
 
-		my $maxmfn = $isis->open(
-			filename => $input->{path},
+		my $maxmfn = $input_db->open(
+			path => $input->{path},
 			code_page => $input->{encoding},	# database encoding
 		);
 
@@ -92,21 +158,36 @@
 			prefix => $input->{name},
 		);
 
-		$n->open(
-			tag => $input->{normalize}->{tag},
-			xml_file => $input->{normalize}->{path},
-		);
+		my $normalize_path = $input->{normalize}->{path};
+
+		if ($normalize_path =~ m/\.xml$/i) {
+			$n->open(
+				tag => $input->{normalize}->{tag},
+				xml_file => $input->{normalize}->{path},
+			);
+		} elsif ($normalize_path =~ m/\.(?:yml|yaml)$/i) {
+			$n->open_yaml(
+				path => $normalize_path,
+				tag => $input->{normalize}->{tag},
+			);
+		}
+
+		foreach my $pos ( 0 ... $input_db->size ) {
 
-		for ( 0 ... $isis->size ) {
+			my $row = $input_db->fetch || next;
 
-			my $row = $isis->fetch || next;
+			my $mfn = $row->{'000'}->[0];
 
-			my $mfn = $row->{'000'}->[0] || die "can't find MFN";
+			if (! $mfn || $mfn !~ m#^\d+$#) {
+				$log->warn("record $pos doesn't have valid MFN but '$mfn', using $pos");
+				$mfn = $pos;
+				push @{ $row->{'000'} }, $pos;
+			}
 
 			my $ds = $n->data_structure($row);
 
 			$est->add(
-				id => $input->{name} . "#" . $mfn,
+				id => $input->{name} . "/" . $mfn,
 				ds => $ds,
 				type => $config->{hyperestraier}->{type},
 			);
@@ -117,5 +198,20 @@
 	};
 
 	$log->info("$total_rows records indexed");
+
+	#
+	# add Hyper Estraier links to other databases
+	#
+	if (ref($db_config->{links}) eq 'ARRAY') {
+		foreach my $link (@{ $db_config->{links} }) {
+			$log->info("adding link $database -> $link->{to} [$link->{credit}]");
+			$est->add_link(
+				from => $database,
+				to => $link->{to},
+				credit => $link->{credit},
+			);
+		}
+	}
+
 }