Changeset 40793

Timestamp:

Jun 14, 2019, 10:36:31 AM (7 years ago)

Author:

tdeboer

Message:

fixed formatting to deal with empty strings

File:

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

trunk/ippScripts/scripts/night_report.pl

@@ -797 +797 @@
     my $result = &mysql_select ($query);
 
-    printf "%18s | %18s | %18s | %18s |\n", "chunk", "Nquad_firstvisit", "Nquad_fourvisits", "Ndiffs done"; 
+    my $Nfirstvisits = 0;
+    my $Nfourvisits = 0;
+
+    printf "%18s | %13s | %13s | %14s |\n", "chunk", "Nobs_1stvisit", "Nobs_4visits", "Ndiffs_publish"; 
     while (@row = $result->fetchrow_array()) {
           my $chunkname = $row[0];
-          my $Nfirstvisits = $row[1];
-          my $Nfourvisits = $row[2];
+          if($row[1] gt 0) {$Nfirstvisits = $row[1]};
+          if($row[2] gt 0) {$Nfourvisits = $row[2]};
 
           my $query2 .= "     SELECT warp_id FROM ";
@@ -825 +828 @@
 
           if ($Nfirstvisits ne $Nfourvisits) {
-            if ($Ndiffs ne ($Nfirstvisits*4)) {printf "%18s | %18s | %18s | %14s%4s | %18s\n", $chunkname, $Nfirstvisits, $Nfourvisits, $Ndiffs, "/?  ", "chunk not finished";}  # chunk        Nquad_firstvisit        Nquad_fourvisits        Ndiffs
-            if ($Ndiffs eq ($Nfirstvisits*4)) {printf "%18s | %18s | %18s | %14s%4s | %18s\n", $chunkname, $Nfirstvisits, $Nfourvisits, $Ndiffs, "/?  ", "chunk done";}          # chunk        Nquad_firstvisit        Nquad_fourvisits        Ndiffs
+            if ($Ndiffs ne ($Nfirstvisits*4)) {printf "%18s | %13s | %13s | %10s%4s | %14s\n", $chunkname, $Nfirstvisits, $Nfourvisits, $Ndiffs, "/?  ", "chunk not done";}  # chunk    Nquad_firstvisit        Nquad_fourvisits        Ndiffs
+            if ($Ndiffs eq ($Nfirstvisits*4)) {printf "%18s | %13s | %13s | %10s%4s | %14s\n", $chunkname, $Nfirstvisits, $Nfourvisits, $Ndiffs, "/?  ", "chunk done";}          # chunk        Nquad_firstvisit        Nquad_fourvisits        Ndiffs
           }
           if ($Nfirstvisits eq $Nfourvisits) {
-            if ($Ndiffs ne ($Nfirstvisits*4)) {printf "%18s | %18s | %18s | %14s%1s%3s | %18s\n", $chunkname, $Nfirstvisits, $Nfourvisits, $Ndiffs,"/",$Nfirstvisits*4, "chunk not finished";}  # chunk Nquad_firstvisit        Nquad_fourvisits        Ndiffs
-            if ($Ndiffs eq ($Nfirstvisits*4)) {printf "%18s | %18s | %18s | %14s%1s%3s | %18s\n", $chunkname, $Nfirstvisits, $Nfourvisits, $Ndiffs,"/",$Nfirstvisits*4, "chunk done";}          # chunk Nquad_firstvisit        Nquad_fourvisits        Ndiffs
+            if ($Ndiffs ne ($Nfirstvisits*4)) {printf "%18s | %13s | %13s | %10s%1s%3s | %14s\n", $chunkname, $Nfirstvisits, $Nfourvisits, $Ndiffs,"/",$Nfirstvisits*4, "chunk not done";}  # chunk     Nquad_firstvisit        Nquad_fourvisits        Ndiffs
+            if ($Ndiffs eq ($Nfirstvisits*4)) {printf "%18s | %13s | %13s | %10s%1s%3s | %14s\n", $chunkname, $Nfirstvisits, $Nfourvisits, $Ndiffs,"/",$Nfirstvisits*4, "chunk done";}          # chunk Nquad_firstvisit        Nquad_fourvisits        Ndiffs
           }
     }