embee/pyaccuwage
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

removed blank field counter, replaced with hash digest of rowspan

Browse source
This commit is contained in:
Binh 2013-03-20 15:49:16 -05:00
parent 456c15eb1c
commit 8cf78b5336
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pyaccuwage/model.py
View file

@ -57,11 +57,9 @@ class Model(object):
[field.get_data() for field in self.get_sorted_fields()]) [field.get_data() for field in self.get_sorted_fields()])
if len(result) != self.record_length: if len(result) != self.record_length:
raise ValidationError("Record result length not equal to %d bytes (%d)" % (self.record_length, len(result))) raise ValidationError("Record result length not equal to %d bytes (%d)" % (self.record_length, len(result)))
#result = ''.join([self.record_identifier] + [field.get_data() for field in self.get_sorted_fields()]) #result = ''.join([self.record_identifier] + [field.get_data() for field in self.get_sorted_fields()])
#if len(result) != self.target_size: #if len(result) != self.target_size:
# raise ValidationError("Record result length not equal to %d bytes (%d)" % (self.target_size, len(result))) # raise ValidationError("Record result length not equal to %d bytes (%d)" % (self.target_size, len(result)))
return result return result
def read(self, fp): def read(self, fp):

11
pyaccuwage/parser.py
View file

@ -6,7 +6,7 @@ convert it into python classes.
""" """
import re import re
import hashlib
class SimpleDefParser(object): class SimpleDefParser(object):
def __init__(self): def __init__(self):
@ -132,7 +132,7 @@ class RecordBuilder(object):
(fields.BlankField, { (fields.BlankField, {
'regexp': { 'regexp': {
'name': [ 'name': [
(re.compile(r'^blank$', re.IGNORECASE), +1), (re.compile(r'^blank$', re.IGNORECASE), +3),
], ],
}, },
}), }),
@ -262,15 +262,16 @@ class RecordBuilder(object):
yield entry yield entry
def _convert_to_records(self, entries): def _convert_to_records(self, entries):
blank_count = 1 #blank_count = 1
for entry in entries: for entry in entries:
result = [] result = []
add = result.append add = result.append
# FIELD NAME # FIELD NAME
if entry['name'] == 'blank': if entry['name'] == 'blank':
add( (u'blank%d' % blank_count).ljust(40) ) blank_id = hashlib.new('md5')
blank_count += 1 blank_id.update(entry['range'].encode())
add( (u'blank_%s' % blank_id.hexdigest()[:8]).ljust(40) )
else: else:
add(entry['name'].ljust(40)) add(entry['name'].ljust(40))