Changeset f6e2532 for server

Timestamp:

Dec 23, 2011, 1:09:01 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

aded2d1

Parents:

94a4825

git-author:

Jessica B. Hamrick <jhamrick@…> (12/23/11 13:09:01)

git-committer:

Jessica B. Hamrick <jhamrick@…> (12/23/11 13:09:01)

Message:

Constants; small changes in printer

Location:

server/lib/gutenbach

Files:

• ipp/__init__.py (modified) (2 diffs)
• ipp/constants.py (modified) (3 diffs)
• server/printer.py (modified) (4 diffs)

server/lib/gutenbach/ipp/__init__.py

@@ -1 +1 @@
 from attribute import Attribute
 from attributegroup import AttributeGroup
-from constants import Tags, StatusCodes
 from request import Request
 from value import Value
+
 import constants
+from constants import *
+
 import exceptions as errors
 
@@ -11 +13 @@
 
 __all__ = ['Attribute', 'AttributeGroup', 'Request', 'Value',
-           'Tags', 'StatusCodes', 'ops', 'errors', 'constants']
+           'ops', 'errors', 'constants']
+__all__.extend(constants.__all__)

server/lib/gutenbach/ipp/constants.py

@@ +1 @@
+__all__ = [
+    'Misc',
+    'JobStates',
+    'PrinterStates',
+    'Operations',
+    'SuccessCodes',
+    'ClientErrorCodes',
+    'ServerErrorCodes',
+    'ErrorCodes',
+    'StatusCodes',
+    'CUPSPrinterType',
+    'AttributeTags',
+    'OutOfBandTags',
+    'IntegerTags',
+    'OctetStringTags',
+    'CharacterStringTags',
+    'operations_attribute_value_tags',
+    'job_attribute_value_tags',
+    'printer_attribute_value_tags',
+]
+
 class Misc():
     """Miscellaneous config options for the IPP server.
@@ -311 +332 @@
     MEMBER_ATTR_NAME      = 0x4a
 
-class Tags(AttributeTags, OutOfBandTags, IntegerTags, OctetStringTags, CharacterStringTags):
-    pass
-
 operations_attribute_value_tags = {
     'attributes-charset': CharacterStringTags.CHARSET,
@@ -349 +367 @@
     "pdl-override-supported": CharacterStringTags.KEYWORD,
     "printer-up-time": IntegerTags.INTEGER,
-    "compression-supported": CharacterStringTags.KEYWORD
+    "compression-supported": CharacterStringTags.KEYWORD,
+    "multiple-operation-time-out": IntegerTags.INTEGER,
+    "multiple-document-jobs-supported": IntegerTags.BOOLEAN
     }
     

server/lib/gutenbach/server/printer.py

@@ -32 +32 @@
         "pdl-override-supported",
         "printer-up-time",
-        "compression-supported"
+        "compression-supported",
+        "multiple-operation-time-out",
+        "multiple-document-jobs-supported",
     ]
+
+    operations = [
+        "print-job",
+        "complete-job",
+        "start-job",
+        "get-job",
+        "get-jobs",
+    ]
+        
 
     #def __init__(self, name, card, mixer):
@@ -102 +113 @@
     def ipp_versions_supported(self):
         return ("1.0", "1.1")
+
     # XXX: We should query ourself for the supported operations
-
     @property
     def operations_supported(self):
-        return 0xa # get-jobs
+        return ipp.Operations.GET_JOBS # get-jobs
 
     @property
@@ -151 +162 @@
     def compression_supported(self):
         return "none"
+
+    @property
+    def multiple_operation_time_out(self):
+        return 240
+
+    @property
+    def multiple_document_jobs_supported(self):
+        return False
 
     def get_printer_attributes(self, request):
@@ -159 +178 @@
 
     ## Printer operations
-    @property
-    def next_jobid(self):
-        self._next_jobid += 1
-        return self._next_jobid
 
     def print_job(self, job):
-        jobid = self.next_jobid
+        jobid = self._next_jobid
+        self._next_jobid += 1
         self.active_jobs.append(jobid)
         self.jobs[jobid] = job