--- lib/PXElator/httpd.pm	2010/01/05 17:34:07	474
+++ lib/PXElator/httpd.pm	2010/07/21 18:29:33	514
@@ -18,6 +18,7 @@
 #use JSON;
 use IO::Socket::INET;
 use Regexp::Common qw/net/;
+use POSIX qw(strftime);
 
 our $title;
 
@@ -50,7 +51,6 @@
 use log;
 use x11;
 use amt;
-use boolean;
 use daemons;
 
 use kvm;
@@ -63,12 +63,12 @@
 use ping;
 use wol;
 
-use CouchDB;
+use store;
 
 
 sub menu {
-	my $couch_url = $url;
-	$couch_url =~ s{:\d+.+}{:5984/_utils/};
+	my $store_url = $url;
+	$store_url =~ s{:\d+.+}{:28017};
 qq{
 <div style="font-size: 80%; color: #888">
 <a target=pids href=/ >home</a>
@@ -77,7 +77,8 @@
 <a target=server href=/brctl >brctl</a>
 <a target=server href=/ip >ip</a>
 |
-<a target=couch href=$couch_url >couchdb</a>
+<a target=store href=$store_url >MongoDB</a>
+<a target=store href=/store/latest >latest</a>
 |
 <a target=client href=/nmap >nmap</a>
 <a target=client href=/client >client</a>
@@ -117,7 +118,7 @@
 	my $buff;
 	my $pos = 0;
 
-	CouchDB::audit( 'static', { pid => $$, path => $path, type => $type, size => $size, block => $block, peerhost => $client->peerhost });
+	store::audit( 'static', { pid => $$, path => $path, type => $type, size => $size, block => $block, peerhost => $client->peerhost });
 
 	progress_bar::start;
 
@@ -145,12 +146,17 @@
 	qq|HTTP/1.1 302 Found\r\nContent-type: text/html\r\nLocation: $to\r\n\r\n|
 }
 
+sub toggle {
+	my $v = shift;
+	return $v ? 0 : 1;
+}
+
 sub get_request {
 	my ( $client, $path, $param ) = @_;
 
 	server->refresh;
 
-	CouchDB::audit( 'request', { path => $path, param => $param, peerhost => $client->peerhost } );
+	store::audit( 'request', { path => $path, param => $param, peerhost => $client->peerhost } );
 
 	$title = $path;
 
@@ -241,7 +247,7 @@
 			eval '$server::' . $name . '= $param->{$name}';
 		}
 		my @table = (
-			  'debug' => qq|<a href=/our/debug/| . boolean::toggle($debug) . qq|>$debug</a>|,
+			  'debug' => qq|<a href=/our/debug/| . toggle($debug) . qq|>$debug</a>|,
 			, 'new_clients' => qq|<input type=text name=new_clients size=3 value="$server::new_clients">|
 		);
 
@@ -264,6 +270,60 @@
 			|
 			;
 
+	} elsif ( $path =~ m{^/store/latest} ) {
+		print $client ok
+			, qq|
+<style type=text/css>
+	.z {
+		background: #eee;
+	}
+	td > pre {
+		margin: 0;
+		max-height: 3em;
+		overflow: hidden;
+	}
+	td:hover > pre {
+		max-height: 100%;
+		overflow: show;
+	}
+</style>
+			|
+			, qq|<table>|
+		;
+		my ( $s1,$s2 ) = ( ' class=z', '' );
+		my @cols;
+
+		my $from_t = $param->{from_t};
+
+		store::query( $from_t, sub {
+			my $o = shift;
+			my $p = delete( $o->{package} );
+			delete( $o->{_id} );
+
+			if ( ! @cols ) {
+				#@cols = keys %$p;
+				@cols = qw( time name );
+				print $client qq|<tr><th>|
+					, join(qq|</th><th>|, @cols)
+					, qq|</th><th></th></tr>|
+				;
+			}
+
+			# XXX sigh, dump dies if we don't do this
+#			delete $o->{$_} foreach ( grep { ! defined $o->{$_} } keys %$o );
+
+			print $client qq|<tr$s1>|
+				, strftime( qq|<td title="%Y-%m-%d">%H:%M:%S</td>|, localtime($p->{time}) )
+				, map { qq|<td>$_<td>| } ( $p->{name} , html::pre_dump($o) )
+				, qq|</tr>\n|
+			;
+			( $s1, $s2 ) = ( $s2, $s1 );
+			$from_t = $p->{time};
+		});
+		print $client qq|</table>|,
+			qq|<a href="/store/latest?from_t=$from_t">more</a>|
+		;
+
 	} elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) {
 		my $ip = $1;
 		$title = $ip if $ip;
@@ -358,7 +418,9 @@
 				my $mac = delete $conf->{mac} || '';
 				my $dev = $arp->{$mac};
 
- 				next unless $dev || $param->{all};
+				my $in_dhcp_range = ip::in_dhcp_range($ip);
+
+ 				next unless $dev || $param->{all} || $in_dhcp_range;
 
 				my $style
 					= 'style="color:'
@@ -368,7 +430,7 @@
 
 				$style ||= '';
 				my $ip_text = qq|<tt>$ip</tt>|;
-				$ip_text = qq|<tt><b>$ip</b></tt>| if ip::in_dhcp_range($ip);
+				$ip_text = qq|<tt><b>$ip</b></tt>| if $in_dhcp_range;
 
 				$dev = qq|<tt>$dev</tt>| if $dev;