From: morimoto <morimoto@180c8125-5b33-4295-ad04-72a68a15b4cc>
Date: Sat, 19 Jul 2008 08:43:51 +0000 (+0000)
Subject: lib/public
X-Git-Tag: tag20080803~17
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=07c75c0f4d20afd7a425f7563b3e21d0d44b08ac;p=keitairc%2Fkeitairc.git

lib/public
---

diff --git a/ChangeLog b/ChangeLog
index 11806f2..1a7cffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-19  Jun Morimoto  <morimoto@mrmt.net>
+
+	* 静的なファイルを配信するため、置き場として lib/public,
+	  そのパスを指定する Config->public_dir を追加。
+	  とりあえず favicon.ico と robots.txt だけが置いてある。
+	  これに伴い action_robots_txt は廃止
+
 2008-07-18  Jun Morimoto  <morimoto@mrmt.net>
 
 	* ごく短時間に同一内容の連続POSTがきた場合は無視.
diff --git a/keitairc b/keitairc
index 020d0e0..4efc3c4 100755
--- 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);
 }
 
 ################################################################