[COMMIT LOGREPORT] service/print/lib/Lire/DlfConverters CUPS.pm,1.1,1.2

[Joost van Baal]

Update of /cvsroot/logreport/service/print/lib/Lire/DlfConverters
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16733

Modified Files:
	CUPS.pm 
Log Message:
allow for extra " - " to occur in page_log. Thanks Marco Gaiarin for the bugreport.  (Debian Bug #313545)

Index: CUPS.pm
===================================================================
RCS file: /cvsroot/logreport/service/print/lib/Lire/DlfConverters/CUPS.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CUPS.pm	18 May 2004 21:49:47 -0000	1.1
+++ CUPS.pm	22 Jul 2006 11:57:30 -0000	1.2
@@ -62,8 +62,10 @@
 sub process_log_line {
     my ($self, $process, $line) = @_;
 
+    # snoopy ANGELA 2 [09/Jun/2005:12:50:37 +0200] 1 1 - 10.27.1.223
+    # lp joostvb 87 [22/Jul/2006:13:37:27 +0200] 1 1 - localhost
     my ( $printer, $user, $job_id, $clftime, $pagenum, $ncopies, $billing )
-      = $line =~ /^([^ ]*) ([^ ]*) ([^ ]*) (\[[^]]+\]) ([^ ]*) ([^ ]*)(?:\s([^ ]*))?$/;
+      = $line =~ /^([^ ]*) ([^ ]*) ([^ ]*) (\[[^]]+\]) ([^ ]*) ([^ ]*)(?: -)?(?:\s([^ ]*))?$/;
     unless ( $printer ) {
         $process->error( 'invalid page_log line', $line );
         return;

-- 
To UNSUBSCRIBE, email to commit-request at logreport.org with a subject of 
"unsubscribe". Trouble? Send an email with subject "help" to 
commit-request at logreport.org