Changeset 14368

Timestamp:

Jul 24, 2007, 2:34:10 PM (19 years ago)

Author:

Paul Price

Message:

Fixing to use new database structure and interaction.

File:

• trunk/ippScripts/scripts/ipp_serial_register.pl (modified) (3 diffs)

trunk/ippScripts/scripts/ipp_serial_register.pl

@@ -13 +13 @@
 
 my ($dbname,                    # Database name to use
-    $workdir,                   # Working directory
     );
 GetOptions(
            'dbname|d=s'  => \$dbname,
-           'workdir|w=s' => \$workdir,
 ) or pod2usage( 2 );
 
@@ -54 +52 @@
 
             foreach my $item (@$list) {
-                my $exp_tag = $item->{exp_tag};
-                my $class = $item->{class};
-                my $class_id = $item->{class_id};
+                my $exp_id = $item->{exp_id};
+                my $exp_name = $item->{tmp_exp_name};
+                my $class_id = $item->{tmp_class_id};
+                my $workdir = $item->{workdir};
                 my $uri = $item->{uri};
                 
-                my $command = "$register_imfile --exp_tag $exp_tag --class $class --class_id $class_id --uri $uri --dbname $dbname";
+                my $command = "$register_imfile --exp_id $exp_id --tmp_class_id $class_id --tmp_exp_name $exp_name --uri $uri --dbname $dbname";
                 $command .= " --workdir $workdir" if defined $workdir;
                 my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
                     run( command => $command, verbose => 1 );
-                die "Unable to do phase 0 imfile processing on $exp_tag $class_id: $error_code\n" if not $success;
+                die "Unable to do phase 0 imfile processing on $exp_name $class_id: $error_code\n" if not $success;
             }
 
@@ -93 +92 @@
 
             foreach my $item (@$list) {
-                my $exp_tag = $item->{exp_tag};
+                my $exp_tag = $item->{tmp_exp_name} . '.' . $item->{exp_id};
+                my $exp_id = $item->{exp_id};
+                my $workdir = $item->{workdir};
                 
-                my $command = "$register_exp --exp_tag $exp_tag --dbname $dbname";
+                my $command = "$register_exp --exp_tag $exp_tag --exp_id $exp_id --dbname $dbname";
                 $command .= " --workdir $workdir" if defined $workdir;
                 my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =