merge from futz2 branch

2009-08-28 18:24:51 +01:00
parent a9fb82d3b9 0877e428ef
commit d2380ba738
22 changed files with 3612 additions and 3570 deletions
@@ -384,8 +384,9 @@ class Importer:
        conv = None
        (stored, duplicates, partial, errors, ttime) = (0, 0, 0, 0, 0)

+        file =  file.decode(fpdb_simple.LOCALE_ENCODING) 
+
        # Load filter, process file, pass returned filename to import_fpdb_file
-            
        if self.settings['threads'] > 0 and self.writeq != None:
            log.info("Converting " + file + " (" + str(q.qsize()) + ")")
        else: