From 2ad10133ccd5b73b98396855fa1d0785c132da0b Mon Sep 17 00:00:00 2001 From: Serghei MIHAI Date: Wed, 20 Nov 2013 16:28:13 +0100 Subject: [PATCH] retreiving the category folder, if provided, or using the default type's folder Closes #3878 --- themis/ocrloader/ocrloader.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/themis/ocrloader/ocrloader.py b/themis/ocrloader/ocrloader.py index 49a8c1f..f548ce9 100644 --- a/themis/ocrloader/ocrloader.py +++ b/themis/ocrloader/ocrloader.py @@ -23,10 +23,11 @@ log = logging.getLogger('Plone') class LoadFromOcr(BrowserView): output_path = '/mnt/gedimport' - def get_folder(self, doctype): + def get_folder(self, doctype, category_folder): portal = getToolByName(self.context, 'portal_url').getPortalObject() folder = portal - for part in themis.config.utils.get_ocr_location(doctype).split('/'): + path = category_folder or themis.config.utils.get_ocr_location(doctype) + for part in path.split('/'): if not part: continue folder = getattr(folder, part) @@ -53,7 +54,7 @@ class LoadFromOcr(BrowserView): for doctype in ('incoming_mails', 'outgoing_mails', 'internal_documents', 'confidential_documents'): try: - category, subcategory = \ + category, subcategory, category_folder = \ themis.config.utils.get_categories_from_ocr_code(code_cat, doctype) except TypeError: continue @@ -62,7 +63,7 @@ class LoadFromOcr(BrowserView): log.warning('no suitable document type found for %s' % filename) continue - folder = self.get_folder(doctype) + folder = self.get_folder(doctype, category_folder) ocr_date = datetime.datetime( int(date[0:4]), int(date[4:6]), int(date[6:]),