--- trunk/lib/Frey/Server.pm	2008/07/06 11:59:58	56
+++ trunk/lib/Frey/Server.pm	2008/07/09 13:11:26	67
@@ -9,6 +9,7 @@
 
 use Frey;
 use Frey::Introspect;
+use Frey::ObjectBrowser;
 
 my @messages;    # Global (shared) list of messages
 my $got_message; # Flag to indicate that there is a new message to display
@@ -16,16 +17,16 @@
 use vars qw( $repl $server );
 
 #$repl = Continuity::REPL->new;
-$server = Continuity->new(
-	port => 16001,
-	path_session => 1,
-	cookie_session => 'sid',
-	callback => \&main,
-	debug_level => 1,
-	staticp => sub { $_[0]->url =~ m/\.(jpg|jpeg|gif|png|css|ico|js|html?)$/ },
-);
 
 sub run {
+	$server = Continuity->new(
+		port => 16001,
+		path_session => 1,
+		cookie_session => 'sid',
+		callback => \&main,
+		debug_level => 1,
+		staticp => sub { $_[0]->url =~ m/\.(jpg|jpeg|gif|png|css|ico|js|html?)$/ },
+	);
 	$server->loop;
 }
 
@@ -41,35 +42,56 @@
 	warn $req->request->header('User_Agent');
 #warn dump( $req );
 
-	if ( $path =~ m!/~/([^/]+)(?:/([^/]*))?! ) {
-		my $f = Frey::Introspect->new( package => $1 );
-		$f->html( $req );
-	}
+	eval {
 
-	# If this is a request for the pushtream, then give them that
-	if($path =~ /pushstream/) {
-		pushstream($req);
-	}
-  
-	# If they are sending us a message, we give them a thread for that too
-	if($path =~ /sendmessage/) {
-		send_message($req);
-	}
+		if ( $path =~ m!/~/([^/]+)(?:/([^/]*))?! ) {
+			my $f = Frey::Introspect->new( package => $1 );
+			$f->html( $req );
+		}
+
+		if ( $path =~ m!/ob/([^/]+)(?:/([^/]*))?! ) {
+			my $f = Frey::ObjectBrowser->new;
+			$f->html( $req );
+		}
+
+	};
+
+	if ( $@ ) {
+		warn $@;
+		#$req->conn->send_error( 404 );	# FIXME this should probably be 500, but we can't ship page with it
+		$req->print( qq{<pre class="error">$@<pre>} );
+
+	} else {
 
-	while ( 1 ) {
 		my $f = Frey->new;
 		my $classes = Continuity::Widget::DomNode->create(
 			ul => [
 				map {
 					warn dump( $_ );
 					my ( $package, $path ) = %$_;
-					( li => [ a => { href => '/~/' . $package . '/' } => [ $package ], " <tt>$path</tt>" ] )
+					( li => [
+						a => { href => '/~/' . $package . '/' } => [ $package ],
+						' ',
+						a => { href => '/ob/' . $package } => [ 'browse' ],
+						" <tt>$path</tt>"
+					] )
 				} @{ $f->classes }
 			],
 		)->to_string;
 		$req->print( $classes );
-		$req->next;
+
 	}
+
+	# If this is a request for the pushtream, then give them that
+	if($path =~ /pushstream/) {
+		pushstream($req);
+	}
+  
+	# If they are sending us a message, we give them a thread for that too
+	if($path =~ /sendmessage/) {
+		send_message($req);
+	}
+
 }
 
 # Here we accept a connection to the browser, and keep it open. Meanwhile we