Changeset 28104

Timestamp:

May 25, 2010, 4:56:34 PM (16 years ago)

Author:

heather

Message:

more tweaks

File:

• branches/haf_branches/ipp.20100512/ippScripts/scripts/minidvodb_createdb.pl (modified) (6 diffs)

branches/haf_branches/ipp.20100512/ippScripts/scripts/minidvodb_createdb.pl

@@ -36 +36 @@
 }
 
-my (  $outroot, $dbname, $dvodb, $minidvodb_group, $camera, $minidvodb_name, $verbose, $no_update,
+my (  $outroot, $dbname, $dvodb, $minidvodb_group, $camera,  $verbose, $no_update,
      $no_op, $redirect, $save_temps);
 GetOptions(    
@@ -42 +42 @@
     'dbname|d=s'        => \$dbname, # Database name
     'minidvodb_group|w=s'       => \$minidvodb_group, # minidvodb_group.
-    'minidvodb_name|w=s' => \$minidvodb_name , 
     'outroot|w=s'       => \$outroot, # output file base name
     'dvodb|w=s'         => \$dvodb,  # output DVO database
@@ -54 +53 @@
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage(
-          -msg => "Required options: --camera --minidvodb_group --dvodb --minidvodb_group --minidvodb_name --outroot",
+          -msg => "Required options: --camera  --dvodb --minidvodb_group  --outroot",
           -exitval => 3,
           ) unless
     defined $minidvodb_group and
-    defined $minidvodb_name and 
-    defined $camera and 
-    defined $outroot and
+    #defined $camera and 
+   #defined $outroot and
     defined $dvodb;
 
-my $ipprc = PS::IPP::Config->new( $camera ) or my_die( "Unable to set up", $minidvodb_name   , $PS_EXIT_CONFIG_ERROR ); # IPP configuration
+my $ipprc = PS::IPP::Config->new( $camera ) or my_die( "Unable to set up", $minidvodb_group   , $PS_EXIT_CONFIG_ERROR ); # IPP configuration
 
-my $logDest = $ipprc->filename("LOG.EXP", $outroot) or &my_die("Missing entry from camera config", $minidvodb_name, $PS_EXIT_CONFIG_ERROR);
+my $logDest = $ipprc->filename("LOG.EXP", $outroot) or &my_die("Missing entry from camera config", $minidvodb_group, $PS_EXIT_CONFIG_ERROR);
 
 if ($redirect) {
-    $ipprc->redirect_output($logDest) or my_die( "Unable to redirect output", $minidvodb_name, $PS_EXIT_SYS_ERROR );
+    $ipprc->redirect_output($logDest) or my_die( "Unable to redirect output", $minidvodb_group, $PS_EXIT_SYS_ERROR );
     print "\n\n";
     print "Starting script $0 on $host\n\n";
@@ -99 +97 @@
 
 unless ($no_op) {
-    my $minidvodb_path;
-    if (defined $dvodbReal) {
-         $minidvodb_path = $dvodbReal . '/' . $minidvodb_name;
-    } else {
-        warn("dvodbReal undefined:\n");
-        exit(4);
-    }
+    
+    
 
 #see if there is already a new_not_ready
@@ -134 +127 @@
 #create the minidvodb entry (well, the command for it)
     my $fpaCommand = "$addtool -addminidvodbrun";
-    $fpaCommand .= " -set_minidvodb_name $minidvodb_name";
-    $fpaCommand .= " -set_minidvodb_path $minidvodb_path";
     $fpaCommand .= " -set_minidvodb_group $minidvodb_group";
     $fpaCommand .= " -set_mergedvodb_path $dvodbReal";
      $fpaCommand .= " -dbname $dbname" if defined $dbname;
-    
+    print $fpaCommand;
    # complain if it doesn't work
 unless ($no_update) {
@@ -157 +148 @@
 {#complain if it doesn't work
     my $msg = shift; # Warning message on die
-    my $minidvodb_name = shift; # Camtool identifier
+    my $minidvodb_group = shift; # Camtool identifier
     my $exit_code = shift; # Exit code to add