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

 #!/usr/bin/perl

 # parser pentru mesajele MQTT

-# Version: 1.0.3

+# Version: 1.0.4

 use strict;

 use warnings;

@@ -59,9 +59,9 @@ while (my $mqttMessage = <$SUB> ) {

       if ($queue eq "LWT"){

         #stergem consumul pentru azi si ieri cand este offline priza

         if ($nonjson eq 'Offline') {

-         #           mysql_query("delete from getdevinfo where user='$mqtt_user' and devid='$mqtt_dev' and (camp='Yesterday' || camp='Today');");

+          delDB($topic);

         }        

-        getdevinfoDB ($topic, "LWT", $nonjson);

+        addDB ($topic, "LWT", $nonjson);

       }

       else {

         #print "nu ma intereseaza alte canale fara json";

@@ -79,19 +79,19 @@ while (my $mqttMessage = <$SUB> ) {

         # 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'}){

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

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

         }

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

-          getdevinfoDB ($topic, "Today", $decoded->{'Today'});

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

         }

       }

       if ($queue eq "ESP"){

         my $decoded = decode_json($json);

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

-          getdevinfoFILE ($topic, "Temp", $decoded->{'Temp'});

+          addFILE ($topic, "Temp", $decoded->{'Temp'});

         }

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

-          getdevinfoFILE ($topic, "Humi", $decoded->{'Humi'});

+          addFILE ($topic, "Humi", $decoded->{'Humi'});

         }

       }

     }

@@ -106,7 +106,8 @@ if ($daemon==1){

   }

 }

-sub getdevinfoFILE {

+# adaug in fisierele pentru graficele senzorilor

+sub addFILE {

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

   my $cale='/var/www/html/www.clickhome.ro/colect/';

   my $filename;

@@ -134,15 +135,27 @@ sub getdevinfoFILE {

   return;

 }

-sub getdevinfoDB {                                                    

+# adaug 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 $sth = $dbh->prepare($query) or die "Can't prepare $query: $dbh->errstr\n";

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

-   $sth->finish();

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

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

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

+  $sth->finish();

+  return;

+}

+

+# sterg din tabela getdevinfo din baza de date 

+sub delDB {                                    

+  (my $topic) = @_;

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

+  my $query = "DELETE FROM getdevinfo WHERE user=? and devid=? and (camp='Yesterday' || camp='Today')";

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

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

+  $sth->finish();

   return;

 }

 $dbh->disconnect;