Changeset 33ea505 for server/lib/gutenbach/server/requests.py

Timestamp:

Jan 11, 2012, 6:58:43 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

09790fe

Parents:

4126d3d

git-author:

Jessica B. Hamrick <jhamrick@…> (01/11/12 18:58:43)

git-committer:

Jessica B. Hamrick <jhamrick@…> (01/11/12 18:58:43)

Message:

Keep IPP code in GutenbachPrinter?, not in GutenbachJob?

File:

• server/lib/gutenbach/server/requests.py (modified) (5 diffs)

server/lib/gutenbach/server/requests.py

@@ -258 +258 @@
             
         # get the job attributes and add them to the response
-        jobs = self.printer.get_jobs(
+        job_attrs = self.printer.get_jobs(
             which_jobs=which_jobs,
-            requesting_user_name=user)
-        for job in jobs:
-            attrs = job.get_job_attributes(requested_attributes=attributes)
+            requesting_user_name=user,
+            requested_attributes=attributes)
+        for attrs in job_attrs:
             response.attribute_groups.append(ipp.AttributeGroup(
                 ipp.AttributeTags.JOB, attrs))
@@ -354 +354 @@
 
         # get attributes from the printer and add to response
-        job = self.printer.create_job(
+        job_id = self.printer.create_job(
             requesting_user_name=requesting_user_name,
             job_name=job_name,
             job_k_octets=job_k_octets)
+        attrs = self.printer.get_job_attributes(job_id)
         response.attribute_groups.append(ipp.AttributeGroup(
-            ipp.AttributeTags.JOB, job.get_job_attributes()))
+            ipp.AttributeTags.JOB, attrs))
     
     @handler_for(ipp.OperationCodes.PAUSE_PRINTER)
@@ -536 +537 @@
 
         if 'requesting-user-name' in operation:
-            user_name = verify_attribute(
+            requesting_user_name = verify_attribute(
                 operation['requesting-user-name'], ipp.RequestingUserName)[0]
 
         try:
-            job = self.printer.get_job(job_id)
-            job.cancel()
+            self.printer.cancel_job(job_id, requesting_user_name=requesting_user_name)
         except InvalidJobException:
             raise ipp.errors.ClientErrorNotFound("bad job: %d" % job_id)
@@ -681 +681 @@
 
         try:
-            job = self.printer.get_job(job_id)
-            job.send_document(
+            self.printer.send_document(
+                job_id,
                 request.data,
-                requesting_user_name=user_name,
                 document_name=document_name,
-                compression=compression,
                 document_format=document_format,
                 document_natural_language=document_natural_language,
+                requesting_user_name=user_name,
+                compression=compression,
                 last_document=last_document)
-            attrs = job.get_job_attributes()
+            attrs = self.printer.get_job_attributes(job_id)
         except InvalidJobException:
             raise ipp.errors.ClientErrorNotFound("bad job: %d" % job_id)
@@ -796 +796 @@
         # get the job attributes and add them to the response
         try:
-            job = self.printer.get_job(job_id)
-            attrs = job.get_job_attributes(requested_attributes=requested_attributes)
+            attrs = self.printer.get_job_attributes(
+                job_id,
+                requested_attributes=requested_attributes)
         except InvalidJobException:
             raise ipp.errors.ClientErrorNotFound("bad job: %d" % job_id)