Changeset 27510

Timestamp:

Mar 29, 2010, 1:53:15 PM (16 years ago)

Author:

Paul Price

Message:

Fix argument parsing for dbname.

File:

• trunk/tools/test_destreak (modified) (7 diffs)

trunk/tools/test_destreak

@@ -2 +2 @@
 
 # given a run id or exposure find the various inputs and run
-# streaksremove 
+# streaksremove
 # Does not update the database or 'replace' the inputs
 
@@ -31 +31 @@
     'outroot=s'     =>  \$outroot,
     'logfile=s'     =>  \$logfile,
-    'dbname'       =>   \$dbname,
+    'dbname=s'      =>   \$dbname,
     'verbose'       =>  \$verbose,
     'save-temps'    =>  \$save_temps,
@@ -71 +71 @@
     magicDSFile.backup_path_base,
     camProcessedExp.path_base AS cam_path_base
-    FROM chipRun 
+    FROM chipRun
     JOIN chipProcessedImfile using(chip_id, exp_id)
     JOIN camRun using(chip_id)
     JOIN camProcessedExp using(cam_id)
-    JOIN magicDSRun ON stage = 'chip' AND stage_id = chipRun.chip_id 
+    JOIN magicDSRun ON stage = 'chip' AND stage_id = chipRun.chip_id
 --  AND camRun.cam_id = magicDSRun.cam_id
     JOIN magicDSFile ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
@@ -116 +116 @@
             . " --uri $uri"
             . " --no-update"
-            
+
             ;
 
@@ -129 +129 @@
     $stage = "warp";
 
-    $query = 
-    
+    $query =
+
 "SELECT
     exp_id,
@@ -141 +141 @@
     warpSkyfile.path_base,
     magicDSFile.backup_path_base
-    FROM warpRun 
+    FROM warpRun
     JOIN warpSkyfile using(warp_id)
-    JOIN magicDSRun ON stage = 'warp' AND stage_id = warpRun.warp_id 
+    JOIN magicDSRun ON stage = 'warp' AND stage_id = warpRun.warp_id
     JOIN magicDSFile ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
                         AND skycell_id = component
@@ -212 +212 @@
     my $dsn = "DBI:mysql:host=$dbserver;database=$dbname";
 
-    my $dbh = DBI->connect($dsn, $dbuser, $dbpassword) 
+    my $dbh = DBI->connect($dsn, $dbuser, $dbpassword)
         or die "Cannot connect to database.\n";