@@ -1,12 +1,13 @@

 #!/usr/bin/perl

 # parser pentru mesajele MQTT

-# Version: 1.0.2

+# Version: 1.0.3

 use strict;

 use warnings;

 use JSON qw( decode_json );

 use DBI;

 use Proc::Daemon;

+use POSIX qw(strftime);

 # pentru debug pun daemon=0 ca sa nu mai ruleze ca daemon

 my $daemon=1;

@@ -52,10 +53,14 @@ while (my $mqttMessage = <$SUB> ) {

     if (index($mqttMessage, "{") == -1) {

       #print "Mesajul nu contine json, il sparg dupa spatiu\n"

       (my $channel, my $nonjson) = split /\ /, $mqttMessage, 2;

+      chomp($nonjson);

       (my $root, my $topic, my $queue) = split /\//, $channel;

       # aleg canalele de unde salvez date in DB:

       if ($queue eq "LWT"){

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

+        #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');");

+        }        

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

       }

       else {

@@ -73,14 +78,21 @@ while (my $mqttMessage = <$SUB> ) {

       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);

-        my $yesterday = $decoded->{'Yesterday'};

-        my $today = $decoded->{'Today'};

-        getdevinfoFILE ($topic, "Yesterday", $yesterday);

-        getdevinfoDB ($topic, "Yesterday", $yesterday);

-        getdevinfoFILE ($topic, "Today", $today);

-        getdevinfoDB ($topic, "Today", $today);

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

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

+        }

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

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

+        }

       }

       if ($queue eq "ESP"){

+        my $decoded = decode_json($json);

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

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

+        }

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

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

+        }

       }

     }

   }

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

     #print 'Nu ma intereseaza mesajele astea!\n$mqttMessage';

   }

 }

-$dbh->disconnect;

 if ($daemon==1){

   while ($continue) {

@@ -97,21 +108,41 @@ if ($daemon==1){

 sub getdevinfoFILE {

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

-  my $cale='/admin/scripts/mqtt-perl/mqttparser.devel.txt';

-  my $tm=localtime;

-  open (my $fh, '>>', $cale) or die "Cannot open";

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

-  print $fh "$tm: Update FILE getdevinfo: $user - $devid - $camp - $valoare\n";

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

+  my $filename;

+  if ($camp eq "Temp"){

+    $filename="temperatura.txt";

+  }

+  if ($camp eq "Humi"){

+    $filename="umiditate.txt";

+  }

+  my $folder = $cale.$topic;

+  unless(-e $folder or mkdir $folder) {

+  }

+  my $cale_fisier=$folder."/".$filename;

+  my $newline="";

+  if (-e $cale_fisier) {

+    $newline=",\n";

+  }  

+  my $month=strftime("%m", localtime(time)); 

+  $month--;

+  my $date = strftime("[Date.UTC(%Y,$month,%d,%H,%M,%S)", localtime(time));

+  my $graph = $newline.$date.", ".$valoare."]";  

+  open (my $fh, '>>', $cale_fisier) or die "Cannot open $cale_fisier";

+  print $fh "$graph";

   close $fh;

   return;

 }

 sub getdevinfoDB {                                                    

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

-   my $query = "insert into mqttparser values (?, ?, ?)";

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

-   my $tm=localtime;

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

-   $sqlQuery->execute('0', "$tm", "$user - $devid - $camp - $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();

   return;

 }

+$dbh->disconnect;