@@ -1,6 +1,6 @@

 #!/usr/bin/perl

 # parser pentru mesajele MQTT

-# Version: 1.0.4

+# Version: 1.0.5

 use strict;

 use warnings;

@@ -76,7 +76,6 @@ while (my $mqttMessage = <$SUB> ) {

       # aleg canalele de unde salvez date in DB:

       if ($queue eq "ENERGY"){

-        # tele/mng9184-1657/ENERGY {"Time":"2018-03-04T13:18:39","Total":1376.995,"Yesterday":23.704,"Today":16.450,"Period":102,"Power":1255,"Factor":0.99,"Voltage":237,"Current":5.298}

         my $decoded = decode_json($json);

         if (exists $decoded->{'Yesterday'}){

           addDB ($topic, "Yesterday", $decoded->{'Yesterday'});

@@ -135,15 +134,13 @@ sub addFILE {

   return;

 }

-# adaug in tabela getdevinfo din baza de date 

+# adaug/updatez in tabela getdevinfo din baza de date 

 sub addDB {                                                    

   (my $topic, my $camp, my $valoare) = @_;

-#  mysql_query("insert into getdevinfo values('$MQTTuser','$MQTTdevice','$MQTTcamp','$MQTTvaloare') on duplicate key update camp='$MQTTcamp',valoare='$MQTTvaloare';");

-#   my $query = "insert into getdevinfo values (?, ?, ?, ?) on duplicate key update camp=$camp,valoare='$valoare";

   (my $user, my $devid) = split /\-/, $topic;

-  my $query = "UPDATE getdevinfo SET valoare=? WHERE user=? and devid=? and camp=?";

+  my $query = "insert into getdevinfo values (?, ?, ?, ?) on duplicate key update camp=?, valoare=?";

   my $sth = $dbh->prepare($query) or die "Can't prepare $query: $dbh->errstr\n";

-  $sth->execute("$valoare", "$user", "$devid", "$camp");

+  $sth->execute("$user", "$devid", "$camp", "$valoare", "$camp", "$valoare");

   $sth->finish();

   return;

 }