Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Now reader don't ignore more blank lines, since can be useful to user…
…s know what line is blank. Also, improved some error reporting.
  • Loading branch information
Felipe Prenholato committed Nov 3, 2011
1 parent 3d9e8f6 commit 9b4bbb9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
8 changes: 7 additions & 1 deletion data_importer/base.py
Expand Up @@ -9,6 +9,7 @@
from data_importer.exceptions import UnknowSource
from data_importer.readers import *
import sys
import traceback
import logging

class FailedInStart(Exception):
Expand Down Expand Up @@ -82,7 +83,6 @@ def _get_reader(self,reader=None,reader_kwargs={}):
raise ValueError,_(u"Doesn't exist a relation between file extension and a reader. You should specify a reader from data_importer.readers or crete your own.")
return READERS_X_EXTENSIONS[parts[-1].lower()](self.import_file,**reader_kwargs)
except Exception, err:
import traceback
exc_info = sys.exc_info()
self.logger.debug("\n".join(traceback.format_exception(*exc_info)))
self.logger.critical(_("Something goes wrong when try to read the file!"))
Expand Down Expand Up @@ -161,6 +161,10 @@ def _clean(self,i,_row):
if i in self._validation_results:
return self._validation_results[i]

if not any(_row.values()):
self.logger.warning(u"Linha %s é vazia, foi ignorada." % i)
return

line_errors = SortedDict()
row = _row.copy()
row['_i'] = i
Expand Down Expand Up @@ -233,6 +237,8 @@ def save_gen(self):
pass
return rows
except Exception, err:
exc_info = sys.exc_info()
self.logger.debug(self.logger.debug("\n".join(traceback.format_exception(*exc_info))))
self.logger.critical(_("Process stoped with error %s."),err)


Expand Down
2 changes: 1 addition & 1 deletion data_importer/readers/csv_reader.py
Expand Up @@ -13,5 +13,5 @@ def set_reader(self):

def get_items(self):
for row in self._reader:
if not row: continue
#if not row: continue
yield self.get_item(row)
4 changes: 2 additions & 2 deletions data_importer/readers/xls_reader.py
Expand Up @@ -29,7 +29,7 @@ def headers(self):
def get_items(self):
for r in range(1,self.nrows):
values = [self._reader.cell(r,c).value for c in range(self.ncols)]
if not any(values): continue
#if not any(values): continue
yield self.get_item(values)

class XLSXReader(XLSReader):
Expand All @@ -50,7 +50,7 @@ def headers(self):
def get_items(self):
for row in self._reader.rows[1:]:
values = [c.value for c in list(row)]
if not any(values): continue
#if not any(values): continue
yield self.get_item(values)


0 comments on commit 9b4bbb9

Please sign in to comment.