lib/public

diff --git a/ChangeLog b/ChangeLog
index 11806f2..1a7cffa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-19  Jun Morimoto  <morimoto@mrmt.net>
+
+       * \e$B@EE*$J%U%!%$%k$rG[?.$9$k$?$a!"CV$->l$H$7$F\e(B lib/public,
+         \e$B$=$N%Q%9$r;XDj$9$k\e(B Config->public_dir \e$B$rDI2C!#\e(B
+         \e$B$H$j$"$($:\e(B favicon.ico \e$B$H\e(B robots.txt \e$B$@$1$,CV$$$F$"$k!#\e(B
+         \e$B$3$l$KH<$$\e(B action_robots_txt \e$B$OGQ;_\e(B
+
 2008-07-18  Jun Morimoto  <morimoto@mrmt.net>
 
        * \e$B$4$/C;;~4V$KF10lFbMF$NO"B3\e(BPOST\e$B$,$-$?>l9g$OL5;k\e(B.

diff --git a/keitairc b/keitairc
index 020d0e0..4efc3c4 100755 (executable)
--- a/keitairc
+++ b/keitairc
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # -*- mode: perl; coding: utf-8 -*-
 # keitairc
-# $Id: keitairc,v 1.62 2008-07-18 15:17:49 morimoto Exp $
+# $Id: keitairc,v 1.63 2008-07-19 08:43:51 morimoto Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/keitairc,v $
 #
 # Copyright (c) 2003-2008 Jun Morimoto <morimoto@mrmt.net>
@@ -151,10 +151,6 @@ sub dispatch{
                return action_login_imodeid($request);
        }
 
-       if($uri eq '/robots.txt'){
-               return action_robots_txt($request);
-       }
-
        for my $name ($pl->list_action_plugins()){
                if($uri =~ m|^/(S[a-zA-Z]{10})/$name/(.*)| ||
                   $uri =~ m|^/(S[a-zA-Z]{10})/$name$|){
@@ -165,8 +161,7 @@ sub dispatch{
                }
        }
 
-       ::log("dispatch: don't know how to dispatch uri[$uri]");
-       return action_404($request);
+       return action_public($request, $uri) || action_404($request);
 }
 
 ################################################################
@@ -224,11 +219,12 @@ sub action_404{
 }
 
 ################################################################
-sub action_robots_txt{
+sub action_public{
        my $request = shift;
+       my $uri = shift;        # such as '/favicon.ico'
        my $ci = new Keitairc::ClientInfo($request);
        my $view = new Keitairc::View($cf, $ci);
-       return $view->render('robots.txt', { content_type => 'text/plain' });
+       return $view->public($uri);
 }
 
 ################################################################