projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fed3782
)
add start of torrus srvderive daemon, RT#10574
author
ivan
<ivan>
Sun, 27 Feb 2011 19:34:09 +0000
(19:34 +0000)
committer
ivan
<ivan>
Sun, 27 Feb 2011 19:34:09 +0000
(19:34 +0000)
FS/bin/freeside-torrus-srvderive
patch
|
blob
|
history
diff --git
a/FS/bin/freeside-torrus-srvderive
b/FS/bin/freeside-torrus-srvderive
index
0615410
..
b645016
100644
(file)
--- a/
FS/bin/freeside-torrus-srvderive
+++ b/
FS/bin/freeside-torrus-srvderive
@@
-40,8
+40,6
@@
my $other_date = concat_sql([ 'other.srv_date', "' '", 'other.srv_time' ]);
$other_date = "CAST( $other_date AS TIMESTAMP )" if driver_name =~ /^Pg/i;
$other_date = str2time_sql. $other_date. str2time_sql_closing;
$other_date = "CAST( $other_date AS TIMESTAMP )" if driver_name =~ /^Pg/i;
$other_date = str2time_sql. $other_date. str2time_sql_closing;
-my $within = "ABS( $_date - $other_date ) <= 60";
-
my $in = concat_sql([ '?', "'_IN'" ]);
my $out = concat_sql([ '?', "'_OUT'" ]);
my $in = concat_sql([ '?', "'_IN'" ]);
my $out = concat_sql([ '?', "'_OUT'" ]);
@@
-50,7
+48,7
@@
my $sql = "
WHERE NOT EXISTS (
SELECT 1 FROM srvexport AS other
WHERE other.serviceid IN ( $in, $out )
WHERE NOT EXISTS (
SELECT 1 FROM srvexport AS other
WHERE other.serviceid IN ( $in, $out )
- AND
$within
+ AND
ABS( $_date - $other_date ) <= 60
)
ORDER BY srv_date, srv_time
LIMIT 100
)
ORDER BY srv_date, srv_time
LIMIT 100
@@
-64,7
+62,7
@@
while (1) {
my $serviceid = $torrus_srvderive->serviceid;
my $serviceid = $torrus_srvderive->serviceid;
- warn $sql if $DEBUG >
1
;
+ warn $sql if $DEBUG >
2
;
my $sth = dbh->prepare($sql) or die $DBI::errstr; #better recovery?
$sth->execute($serviceid, $serviceid) or die $sth->errstr;
my $prev = 0;
my $sth = dbh->prepare($sql) or die $DBI::errstr; #better recovery?
$sth->execute($serviceid, $serviceid) or die $sth->errstr;
my $prev = 0;
@@
-86,7
+84,7
@@
while (1) {
my $sum = "
SELECT SUM(value) FROM srvexport AS other
WHERE other.serviceid IN ($sin)
my $sum = "
SELECT SUM(value) FROM srvexport AS other
WHERE other.serviceid IN ($sin)
- AND
$within
+ AND
ABS( $cur - $other_date ) <= 60
";
my $isql = "
";
my $isql = "
@@
-99,7
+97,7
@@
while (1) {
300, #intvl ...
);
warn $isql. ' with param '. @param. "\n"
300, #intvl ...
);
warn $isql. ' with param '. @param. "\n"
- if $DEBUG;
+ if $DEBUG
> 1
;
my $isth = dbh->prepare($isql) or die $DBI::errstr; #better recovery?
$isth->execute( @param ) or die $isth->errstr;
my $isth = dbh->prepare($isql) or die $DBI::errstr; #better recovery?
$isth->execute( @param ) or die $isth->errstr;