--- trunk/run.pl	2005/11/24 11:47:29	127
+++ trunk/run.pl	2005/11/25 00:22:58	141
@@ -13,32 +13,41 @@
 use WebPAC::Normalize::XML;
 use WebPAC::Output::TT;
 use WebPAC::Output::Estraier;
+use YAML qw/LoadFile/;
 
 my $limit = shift @ARGV;
 
+my $config = LoadFile('conf/config.yml');
+
+print "config = ",Dumper($config);
+
+my $type = lc($config->{input}->{type});
+
+die "I know only how to handle input type isis, not '$type'!\n" unless ($type eq 'isis');
+
 my $abs_path = abs_path($0);
 $abs_path =~ s#/[^/]*$#/#;
 
-my $isis_file = '/data/isis_data/ps/LIBRI/LIBRI';
-
 my $lookup = new WebPAC::Lookup(
-	lookup_file => "$abs_path/conf/lookup/isis.pm",
+	lookup_file => $config->{input}->{lookup},
 );
 
+
+
 my $isis = new WebPAC::Input::ISIS(
-	code_page => 'ISO-8859-2',	# application encoding
-	limit_mfn => $limit,
+	code_page => $config->{webpac}->{webpac_encoding},
+	limit_mfn => $config->{input}->{limit},
 );
 
 my $maxmfn = $isis->open(
-	filename => $isis_file,
-	code_page => '852',		# database encoding
+	filename => $config->{input}->{path},
+	code_page => $config->{input}->{encoding},	# database encoding
 );
 
 my $path = './db/';
 
 my $db = new WebPAC::DB(
-	path => $path,
+	path => $config->{webpac}->{db_path},
 );
 
 my $n = new WebPAC::Normalize::XML(
@@ -49,20 +58,17 @@
 );
 
 $n->open(
-	tag => 'isis',
-	xml_file => "$abs_path/conf/normalize/isis_ffzg.xml",
+	tag => $config->{normalize}->{tag},
+	xml_file => $config->{normalize}->{path},
 );
 
 my $out = new WebPAC::Output::TT(
-	include_path => "$abs_path/conf/output/tt",
+	include_path => $config->{webpac}->{template_path},
 	filters => { foo => sub { shift } },
 );
 
 my $est = new WebPAC::Output::Estraier(
-	url => 'http://localhost:1978/node/webpac2',
-	user => 'admin',
-	passwd => 'admin',
-	database => 'ps',
+	%{ $config->{hyperestraier} }
 );
 
 my $total_rows = 0;
@@ -96,7 +102,7 @@
 	$est->add(
 		id => $mfn,
 		ds => $ds,
-		type => 'search',
+		type => $config->{hyperestraier}->{type},
 	);
 
 	$total_rows++;