--- trunk/run.pl	2006/09/25 15:26:12	707
+++ trunk/run.pl	2006/10/05 12:57:51	736
@@ -9,8 +9,8 @@
 use WebPAC::Common 0.02;
 use WebPAC::Parser 0.04;
 use WebPAC::Input 0.13;
-use WebPAC::Store 0.03;
-use WebPAC::Normalize 0.11;
+use WebPAC::Store 0.11;
+use WebPAC::Normalize 0.22;
 use WebPAC::Output::TT;
 use WebPAC::Validate 0.06;
 use WebPAC::Output::MARC;
@@ -285,7 +285,7 @@
 	my $abs_path = abs_path($0);
 	$abs_path =~ s#/[^/]*$#/#;
 
-	my $db_path = $config->get('webpac')->{db_path} . '/' . $database;
+	my $db_path = $config->webpac('db_path');
 
 	if ($clean) {
 		$log->info("creating new database '$database' in $db_path");
@@ -294,9 +294,8 @@
 		$log->info("working on database '$database' in $db_path");
 	}
 
-	my $db = new WebPAC::Store(
+	my $store = new WebPAC::Store(
 		path => $db_path,
-		database => $database,
 		debug => $debug,
 	);
 
@@ -316,7 +315,9 @@
 
 	foreach my $input (@inputs) {
 
-		next if ($only_input && ($input->{name} !~ m#$only_input#i && $input->{type} !~ m#$only_input#i));
+		my $input_name = $input->{name} || $log->logdie("input without a name isn't valid: ",dump($input));
+
+		next if ($only_input && ($input_name !~ m#$only_input#i && $input->{type} !~ m#$only_input#i));
 
 		my $type = lc($input->{type});
 
@@ -326,7 +327,7 @@
 
 		my @lookups = $parser->have_lookup_create($database, $input);
 
-		$log->info("working on input '$input->{name}' in $input->{path} [type: $input->{type}] using $input_module",
+		$log->info("working on input '$input_name' in $input->{path} [type: $input->{type}] using $input_module",
 			@lookups ? " creating lookups: ".join(", ", @lookups) : ""
 		);
 
@@ -349,11 +350,10 @@
 		$log->logdie("can't create input using $input_module") unless ($input);
 
 		if (defined( $input->{lookup} )) {
-			$log->warn("$database/", $input->{name}, " has depriciated lookup definition, removing it...");
+			$log->warn("$database/$input_name has depriciated lookup definition, removing it...");
 			delete( $input->{lookup} );
 		}
 
-		my $lookup;
 		my $lookup_coderef;
 
 		if (@lookups) {
@@ -364,14 +364,20 @@
 				my $rec = shift || die "need rec!";
 				my $mfn = $rec->{'000'}->[0] || die "need mfn in 000";
 
+				$store->save_row(
+					database => $database,
+					input => $input_name,
+					id => $mfn,
+					row => $rec,
+				);
+
 				WebPAC::Normalize::data_structure(
 					row => $rec,
 					rules => $rules,
-					lookup => $lookup,
 					config => create_ds_config( $db_config, $database, $input, $mfn ),
 				);
 
-				warn "current lookup = ", dump($lookup) if ($lookup);
+				#warn "current lookup: ", dump(WebPAC::Normalize::_get_lookup());
 			};
 
 			WebPAC::Normalize::_set_lookup( undef );
@@ -380,139 +386,175 @@
 
 		};
 
+		my $lookup_jar;
+
 		my $maxmfn = $input_db->open(
 			path => $input->{path},
 			code_page => $input->{encoding},	# database encoding
 			lookup_coderef => $lookup_coderef,
+			lookup => $lookup_jar,
 			%{ $input },
 		);
 
-		$log->debug("created following lookups: ", dump( WebPAC::Normalize::_get_lookup() ) );
+		my $lookup_data = WebPAC::Normalize::_get_lookup();
+
+		if (defined( $lookup_data->{$database}->{$input_name} )) {
+			$log->debug("created following lookups: ", dump( $lookup_data ));
+
+			foreach my $key (keys %{ $lookup_data->{$database}->{$input_name} }) {
+				$store->save_lookup(
+					database => $database,
+					input => $input_name,
+					key => $key,
+					data => $lookup_data->{$database}->{$input_name}->{$key},
+				);
+			}
+		}
 
 		my $report_fh;
 		if ($stats || $validate) {
-			my $path = "out/report/" . $database . '-' . $input->{name} . '.txt';
+			my $path = "out/report/${database}-${input_name}.txt";
 			open($report_fh, '>', $path) || $log->logdie("can't open $path: $!");
 
-			print $report_fh "Report for database '$database' input '$input->{name}' records ",
+			print $report_fh "Report for database '$database' input '$input_name' records ",
 				$offset || 1, "-", $limit || $input->{limit} || $maxmfn, "\n\n";
 			$log->info("Generating report file $path");
 		}
 
-		my @norm_array = ref($input->{normalize}) eq 'ARRAY' ?
-			@{ $input->{normalize} } : ( $input->{normalize} );
-
+		my $marc;
 		if ($marc_normalize) {
-			@norm_array = ( {
-				path => $marc_normalize,
-				output => $marc_output || 'out/marc/' . $database . '-' . $input->{name} . '.marc',
-			} );
-		}
-
-		foreach my $normalize (@norm_array) {
-
-			my $normalize_path = $normalize->{path} || $log->logdie("can't find normalize path in config");
-
-			$log->logdie("Found '$normalize_path' as normalization file which isn't supported any more!") unless ( $normalize_path =~ m!\.pl$!i );
-
-			my $rules = read_file( $normalize_path ) or die "can't open $normalize_path: $!";
-
-			$log->info("Using $normalize_path for normalization...");
-
-			my $marc = new WebPAC::Output::MARC(
-				path => $normalize->{output},
+			$marc = new WebPAC::Output::MARC(
+				path => $marc_output || "out/marc/${database}-${input_name}.marc",
 				lint => $marc_lint,
 				dump => $marc_dump,
-			) if ($normalize->{output});
-
-			# reset position in database
-			$input_db->seek(1);
-
-			# generate name of config key for indexer (strip everything after -)
-			my $indexer_config = $use_indexer;
-			$indexer_config =~ s/^(\w+)-?.*$/$1/g if ($indexer_config);
-
-			foreach my $pos ( 0 ... $input_db->size ) {
-
-				my $row = $input_db->fetch || next;
-
-				my $mfn = $row->{'000'}->[0];
+			);
+		}
 
-				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 $rules = $parser->normalize_rules($database,$input_name) || $log->logdie("no normalize rules found for $database/$input_name");
+		$log->debug("parsed normalize rules:\n$rules");
 
+		# reset position in database
+		$input_db->seek(1);
 
-				if ($validate) {
-					if ( my $errors = $validate->validate_errors( $row, $input_db->dump ) ) {
-						$log->error( "MFN $mfn validation error:\n",
-							$validate->report_error( $errors )
+		# generate name of config key for indexer (strip everything after -)
+		my $indexer_config = $use_indexer;
+		$indexer_config =~ s/^(\w+)-?.*$/$1/g if ($indexer_config);
+
+		my $lookup_hash;
+		my $depends = $parser->depends($database,$input_name);
+	
+		if ($depends) {
+			$log->debug("$database/$input_name depends on: ", dump($depends)) if ($depends);
+			$log->logdie("parser->depends didn't return HASH") unless (ref($depends) eq 'HASH');
+
+			foreach my $db (keys %$depends) {
+				foreach my $i (keys %{$depends->{$db}}) {
+					foreach my $k (keys %{$depends->{$db}->{$i}}) {
+						$log->debug("loading lookup $db/$i");
+						$lookup_hash->{$db}->{$i}->{$k} = $store->load_lookup(
+							database => $db,
+							input => $i,
+							key => $k,
 						);
 					}
 				}
+			}
 
-				my $ds = WebPAC::Normalize::data_structure(
-					row => $row,
-					rules => $rules,
-					lookup => $lookup ? $lookup->lookup_hash : undef,
-					config => create_ds_config( $db_config, $database, $input, $mfn ),
-					marc_encoding => 'utf-8',
-				);
+			$log->debug("lookup_hash = ", dump( $lookup_hash ));
+		}
 
-				$db->save_ds(
-					id => $mfn,
-					ds => $ds,
-					prefix => $input->{name},
-				) if ($ds && !$stats);
-
-				$indexer->add(
-					id => $input->{name} . "/" . $mfn,
-					ds => $ds,
-					type => $config->get($indexer_config)->{type},
-				) if ($indexer && $ds);
-
-				if ($marc) {
-					my $i = 0;
-
-					while (my $fields = WebPAC::Normalize::_get_marc_fields( fetch_next => 1 ) ) {
-						$marc->add(
-							id => $mfn . ( $i ? "/$i" : '' ),
-							fields => $fields,
-							leader => WebPAC::Normalize::marc_leader(),
-							row => $row,
-						);
-						$i++;
-					}
 
-					$log->info("Created $i instances of MFN $mfn\n") if ($i > 1);
-				}
+		foreach my $pos ( 0 ... $input_db->size ) {
+
+			my $row = $input_db->fetch || next;
 
-				$total_rows++;
+			my $mfn = $row->{'000'}->[0];
+
+			if (! $mfn || $mfn !~ m#^\d+$#) {
+				$log->warn("record $pos doesn't have valid MFN but '$mfn', using $pos");
+				$mfn = $pos;
+				push @{ $row->{'000'} }, $pos;
 			}
 
+
 			if ($validate) {
-				my $errors = $validate->report;
-				if ($errors) {
-					$log->info("validation errors:\n$errors\n" );
-					print $report_fh "$errors\n" if ($report_fh);
+				if ( my $errors = $validate->validate_errors( $row, $input_db->dump ) ) {
+					$log->error( "MFN $mfn validation error:\n",
+						$validate->report_error( $errors )
+					);
 				}
 			}
 
-			if ($stats) {
-				my $s = $input_db->stats;
-				$log->info("statistics of fields usage:\n$s");
-				print $report_fh "Statistics of fields usage:\n$s" if ($report_fh);
+			my $ds = WebPAC::Normalize::data_structure(
+				row => $row,
+				rules => $rules,
+				lookup => $lookup_hash,
+				config => create_ds_config( $db_config, $database, $input, $mfn ),
+				marc_encoding => 'utf-8',
+				load_row_coderef => sub {
+					my ($database,$input,$mfn) = @_;
+					return $store->load_row(
+						database => $database,
+						input => $input,
+						id => $mfn,
+					);
+				},
+			);
+
+			$log->debug("ds = ",dump($ds));
+
+			$store->save_ds(
+				database => $database,
+				input => $input_name,
+				id => $mfn,
+				ds => $ds,
+			) if ($ds && !$stats);
+
+			$indexer->add(
+				id => "${input_name}/${mfn}",
+				ds => $ds,
+				type => $config->get($indexer_config)->{type},
+			) if ($indexer && $ds);
+
+			if ($marc) {
+				my $i = 0;
+
+				while (my $fields = WebPAC::Normalize::_get_marc_fields( fetch_next => 1 ) ) {
+					$marc->add(
+						id => $mfn . ( $i ? "/$i" : '' ),
+						fields => $fields,
+						leader => WebPAC::Normalize::marc_leader(),
+						row => $row,
+					);
+					$i++;
+				}
+
+				$log->info("Created $i instances of MFN $mfn\n") if ($i > 1);
 			}
 
-			# close MARC file
-			$marc->finish if ($marc);
+			$total_rows++;
+		}
 
-			# close report
-			close($report_fh) if ($report_fh)
+		if ($validate) {
+			my $errors = $validate->report;
+			if ($errors) {
+				$log->info("validation errors:\n$errors\n" );
+				print $report_fh "$errors\n" if ($report_fh);
+			}
 		}
 
+		if ($stats) {
+			my $s = $input_db->stats;
+			$log->info("statistics of fields usage:\n$s");
+			print $report_fh "Statistics of fields usage:\n$s" if ($report_fh);
+		}
+
+		# close MARC file
+		$marc->finish if ($marc);
+
+		# close report
+		close($report_fh) if ($report_fh)
+
 	}
 
 	eval { $indexer->finish } if ($indexer && $indexer->can('finish'));