Menu
▾
▴
[Liveframe-commits] cvs commit: lab/lib/LiveFrame /tmp/cvs-serv16357/lib/LiveFrame/Application.pm Application.pm
|
From: <ix...@us...> - 2001-11-30 01:48:17
|
ixjonez 01/11/29 17:48:16
Modified: lib/LiveFrame Tag: õ `¶@h¶@h¶@èz èz h ¸
¶@¶@° ° ¶@¶@¶@¶@è è ¨¶@¨¶@è
è ¸¶@¸¶@h h m m
ж@ж@ض@ض@à¶@à¶@è¶@è¶@ð¶@ð¶@ø¶@ø¶@ðs
ðs ·@·@ð ð ·@·@ ·@
·@(·@(·@0·@0·@
@·@@·@H·@H·@P·@P·@X·@X·@`·@`·@h·@h·@p·@p·@èª
èª ·@·@Ð Ð
·@·@·@·@ ·@ ·@¨·@¨·@°·@°·@¸·@¸·@À·@À·@È·@È·@з@з@Ø·@Ø·@à·@à·@è·@è·@ð·@ð·@ø·@ø·@
/tmp/cvs-serv16357/lib/LiveFrame/Application.pm No
tag Application.pm
Log:
absolutize the config file path
Revision Changes Path
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
1.2 +15 -5 lab/lib/LiveFrame/Application.pm
Index: /tmp/cvs-serv16357/lib/LiveFrame/Application.pm
===================================================================
RCS file: /cvsroot/liveframe/lab/lib/LiveFrame/Application.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /tmp/cvs-serv16357/lib/LiveFrame/Application.pm 2001/11/30 01:03:03 1.1
+++ /tmp/cvs-serv16357/lib/LiveFrame/Application.pm 2001/11/30 01:48:16 1.2
@@ -134,7 +134,18 @@
sub config_file {
my $self = shift;
- $self->{config_file} = shift if @_;
+ my $orig = shift if @_;
+
+ if (defined $orig || ! defined $self->{config_file}) {
+ $orig ||= $self->config()->config_file();
+ my $file = File::Spec->file_name_is_absolute($orig) ?
+ File::Spec->canonpath($orig) :
+ File::Spec->rel2abs($orig, Cwd::getcwd());
+ -f $file or
+ die "config file $file not found\n";
+ $self->{config_file} = $file;
+ }
+
return $self->{config_file};
}
@@ -426,10 +437,9 @@
my ($self, $params) = @_;
return 1 unless $params;
- $self->{config_file} = $params->{config_file};
- $self->{default_action_name} =
- $params->{default_action_name} || 'default';
- $self->{default_error_page} = $params->{default_error_page};
+ $self->config_file($params->{config_file});
+ $self->default_action_name($params->{default_action_name} || 'default');
+ $self->default_error_page($params->{default_error_page});
if ($params->{config_vars}) {
unless (UNIVERSAL::isa($params->{config_vars}, 'ARRAY')) {
No revision
No revision
1.2 +15 -5 lab/lib/LiveFrame/Application.pm
Index: Application.pm
===================================================================
RCS file: /cvsroot/liveframe/lab/lib/LiveFrame/Application.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Application.pm 2001/11/30 01:03:03 1.1
+++ Application.pm 2001/11/30 01:48:16 1.2
@@ -134,7 +134,18 @@
sub config_file {
my $self = shift;
- $self->{config_file} = shift if @_;
+ my $orig = shift if @_;
+
+ if (defined $orig || ! defined $self->{config_file}) {
+ $orig ||= $self->config()->config_file();
+ my $file = File::Spec->file_name_is_absolute($orig) ?
+ File::Spec->canonpath($orig) :
+ File::Spec->rel2abs($orig, Cwd::getcwd());
+ -f $file or
+ die "config file $file not found\n";
+ $self->{config_file} = $file;
+ }
+
return $self->{config_file};
}
@@ -426,10 +437,9 @@
my ($self, $params) = @_;
return 1 unless $params;
- $self->{config_file} = $params->{config_file};
- $self->{default_action_name} =
- $params->{default_action_name} || 'default';
- $self->{default_error_page} = $params->{default_error_page};
+ $self->config_file($params->{config_file});
+ $self->default_action_name($params->{default_action_name} || 'default');
+ $self->default_error_page($params->{default_error_page});
if ($params->{config_vars}) {
unless (UNIVERSAL::isa($params->{config_vars}, 'ARRAY')) {
|
