corr din/ain

This commit is contained in:
2018-11-19 23:21:01 +01:00
parent 38f60ce3cc
commit f0ab80f719

View File

@@ -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,30 +486,24 @@ 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" ) {
}elsif ( $tooltype eq "GD" ) {
my ( $div, $Vbat, $Tmod ) =
split( /;/, $NodeData );
$CSVData[0] = $Vbat . ";" . $Tmod;
@@ -554,7 +548,7 @@ while ( my $line = <FILE> ) {
$nodenum++;
}
}
}
}
}
close FILE;
$sql[ ( $outcount % $maxsqllines ) - 1 ] =~ s/,$/;/g;