error messages can have other chars

[freeside.git] / FS / FS / queue.pm

diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index c75f758..d35dc88 100644 (file)
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -1,7 +1,7 @@
 package FS::queue;
 
 use strict;
 package FS::queue;
 
 use strict;

-use vars qw( @ISA @EXPORT_OK $conf );
+use vars qw( @ISA @EXPORT_OK $conf $jobnums);

 use Exporter;
 use FS::UID;
 use FS::Conf;
 use Exporter;
 use FS::UID;
 use FS::Conf;


@@ -18,6 +18,8 @@ $FS::UID::callback{'FS::queue'} = sub {
   $conf = new FS::Conf;
 };
 
   $conf = new FS::Conf;
 };
 

+$jobnums = '';
+

 =head1 NAME
 
 FS::queue - Object methods for queue records
 =head1 NAME
 
 FS::queue - Object methods for queue records


@@ -118,6 +120,8 @@ sub insert {
     }
   }
 
     }
   }
 

+  push @$jobnums, $self->jobnum if $jobnums;
+

   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   '';
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   '';


@@ -192,7 +196,7 @@ sub check {
     || $self->ut_anything('job')
     || $self->ut_numbern('_date')
     || $self->ut_enum('status',['', qw( new locked failed )])
     || $self->ut_anything('job')
     || $self->ut_numbern('_date')
     || $self->ut_enum('status',['', qw( new locked failed )])

-    || $self->ut_textn('statustext')
+    || $self->ut_anything('statustext')

     || $self->ut_numbern('svcnum')
   ;
   return $error if $error;
     || $self->ut_numbern('svcnum')
   ;
   return $error if $error;


@@ -232,22 +236,35 @@ sub cust_svc {
   qsearchs('cust_svc', { 'svcnum' => $self->svcnum } );
 }
 
   qsearchs('cust_svc', { 'svcnum' => $self->svcnum } );
 }
 

+=item queue_depend
+
+Returns the FS::queue_depend objects associated with this job, if any.
+
+=cut
+
+sub queue_depend {
+  my $self = shift;
+  qsearch('queue_depend', { 'jobnum' => $self->jobnum } );
+}
+
+

 =item depend_insert OTHER_JOBNUM
 
 =item depend_insert OTHER_JOBNUM
 

-Inserts a dependancy for this job.  If there is an error, returns the error,
-otherwise returns false.
+Inserts a dependancy for this job - it will not be run until the other job
+specified completes.  If there is an error, returns the error, otherwise
+returns false.

 
 

-When using job dependancies, you should wrap the insertion of jobs in a
-database transaction.  
+When using job dependancies, you should wrap the insertion of all relevant jobs
+in a database transaction.  

 
 =cut
 
 sub depend_insert {
   my($self, $other_jobnum) = @_;
 
 =cut
 
 sub depend_insert {
   my($self, $other_jobnum) = @_;

-  my $queue_depend = new FS::queue_depend (
+  my $queue_depend = new FS::queue_depend ( {

     'jobnum'        => $self->jobnum,
     'depend_jobnum' => $other_jobnum,
     'jobnum'        => $self->jobnum,
     'depend_jobnum' => $other_jobnum,

-  );
+  } );

   $queue_depend->insert;
 }
 
   $queue_depend->insert;
 }
 


@@ -265,6 +282,7 @@ sub joblisting {
   my($hashref, $noactions) = @_;
 
   use Date::Format;
   my($hashref, $noactions) = @_;
 
   use Date::Format;

+  use HTML::Entities;

   use FS::CGI;
 
   my @queue = qsearch( 'queue', $hashref );
   use FS::CGI;
 
   my @queue = qsearch( 'queue', $hashref );


@@ -295,7 +313,9 @@ END
 
     my $args;
     if ( $dangerous || $queue->job !~ /^FS::part_export::/ || !$noactions ) {
 
     my $args;
     if ( $dangerous || $queue->job !~ /^FS::part_export::/ || !$noactions ) {

-      $args = join(' ', $queue->args);
+      $args = encode_entities( join(' ',
+        map { length($_)<54 ? $_ : substr($_,0,32)."..."  } $queue->args #1&g
+      ) );

     } else {
       $args = '';
     }
     } else {
       $args = '';
     }


@@ -303,6 +323,11 @@ END
     my $date = time2str( "%a %b %e %T %Y", $queue->_date );
     my $status = $queue->status;
     $status .= ': '. $queue->statustext if $queue->statustext;
     my $date = time2str( "%a %b %e %T %Y", $queue->_date );
     my $status = $queue->status;
     $status .= ': '. $queue->statustext if $queue->statustext;

+    my @queue_depend = $queue->queue_depend;
+    $status .= ' (waiting for '.
+               join(', ', map { $_->depend_jobnum } @queue_depend ). 
+               ')'
+      if @queue_depend;

     my $changable = $dangerous
          || ( ! $noactions && $status =~ /^failed/ || $status =~ /^locked/ );
     if ( $changable ) {
     my $changable = $dangerous
          || ( ! $noactions && $status =~ /^failed/ || $status =~ /^locked/ );
     if ( $changable ) {


@@ -360,10 +385,12 @@ END
 
 =head1 VERSION
 
 
 =head1 VERSION
 

-$Id: queue.pm,v 1.12 2002-05-15 13:24:24 ivan Exp $
+$Id: queue.pm,v 1.15 2002-07-02 06:48:59 ivan Exp $

 
 =head1 BUGS
 
 
 =head1 BUGS
 

+$jobnums global
+

 =head1 SEE ALSO
 
 L<FS::Record>, schema.html from the base documentation.
 =head1 SEE ALSO
 
 L<FS::Record>, schema.html from the base documentation.