[svn:p5ee] r13009 - p5ee/trunk/App-Repository/lib/App/Repository

[spadkins]

Author: spadkins
Date: Mon Jul  6 13:04:29 2009
New Revision: 13009

Modified:
   p5ee/trunk/App-Repository/lib/App/Repository/Oracle.pm

Log:
use self name instead of self dbname in specifiying the sqlldr options

Modified: p5ee/trunk/App-Repository/lib/App/Repository/Oracle.pm
==============================================================================
--- p5ee/trunk/App-Repository/lib/App/Repository/Oracle.pm      (original)
+++ p5ee/trunk/App-Repository/lib/App/Repository/Oracle.pm      Mon Jul  6 
13:04:29 2009
@@ -496,7 +496,8 @@
         $nrows = $self->insert_rows($table, $columns, $file, $options);
     }
     else {
-        my $context_options = $self->{context}{options};
+        my $context         = $self->{context};
+        my $context_options = $context->{options};
         my $prefix    = $context_options->{prefix};
         my $debug_sql = $context_options->{debug_sql};
         my ($timer, $elapsed_time);
@@ -508,6 +509,7 @@
         $filebase =~ s/\.dat$//;
 
         my $dbname = $self->{dbname};
+        my $dbrep  = $self->{name};
         my $control_key_source = join(",", @$columns);
         if ($options && %$options) {
             my @option_keys = sort keys %$options;
@@ -533,13 +535,13 @@
 
         #my $sqlldr_options = " direct=TRUE parallel=TRUE silent";
         my $sqlldr_options = "";
-        if ($context_options->{"app.Repository.$dbname.$table.import_rows"}) {
+        if ($context_options->{"app.Repository.$dbrep.$table.import_rows"}) {
             $sqlldr_options .= " " if ($sqlldr_options);
-            $sqlldr_options .= "rows=" . 
$context_options->{"app.Repository.$dbname.$table.import_rows"};
+            $sqlldr_options .= "rows=" . 
$context_options->{"app.Repository.$dbrep.$table.import_rows"};
         }
-        if 
($context_options->{"app.Repository.$dbname.$table.import_bindsize"}) {
+        if 
($context_options->{"app.Repository.$dbrep.$table.import_bindsize"}) {
             $sqlldr_options .= " " if ($sqlldr_options);
-            $sqlldr_options .= "bindsize=" . 
$context_options->{"app.Repository.$dbname.$table.import_bindsize"};
+            $sqlldr_options .= "bindsize=" . 
$context_options->{"app.Repository.$dbrep.$table.import_bindsize"};
         }
 
         my $cmd = "sqlldr userid=$self->{dbuser}/$self->{dbpas...@$dbname 
data=$datfile control=$ctlfile bad=$badfile log=$logfile errors=0 
$sqlldr_options > $outfile 2>&1";