[Yapcom checkin] rev 19 - lib/YAPC

[prev] [thread] [next] [lurker] [Date index for 2003/11/24]

Author: gabor
Date: 2003-11-24 16:59:02 +0200 (Mon, 24 Nov 2003)
New Revision: 19

Modified:
   lib/YAPC/Organizer.pm
Log:
adding no_such_page run_mode for refactoring

Modified: lib/YAPC/Organizer.pm
===================================================================
--- lib/YAPC/Organizer.pm	2003-11-24 14:44:41 UTC (rev 18)
+++ lib/YAPC/Organizer.pm	2003-11-24 14:59:02 UTC (rev 19)
@@ -37,6 +37,7 @@
               'change_password' => 'do_change_password',
               'get_validation_code' => 'get_validation_code',
               'get_lost_password' => 'get_lost_password',
+              'no_such_page'      => 'do_no_such_page',
                );
 }
 
@@ -48,6 +49,18 @@
    #warn "PRE: @_\n";
    #$self->prerun_mode('login');
 
+   # REQUEST_URI looks like this:  /content.html
+   my $page = $ENV{REQUEST_URI} || '';
+   $page =~ s@.*/@@;
+   $page =~ s/\.html(\?.*)?$//;
+   $page ||= 'index';
+
+   my $filename = "$templates_dir/$page.tmpl";
+
+   if (not -e $filename) {
+       #warn "YAPC script called for not existing file. Original: '$ENV{REQUEST_URI}' cut down: '$filename'\n";
+       $self->prerun_mode('no_such_page');
+   }
 }
 
 
@@ -66,13 +79,6 @@
 
     my $filename = "$templates_dir/$page.tmpl";
 
-    if (not -e $filename) {
-       #warn "YAPC script called for not existing file. Original: '$ENV{REQUEST_URI}' cut down: '$filename'\n";
-       #$filename = "$templates_dir/error.tmpl";
-       return $self->do_no_such_page();
-    }
-
-
     if ($page eq 'list_people') { return $self->do_list_people; }
     #if ($page eq 'login') { return $self->do_login; }
     #if ($page eq 'proposal') { return $self->do_send_proposal; }

• [Yapcom checkin] rev 19 - lib/YAPC svn 16:59 on 24 Nov 2003

Generated at 18:06 on 24 Nov 2003 by mariachi 0.51