Changeset 40794 for trunk

Timestamp:

Jun 18, 2019, 2:00:16 PM (7 years ago)

Author:

tdeboer

Message:

improve hadnling of chunks

File:

• trunk/ippScripts/scripts/night_report.pl (modified) (4 diffs)

trunk/ippScripts/scripts/night_report.pl

@@ -776 +776 @@
     $query .= "     SELECT dateobs,comment,substr(comment, 1, position(' ' in comment)) AS chunk,count(distinct(comment)) AS Nquad_firstvisit";
     $query .= "     FROM rawExp";
-    $query .= "     WHERE dateobs LIKE '$date%'";
+    $query .= "     WHERE dateobs LIKE '$date%' AND exp_id > $refExpID";
     $query .= "     AND (obs_mode LIKE '%SS%' OR obs_mode LIKE '%BRIGHT%') AND obs_mode NOT LIKE 'ENGINEERING'";
     $query .= "     AND comment LIKE '%visit 1%'";
@@ -786 +786 @@
     $query .= "       (SELECT substr(comment, 1, position(' ' in comment)) AS chunk,count(distinct(comment)) AS Nvisits";
     $query .= "         FROM rawExp";
-    $query .= "         WHERE dateobs LIKE '$date%' AND (obs_mode LIKE '%SS%' OR obs_mode LIKE '%BRIGHT%')";
+    $query .= "         WHERE dateobs LIKE '$date%' AND exp_id > $refExpID AND (obs_mode LIKE '%SS%' OR obs_mode LIKE '%BRIGHT%')";
     $query .= "         AND obs_mode NOT LIKE 'ENGINEERING' AND comment LIKE '%visit%'";
     $query .= "         GROUP BY object, filter, chunk";
@@ -808 +808 @@
           my $query2 .= "     SELECT warp_id FROM ";
           $query2 .= "           warpRun JOIN fakeRun USING (fake_id) JOIN camRun USING (cam_id) JOIN camProcessedExp USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)";
-          $query2 .= "           WHERE rawExp.dateobs LIKE '$date%' AND (obs_mode LIKE '%SS%' OR obs_mode LIKE '%BRIGHT%')";
+          $query2 .= "           WHERE rawExp.dateobs LIKE '$date%' AND exp_id > $refExpID AND (obs_mode LIKE '%SS%' OR obs_mode LIKE '%BRIGHT%')";
           $query2 .= "           AND substr(comment, 1, position(' ' in comment)) LIKE '$chunkname%'";
           my $result2 = &mysql_select ($query2);
@@ -840 +840 @@
 }
 
+
 exit 0;