[interchange-cvs] interchange - heins modified 7 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Sun Apr 11 12:34:50 EDT 2004
User: heins
Date: 2004-04-11 16:34:50 GMT
Modified: code/UI_Tag flex_select.coretag import_fields.coretag
Modified: dist/lib/UI/profiles db_maintenance
Modified: dist/test catalog.cfg
Modified: lib/Vend Config.pm Data.pm
Modified: lib/Vend/Table DBI_CompositeKey.pm
Log:
* Change MULTIPLE_KEYS to COMPOSITE_KEY for better intuitiveness.
Revision Changes Path
1.8 +1 -2 interchange/code/UI_Tag/flex_select.coretag
rev 1.8, prev_rev 1.7
Index: flex_select.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/flex_select.coretag,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- flex_select.coretag 11 Apr 2004 05:05:50 -0000 1.7
+++ flex_select.coretag 11 Apr 2004 16:34:50 -0000 1.8
@@ -82,7 +82,7 @@
$ts->{large} = 1;
}
- if( $db->config('MULTIPLE_KEYS') ) {
+ if( $db->config('COMPOSITE_KEY') ) {
$ts->{multikey} = 1;
$ts->{key_columns} = $db->config('_Key_columns');
}
@@ -799,7 +799,6 @@
my $m = $cc->{$mcol};
if($mkey{$col}) {
-::logDebug("col=$col index=$idx");
push @mcol, $idx - 1;
}
1.10 +1 -1 interchange/code/UI_Tag/import_fields.coretag
rev 1.10, prev_rev 1.9
Index: import_fields.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/import_fields.coretag,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import_fields.coretag 11 Apr 2004 05:05:50 -0000 1.9
+++ import_fields.coretag 11 Apr 2004 16:34:50 -0000 1.10
@@ -1,6 +1,6 @@
UserTag import_fields Order table
UserTag import_fields addAttr
-UserTag import_fields Version $Revision: 1.9 $
+UserTag import_fields Version $Revision: 1.10 $
UserTag import_fields Routine <<EOR
sub {
my($table, $opt) = @_;
@@ -236,7 +236,7 @@
die "Invalid key '$key' for table $table (wrong file format ?)\n";
}
- my $multikey = $db->config('MULTIPLE_KEYS') ? 1 : 0;
+ my $multikey = $db->config('COMPOSITE_KEY') ? 1 : 0;
if ($opt->{ignore_fields}) {
2.4 +1 -1 interchange/dist/lib/UI/profiles/db_maintenance
rev 2.4, prev_rev 2.3
Index: db_maintenance
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/profiles/db_maintenance,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- db_maintenance 11 Apr 2004 05:05:50 -0000 2.3
+++ db_maintenance 11 Apr 2004 16:34:50 -0000 2.4
@@ -133,7 +133,7 @@
}
my $db = $Db{$t};
- if($db->config('MULTIPLE_KEYS')) {
+ if($db->config('COMPOSITE_KEY')) {
$CGI->{$idp} =~ s/-_NULL_-/\0/g;
my $key = $CGI->{$idp};
$key =~ s/\0/,/g;
2.8 +1 -1 interchange/dist/test/catalog.cfg
rev 2.8, prev_rev 2.7
Index: catalog.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/test/catalog.cfg,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -r2.7 -r2.8
--- catalog.cfg 11 Apr 2004 16:23:05 -0000 2.7
+++ catalog.cfg 11 Apr 2004 16:34:50 -0000 2.8
@@ -15,7 +15,7 @@
Database sort sort.asc TAB
Database sort MEMORY 1
Database composite composite.asc dbi:mysql:test
-Database composite MULTIPLE_KEYS key1 key2 key3
+Database composite COMPOSITE_KEY key1 key2 key3
Database composite COLUMN_DEF "key1=varchar(64)"
Database composite COLUMN_DEF "key2=varchar(64)"
Database composite COLUMN_DEF "key3=varchar(64)"
2.138 +3 -3 interchange/lib/Vend/Config.pm
rev 2.138, prev_rev 2.137
Index: Config.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Config.pm,v
retrieving revision 2.137
retrieving revision 2.138
diff -u -r2.137 -r2.138
--- Config.pm 11 Apr 2004 05:05:49 -0000 2.137
+++ Config.pm 11 Apr 2004 16:34:50 -0000 2.138
@@ -1,6 +1,6 @@
# Vend::Config - Configure Interchange
#
-# $Id: Config.pm,v 2.137 2004/04/11 05:05:49 mheins Exp $
+# $Id: Config.pm,v 2.138 2004/04/11 16:34:50 mheins Exp $
#
# Copyright (C) 2002-2003 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -48,7 +48,7 @@
use Vend::File;
use Vend::Data;
-$VERSION = substr(q$Revision: 2.137 $, 10);
+$VERSION = substr(q$Revision: 2.138 $, 10);
my %CDname;
my %CPname;
@@ -3299,7 +3299,7 @@
$d->{$p} = [] unless defined $d->{$p};
push @{$d->{$p}}, @v;
}
- elsif ($p eq 'MULTIPLE_KEYS') {
+ elsif ($p eq 'COMPOSITE_KEY') {
## Magic hardcode
if($d->{type} == 8) {
$d->{Class} = 'DBI_CompositeKey';
2.38 +2 -2 interchange/lib/Vend/Data.pm
rev 2.38, prev_rev 2.37
Index: Data.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Data.pm,v
retrieving revision 2.37
retrieving revision 2.38
diff -u -r2.37 -r2.38
--- Data.pm 11 Apr 2004 05:05:49 -0000 2.37
+++ Data.pm 11 Apr 2004 16:34:50 -0000 2.38
@@ -1,6 +1,6 @@
# Vend::Data - Interchange databases
#
-# $Id: Data.pm,v 2.37 2004/04/11 05:05:49 mheins Exp $
+# $Id: Data.pm,v 2.38 2004/04/11 16:34:50 mheins Exp $
#
# Copyright (C) 2002-2003 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -1956,7 +1956,7 @@
}
#::logDebug("autonumber=$autonumber");
- my $multikey = $base_db->config('MULTIPLE_KEYS');
+ my $multikey = $base_db->config('COMPOSITE_KEY');
if(@file_fields) {
my $Tag = new Vend::Tags;
1.4 +8 -8 interchange/lib/Vend/Table/DBI_CompositeKey.pm
rev 1.4, prev_rev 1.3
Index: DBI_CompositeKey.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Table/DBI_CompositeKey.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DBI_CompositeKey.pm 11 Apr 2004 16:11:45 -0000 1.3
+++ DBI_CompositeKey.pm 11 Apr 2004 16:34:50 -0000 1.4
@@ -1,6 +1,6 @@
# Vend::Table::DBI - Access a table stored in an DBI/DBD database
#
-# $Id: DBI_CompositeKey.pm,v 1.3 2004/04/11 16:11:45 mheins Exp $
+# $Id: DBI_CompositeKey.pm,v 1.4 2004/04/11 16:34:50 mheins Exp $
#
# Copyright (C) 2002-2004 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -21,7 +21,7 @@
# MA 02111-1307 USA.
package Vend::Table::DBI_CompositeKey;
-$VERSION = substr(q$Revision: 1.3 $, 10);
+$VERSION = substr(q$Revision: 1.4 $, 10);
use strict;
@@ -55,15 +55,15 @@
my ($class, $config, $columns, $tablename) = @_;
#::logDebug("DBI_CompositeKey trying create table $tablename");
- if(! $config->{MULTIPLE_KEYS}) {
+ if(! $config->{COMPOSITE_KEY}) {
die ::errmsg(
- "Class %s: requires MULTIPLE_KEYS setting\n",
+ "Class %s: requires COMPOSITE_KEY setting\n",
$class,
);
}
if(! $config->{_Key_columns}) {
- my @keycols = grep length($_), split /[\s,\0]+/, $config->{MULTIPLE_KEYS};
+ my @keycols = grep length($_), split /[\s,\0]+/, $config->{COMPOSITE_KEY};
$config->{_Key_columns} = \@keycols;
$config->{_Key_where} = 'WHERE ';
my $hash = {};
@@ -92,15 +92,15 @@
my ($class, $config, $tablename) = @_;
#::logDebug("DBI_CompositeKey trying to open table $tablename");
- if(! $config->{MULTIPLE_KEYS}) {
+ if(! $config->{COMPOSITE_KEY}) {
die ::errmsg(
- "Class %s: requires MULTIPLE_KEYS setting\n",
+ "Class %s: requires COMPOSITE_KEY setting\n",
$class,
);
}
if(! $config->{_Key_columns}) {
- my @keycols = grep length($_), split /[\s,\0]+/, $config->{MULTIPLE_KEYS};
+ my @keycols = grep length($_), split /[\s,\0]+/, $config->{COMPOSITE_KEY};
$config->{_Key_columns} = \@keycols;
$config->{_Key_where} = 'WHERE ';
my $hash = {};
More information about the interchange-cvs
mailing list