--- Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/12/05 19:15:01	222
+++ Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/12/06 23:49:13	237
@@ -7,7 +7,7 @@
 	Catalyst::Model
 /;
 use Data::Dumper;
-use WebPAC::Store 0.03;
+use WebPAC::Store 0.08;
 use WebPAC::Output::TT 0.02;
 use WebPAC::Search::Estraier 0.05;
 use File::Slurp;
@@ -90,6 +90,7 @@
 	$self->{db} = new WebPAC::Store(
 		path => $db_path,
 		read_only => 1,
+		database => $est_cfg->{database},
 	);
 
 	$self->{out} = new WebPAC::Output::TT(
@@ -191,13 +192,19 @@
 
 	for my $i ( 0 .. $#results ) {
 
-		my $mfn = $1 if ( $results[$i]->{'@uri'} =~ m#/(\d+)$#);
+		my ($database, $prefix, $id);
+		if ( $results[$i]->{'@uri'} =~ m!/([^/]+)/([^/]+)#(\d+)$!) {
+			($database, $prefix,$id) = ($1,$2,$3);
+		} else {
+			$log->warn("can't decode prefix#id from " .  $results[$i]->{'@uri'});
+			next;
+		}
 
-		#$log->debug("load_ds( $mfn )");
+		#$log->debug("load_ds( id => $id, prefix => '$prefix' )");
 
 		$t = time();
 
-		my $ds = $self->{db}->load_ds( $mfn ) || $log->error("can't load_ds( $mfn )") && next;
+		my $ds = $self->{db}->load_ds( database => $database, prefix => $prefix, id => $id ) || $log->error("can't load_ds( $database / $prefix # $id )") && next;
 
 		$times->{db} += time() - $t;
 
@@ -208,6 +215,7 @@
 		my $html = $self->{out}->apply(
 			template => $template_filename,
 			data => $ds,
+			record_uri => "${database}/${prefix}#${id}",
 		);
 
 		$times->{out} += time() - $t;
@@ -251,13 +259,13 @@
 	my $log = $self->{log};
 	$log->debug("args: " . Dumper( $args ));
 
-	foreach my $f (qw/mfn template/) {
-		$log->die("need $f") unless ($args->{$f});
+	foreach my $f (qw/mfn template prefix/) {
+		$log->fatal("need $f") unless ($args->{$f});
 	}
 
 	my $mfn = $args->{mfn};
 
-	my $ds = $self->{db}->load_ds( $mfn ) || $log->error("can't load_ds( $mfn )") && next;
+	my $ds = $self->{db}->load_ds( id => $mfn, prefix => 'FIXME' ) || $log->error("can't load_ds( $mfn )") && return;
 
 	my $html = $self->{out}->apply(
 		template => $args->{template},