Changeset c269bc7 for server/lib/ippvalue.py

Timestamp:

Mar 7, 2011, 7:47:42 PM (14 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

fa0d0ef

Parents:

5cfb358

git-author:

Jessica B. Hamrick <jhamrick@…> (03/07/11 19:47:42)

git-committer:

Jessica B. Hamrick <jhamrick@…> (03/07/11 19:47:42)

Message:

Update API for Value, Attribute, and AttributeGroup?

File:

• server/lib/ippvalue.py (modified) (10 diffs)

server/lib/ippvalue.py

@@ -65 +65 @@
         self.value_tag    = None # one byte, the type of value
         self.value        = None # non-binary value of self.value
-        self.value_size   = None # size of self.value
+        self.tag_size     = 1    # length of the tag in bytes
+        self.value_size   = None # size of self.value in bytes
         self.binary_value = None # binary value of self.value
 
@@ -72 +73 @@
                 self.value_tag = value_tag
                 self.binary_value = value
-                self.unpack()
-                self.pack()
+                self.value_size, self.value = self.unpack()
             else:
                 self.value_tag = value_tag
                 self.value = value
-                self.pack()
-                self.unpack()
+                self.value_size, self.binary_value = self.pack()
+
+            self.verify()
 
     def unpack(self):
@@ -196 +197 @@
                    "unpacked value is not the same as self.value!"
 
-        self.value_size = value_size
-        self.value = value
-        
         return value_size, value
 
@@ -313 +311 @@
             binary_value = self.value
 
-        if self.value_size is not None:
-            assert value_size == self.value_size, \
-                   "packed value size is not the same as " + \
-                   "self.value_size!"
-        if self.binary_value is not None:
-            assert binary_value == self.binary_value, \
-                   "packed binary value is not the same as " + \
-                   "self.binary_value!"
-
-        self.value_size = value_size
-        self.binary_value = binary_value
-
         return value_size, binary_value
 
@@ -346 +332 @@
                "value type is unknown!"
 
-        self.pack()
-        self.unpack()
+        value_size1, binary_value = self.pack()
+        value_size2, value = self.unpack()
+
+        assert value_size1 == value_size2, \
+               "packed value size is not the same as " + \
+               "unpacked value size!"
+        assert value_size == self.value_size, \
+               "packed value size is not the same as " + \
+               "self.value_size!"
+        assert binary_value == self.binary_value, \
+               "packed binary value is not the same as " + \
+               "self.binary_value!"
 
     def getValue(self):
@@ -371 +367 @@
         return self.value_tag
 
-    def getSize(self):
+    def getValueSize(self):
         """
         Get the size of the value in bytes.
@@ -378 +374 @@
         return self.value_size
 
+    def getTagSize(self):
+        """
+        Get the size of the value tag in bytes.
+        """
+
+        return self.tag_size
+
     def setValue(self, value):
         """
         Set the non-binary value.
         """
-        
+
         self.value = value
 
@@ -389 +392 @@
         Set the binary value.
         """
+
         self.binary_value = binary_value
 
@@ -399 +403 @@
         self.value_tag = value_tag
 
-    def setSize(self, size):
+    def setValueSize(self, size):
         """
         Set the size of the value in bytes.
@@ -405 +409 @@
         
         self.value_size = size
+
+    def getTotalSize(self):
+        """
+        Get the total size of the IPP value.
+        """
+
+        return self.value_size + self.tag_size
 
     def __str__(self):