Merge lp:~jri-openerp/enapps-csv-import-tool/python_csv_reader into lp:~enapps-london-uk/enapps-csv-import-tool/old_trunk

[Juan Rial (OpenERP)]

Fixes 2 issues:
1) LP Bug #999180: multiline text fields weren't properly handled since the file was read and parsed line by line
2) When the separator occurs within a text field (enclosed by string delimiters), the field it split in two, resulting in an incorrect line being parsed

Unmerged revisions

4. By Juan Rial (OpenERP) on 2012-05-18

[FIX] LP Bug #999180: inline trivial file_to_list() functionality

3. By Juan Rial (OpenERP) on 2012-05-18

[FIX] LP Bug #999180: first commit, switching to python's own csv reader.

2. By Enapps Ltd OpenERP Partner London UK on 2012-04-10

fix invalid model reference

=== modified file 'ea_import/ea_import_chain.py'
--- ea_import/ea_import_chain.py	2012-04-10 11:00:44 +0000
+++ ea_import/ea_import_chain.py	2012-05-18 13:19:22 +0000
@@ -24,6 +24,7 @@
 import datetime
 from cStringIO import StringIO
 import time
+import csv
 
 class ea_import_chain(osv.osv):
     _name='ea_import.chain'
@@ -58,13 +59,13 @@
         context['result_ids'] = []
         result_pool = self.pool.get('ea_import.chain.result')
         for chain in self.browse(cr, uid, ids, context=context):
-            csv_list = chain.file_to_list()
+            csv_reader = csv.reader(StringIO(base64.b64decode(chain.input_file)), delimiter=str(chain.separator), quotechar=str(chain.delimiter))
             if chain.header:
-                csv_list.pop(0)
+                csv_reader.next()
             result_ids = {}
             for chain_link in chain.link_ids:
                 result_ids.update({chain_link.template_id.target_model_id.model: set([])})
-            for record_list in csv_list:
+            for record_list in csv_reader:
                 for chain_link in sorted(chain.link_ids, key=lambda k: k.sequence):
                     result_id = chain_link.template_id.generate_record(record_list, context=context)
                     result_ids[chain_link.template_id.target_model_id.model] = result_ids[chain_link.template_id.target_model_id.model] | set(result_id)
@@ -79,19 +80,6 @@
                 context['result_ids'].append(result_ids)
         return True
 
-    def file_to_list(self, cr, uid, ids, context={}):
-        result = []
-        for chain in self.browse(cr, uid, ids, context={}):
-            input_file = StringIO(base64.b64decode(chain.input_file))
-            for string_record in input_file:
-                line = []
-                for field_string in string_record.split(chain.separator):
-                    delimiter = chain.delimiter and chain.delimiter + "\n\r" or "\n\r"
-                    line.append(field_string.strip(delimiter))
-                result.append(line)
-        return result
-
-
 ea_import_chain()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'ea_import/ea_import_template.py'
--- ea_import/ea_import_template.py	2012-04-10 11:00:44 +0000
+++ ea_import/ea_import_template.py	2012-05-18 13:19:22 +0000
@@ -24,6 +24,7 @@
 import base64
 from cStringIO import StringIO
 from types import *
+import csv
 
 class ea_import_template(osv.osv):
     _name='ea_import.template'
@@ -46,10 +47,13 @@
             base_model = template.target_model_id.model
             input_file = StringIO(base64.b64decode(template.test_input_file))
             result = []
+            # Let's hope Python's csv reader is good at guessing delimiter and quotechar since they're stored on chain level.
+            # Then again, this function is never called for the moment. Can be fixed later, when this becomes live code.
+            template_reader = csv.reader(template.test_input_file)
             if template.header:
-                header_string = input_file.readline()
-            for record_string in input_file:
-                record = template.generate_record(record_string)
+                header_row = template_reader.next()
+            for row in template_reader:
+                record = template.generate_record(row)
                 if record and record[0] not in result:
                     result.append(record[0])
             return {