Changeset cf32fee for server

Timestamp:

Dec 20, 2011, 11:56:46 AM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

71bfce0

Parents:

dc40fe9

git-author:

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

git-committer:

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

Message:

Add/update helper functions in ipp/operations

File:

• server/lib/gutenbach/ipp/operations.py (modified) (3 diffs)

server/lib/gutenbach/ipp/operations.py

@@ -22 +22 @@
             "Attribute group does not have OPERATION tag: 0x%x" % op_attrs.tag)
 
-    # check charset attribute
+    # XXX: check version
+    if False:
+        raise err.VersionNotSupported(str(request.version))
+
+    # check operation id
+    if False:
+        raise err.OperationNotSupported(str(request.operation_id))
+
+    # # check compression
+    # if False:
+    #     raise err.CompressionNotSupported
+
+    # # check document format
+    # if False:
+    #     raise err.DocumentFormatNotSupported
+
+    # # check document uri
+    # if False:
+    #     raise err.UriSchemeNotSupported
+
+    # check charset
+    charset attribute
     charset_attr = op_attrs.attributes[0]
     if charset_attr.name != 'attributes-charset':
@@ -37 +58 @@
             "Charset value does not have CHARSET tag: 0x%x" % charset_value.tag)
     if charset_value.value != 'utf-8':
-        raise err.Charset(
-            "Invalid charset value: %s" % charset_value.value)
+        raise err.CharsetNotSupported(str(charset_value.value))
 
     # check for attributes-natural-language
@@ -72 +92 @@
             requser_value.tag)
     return requser_value.value
+
+def make_empty_response(request):
+    # Operation attributes -- typically the same for any request
+    attributes = [
+        ipp.Attribute(
+            'attributes-charset',
+            [ipp.Value(ipp.Tags.CHARSET, 'utf-8')]),
+        ipp.Attribute(
+            'attributes-natural-language',
+            [ipp.Value(ipp.Tags.NATURAL_LANGUAGE, 'en-us')])
+        ]
+    # Put the operation attributes in a group
+    attribute_group = ipp.AttributeGroup(
+        const.AttributeTags.OPERATION,
+        attributes)
+
+    # Set up the default response -- handlers will override these
+    # values if they need to
+    response_kwargs = {}
+    response_kwargs['version']          = request.version
+    response_kwargs['operation_id']     = const.StatusCodes.OK
+    response_kwargs['request_id']       = request.request_id
+    response_kwargs['attribute_groups'] = [attribute_group]
+    response = ipp.Request(**response_kwargs)
+
+    return response
+
+#### GET-JOBS
 
 def verify_get_jobs_request(request):