Changeset c1dc25f

Timestamp:

Jan 21, 2012, 3:43:44 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

56fd535

Parents:

9da7428

git-author:

Jessica B. Hamrick <jhamrick@…> (01/21/12 15:43:44)

git-committer:

Jessica B. Hamrick <jhamrick@…> (01/21/12 15:43:44)

Message:

Send URI added to printer.py

Location:

server/lib

Files:

• TODO (modified) (1 diff)
• gutenbach/server/printer.py (modified) (1 diff)
• gutenbach/server/requests.py (modified) (3 diffs)

server/lib/TODO

@@ -19 +19 @@
      [ ] resume printer
      [\] set printer attributes
-     [ ] send uri
+     [\] send uri
      [\] set job attributes
      [X] restart job

server/lib/gutenbach/server/printer.py

@@ -452 +452 @@
         job.spool(document)
 
-    def send_uri(self):
-        pass
+    def send_uri(self, job_id, document_uri, document_name=None,
+                 document_format=None, document_natural_language=None,
+                 requesting_user_name=None, compression=None,
+                 last_document=None):
+        job = self.get_job(job_id)
+        # XXX: need to validate URI
+        # XXX: need to deal with the URI stream?
+        #job.spool_uri(document_uri)
 
     def get_job_attributes(self, job_id, requested_attributes=None):

server/lib/gutenbach/server/requests.py

@@ -930 +930 @@
             REQUIRED 'job-id' (integer(1:MAX)) and 'printer-uri' (uri)
             REQUIRED 'document-uri' (uri)
-              -or-   'job-uri' (uri)
+            OPTIONAL 'job-uri' (uri)
             OPTIONAL 'requesting-user-name' (name(MAX))
             OPTIONAL 'document-name' (name(MAX))
@@ -936 +936 @@
             OPTIONAL 'document-format' (mimeMediaType)
             OPTIONAL 'document-natural-language' (naturalLanguage)
-        Group 2: Document Content
             
         Response
@@ -1014 +1013 @@
             self.printer.send_uri(
                 job_id,
-                document_uri=document_uri,
+                document_uri,
                 document_name=document_name,
                 document_format=document_format,