[Gmod-schema-cmts] schema/chado/bin pg2cdbi.pl,1.4,1.5

[<ky...@us...>]

Update of /cvsroot/gmod/schema/chado/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv15399

Modified Files:
	pg2cdbi.pl 
Log Message:
Mostly cosmetic changes to make more readable.


Index: pg2cdbi.pl
===================================================================
RCS file: /cvsroot/gmod/schema/chado/bin/pg2cdbi.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pg2cdbi.pl	25 Oct 2003 18:41:59 -0000	1.4
--- pg2cdbi.pl	25 Nov 2003 20:29:13 -0000	1.5
***************
*** 1,26 ****
  #!/usr/bin/perl
  use strict;
  use SQL::Translator;
- use SQL::Translator::Producer::ClassDBI;
- 
- print "USAGE: $0 <dbname> <username> <password> <sql file> [<sql files>]\n" and exit unless scalar(@ARGV) > 3;
- 
- my $dbname   = shift @ARGV;
- my $username = shift @ARGV;
- my $password = shift @ARGV;
- my @files = @ARGV;
  
! my $translator     = SQL::Translator->new(
! 						producer_args => {
! 							db_user => $username,
! 							db_pass => $password,
! 							dsn     => "dbi:Pg:dbname=$dbname",
! 						},
! 					 );
  
! my $config = { from       => "PostgreSQL", 
! 	       to         => "ClassDBI",
! 	       filename   => \@files,
! 	     };
  
  $translator->format_package_name(\&x);
--- 1,26 ----
  #!/usr/bin/perl
+ # vim: set ft=perl ts=2 expandtab:
+ 
  use strict;
  use SQL::Translator;
  
! unless ( scalar @ARGV > 3 ) {
!   die "USAGE: $0 <dbname> <username> <password> <sql file> [<sql files>]\n";
! }
  
! my $dbname      = shift @ARGV;
! my $username    = shift @ARGV;
! my $password    = shift @ARGV;
! my @files       = @ARGV;
! my $translator  = SQL::Translator->new(
!   from          => 'PostgreSQL', 
!   to            => 'ClassDBI',
!   filename      => \@files,
!   producer_args => {
!     db_user     => $username,
!     db_pass     => $password,
!     dsn         => "dbi:Pg:dbname=$dbname",
!   },
! );
  
  $translator->format_package_name(\&x);
***************
*** 28,59 ****
  $translator->format_fk_name(\&y);
  
! my $output = $translator->translate($config) or die $translator->error;
  
  print $output;
  
- 
  sub x { 
! my ($name, $primary_key) = @_;
! 
! my $package_name;
! 
! my @temp = split(/_/,$name);
! 
! for(my $i = 0; $i < scalar(@temp); $i++) {
!   my $new_name = ucfirst($temp[$i]);
  
!   if($i == 0) {
! 	$package_name .= $new_name;
!   }else {
! 	$package_name .= "_" .$new_name;
    }
  
! }
! 
! 
! $package_name = 'Chado::' . $package_name;
! 
! return $package_name;
  
  }
  
--- 28,52 ----
  $translator->format_fk_name(\&y);
  
! my $output = $translator->translate or die $translator->error;
  
  print $output;
  
  sub x { 
!   my ($name, $primary_key) = @_;
!   my $package_name;
!   my @temp = split(/_/,$name);
  
!   for(my $i = 0; $i < scalar(@temp); $i++) {
!     my $new_name = ucfirst($temp[$i]);
!     if($i == 0) {
!       $package_name .= $new_name;
!     } else {
!       $package_name .= "_" .$new_name;
!     }
    }
  
!   $package_name = 'Chado::' . $package_name;
  
+   return $package_name;
  }
  
***************
*** 63,67 ****
    $field_name =~ s/_id$//;
    return $field_name;
- #  return $table_name;
  }
- 
--- 56,58 ----