Changeset aded2d1 for server/lib/gutenbach/server/job.py

Timestamp:

Dec 23, 2011, 8:20:29 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

b828a96

Parents:

f6e2532

git-author:

Jessica B. Hamrick <jhamrick@…> (12/23/11 20:20:29)

git-committer:

Jessica B. Hamrick <jhamrick@…> (12/23/11 20:20:29)

Message:

Checkpoint, creating classes for specific IPP attributes

File:

• server/lib/gutenbach/server/job.py (modified) (2 diffs)

server/lib/gutenbach/server/job.py

@@ -1 +1 @@
 from exceptions import InvalidJobException, InvalidPrinterStateException
 import os
+import gutenbach.ipp.object_attributes.job_description_attributes as jda
 
 # initialize logger
@@ -50 +51 @@
     @property
     def job_id(self):
-        return self.jid
+        return jda.JobId(self.jid)
 
     @property
     def job_name(self):
-        return self.name
+        return jda.JobName(self.name)
 
     # XXX: we need to actually calculate this!
     @property
     def job_originating_user_name(self):
-        return "jhamrick"
+        return jda.JobOriginatingUserName("jhamrick")
 
     # XXX: we need to actually calculate this!
     @property
     def job_k_octets(self):
-        return 1
+        return jda.JobKOctets(1)
 
     @property
     def job_state(self):
-        return self.status
+        return jda.JobState(self.status)
 
     @property
     def job_printer_uri(self):
-        return self.printer.uri
+        return jda.JobPrinterUri(self.printer.uri)
 
     def get_job_attributes(self, request):
-        attributes = [(attr, getattr(self, attr)) for attr in self.attributes]
-        attributes = map(lambda x: x if isinstance(x, (tuple, list)) else [x], attributes)
+        attributes = [getattr(self, attr) for attr in self.attributes]
         return attributes