Tadashi Okoshi
slash****@users*****
2006年 6月 1日 (木) 15:34:13 JST
Index: affelio/lib/Affelio/misc/InitAffelio.pm
diff -u affelio/lib/Affelio/misc/InitAffelio.pm:1.24 affelio/lib/Affelio/misc/InitAffelio.pm:1.25
--- affelio/lib/Affelio/misc/InitAffelio.pm:1.24 Mon May 29 21:08:49 2006
+++ affelio/lib/Affelio/misc/InitAffelio.pm Thu Jun 1 15:34:13 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: InitAffelio.pm,v 1.24 2006/05/29 12:08:49 slash5234 Exp $
+# $Id: InitAffelio.pm,v 1.25 2006/06/01 06:34:13 slash5234 Exp $
package Affelio::misc::InitAffelio;
{
@@ -173,11 +173,12 @@
#####################################################################
sub init_db{
my $top_dir = shift;
+ my $default_dir = shift;
my $g_nickname = shift;
my $g_email =shift;
my $g_lh=shift;
- debug_print("init_db: [$top_dir] [$g_nickname] [$g_email]");
+ debug_print("init_db: [$top_dir] [$default_dir] [$g_nickname] [$g_email]");
################################################################
#Stage 0: load Affelio (init mode)
@@ -237,7 +238,7 @@
}
try{
- open(FIN, "$top_dir/defaults/AFuser_CORE_prof_attr.csv");
+ open(FIN, "$default_dir/AFuser_CORE_prof_attr.csv");
while(my $line=<FIN>){
chomp($line);
@@ -309,7 +310,7 @@
#tmp_recvd_hs
################################
$create_tbl_cmd = <<EOT;
-CREATE TABLE $af->{site__dbtbl_prefix}_SNS_tmp_recvd_hs(sessionid TEXT, timestamp TEXT, af_id CHAR(255), nickname TEXT, DH_key_str TEXT)
+CREATE TABLE $af->{site__dbtbl_prefix}_SNS_tmp_recvd_hs(sessionid TEXT, timestamp TEXT, af_id CHAR(255), nickname TEXT, DH_key_str TEXT, peer_type TEXT)
EOT
if(!$dbh->do($create_tbl_cmd)){
throw Affelio::exception::DBException("creating tmp_recved tbl: $@");
@@ -319,7 +320,7 @@
#tmp_sent_hs
################################
$create_tbl_cmd = <<EOT;
-CREATE TABLE $af->{site__dbtbl_prefix}_SNS_tmp_sent_hs(sessionid TEXT, timestamp TEXT, af_id CHAR(255), nickname TEXT, DH_key_str TEXT)
+CREATE TABLE $af->{site__dbtbl_prefix}_SNS_tmp_sent_hs(sessionid TEXT, timestamp TEXT, af_id CHAR(255), nickname TEXT, DH_key_str TEXT, peer_type TEXT)
EOT
if(!$dbh->do($create_tbl_cmd)){
throw Affelio::exception::DBException("creating tmp_send tbl: $@");
@@ -617,7 +618,9 @@
################################
#(8)initialize DB
- init_db($root_dir , $nickname, $email, $lh);
+ init_db($root_dir ,
+ "$root_dir/defaults",
+ $nickname, $email, $lh);
debug_print("InitAffelio:setup (7) Init DB done.");
################################
@@ -726,7 +729,8 @@
################################
#(3)Copy default files
- copy_def_files($fs_farm_dir , $fs_userdata_dir,
+ copy_def_files($fs_farm_dir ,
+ $fs_userdata_dir,
$locale, $password_remoteop);
debug_print("InitAffelio:setup_AFE2 (3) copy default files. done.");
@@ -736,7 +740,9 @@
################################
#(5)initialize DB
- init_db($fs_affelio_dir , $nickname, $email, $lh);
+ init_db($fs_affelio_dir,
+ "$fs_farm_dir/defaults",
+ $nickname, $email, $lh);
debug_print("InitAffelio:setup_AFE2 (5) Init DB done.");
################################
Index: affelio/lib/Affelio/misc/L10N.pm
diff -u affelio/lib/Affelio/misc/L10N.pm:1.4 affelio/lib/Affelio/misc/L10N.pm:removed
--- affelio/lib/Affelio/misc/L10N.pm:1.4 Tue Mar 7 23:39:11 2006
+++ affelio/lib/Affelio/misc/L10N.pm Thu Jun 1 15:34:13 2006
@@ -1,34 +0,0 @@
-# Copyright (C) 2005 FishGrove Inc.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# $Id: L10N.pm,v 1.4 2006/03/07 14:39:11 slash5234 Exp $
-
-package Affelio::misc::L10N;
-{
- use strict;
- use lib("../../../extlib");
- use Locale::Maketext;
-
- use lib("../../../lib");
- use Affelio::misc::L10N;
-
- @Affelio::misc::L10N::ISA = qw(Locale::Maketext);
- @Affelio::misc::L10N::Lexicon = (_AUTO => 1,
- );
-
-
-}
-1;