--- trunk/lib/Frey/Server.pm 2008/07/13 18:04:45 117 +++ trunk/lib/Frey/Server.pm 2008/07/16 14:14:18 142 @@ -8,7 +8,7 @@ #use Continuity::REPL; use Data::Dump qw/dump/; -#use Carp::REPL; +use Carp::REPL; use Frey::ClassLoader; my @messages; # Global (shared) list of messages @@ -40,12 +40,14 @@ my ($req) = @_; my $path = $req->request->url->path; - warn "REQUEST: $path\n"; + warn "REQUEST: $path ",dump( $req->params ),"\n"; - warn $req->request->header('User_Agent'); -#warn dump( $req ); + Module::Reload->check if $path =~ m!reload! || $req->param('reload'); - eval { +# warn $req->request->header('User_Agent'); + +# eval { + { my $f; @@ -55,6 +57,10 @@ $f = Frey::ObjectBrowser->new( fey_class => $1 ); } elsif ( $path =~ m!/od/([^/]+)(.*)! ) { $f = Frey::ObjectDesigner->new( fey_class => $1 ); + } elsif ( $path =~ m!/pod/([^/]+)(.*)! ) { + $f = Frey::Pod->new( class => $1 ); + } else { + $f = Frey::ClassBrowser->new; } $f->html( $req ) if $f; @@ -64,23 +70,7 @@ warn $@; #$req->conn->send_error( 404 ); # FIXME this should probably be 500, but we can't ship page with it $req->print( qq{
$@
} );
-#		Carp::REPL::repl;	# FIXME if $self->debug
-	} else {
-
-		my $f = Frey::ClassLoader->new;
-		my $classes = dom2html(
-			table => [
-				map {
-					my $package = $_;
-					( tr => [
-						td => [ a => { href => '/~/' . $package, title => $f->package_path( $package ) } => [ $package ] ],
-						td => [ $package->can('meta') ? ( a => { href => '/od/' . $package } => [ 'design' ] ) : '' ],
-						td => [ $package->can('collection_table') ? ( a => { href => '/ob/' . $package } => [ 'collection' ] ) : '' ],
-					] )
-				} $f->classes
-			],
-		);
-		$req->print( "

Classes

$classes" ); + Carp::REPL::repl; # FIXME if $self->debug } @@ -88,7 +78,11 @@ if($path =~ /pushstream/) { pushstream($req); } - + + if ( $path =~ m/die/ ) { + Carp::REPL::repl; # FIXME if $self->debug + } + # If they are sending us a message, we give them a thread for that too if($path =~ /sendmessage/) { send_message($req);