--- trunk/run.pl	2005/12/05 17:47:23	213
+++ trunk/run.pl	2005/12/18 21:06:46	286
@@ -7,12 +7,13 @@
 use Data::Dumper;
 use lib './lib';
 
+use WebPAC::Common 0.02;
 use WebPAC::Lookup;
-use WebPAC::Input::ISIS;
+use WebPAC::Input::ISIS 0.02;
 use WebPAC::Store 0.03;
 use WebPAC::Normalize::XML;
 use WebPAC::Output::TT;
-use WebPAC::Output::Estraier 0.02;
+use WebPAC::Output::Estraier 0.05;
 use YAML qw/LoadFile/;
 use LWP::Simple;
 
@@ -28,37 +29,37 @@
 
 while (my ($database, $db_config) = each %{ $config->{databases} }) {
 
-	my $type = lc($db_config->{input}->{type});
+	my $log = _new WebPAC::Common()->_get_logger();
 
-	die "I know only how to handle input type isis, not '$type'!\n" unless ($type eq 'isis');
+	#
+	# open Hyper Estraier database
+	#
 
-	my $abs_path = abs_path($0);
-	$abs_path =~ s#/[^/]*$#/#;
+	my $est_config = $config->{hyperestraier} || $log->logdie("can't find 'hyperestraier' part in confguration");
+	$est_config->{database} = $database;
 
-	my $lookup = new WebPAC::Lookup(
-		lookup_file => $db_config->{input}->{lookup},
+	$log->info("using HyperEstraier URL $est_config->{masterurl}");
+
+	my $est = new WebPAC::Output::Estraier(
+		%{ $est_config },
 	);
 
-	my $db_path = $config->{webpac}->{db_path} . '/' . $database;
+	#
+	# now WebPAC::Store
+	#
+	my $abs_path = abs_path($0);
+	$abs_path =~ s#/[^/]*$#/#;
 
+	my $db_path = $config->{webpac}->{db_path} . '/' . $database;
 
-	my $log = $lookup->_get_logger;
 	$log->info("working on $database in $db_path");
 
-	my $path = './db/';
-
 	my $db = new WebPAC::Store(
 		path => $db_path,
+		database => $database,
+		debug => 1,
 	);
 
-	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 +68,43 @@
 	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");
+
+		sub new_input {
+			my $name = shift;
+			my $args = shift;
+			new $name->($args);
+		}
+
+		my $input = new_input($input_module,{
 			code_page => $config->{webpac}->{webpac_encoding},
 			limit_mfn => $input->{limit},
-		);
+			lookup => $lookup,
+		});
+		$log->logdie("can't create input using $input_module") unless ($input);
 
-		my $maxmfn = $isis->open(
-			filename => $input->{path},
+		my $maxmfn = $input->open(
+			path => $input->{path},
 			code_page => $input->{encoding},	# database encoding
 		);
 
@@ -89,16 +113,26 @@
 			db => $db,
 			lookup_regex => $lookup->regex,
 			lookup => $lookup,
+			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},
+			);
+		}
 
-		for ( 0 ... $isis->size ) {
+		for ( 0 ... $input->size ) {
 
-			my $row = $isis->fetch || next;
+			my $row = $input->fetch || next;
 
 			my $mfn = $row->{'000'}->[0] || die "can't find MFN";
 
@@ -116,5 +150,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},
+			);
+		}
+	}
+
 }