Merge pull request #165 from javaTheHutts/162_tweak_text_manager

162 tweak text manager closes #162

Author: AndreasNel

src/main/python/image_processing/text_manager.py

@@ -59,18 +59,18 @@ def __init__(self):
             'multi_line': False
         }, {
             'field': 'surname',
-            'find': ['surname'],
+            'find': ['surname', 'vansurname'],
             'field_type': FieldType.TEXT_ONLY,
             'to_uppercase': False,
             'multi_line': True,
-            'multi_line_end': ['names', 'fore names']
+            'multi_line_end': ['forenames', 'names', 'voornameforenames']
         }, {
             'field': 'names',
-            'find': ['names', 'fore names'],
+            'find': ['forenames', 'names', 'voornameforenames'],
             'field_type': FieldType.TEXT_ONLY,
             'to_uppercase': False,
             'multi_line': True,
-            'multi_line_end': ['sex', 'country of birth']
+            'multi_line_end': ['country of birth', 'sex', 'geboortedistrik of-land']
         }, {
             'field': 'sex',
             'find': ['sex'],
@@ -85,7 +85,7 @@ def __init__(self):
             'multi_line': False
         }, {
             'field': 'country_of_birth',
-            'find': ['country of birth'],
+            'find': ['country of birth', 'district or country of birth'],
             'field_type': FieldType.TEXT_ONLY,
             'to_uppercase': True,
             'multi_line': False
@@ -258,9 +258,6 @@ def dictify(self, id_string, barcode_data=None, fuzzy_min_ratio=60.0, max_multi_
         # create a dictionary object and populate it with
         # relevant information from said text.
         id_info = {}
-        # Attempt to populate id_info.
-        logger.debug('Extracting details from the given text string...')
-        self._populate_id_information(id_string, id_info, fuzzy_min_ratio, max_multi_line)
         # Check if barcode data, containing the id number, exists and
         # if so, save it and extract some relevant information from it.
         # It should overwrite any existing fields that can be extracted from the id number, since
@@ -269,6 +266,9 @@ def dictify(self, id_string, barcode_data=None, fuzzy_min_ratio=60.0, max_multi_
             logger.debug('Extracting details from barcode data...')
             id_info['identity_number'] = barcode_data['identity_number']
             self._id_number_information_extraction(id_info, barcode_data['identity_number'])
+        # Attempt to populate id_info with information from the given ID string.
+        logger.debug('Extracting details from the given text string...')
+        self._populate_id_information(id_string, id_info, fuzzy_min_ratio, max_multi_line)
         # Perform some custom post-processing on the information that was extracted.
         logger.debug('Post-processing some field values...')
         self._post_process(id_info)
@@ -331,20 +331,17 @@ def _populate_id_information(self, id_string, id_info, fuzzy_min_ratio, max_mult
         id_string_list = id_string.split('\n')
         # Attempt to retrieve matches.
         for match_context in self.match_contexts:
-            # Logging for debugging purposes.
-            logger.debug('Searching for field value for "%s"' % match_context['field'])
             # Extract desired field name from context as key.
             key = match_context['field']
             # Only retrieve information if it does not exist or it could not previously
             # be determined.
-            id_info[key] = self._get_match(id_string_list, match_context, fuzzy_min_ratio, max_multi_line)
-            # Logging for debugging purposes.
-            logger.debug('%s value found for "%s"' % ('Field' if id_info[key] else 'No field', match_context['field']))
-        # If the ID number has been retrieved, use it to extract other useful information.
-        # It should overwrite any existing fields that can be extracted from the id number, since
-        # the information embedded within the id number is more reliable, at least theoretically.
-        if id_info['identity_number']:
-            self._id_number_information_extraction(id_info, id_info['identity_number'])
+            if key not in id_info or not id_info[key]:
+                id_info[key] = self._get_match(id_string_list, match_context, fuzzy_min_ratio, max_multi_line)
+                # If the ID number has been retrieved, use it to extract other useful information.
+                # It should overwrite any existing fields that can be extracted from the id number, since
+                # the information embedded within the id number is more reliable, at least theoretically.
+                if key == 'identity_number' and id_info[key]:
+                    self._id_number_information_extraction(id_info, id_info[key])
 
     @staticmethod
     def _get_match(id_string_list, match_context, fuzzy_min_ratio, max_multi_line):