From f0ab80f7197270ef2076b938df5d61016dbfda4c Mon Sep 17 00:00:00 2001
From: battilo <alessandro.battilani@gmail.com>
Date: Mon, 19 Nov 2018 23:21:01 +0100
Subject: [PATCH] corr din/ain

---
 LoadCSVData.pl | 120 +++++++++++++++++++++++--------------------------
 1 file changed, 57 insertions(+), 63 deletions(-)

diff --git a/LoadCSVData.pl b/LoadCSVData.pl
index d23bd01..6a325fa 100644
--- a/LoadCSVData.pl
+++ b/LoadCSVData.pl
@@ -24,7 +24,7 @@ my ( @CSVData, @sql );
 my $outcount    = 0;
 my $outfilenum  = 0;
 my $maxsqllines = 10000;
-my ($tool,    $toolbatt, $tooltemp, $tooltype, @channels,@NewData, @din,      @nodetype, $GDEventDate);
+my ($tool, $toolbatt, $tooltemp, $tooltype, @channels,@NewData, @ain, @din, @nodetype, $GDEventDate);
 my $matlab_ip        = "160.78.21.71";
 my $matlab_cmd       = "matlab.cmd";
 my $matlab_timestamp = "";
@@ -486,90 +486,84 @@ while ( my $line = <FILE> ) {
 						if ($used_din eq 0) {
 							$CSVData[$idx++] = $Din1;
 							$used_din = 1;
-						}
-						else {
+						} else {
 							$CSVData[$idx++] = $Din2;
 						}
-					}
-					elsif ($ain[i] eq 1) {
+					} elsif ($ain[i] eq 1) {
 						if ($used_ain eq 0) {
 							$CSVData[$idx++] = $Ain1;
 							$used_ain = 1;
-						}
-						else {
+						} else {
 							$CSVData[$idx++] = $Ain2;
 						}
-					}
-					elsif ($din[i] eq 2) {
+					} elsif ($din[i] eq 2) {
 						$CSVData[$idx++] = $Din1 . ";" . $Din2;
-					}
-					elsif ($ain[i] eq 2) {
+					} elsif ($ain[i] eq 2) {
 						$CSVData[$idx++] = $Ain1 . ";" . $Ain2;
 					}
 				}
-			}
-		}
-		elsif ( $tooltype eq "GD" ) {
-			my ( $div, $Vbat, $Tmod ) =
-			  split( /;/, $NodeData );
-			$CSVData[0] = $Vbat . ";" . $Tmod;
-			my ( $y, $m, $d, $t ) = split( /[\s\/]/, $first );
-			my ( $h, $min, $sec ) = split( /:/, $t );
-			$GDEventDate = $y . '-' . $m . '-' . $d;
-			$CSVData[1] = "DT". substr( $tool, 2, 4 ) . ';'. $h . ':'. ( $min - 1 ) . ';'. $h . ':'. ( $min + 1 );
-		}else {
-			@CSVData = split( /\|/, $NodeData );
-		}
-
-		my $nodenum = 0;
-		foreach (@CSVData) {
-			$sql[ ( $outcount % $maxsqllines ) ] = "";
-			my (@data) = grep { /\S/ } split( /\;/, $_ );
-			if ( $nodenum eq 0 ) {
-				$toolbatt = $data[0];
-				$tooltemp = $data[1];
-			}else {
+				
+			}elsif ( $tooltype eq "GD" ) {
+				my ( $div, $Vbat, $Tmod ) =
+				  split( /;/, $NodeData );
+				$CSVData[0] = $Vbat . ";" . $Tmod;
 				my ( $y, $m, $d, $t ) = split( /[\s\/]/, $first );
-				if (length($y) != 4) { # G201 con la data invertita
-					my $w = $y;
-					$y = $d;
-					$m = sprintf('%02d',$m);
-					$d = sprintf('%02d',$w);
-				}
-				foreach (@data) {
-					if ( $sql[ ( $outcount % $maxsqllines ) ] eq "" ) {
-						$sql[ ( $outcount % $maxsqllines ) ] = "('$unit','$tool','$nodenum','$y-$m-$d','$t','$toolbatt','$tooltemp'";
-					}
-					$sql[ ( $outcount % $maxsqllines ) ] .= ",'" . $_ . "'";
-				}
-				my $InsCompl = ",NULL" x ( 15 - $#data );
-				$sql[ ( $outcount % $maxsqllines ) ] .= $InsCompl . ")";
-				if ( ++$outcount % $maxsqllines eq 0 ) {
-					$sql[ ( $outcount % $maxsqllines ) - 1 ] .= ";\n";
-					writeOutSql($tool);
-				}else {
-					$sql[ ( $outcount % $maxsqllines ) - 1 ] .= ",\n";
-				}
+				my ( $h, $min, $sec ) = split( /:/, $t );
+				$GDEventDate = $y . '-' . $m . '-' . $d;
+				$CSVData[1] = "DT". substr( $tool, 2, 4 ) . ';'. $h . ':'. ( $min - 1 ) . ';'. $h . ':'. ( $min + 1 );
+			}else {
+				@CSVData = split( /\|/, $NodeData );
+			}
+
+			my $nodenum = 0;
+			foreach (@CSVData) {
+				$sql[ ( $outcount % $maxsqllines ) ] = "";
+				my (@data) = grep { /\S/ } split( /\;/, $_ );
+				if ( $nodenum eq 0 ) {
+					$toolbatt = $data[0];
+					$tooltemp = $data[1];
+				}else {
+					my ( $y, $m, $d, $t ) = split( /[\s\/]/, $first );
+					if (length($y) != 4) { # G201 con la data invertita
+						my $w = $y;
+						$y = $d;
+						$m = sprintf('%02d',$m);
+						$d = sprintf('%02d',$w);
+					}
+					foreach (@data) {
+						if ( $sql[ ( $outcount % $maxsqllines ) ] eq "" ) {
+							$sql[ ( $outcount % $maxsqllines ) ] = "('$unit','$tool','$nodenum','$y-$m-$d','$t','$toolbatt','$tooltemp'";
+						}
+						$sql[ ( $outcount % $maxsqllines ) ] .= ",'" . $_ . "'";
+					}
+					my $InsCompl = ",NULL" x ( 15 - $#data );
+					$sql[ ( $outcount % $maxsqllines ) ] .= $InsCompl . ")";
+					if ( ++$outcount % $maxsqllines eq 0 ) {
+						$sql[ ( $outcount % $maxsqllines ) - 1 ] .= ";\n";
+						writeOutSql($tool);
+					}else {
+						$sql[ ( $outcount % $maxsqllines ) - 1 ] .= ",\n";
+					}
+				}
+				$nodenum++;
 			}
-			$nodenum++;
 		}
 	}
 }
-}
 close FILE;
 $sql[ ( $outcount % $maxsqllines ) - 1 ] =~ s/,$/;/g;
 writeOutSql($tool);
 if ( $tooltype eq "GD" ) {
-  print getTimeStamp("log") . " - pid $$ >> tool GD: nothing to do.\n";
+	print getTimeStamp("log") . " - pid $$ >> tool GD: nothing to do.\n";
 }else {
-  matlabCalc();
+	matlabCalc();
 
-  if ($ftp_send) {
-	  if ( $tool eq 'DT0076' ) {
-		  sleep(600);
-	  }
-	  trxelab();
-  }
+	if ($ftp_send) {
+		if ( $tool eq 'DT0076' ) {
+			sleep(600);
+		}
+		trxelab();
+	}
 }
 
 print getTimeStamp("log") . " - pid $$ >> Execution ended.\n";