[interchange-cvs] interchange - heins modified
code/UI_Tag/xfer_catalog.coretag
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Wed May 5 14:49:27 EDT 2004
User: heins
Date: 2004-05-05 18:49:27 GMT
Modified: code/UI_Tag xfer_catalog.coretag
Log:
* Make pref_group come out properly.
* Fix argument processing for user and password.
Revision Changes Path
1.4 +6 -4 interchange/code/UI_Tag/xfer_catalog.coretag
rev 1.4, prev_rev 1.3
Index: xfer_catalog.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/xfer_catalog.coretag,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfer_catalog.coretag 19 Jul 2003 02:23:52 -0000 1.3
+++ xfer_catalog.coretag 5 May 2004 18:49:27 -0000 1.4
@@ -27,6 +27,7 @@
backup => ['./backup/*'],
config => ['./config/*'],
upload => ['./upload/*'],
+ download => ['./download/*'],
);
my $export_and_exclude = sub {
@@ -185,19 +186,20 @@
$dbname{$dsn} = $dbname;
- $dsn{$dsn} = join " ", $map->{command}, @args, $dbname;
if (my $user = $o->{USER}) {
$user{$dsn} = $user;
my $tpl = $map->{user};
$tpl =~ s/\%s/$user/g
- and $dsn{$dsn} .= " $tpl";
+ and push @args, " $tpl";
}
if (my $pass = $o->{PASS}) {
$pass{$dsn} = $pass;
my $tpl = $map->{pass};
$tpl =~ s/\%s/$pass/g
- and $dsn{$dsn} .= " $tpl";
+ and push @args, " $tpl";
}
+
+ $dsn{$dsn} = join " ", $map->{command}, @args, $dbname;
}
for my $t (keys %export) {
@@ -284,7 +286,7 @@
my %restore;
for(@vars) {
my $val = $CGI::values{$_} || $::Variable->{$_};
- my $pref = $val, tag_data('variable', 'pref_group', $_);
+ my $pref = tag_data('variable', 'pref_group', $_);
push @vdb, join("\t", $_, $val, $pref);
if($_ eq 'SQLDSN') {
my $thing = $restore{sqldsn} = $val;
More information about the interchange-cvs
mailing list