Changeset 9fdf4a1 for client/bin

Timestamp:

Aug 10, 2010, 6:58:40 PM (14 years ago)

Author:

Kyle Brogle <broglek@…>

Branches:

master, debian, mac, no-cups

Children:

618236b, 22be2fa

Parents:

0d02eca

git-author:

Kyle Brogle <broglek@…> (08/10/10 18:58:40)

git-committer:

Kyle Brogle <broglek@…> (08/10/10 18:58:40)

Message:

Fixed gbq bug with uninitialized values resulting from having an Artist but
no Title tag

Added more helpful error messages to gb{q,r,rm} when they can't contact the queue

Location:

client/bin

Files:

• gbq (modified) (1 diff)
• gbr (modified) (2 diffs)
• gbrm (modified) (1 diff)

client/bin/gbq

@@ -37 +37 @@
 my $printer = $cups->getDestination("$queue");
 
+unless( $printer){
+    print "Cannot access queue $q...do you have network connectivity and permission to view the queue?\n";
+    exit 1;
+}
 print "Queue listing for queue '$queue' on '$host'\n\n";
 print "Job ID\t\tOwner\t\tTitle\n";

client/bin/gbr

@@ -38 +38 @@
 $cups->setServer("$host");
 my $printer = $cups->getDestination("$queue");
+unless( $printer){
+    print "Cannot access queue $q...do you have network connectivity and permission to view the queue?\n";
+    exit 1;
+}
 my ($jobid, $title);
 
@@ -52 +56 @@
         my $magic = $fileinfo->{FileType};
 
-        if ($magic) {
+        if ($magic && exists($fileinfo->{Title}) && exists($fileinfo->{Artist}) && exists($fileinfo->{Album})) {
             $title = $fileinfo->{'Title'}." - ".$fileinfo->{'Artist'}." - ".$fileinfo->{'Album'};
         }

client/bin/gbrm

@@ -37 +37 @@
 $cups->setServer("$host");
 my $printer = $cups->getDestination("$queue");
+unless( $printer){
+    print "Cannot access queue $q...do you have network connectivity and permission to view the queue?\n";
+    exit 1;
+}
 my @jobs = $printer->getJobs(0, 0);