--- Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/12/05 23:15:43	228
+++ 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;
@@ -192,9 +192,9 @@
 
 	for my $i ( 0 .. $#results ) {
 
-		my ($id, $prefix);
-		if ( $results[$i]->{'@uri'} =~ m!/([^/]+)#(\d+)$!) {
-			($prefix,$id) = ($1,$2);
+		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;
@@ -204,7 +204,7 @@
 
 		$t = time();
 
-		my $ds = $self->{db}->load_ds( id => $id, prefix => $prefix ) || $log->error("can't load_ds( id => $id, prefix => '$prefix' )") && 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;
 
@@ -215,6 +215,7 @@
 		my $html = $self->{out}->apply(
 			template => $template_filename,
 			data => $ds,
+			record_uri => "${database}/${prefix}#${id}",
 		);
 
 		$times->{out} += time() - $t;