Changeset 6c60b2e

Timestamp:

Jan 21, 2012, 6:25:33 PM (12 years ago)

Author:

Daniel Cooper <danny@…>

Branches:

no-cups

Children:

0494098, 079ef11

Parents:

7f1098c

git-author:

Daniel Cooper <danny@…> (01/21/12 18:25:33)

git-committer:

Daniel Cooper <danny@…> (01/21/12 18:25:33)

Message:

completed print_job function definition in request.py

File:

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

server/lib/gutenbach/server/requests.py

@@ -125 +125 @@
     @handler_for(ipp.OperationCodes.PRINT_JOB)
     def print_job(self, request, response):
-        """RFC 2911: 3.2.1 Print-Job Operation
+            """RFC 2911: 3.2.1 Print-Job Operation
 
         This REQUIRED operation allows a client to submit a print job
@@ -199 +199 @@
         # get attributes from the printer and add to response
         job_id = self.printer.create_job(
-            requesting_user_name=requesting_user_name,
+            requesting_user_name=user_name,
             job_name=job_name,
             job_k_octets=job_k_octets)
@@ -208 +208 @@
         # Get nescessary information for calling send_document
         # Any field being set to None here just means that we either aren't using or haven't implemented parsing it
-        document = request.attribute_groups[2]
+        document = request.data        
         #XXX
         document_format = None
@@ -218 +218 @@
         
         # Actually put the document in the job
-        self.printer.send_document(job_id,document,
+        try:
+            self.printer.send_document(job_id,document,
+                    document_name = document_name,
+                    document_format = document_format,
+                    document_natural_language = document_natural_language,
+                    requesting_user_name = requesting_user_name,
+                    compression = compression,
+                    last_document = last_document)
+        except InvalidJobException:
+            raise ipp.errors.ClientErrorNotFound("bad job: %d" % job_id)
+
+        
+        # Print the job, now that we've filled it in as appropriate
+       
+       #XXX
+       #Should we be handling a possible exception here?
+        self.print_job(document,
                 document_name = document_name,
                 document_format = document_format,
                 document_natural_language = document_natural_language,
                 requesting_user_name = requesting_user_name,
-                compression = compression,
-                last_document = last_document)
-        #fix this once jess pushes
-        self.print_job()
+                compression=compression,
+                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, attrs))
+
     @handler_for(ipp.OperationCodes.VALIDATE_JOB)
     def validate_job(self, request, response):