--- branches/mojo/lib/Frey/Server.pm	2008/11/02 18:27:19	242
+++ branches/mojo/lib/Frey/Server.pm	2008/11/02 21:24:04	243
@@ -65,26 +65,37 @@
 
 #	warn $req->request->header('User_Agent');
 
-#	eval {
-	{
+	my %params = $req->params;
+	my $html;
+
+	eval {
 
 		my $f;
 
 		my $run_regexp = join('|', Frey::Run->execute );
 
-		if ( $path =~ m!/~/([^/]+)(.*)! ) {
-			$f = Frey::Introspect->new( package => $1 );
-		} elsif ( $path =~ m!/ob/([^/]+)(.*)! ) {
-			$f = Frey::ObjectBrowser->new( fey_class => $1 );
-		} elsif ( $path =~ m!/od/([^/]+)(.*)! ) {
-			$f = Frey::ObjectDesigner->new( fey_class => $1 );
-		} elsif ( $path =~ m!/($run_regexp)/([^/]+)(.*)! ) {
+		if ( $path =~ m!/Frey[:-]+ObjectBrowser! ) {
+			$f = Frey::ObjectBrowser->new( fey_class => $params{class} );
+			$f->request( $req );
+		} elsif ( $path =~ m!/Frey[:-]+ObjectDesigner! ) {
+			$f = Frey::ObjectDesigner->new( fey_class => $params{class} );
+			$f->request( $req );
+		} elsif ( $path =~ m!/Frey[:-]+Introspect! ) {
+			$f = Frey::Introspect->new( class => $params{class} );
+			$req->print( $f->markup );
+			undef $f;
+		} elsif ( $path =~ m!/([^/]+)/($run_regexp)! ) {
 			warn "# run $1 $2\n";
-			$f = Frey::Run->new( class => $2 );
+			$f = Frey::Run->new( class => $1, params => \%params );
 		} else {
 			$f = Frey::Run->new( class => 'Frey::ClassBrowser' );
 		}
-		$f->request( $req ) if $f;
+
+		if ( $f ) {
+			$req->print( $f->html );
+		} else {
+			warn "# can't call request on nothing!";
+		}
 
 	};