Changeset 41213 for trunk/ippScripts

Timestamp:

Dec 24, 2019, 2:57:20 AM (7 years ago)

Author:

cclin33

Message:

update for addstar tasks

Location:

trunk/ippScripts/scripts

Files:

• addstar_run.pl (modified) (6 diffs)
• minidvodb_createdb.pl (modified) (4 diffs)

trunk/ippScripts/scripts/addstar_run.pl

@@ -44 +44 @@
 my $minidvodb_path;
 
-my ( $add_id, $camera, $stage, $stage_id, $stage_extra1, $outroot, $stageroot, $dbname, $reduction, $dvodb, $minidvodb, $minidvodb_name, $minidvodb_group, $image_only, $verbose, $no_update,
-     $no_op, $redirect, $save_temps);
+my ( $add_id, $camera, $stage, $stage_id, $stage_extra1, $outroot, $stageroot, $dbname, $reduction,
+     $dvodb, $minidvodb, $minidvodb_name, $minidvodb_group, $minidvodb_host, $image_only, $verbose,
+     $no_update, $no_op, $redirect, $save_temps, $dvodbhost);
 GetOptions(
     'add_id=s'          => \$add_id, # Camtool identifier
@@ -66 +67 @@
     'redirect-output'   => \$redirect,
     'save-temps'        => \$save_temps, # Save temporary files?
+    'dvodbhost|w=s' => \$dvodbhost, # miniDVO database group
     ) or pod2usage( 2 );
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage(
-          -msg => "Required options: --add_id --camera --outroot --dvodb --stageroot --stage --dbname",
+          -msg => "Required options: --add_id --camera --outroot --dvodb --stageroot --stage --dbname --dvodbhost",
           -exitval => 3,
           ) unless
@@ -79 +81 @@
     defined $dvodb and
     defined $dbname and
+    defined $dvodbhost and
     defined $camera;
 if ($stage =~ /cam/ && !defined $stage_id) {
@@ -297 +300 @@
         $minidvodb_path = $comp->{minidvodb_path};
         $minidvodb_name = $comp->{minidvodb_name};
-        
+        $minidvodb_host = $comp->{minidvodb_host};
+
         if (!defined($minidvodb_path)) {
             &my_die("Unable to parse minidvodb_path", $add_id, $PS_EXIT_PROG_ERROR);
@@ -422 +426 @@
 $fpaCommand .= " -dvodb_path $minidvodb_path" if defined $minidvodb_path;
 $fpaCommand .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name;
+$fpaCommand .= " -minidvodb_host $dvodbhost" if defined $dvodbhost;
 $fpaCommand .= " -dbname $dbname" if defined $dbname;
 
@@ -458 +463 @@
         $command .= " -path_base $outroot" if defined $outroot;
         $command .= (" -dtime_addstar " . ((DateTime->now->mjd - $mjd_start) * 86400));
-   #     $command .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name; don't think we want it recorded (not sure)
+        $command .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name; # dont think we want it recorded (not sure)
+        $command .= " -minidvodb_host $dvodbhost" if defined $dvodbhost; # dont think we want it recorded (not sure)
         $command .= " -stage_extra1 $stage_extra1" if defined $stage_extra1;
         $command .= " -dbname $dbname" if defined $dbname;

trunk/ippScripts/scripts/minidvodb_createdb.pl

@@ -38 +38 @@
     exit($PS_EXIT_CONFIG_ERROR);
 }
-
-my (  $outroot, $dbname, $dvodb, $minidvodb,$minidvodb_interval, $minidvodb_nums, $minidvodb_group, $camera,  $verbose, $no_update,
+my (  $outroot, $dbname, $dvodb, $minidvodb,$minidvodb_interval, $minidvodb_nums, $minidvodb_group, $minidvodb_host, $camera,  $verbose, $no_update,
      $no_op, $redirect, $save_temps);
 GetOptions(
@@ -50 +49 @@
     'interval|w=s'      => \$minidvodb_interval, #interval between creation of minidvodbs (default = 1day)
     'num|w=s'      => \$minidvodb_nums, #interval between creation of minidvodbs (default = 500 addRuns)
+    'minidvodb_host|w=s'  => \$minidvodb_host, #assign a hostname for addstar
     'verbose'           => \$verbose,   # Print to stdout
     'no-update'         => \$no_update, # Update the database?
@@ -164 +164 @@
     &my_die( "Unable to get listminidvodbrun",$minidvodb_group, $PS_EXIT_SYS_ERROR) unless $success2;
   # if it didn't list something in active state (what?) then we definitely need to create a new one
-    if (defined(@$stdout_buf2)) {
+    if ((@$stdout_buf2)) {
   my  $metadata2 = $mdcParser->parse(join "", @$stdout_buf2) or
         &my_die("Unable to parse metadata config", $minidvodb_group, $PS_EXIT_PROG_ERROR);
@@ -196 +196 @@
     &my_die( "Unable to get checkminidvodbunaddrun", $minidvodb_group, $PS_EXIT_SYS_ERROR) unless $success3;
 
-    if (defined(@$stdout_buf3)) {  #checkminidvodb returns nothing IF there have been no addruns added to the db yet
+    if ((@$stdout_buf3)) {  #checkminidvodb returns nothing IF there have been no addruns added to the db yet
     my  $metadata3 = $mdcParser->parse(join "", @$stdout_buf3) or
         &my_die("Unable to parse metadata config", $minidvodb_group, $PS_EXIT_PROG_ERROR);