projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
handle domestic_prefix of 0, RT#11390
[freeside.git]
/
FS
/
FS
/
queue.pm
diff --git
a/FS/FS/queue.pm
b/FS/FS/queue.pm
index
1f2abe3
..
3f8763d
100644
(file)
--- a/
FS/FS/queue.pm
+++ b/
FS/FS/queue.pm
@@
-12,6
+12,7
@@
use FS::Record qw( qsearch qsearchs dbh );
use FS::queue_arg;
use FS::queue_depend;
use FS::cust_svc;
use FS::queue_arg;
use FS::queue_depend;
use FS::cust_svc;
+use FS::CGI qw(rooturl);
@ISA = qw(FS::Record);
@EXPORT_OK = qw( joblisting );
@ISA = qw(FS::Record);
@EXPORT_OK = qw( joblisting );
@@
-66,6
+67,20
@@
Job status (new, locked, or failed)
Freeform text status message
Freeform text status message
+=cut
+
+sub statustext {
+ my $self = shift;
+ if ( defined ( $_[0] ) ) {
+ $self->SUPER::statustext(@_);
+ } else {
+ my $value = $self->SUPER::statustext();
+ my $rooturl = rooturl();
+ $value =~ s/%%%ROOTURL%%%/$rooturl/g;
+ $value;
+ }
+}
+
=item _date
UNIX timestamp
=item _date
UNIX timestamp
@@
-192,6
+207,14
@@
sub delete {
my @del = qsearch( 'queue_arg', { 'jobnum' => $self->jobnum } );
push @del, qsearch( 'queue_depend', { 'depend_jobnum' => $self->jobnum } );
my @del = qsearch( 'queue_arg', { 'jobnum' => $self->jobnum } );
push @del, qsearch( 'queue_depend', { 'depend_jobnum' => $self->jobnum } );
+ my $reportname = '';
+ if ( $self->status =~/^done/ ) {
+ my $dropstring = rooturl(). '/misc/queued_report\?report=';
+ if ($self->statustext =~ /.*$dropstring([.\w]+)\>/) {
+ $reportname = "$FS::UID::cache_dir/cache.$FS::UID::datasrc/report.$1";
+ }
+ }
+
my $error = $self->SUPER::delete;
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
my $error = $self->SUPER::delete;
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
@@
-207,6
+230,8
@@
sub delete {
}
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
}
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+ unlink $reportname if $reportname;
'';
'';
@@
-235,7
+260,7
@@
sub check {
$self->ut_numbern('jobnum')
|| $self->ut_anything('job')
|| $self->ut_numbern('_date')
$self->ut_numbern('jobnum')
|| $self->ut_anything('job')
|| $self->ut_numbern('_date')
- || $self->ut_enum('status',['', qw( new locked failed )])
+ || $self->ut_enum('status',['', qw( new locked failed
done
)])
|| $self->ut_anything('statustext')
|| $self->ut_numbern('svcnum')
;
|| $self->ut_anything('statustext')
|| $self->ut_numbern('svcnum')
;
@@
-352,7
+377,7
@@
If there is an error, returns the error, otherwise returns false.
use vars qw($_update_statustext_dbh);
sub update_statustext {
my( $self, $statustext ) = @_;
use vars qw($_update_statustext_dbh);
sub update_statustext {
my( $self, $statustext ) = @_;
- return '' if $statustext eq $self->
statustext;
+ return '' if $statustext eq $self->
get('statustext'); #avoid rooturl expansion
warn "updating statustext for $self to $statustext" if $DEBUG;
$_update_statustext_dbh ||= myconnect;
warn "updating statustext for $self to $statustext" if $DEBUG;
$_update_statustext_dbh ||= myconnect;
@@
-363,7
+388,7
@@
sub update_statustext {
$sth->execute($statustext, $self->jobnum) or return $sth->errstr;
$_update_statustext_dbh->commit or die $_update_statustext_dbh->errstr;
$sth->execute($statustext, $self->jobnum) or return $sth->errstr;
$_update_statustext_dbh->commit or die $_update_statustext_dbh->errstr;
- $self->s
tatustext($statustext);
+ $self->s
et('statustext', $statustext); #avoid rooturl expansion
'';
#my $new = new FS::queue { $self->hash };
'';
#my $new = new FS::queue { $self->hash };