Tadashi Okoshi
slash****@users*****
2006年 3月 7日 (火) 23:39:08 JST
Index: affelio/lib/Affelio.pm
diff -u affelio/lib/Affelio.pm:1.39 affelio/lib/Affelio.pm:1.40
--- affelio/lib/Affelio.pm:1.39 Thu Feb 23 21:41:37 2006
+++ affelio/lib/Affelio.pm Tue Mar 7 23:39:08 2006
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: Affelio.pm,v 1.39 2006/02/23 12:41:37 slash5234 Exp $
+# $Id: Affelio.pm,v 1.40 2006/03/07 14:39:08 slash5234 Exp $
package Affelio;
{
@@ -720,16 +720,47 @@
}
##############################################
+ #[site] / Farm mode
+ ##############################################
+ #farm_mode
+ if($ENV{FARM_MODE}){
+ $self->{site__farm_mode} = $ENV{FARM_MODE};
+ $self->{farm__connecter_path} = $ENV{FARM_CONNECTOR};
+ }else{
+ $self->{site__farm_mode} = $Config->{site_config}->{farm_mode};
+ $self->{farm__connecter_path} =
+ $Config->{affelio_farm}->{farm_connecter};
+ }
+ debug_print("Affelio::read_site_config: farm_mode=[$self->{site__farm_mode}]");
+ debug_print("Affelio::read_site_config: farm_con=[$self->{site__farm_connector}]");
+
+ #Detect AFE (not 2)
+ if(($self->{site__farm_mode} eq "")
+ && ($self->{farm__connecter_path} ne "")){
+ $self->{site__farm_mode} = "AFE";
+ }
+
+ #platform
+ $self->{site__platform} = $Config->{site_config}->{platform};
+ debug_print("Affelio::read_site_config: platform=[$self->{site__platform}]");
+
+ ##############################################
#[site]
##############################################
- #site_fs_root
- $self->{site__fs_root} = $Config->{site_config}->{fs_root};
+ if($self->{site__farm_mode} eq "AFE2"){
+ #site_fs_root
+ $self->{site__fs_root} = "$ENV{FARM_FS_TOP}/affelio";
+ #site_web_root
+ $self->{site__web_root} = "$ENV{FARM_WEB_TOP}/affelio";
+ }else{
+ #site_fs_root
+ $self->{site__fs_root} = $Config->{site_config}->{fs_root};
+ #site_web_root
+ $self->{site__web_root} = $Config->{site_config}->{web_root};
+ }
if($self->{site__fs_root} =~ /(.*)\/$/){
$self->{site__fs_root} = $1;
}
-
- #site_web_root
- $self->{site__web_root} = $Config->{site_config}->{web_root};
if($self->{site__web_root} =~ /(.*)\/$/){
$self->{site__web_root} = $1;
}
@@ -748,21 +779,6 @@
$self->{site__template} = "default";
}
- #farm_mode
- $self->{site__farm_mode} = $Config->{site_config}->{farm_mode};
- debug_print("Affelio::read_site_config: farm_mode=[$self->{site__farm_mode}]");
- $self->{farm__connecter_path} =
- $Config->{affelio_farm}->{farm_connecter};
-
- #Detect AFE (not 2)
- if(($self->{site__farm_mode} eq "")
- && ($self->{farm__connecter_path} ne "")){
- $self->{site__farm_mode} = "AFE";
- }
-
- #platform
- $self->{site__platform} = $Config->{site_config}->{platform};
- debug_print("Affelio::read_site_config: platform=[$self->{site__platform}]");
##############################################
#AFE
@@ -785,19 +801,18 @@
####################
#farm__fs_data_root
####################
- $self->{farm__fs_data_root} = $self->{farm_con}->get_fsdataroot();
- if(!$self->{farm__fs_data_root}){
+ $self->{farm__fs_datadir} = $self->{farm_con}->get_fs_datadir();
+ if(!$self->{farm__fs_datadir}){
throw Affelio::exception::SystemException("affelio.cfg: cannot obtain fs_data_root from FarmConnector.");
}
####################
- #farm__web_users_root
+ #farm__user_afid
####################
- $self->{farm__web_users_root} = $self->{farm_con}->get_webusersroot();
- if(!$self->{farm__web_users_root}){
- throw Affelio::exception::SystemException("affelio.cfg: cannot obtain web_users_root from FarmConnector.");
+ $self->{farm__user_afid} = $self->{farm_con}->get_user_afid();
+ if(!$self->{farm__user_afid}){
+ throw Affelio::exception::SystemException("affelio.cfg: cannot obtain fs_data_root from FarmConnector.");
}
- $self->{farm__web_users_root} =~ s/\/$//;
####################
#farm__cur_user
@@ -807,17 +822,36 @@
throw Affelio::exception::SystemException("AFE2/farm_cur_user not set.");
}
+ ####################
+ #farm__fs_farmroot
+ ####################
+ $self->{farm__fs_farmroot} = $ENV{'FARM_FS_TOP'} . "/" . $ENV{'REDIRECT_AF_EXEC_TYPE'} . "Farm";
+
+ ####################
+ #farm__web_farmroot
+ ####################
+ $self->{farm__web_farmroot} = $ENV{'FARM_WEB_TOP'} . "/" . $ENV{'REDIRECT_AF_EXEC_TYPE'} . "Farm";
+
}
#if(AFE2)
##############################################
+ #exec_type
+ ##############################################
+ if($self->{site__farm_mode} eq "AFE2"){
+ $self->{site__exec_type} = $ENV{'REDIRECT_AF_EXEC_TYPE'};
+ }else{
+ $self->{site__exec_type} = "";
+ }
+ debug_print("Affelio::read_site_config: site__exec_type = [$self->{site__exec_type}]");
+
+
+ ##############################################
#site__user_afid
##############################################
if($self->{site__farm_mode} eq "AFE2"){
- $self->{site__user_afid} =
- $self->{farm__web_users_root} . "/"
- . $self->{farm__cur_user};
+ $self->{site__user_afid} = $self->{farm__user_afid};
}else{
$self->{site__user_afid} = $self->{site__web_root};
}
@@ -828,8 +862,7 @@
##############################################
if($self->{site__farm_mode} eq "AFE2"){
$self->{site__user_dir} =
- $self->{farm__fs_data_root} . "/users/"
- . $self->{farm__cur_user} . "/userdata/";
+ $self->{farm__fs_datadir} . "/userdata/";
}else{
try{
$self->{site__user_dir} =
@@ -846,14 +879,42 @@
##############################################
if($self->{site__farm_mode} eq "AFE2"){
$self->{site__tmpldyn_dir} =
- $self->{farm__fs_data_root} . "/users/"
- . $self->{farm__cur_user} . "/templates_dyn/";
+ $self->{farm__fs_datadir} . "/templates_dyn/";
}else{
$self->{site__tmpldyn_dir} = "$self->{site__fs_root}/templates_dyn/";
}
debug_print("Affelio::read_site_config: site_tmpldyn_dir = [$self->{site__tmpldyn_dir}]");
##############################################
+ #Determine templates dir
+ ##############################################
+ if($self->{site__farm_mode} eq "AFE2"){
+ $self->{site__tmpl_dir}
+ = $self->{farm__fs_farmroot} . "/templates/"
+ . $self->{site__template};
+ }else{
+ $self->{site__tmpl_dir}
+ = $self->{site__fs_root} . "/templates/"
+ . $self->{site__template};
+ }
+ debug_print("Affelio::read_site_config: site_tmpl_dir = [$self->{site__tmpl_dir}]");
+
+ ##############################################
+ #Determine templates web path
+ ##############################################
+ if($self->{site__farm_mode} eq "AFE2"){
+ $self->{site__tmpl_web_path}
+ = $self->{farm__web_farmroot} . "/templates/"
+ . $self->{site__template};
+ }else{
+ $self->{site__tmpl_web_path}
+ = $self->{site__web_root} . "/templates/"
+ . $self->{site__template};
+ }
+ debug_print("Affelio::read_site_config: site_tmpl_web_path = [$self->{site__tmpl_web_path}]");
+
+
+ ##############################################
#[command]
##############################################
$self->{cmd__sendmail} = $Config->{command}->{sendmail};
@@ -876,7 +937,8 @@
#Table name prefix
if($self->{site__farm_mode} eq "AFE2"){
- $self->{site__dbtbl_prefix} = "AF" . $self->{site__username};
+ $self->{site__dbtbl_prefix}
+ = "AF_" . $self->{site__exec_type} . "_" . $self->{site__username};
}else{
$self->{site__dbtbl_prefix} = "AF" . "user";
}
@@ -1148,6 +1210,43 @@
my $sbst = $af->{lh}->maketext($text_value, $param_value);
+ debug_print("Affelio::translate tag_body = [$tag_body]\n");
+ debug_print("Affelio::translate \t text=[$text_value]\n");
+ debug_print("Affelio::translate \t param=[$param_value]\n");
+ debug_print("Affelio::translate \t sbst=[$sbst]\n");
+
+ $mesg =~ s/\Q<AF_M $tag_body>\E/$sbst/g;
+# debug_print("Affelio::loop end.");
+ }
+
+# debug_print("Affelio::translate end.");
+ return($mesg);
+ }
+
+
+
+
+ sub translate_templateL10N_old{
+ my $af=shift;
+ my $mesg = shift;
+
+ my $tag_body ="";
+ my $text_value="";
+ my $param_value="";
+
+ while( $mesg =~ /<AF_M ([^>]+)>/ ){
+ $tag_body = $1;
+
+ $tag_body =~ /text(\s*)=(\s*)["']([^"']*)["'](\s*)param(\s*)=(\s*)["']([^"']*)["']/;
+ $text_value=$3;
+ $param_value=$7;
+ if($text_value eq ""){
+ $tag_body =~ /text(\s*)=(\s*)["']([^"']*)["']/;
+ $text_value=$3;
+ }
+
+ my $sbst = $af->{lh}->maketext($text_value, $param_value);
+
# debug_print("Affelio::translate tag_body = [$tag_body]\n");
# debug_print("Affelio::translate \t text=[$text_value]\n");
# debug_print("Affelio::translate \t param=[$param_value]\n");
Index: affelio/lib/AffelioApp.pm
diff -u affelio/lib/AffelioApp.pm:1.19 affelio/lib/AffelioApp.pm:1.20
--- affelio/lib/AffelioApp.pm:1.19 Thu Feb 23 21:41:37 2006
+++ affelio/lib/AffelioApp.pm Tue Mar 7 23:39:08 2006
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: AffelioApp.pm,v 1.19 2006/02/23 12:41:37 slash5234 Exp $
+# $Id: AffelioApp.pm,v 1.20 2006/03/07 14:39:08 slash5234 Exp $
package AffelioApp;
{
@@ -48,17 +48,25 @@
if($ENV{REDIRECT_URL}){
#AFE2
$install_name = $ENV{REDIRECT_URL};
- $install_name =~ s|/([a-zA-Z0-9\-\_\.]+)$||g;
- $install_name =~ /\/([a-zA-Z0-9\-\_\.]+)$/;
+ debug_print("AffelioApp::new: [$install_name]");
+ $install_name =~ s|/([a-zA-Z0-9\-\_\.]+)$|/|;
+ $install_name =~ /\/([a-zA-Z0-9\-\_]+)\/$/;
$install_name = $1;
}else{
$install_name = $app__fs_root;
$install_name =~ s|/(.*)/||g;
}
- my $af = new Affelio(ConfigDir => "$app__fs_root/../../config/",
- Caller => $install_name);
- my $app__web_root = "$af->{site__user_afid}/apps/$install_name";
+ my $af;
+ if($ENV{FARM_MODE} eq "AFE2"){
+ $af = new Affelio(ConfigDir => "$ENV{FARM_FS_TOP}/affelio/config/",
+ Caller => $install_name);
+ }else{
+ $af = new Affelio(ConfigDir => "$app__fs_root/../../config/",
+ Caller => $install_name);
+ }
+
+ my $app__web_root = "$af->{site__user_afid}apps/$install_name";
debug_print("AffelioApp::new: ConfigDir =$app__fs_root");
debug_print("AffelioApp::new: cfg_path =$cfg_path");