--- lib/PXElator/CouchDB.pm	2009/08/12 22:27:57	206
+++ lib/PXElator/CouchDB.pm	2009/08/13 00:06:48	209
@@ -74,7 +74,6 @@
 
 sub put {
 	my ($self, $url, $json) = @_;
-	warn "put $url ",dump($json);
 
 	if ( ! defined $json->{_rev} ) {
 		my $old = eval { $self->get( $url )->{_rev} };
@@ -100,21 +99,20 @@
 	my $data = pop @_;
 
 	my $url = join(' ', @_);
-	$url =~ s/-\S+//g;
+	$url =~ s/\s+-\S+//g;	# remove command line options
 	$url =~ s/\W+/-/g;
 
-	my ( $package, undef, $line, $sub ) = caller(1);
+	my ( $package, $file, $line, $sub ) = caller(1);
 	( $package, undef, $line ) = caller(0) if $package eq 'main';
 
-	$data->{x_meta} = {
-		'ident' => [ @_ ],
-		'time' => time(),
-		'package' => $package,
-		'line' => $line,
-		'sub' => $sub,
-	};
+	my $time = time();
 
-	$audit->put( "pxelator/$package.$url", $data );
+	$data->{$_} = eval '$' . $_ foreach ( qw/time package line sub/ );
+
+	warn 'audit ', dump($data), "at $file +$line\n";
+
+	$time = int($time); # reduce granularity
+	$audit->put( "pxelator/$time.$package.$url", $data );
 }
 
 1;