Changeset 21033

Timestamp:

Dec 17, 2008, 3:26:17 PM (17 years ago)

Author:

Paul Price

Message:

Attempt to fix following schema change.

Location:

trunk/tools

Files:

• diff_inputs.pl (modified) (3 diffs)
• diff_outputs.pl (modified) (3 diffs)

trunk/tools/diff_inputs.pl

@@ -26 +26 @@
 
 my ($db_host, $db_name, $db_user, $db_pw); # Database details
-my ($diff_id);                  # Diff of interest
+my ($diff_id, $skycell_id);     # Diff and skycell of interest
 my ($input);                    # Input list
 
@@ -35 +35 @@
            'dbpass=s' => \$db_pw, # Database p/w
            'diff_id=s' => \$diff_id, # Diff identifier
+           'skycell_id=s' => \$skycell_id, # Skycell identifier
            'input=s'  => \$input, # Input list to generate
            ) or die "Unable to parse arguments.\n";
@@ -57 +58 @@
     "     NULL AS stack_path_base" .
     " FROM diffRun" .
-    " JOIN diffInputSkyfile USING(diff_id, skycell_id)" .
+    " JOIN diffInputSkyfile USING(diff_id)" .
     " JOIN warpSkyfile USING(warp_id, skycell_id)" .
-    " WHERE diff_id = $diff_id" .
-    " UNION" .
+    " WHERE diff_id = $diff_id";
+$sql .= " AND skycell_id = $skycell_id" if defined $skycell_id;
+$sql.= " UNION" .
     " SELECT" .
     "     NULL AS warp_path_base," .
     "     stackSumSkyfile.path_base AS stack_path_base" .
     " FROM diffRun" .
-    " JOIN diffInputSkyfile USING(diff_id, skycell_id)" .
+    " JOIN diffInputSkyfile USING(diff_id)" .
     " JOIN stackSumSkyfile USING(stack_id)" .
     " WHERE diff_id = $diff_id";
+$sql .= " AND skycell_id = $skycell_id" if defined $skycell_id;
 
 

trunk/tools/diff_outputs.pl

@@ -21 +21 @@
 
 my ($db_host, $db_name, $db_user, $db_pw); # Database details
-my ($diff_id);                  # Diff of interest
+my ($diff_id, $skycell_id);     # Diff and skycell of interest
 my ($input);                    # Input list
 my ($products);                 # Products of interest
@@ -31 +31 @@
            'dbpass=s' => \$db_pw, # Database p/w
            'diff_id=s' => \$diff_id, # Diff identifier
+           'skycell_id=s' => \$skycell_id, # Skycell identifier
            'products=s' => \$products, # Products of interest
            ) or die "Unable to parse arguments.\n";
@@ -50 +51 @@
 # Query to run
 my $sql = "SELECT path_base FROM diffSkyfile WHERE diff_id = $diff_id";
+$sql .= " AND skycell_id = $skycell_id" if defined $skycell_id;
 
 # List of diffs