Tadashi Okoshi
slash****@users*****
2005年 10月 24日 (月) 17:52:49 JST
Index: affelio/lib/Affelio.pm
diff -u affelio/lib/Affelio.pm:1.18 affelio/lib/Affelio.pm:1.19
--- affelio/lib/Affelio.pm:1.18 Fri Jul 1 17:19:42 2005
+++ affelio/lib/Affelio.pm Mon Oct 24 17:52:49 2005
@@ -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.18 2005/07/01 08:19:42 slash5234 Exp $
+# $Id: Affelio.pm,v 1.19 2005/10/24 08:52:49 slash5234 Exp $
package Affelio;
{
@@ -58,6 +58,8 @@
#cfg_path Configuration file's path
#cfg_dir Configuration file's directory
+ my $top_dir = $param{ConfigDir} . "/../";
+
###################################
#Mode
###################################
@@ -111,6 +113,7 @@
###################################
my $self = {cfg_path => $cfg_path,
cfg_dir => $cfg_dir,
+ top_dir => $top_dir,
lh => $lh,
db => $db,
pm => $pm,
@@ -478,12 +481,12 @@
#Determine userdata/..../ directory
my $dir;
eval{
- opendir(DIR, "$self->{cfg_dir}/userdata");
+ opendir(DIR, "$self->{top_dir}/userdata");
while (defined($dir = readdir(DIR))) {
if(($dir ne '.') && ($dir ne '..')
&& ($dir ne 'default') && ($dir ne 'CVS')){
$self->{site__user_dir} =
- $wi->PTN_dirname("$self->{cfg_dir}/userdata/$dir");
+ $wi->PTN_dirname("$self->{top_dir}/userdata/$dir");
}
}
};
@@ -503,7 +506,7 @@
$self->{site__password} = $Config2->{auth}->{password};
#Determine session/..../ directory
- $self->{site__session_dir} = $wi->PTN_dirname("$self->{cfg_dir}/session");
+ $self->{site__session_dir} = $wi->PTN_dirname("$self->{top_dir}/session");
debug_print("Affelio::read_site_config: session_dir = [$self->{site__session_dir}]");
debug_print("Affelio::read_site_config: end.");
}
Index: affelio/lib/AffelioApp.pm
diff -u affelio/lib/AffelioApp.pm:1.11 affelio/lib/AffelioApp.pm:1.12
--- affelio/lib/AffelioApp.pm:1.11 Wed Jul 6 08:18:21 2005
+++ affelio/lib/AffelioApp.pm Mon Oct 24 17:52:49 2005
@@ -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.11 2005/07/05 23:18:21 slash5234 Exp $
+# $Id: AffelioApp.pm,v 1.12 2005/10/24 08:52:49 slash5234 Exp $
package AffelioApp;
{
@@ -62,7 +62,7 @@
############################
#Load Affelio
############################
- my $af = new Affelio(ConfigDir => "$app__fs_root/../../",
+ my $af = new Affelio(ConfigDir => "$app__fs_root/../../config/",
Caller => $install_name);
############################