--- lib/PXElator/httpd.pm	2009/09/14 21:11:23	433
+++ lib/PXElator/httpd.pm	2010/01/23 20:47:17	487
@@ -18,6 +18,7 @@
 #use JSON;
 use IO::Socket::INET;
 use Regexp::Common qw/net/;
+use YAML;
 
 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 >store</a>
+<a target=store href=/store/query >query</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,21 @@
 			|
 			;
 
+	} elsif ( $path =~ m{^/store/query} ) {
+		print $client ok
+			, qq|<table>|
+		;
+		store::query( sub {
+			my $o = shift;
+			my $p = delete( $o->{package} );
+			delete( $o->{_id} );
+			# XXX sigh, dump dies if we don't do this
+			my $tmp = delete( $o->{param} );
+			$o->{param} = $tmp if defined $tmp;
+			print $client qq|<tr><td>|, join(qq|</td><td>|, map { $p->{$_} } keys %$p ), qq|</td><td><pre>|, dump( $o ), qq|</pre></td></tr>\n|;
+		});
+		print $client qq|</table>|;
+
 	} elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) {
 		my $ip = $1;
 		$title = $ip if $ip;
@@ -338,6 +359,8 @@
 
 		} else {
 
+			print $client ok qq|<h2>Clients on $server::ip</h2>|;
+
 			my @ping;
 			if ( my $host = $param->{ping_target} ) {
 				@ping = ( $host );
@@ -348,33 +371,40 @@
 			my $ping = ping::fping( @ping ) if @ping;
 			my $arp = client::arp_mac_dev;
 
-			print $client ok
-				, qq|<h2>Clients on $server::ip</h2>|
-				, html::table( -5,
-					'ip', 'mac', 'dev', 'hostname', 'conf',
-					map {
-						my $ip = $_;
-						my $conf = client::all_conf( $ip );
-						my $mac = delete $conf->{mac} || '';
-						my $style;
-						$style
-							= 'style="color:'
-							. ( $ping->{$ip} ? 'green' : 'red' )
-							. '"'
-							if $ping;
-						$style ||= '';
-						my $ip_text = qq|<tt>$ip</tt>|;
-						$ip_text = qq|<tt><b>$ip</b></tt>| if ip::in_dhcp_range($ip);
-						(
-							qq|<a $style name=$ip target=client href=/client/$ip>$ip_text</a>|
-							, format::mac( $mac => 'html' )
-							, $arp->{$mac}
-							, delete $conf->{hostname}
-							, html::conf( $ip, $conf, 'inline' )
-						)
-					} client::all_ips
-				)
+			my @clients;
+
+			foreach my $ip ( client::all_ips ) {
+				
+				my $conf = client::all_conf( $ip );
+				my $mac = delete $conf->{mac} || '';
+				my $dev = $arp->{$mac};
+
+ 				next unless $dev || $param->{all};
+
+				my $style
+					= 'style="color:'
+					. ( $ping->{$ip} ? 'green' : 'red' )
+					. '"'
+					if $ping;
+
+				$style ||= '';
+				my $ip_text = qq|<tt>$ip</tt>|;
+				$ip_text = qq|<tt><b>$ip</b></tt>| if ip::in_dhcp_range($ip);
+
+				$dev = qq|<tt>$dev</tt>| if $dev;
+
+				push @clients
+					, qq|<a $style name=$ip target=client href=/client/$ip>$ip_text</a>|
+					, format::mac( $mac => 'html' )
+					, $dev
+					, delete $conf->{hostname}
+					, html::conf( $ip, $conf, 'inline' )
 				;
+			}
+
+			my $all = $param->{all} ? 0 : 1;
+
+			print $client html::table( -5, 'ip', 'mac', qq|<a href="?all=$all">dev</a>|, 'hostname', 'conf', @clients );
 			print $client qq|
 				<form method=get>
 				<input type=text   name=ping_target   size=15>