[freeside-commits] freeside/FS/bin freeside-torrus-srvderive, 1.25, 1.26

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/bin
In directory wavetail.420.am:/tmp/cvs-serv6197/FS/bin

Modified Files:
	freeside-torrus-srvderive 
Log Message:
add start of torrus srvderive daemon, RT#10574

Index: freeside-torrus-srvderive
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/bin/freeside-torrus-srvderive,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -w -d -r1.25 -r1.26
--- freeside-torrus-srvderive	27 Feb 2011 21:47:22 -0000	1.25
+++ freeside-torrus-srvderive	27 Feb 2011 22:04:31 -0000	1.26
@@ -82,9 +82,13 @@
                            AND srvexport.srv_date = other.srv_date
                            AND ABS( $_date - $other_date ) <= 60
                      )
-      $orderlimit
     ";
 
+    $ssql .= " AND srv_date >= '". $torrus_srvderive->last_srv_date. "' "
+      if $torrus_srvderive->last_srv_date;
+
+    $ssql .= $orderlimit;
+
     warn $ssql if $DEBUG > 1;
     my $sth = dbh->prepare($ssql) or die $DBI::errstr; #better recovery?
     $sth->execute($serviceid, $serviceid) or die $sth->errstr;
@@ -125,10 +129,17 @@
 
         my $isth = dbh->prepare($isql) or die $DBI::errstr; #better recovery?
         $isth->execute( @param )       or die $isth->errstr;
-        dbh->commit                    or die dbh->errstr;
                         
       }
 
+      if ( $srv_date ne $torrus_srvderive->last_srv_date ) {
+        warn "updating last_srv_date of $serviceid to $srv_date\n" if $DEBUG;
+        $torrus_srvderive->last_srv_date($srv_date);
+        my $error = $torrus_srvderive->replace;
+        die $error if $error;
+      }
+      dbh->commit or die dbh->errstr;
+
       $prev = $cur;
     }