fixing to trunk

(bzr r12588.1.34)

1 files changed, 36 insertions, 13 deletions

diff --git a/share/extensions/Barcode/Code128.py b/share/extensions/Barcode/Code128.py
index 8734fc330..618ce7817 100644
--- a/share/extensions/Barcode/Code128.py
+++ b/share/extensions/Barcode/Code128.py
@@ -27,7 +27,29 @@ from Base import Barcode
 import math
 import re
 
-map = [ '11011001100','11001101100','11001100110','10010011000','10010001100','10001001100','10011001000','10011000100','10001100100','11001001000','11001000100','11000100100','10110011100','10011011100','10011001110','10111001100','10011101100','10011100110','11001110010','11001011100','11001001110','11011100100','11001110100','11101101110','11101001100','11100101100','11100100110','11101100100','11100110100','11100110010','11011011000','11011000110','11000110110','10100011000','10001011000','10001000110','10110001000','10001101000','10001100010','11010001000','11000101000','11000100010','10110111000','10110001110','10001101110','10111011000','10111000110','10001110110','11101110110','11010001110','11000101110','11011101000','11011100010','11011101110','11101011000','11101000110','11100010110','11101101000','11101100010','11100011010','11101111010','11001000010','11110001010','10100110000','10100001100','10010110000','10010000110','10000101100','10000100110','10110010000','10110000100','10011010000','10011000010','10000110100','10000110010','11000010010','11001010000','11110111010','11000010100','10001111010','10100111100','10010111100','10010011110','10111100100','10011110100','10011110010','11110100100','11110010100','11110010010','11011011110','11011110110','11110110110','10101111000','10100011110','10001011110','10111101000','10111100010','11110101000','11110100010','10111011110','10111101110','11101011110','11110101110','11010000100','11010010000','11010011100','11000111010','11' ]
+codeMap = [
+        '11011001100','11001101100','11001100110','10010011000','10010001100',
+        '10001001100','10011001000','10011000100','10001100100','11001001000',
+        '11001000100','11000100100','10110011100','10011011100','10011001110',
+        '10111001100','10011101100','10011100110','11001110010','11001011100',
+        '11001001110','11011100100','11001110100','11101101110','11101001100',
+        '11100101100','11100100110','11101100100','11100110100','11100110010',
+        '11011011000','11011000110','11000110110','10100011000','10001011000',
+        '10001000110','10110001000','10001101000','10001100010','11010001000',
+        '11000101000','11000100010','10110111000','10110001110','10001101110',
+        '10111011000','10111000110','10001110110','11101110110','11010001110',
+        '11000101110','11011101000','11011100010','11011101110','11101011000',
+        '11101000110','11100010110','11101101000','11101100010','11100011010',
+        '11101111010','11001000010','11110001010','10100110000','10100001100',
+        '10010110000','10010000110','10000101100','10000100110','10110010000',
+        '10110000100','10011010000','10011000010','10000110100','10000110010',
+        '11000010010','11001010000','11110111010','11000010100','10001111010',
+        '10100111100','10010111100','10010011110','10111100100','10011110100',
+        '10011110010','11110100100','11110010100','11110010010','11011011110',
+        '11011110110','11110110110','10101111000','10100011110','10001011110',
+        '10111101000','10111100010','11110101000','11110100010','10111011110',
+        '10111101110','11101011110','11110101110','11010000100','11010010000',
+        '11010011100','11000111010','11' ]
 
 def mapExtra(sd, chars):
     result = list(sd)
@@ -44,7 +66,8 @@ charAB = list(' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^
 charA = mapExtra(charAB, range(0, 31)) # Offset 64
 charB = mapExtra(charAB, range(96, 125)) # Offset -32
 
-class Object(Barcode):
+class Code128(Barcode):
+    """Main barcode object, generates the encoding bits here"""
     def encode(self, text):
         result = ''
         blocks = []
@@ -65,7 +88,7 @@ class Object(Barcode):
         if block:
             blocks.append(self.bestBlock(block))
             block = '';
-        
+
         self.inclabel = text
         return self.encodeBlocks(blocks)
 
@@ -74,12 +97,12 @@ class Object(Barcode):
         if block.upper() == block:
             return [ 'A', block ]
         return [ 'B', block ]
-        
+
     def encodeBlocks(self, blocks):
         total  = 0
         pos    = 0
         encode = '';
-    
+
         for block in blocks:
             set   = block[0]
             datum = block[1]
@@ -103,7 +126,7 @@ class Object(Barcode):
                 i = 1
 
             total = total + num * i
-            encode = encode + map[num]
+            encode = encode + codeMap[num]
             pos = pos + 1
 
             if set == 'A' or set == 'B':
@@ -113,18 +136,18 @@ class Object(Barcode):
 
                 for char in datum:
                     total = total + (chars.index(char) * pos)
-                    encode = encode + map[chars.index(char)]
+                    encode = encode + codeMap[chars.index(char)]
                     pos = pos + 1
             else:
                 for char in (datum[i:i+2] for i in range(0, len(datum), 2)):
                     total = total + (int(char) * pos)
-                    encode = encode + map[int(char)]
+                    encode = encode + codeMap[int(char)]
                     pos = pos + 1
-    
+
         checksum = total % 103
-        encode = encode + map[checksum]
-        encode = encode + map[106]
-        encode = encode + map[107]
-    
+        encode = encode + codeMap[checksum]
+        encode = encode + codeMap[106]
+        encode = encode + codeMap[107]
+
         return encode