--- Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/12/17 22:35:00	281
+++ Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/12/18 23:35:24	293
@@ -193,10 +193,10 @@
 	for my $i ( 0 .. $#results ) {
 
 		my ($database, $prefix, $id);
-		if ( $results[$i]->{'@uri'} =~ m!/([^/]+)/([^/]+)#(\d+)$!) {
+		if ( $results[$i]->{'@uri'} =~ m!/([^/]+)/([^/]+)/(\d+)$!) {
 			($database, $prefix,$id) = ($1,$2,$3);
 		} else {
-			$log->warn("can't decode prefix#id from " .  $results[$i]->{'@uri'});
+			$log->warn("can't decode database/prefix/id from " .  $results[$i]->{'@uri'});
 			next;
 		}
 
@@ -206,7 +206,7 @@
 
 		my $ds = $self->{db}->load_ds( database => $database, prefix => $prefix, id => $id );
 		if (! $ds) {
-			$log->error("can't load_ds( ${database}/${prefix}#${id} )");
+			$log->error("can't load_ds( ${database}/${prefix}/${id} )");
 			next;
 		}
 
@@ -315,6 +315,7 @@
 	$content =~ s/%u([a-fA-F0-9]{4})/_conv_js($1)/gex;
 	$content =~ s/^[\n\r]+//s;
 	$content =~ s/[\n\r]+$/\n/s;
+	$content =~ s/\n\r/\n/gs;
 
 	my ($from, $to) = (
 		$self->{out_encoding},