oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Demo site loads

Browse source
This commit is contained in:
Patrick Donelan 2010-03-14 22:09:57 -04:00
parent 158124cf37
commit d858c6e1ab
8 changed files with 99 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Asset/Template.pm
View file

@ -589,7 +589,7 @@ sub process {
}
# Return a JSONinfied version of vars if JSON is the only requested content type.
if ( defined $session->request && $session->request->headers_in->{Accept} eq 'application/json' ) {
if ( defined $session->request && $session->request->header('Accept') eq 'application/json' ) {
$session->http->setMimeType( 'application/json' );
return to_json( $vars );
}

4
lib/WebGUI/Content/Asset.pm
View file

@ -20,8 +20,6 @@ use Time::HiRes;
use WebGUI::Asset;
use WebGUI::PassiveAnalytics::Logging;
use Apache2::Const -compile => qw(OK);
=head1 NAME
Package WebGUI::Content::MyHandler
@ -131,7 +129,7 @@ sub handler {
my $oldContentType = $request->content_type($ct);
if ($request->sendfile($filename) ) {
$session->close;
return Apache2::Const::OK;
return; # TODO - what should we return to indicate streaming?
}
else {
$request->content_type($oldContentType);

3
lib/WebGUI/Session/Output.pm
View file

@ -96,8 +96,7 @@ sub print {
}
elsif ($self->session->request) {
# TODO - put in IO bound delayed response
warn "content: $content";
# $self->session->request->body([]) unless $self->session->request->body();
$self->session->response->body( $self->session->response->body() . $content );
# if (ref $self->session->request->body eq 'ARRAY') {
# push @{$self->session->request->body}, $content;
# } else {

2
lib/WebGUI/Session/Url.pm
View file

@ -322,7 +322,7 @@ sub getRequestedUrl {
my $self = shift;
return undef unless ($self->session->request);
unless ($self->{_requestedUrl}) {
$self->{_requestedUrl} = $self->session->request->uri;
$self->{_requestedUrl} = $self->session->request->path_info; # TODO - is path_info right?
my $gateway = $self->session->config->get("gateway");
$self->{_requestedUrl} =~ s/^$gateway([^?]*)\??.*$/$1/;
}

87
lib/WebGUI/URL/Content.pm
View file

@ -15,6 +15,7 @@ package WebGUI::URL::Content;
=cut
use strict;
use Apache2::Const -compile => qw(OK DECLINED);
use WebGUI::Affiliate;
use WebGUI::Exception;
use WebGUI::Pluggable;
@ -41,7 +42,7 @@ These subroutines are available from this package:
#-------------------------------------------------------------------
=head2 handler ( request, session )
=head2 handler ( request, server, config )
The Apache request handler for this package.
@ -60,55 +61,55 @@ to the user, instead of displaying the Page Not Found page.
=cut
sub handler {
my ($request, $session) = @_;
my $config = $session->config;
# my $session = $request->pnotes('wgSession'); # TODO - no more pnotes
# unless (defined $session) {
# TODO - fix this - server is gone
# $session = WebGUI::Session->open($server->dir_config('WebguiRoot'), $config->getFilename, $request, $server);
# }
WEBGUI_FATAL: foreach my $handler (@{$config->get("contentHandlers")}) {
my $output = eval { WebGUI::Pluggable::run($handler, "handler", [ $session ] )};
if ( my $e = WebGUI::Error->caught ) {
$session->errorHandler->error($e->package.":".$e->line." - ".$e->error);
$session->errorHandler->debug($e->package.":".$e->line." - ".$e->trace);
my ($request, $server, $config) = @_;
$request->push_handlers(PerlResponseHandler => sub {
my $session = $request->pnotes('wgSession');
unless (defined $session) {
$session = WebGUI::Session->open($server->dir_config('WebguiRoot'), $config->getFilename, $request, $server);
}
elsif ( $@ ) {
$session->errorHandler->error( $@ );
}
else {
if (defined $output) {
$session->response->body($output);
return;
WEBGUI_FATAL: foreach my $handler (@{$config->get("contentHandlers")}) {
my $output = eval { WebGUI::Pluggable::run($handler, "handler", [ $session ] )};
if ( my $e = WebGUI::Error->caught ) {
$session->errorHandler->error($e->package.":".$e->line." - ".$e->error);
$session->errorHandler->debug($e->package.":".$e->line." - ".$e->trace);
}
if ($output eq "chunked") {
if ($session->errorHandler->canShowDebug()) {
$session->output->print($session->errorHandler->showDebug(),1);
elsif ( $@ ) {
$session->errorHandler->error( $@ );
}
else {
if ($output eq "chunked") {
if ($session->errorHandler->canShowDebug()) {
$session->output->print($session->errorHandler->showDebug(),1);
}
last;
}
last;
}
if ($output eq "empty") {
if ($session->errorHandler->canShowDebug()) {
$session->output->print($session->errorHandler->showDebug(),1);
if ($output eq "empty") {
if ($session->errorHandler->canShowDebug()) {
$session->output->print($session->errorHandler->showDebug(),1);
}
last;
}
last;
}
elsif (defined $output && $output ne "") {
$session->http->sendHeader;
$session->output->print($output);
if ($session->errorHandler->canShowDebug()) {
$session->output->print($session->errorHandler->showDebug(),1);
elsif (defined $output && $output ne "") {
$session->http->sendHeader;
$session->output->print($output);
if ($session->errorHandler->canShowDebug()) {
$session->output->print($session->errorHandler->showDebug(),1);
}
last;
}
# Keep processing for success codes
elsif ($session->http->getStatus < 200 || $session->http->getStatus > 299) {
$session->http->sendHeader;
last;
}
last;
}
# Keep processing for success codes
elsif ($session->http->getStatus < 200 || $session->http->getStatus > 299) {
$session->http->sendHeader;
last;
}
}
}
$session->close;
$session->close;
return Apache2::Const::OK;
});
$request->push_handlers(PerlMapToStorageHandler => sub { return Apache2::Const::OK });
$request->push_handlers(PerlTransHandler => sub { return Apache2::Const::OK });
return Apache2::Const::OK;
}
1;