Changeset 23524

Timestamp:

11/13/08 11:24:37 (5 years ago)

Author:

tokuhirom

Message:

最新版に差し替え

Files:

• lang/perl/App-Benchmark-WAF/trunk/t/htdocs/cgi/menta-nocompile/lib/MENTA.pm (modified) (6 diffs)

lang/perl/App-Benchmark-WAF/trunk/t/htdocs/cgi/menta-nocompile/lib/MENTA.pm

@@ -21 +21 @@
 
 sub run_menta {
+    my $config = shift @_;
+
+    local $MENTA::CONFIG;
+    local $MENTA::REQ;
+    local $MENTA::FINISHED = 0;
+
     {
-        my $config = shift @_;
         $config->{menta}->{max_post_body} ||= MENTA::DEFAULT_MAX_POST_BODY;
         $MENTA::CONFIG = $config;
@@ -28 +33 @@
 
     eval {
-        my $config = config();
-        if (! $config) {
-            die "config() でアプリケーション設定がされていません!";
-        }
-
-        my $input;
-        if ($ENV{'REQUEST_METHOD'} eq "POST") {
-            my $max_post_body = $config->{menta}->{max_post_body};
-            if ($max_post_body > 0 && $ENV{CONTENT_LENGTH} > $max_post_body) {
-                die "投稿データが長すぎです";
-            } else {
-                read(STDIN, $input, $ENV{'CONTENT_LENGTH'});
+        my $path = $ENV{PATH_INFO} || '/';
+        $path =~ s!^/+!!g;
+        if ($path =~ /^[a-z0-9_]*$/) {
+            my $mode = $path || 'index';
+            my $meth = "do_$mode";
+            if (my $code = main->can($meth)) {
+                $code->();
+                unless ($MENTA::FINISHED) {
+                    die "なにも出力してません";
+                }
+            } else {
+                die "「${mode}」というモードは存在しません";
+            }
+        } elsif (-f $path) {
+            if (open my $fh, '<', $path) {
+                printf "Content-Type: %s\r\n\r\n", guess_mime_type($path);
+                print do { local $/; <$fh> };
+                close $fh;
+                return 1;
+            } else {
+                die "ファイルが開きません";
             }
         } else {
-            $input = $ENV{QUERY_STRING};
-        }
-        local $MENTA::REQ = {};
-        local $MENTA::FINISHED = 0;
-
-        for ( split /&/, $input) {
-            my ($key, $val) = split /=/, $_;
-            if ($val) {
-                $val =~ tr/+/ /;
-                $val =~ s/%([a-fA-F0-9]{2})/pack("H2", $1)/eg;
-            }
-            $MENTA::REQ->{$key} = $val;
-        }
-
-        if (my $static_file = $ENV{PATH_INFO}) {
-            $static_file =~ s!^/+!!g;
-            if ($static_file !~ /\bmenta\.cgi\b/ && -f $static_file) {
-                if (open my $fh, '<', $static_file) {
-                    printf "Content-Type: %s\r\n\r\n", guess_mime_type($static_file);
-                    print do { local $/; <$fh> };
-                    close $fh;
-                    return 1;
-                } else {
-                    die "ファイルが開きません";
-                }
-            }
-        }
-
-        my $mode = $MENTA::REQ->{mode} || 'index';
-        my $meth = "do_$mode";
-        if (my $code = main->can($meth)) {
-            $code->($MENTA::REQ);
-            unless ($MENTA::FINISHED) {
-                die "なにも出力してません";
-            }
-        } else {
-            die "「${mode}」というモードは存在しません";
+            die "$path を処理する方法がわかりません";
         }
     };
@@ -89 +67 @@
         print "\r\n";
 
-        my $config = config() || {};
         my $body = do {
             if ($config->{menta}->{kcatch_mode}) {
@@ -155 +132 @@
         die $@ if $@;
         $out = $tmplcode->(@params);
-        write_file($cachefname, $src);
+        write_file($cachefname, "package main; use utf8;\n$src");
     }
 
@@ -188 +165 @@
 sub read_file {
     my $fname = shift;
-    open my $fh, '<:utf8', $fname or die $!;
+    open my $fh, '<:utf8', $fname or die "${fname} を読み込みように開けません: $!";
     my $s = do { local $/; join '', <$fh> };
     close $fh;
@@ -196 +173 @@
 sub write_file {
     my ($fname, $stuff) = @_;
-    open my $fh, '>:utf8', $fname or die $!;
+    open my $fh, '>:utf8', $fname or die "${fname} を書き込み用に開けません： $!";
     print $fh $stuff;
     close $fh;
 }
 
+sub param {
+    my $key = shift;
+
+    unless (defined $MENTA::REQ) {
+        my $input;
+        if ($ENV{'REQUEST_METHOD'} eq "POST") {
+            my $max_post_body = config()->{menta}->{max_post_body};
+            if ($max_post_body > 0 && $ENV{CONTENT_LENGTH} > $max_post_body) {
+                die "投稿データが長すぎです";
+            } else {
+                read(STDIN, $input, $ENV{'CONTENT_LENGTH'});
+            }
+        } else {
+            $input = $ENV{QUERY_STRING};
+        }
+
+        for ( split /&/, $input) {
+            my ($key, $val) = split /=/, $_;
+            if ($val) {
+                $val =~ tr/+/ /;
+                $val =~ s/%([a-fA-F0-9]{2})/pack("H2", $1)/eg;
+            }
+            $MENTA::REQ->{$key} = $val;
+        }
+    }
+
+    return $MENTA::REQ->{$key};
+}
+
 1;