--- trunk/run.pl	2006/09/26 10:23:04	712
+++ trunk/run.pl	2006/09/26 12:42:49	713
@@ -9,7 +9,7 @@
 use WebPAC::Common 0.02;
 use WebPAC::Parser 0.04;
 use WebPAC::Input 0.13;
-use WebPAC::Store 0.10;
+use WebPAC::Store 0.11;
 use WebPAC::Normalize 0.11;
 use WebPAC::Output::TT;
 use WebPAC::Validate 0.06;
@@ -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");
@@ -296,7 +296,6 @@
 
 	my $store = new WebPAC::Store(
 		path => $db_path,
-		database => $database,
 		debug => $debug,
 	);
 
@@ -395,7 +394,12 @@
 			$log->debug("created following lookups: ", dump( $lookup_data ));
 
 			foreach my $key (keys %{ $lookup_data->{$database}->{$input_name} }) {
-				$store->save_lookup( $database, $input_name, $key, $lookup_data->{$database}->{$input_name}->{$key} );
+				$store->save_lookup(
+					database => $database,
+					input => $input_name,
+					key => $key,
+					data => $lookup_data->{$database}->{$input_name}->{$key},
+				);
 			}
 		}
 
@@ -472,9 +476,10 @@
 				);
 
 				$store->save_ds(
+					database => $database,
+					input => $input_name,
 					id => $mfn,
 					ds => $ds,
-					prefix => $input_name,
 				) if ($ds && !$stats);
 
 				$indexer->add(