BUGFIX final tests V.3.04.00

Examples/ebas_convert.py

@@ -9,8 +9,9 @@ import sys
 import logging
 import argparse
 import textwrap
+import re
 from nilutility.argparse_helper import ParseStrings, ParseIntegers
-from ebas.db_fileindex import IndexDb, IndexDbNotOpen, IndexDbExists
+from ebas.db_fileindex import IndexDb, OperationalError
 from ebas.commandline import EbasCommandline
 from ebas.io.file import EbasIOFlagOption
 from ebas.io.file.nasa_ames import EbasNasaAmes, EbasNasaAmesReadError
@@ -177,13 +178,21 @@ def open_indexdb(dbname, logger):
     """
     if dbname:
         try:
-            return IndexDb(dbname)
-        except IndexDbNotOpen:
-            logger.error("can not open index db {}".format(dbname))
-            sys.exit(1)
-        except IndexDbExists:
-            logger.error("index db {} exists already".format(dbname))
-            sys.exit(1)
+            indexdb = IndexDb(dbname)
+        except OperationalError as excpt:
+            if str(excpt) == 'unable to open database file':
+                logger.error("can not open index db {}".format(dbname))
+                sys.exit(1)
+            raise
+        try:
+            indexdb.create_tables()
+        except OperationalError as excpt:
+            if re.match('table .* already exists', str(excpt)):
+                logger.error("index db {} exists already".format(dbname))
+                sys.exit(1)
+            else:
+                raise
+        return indexdb
     return None
 
 def ebas_convert(cmdline):
@@ -201,7 +210,6 @@ def ebas_convert(cmdline):
 
     exitcode = 0 # number of failed files (max 255)
     indexdb = open_indexdb(args.fileindex, logger)
-    print(args.format)
     fileset = EbasIOResultSet(
         outformat=args.format, createfiles=args.createfiles,
         destdir=args.destdir, xmlwrap=args.xmlwrap, flags=args.flags,

Examples/ebas_flatcsv.py

@@ -39,7 +39,7 @@ def prepare_csv():
     Returns:
         csv.writer object
     """
-    outfile = open("output.csv", "wb")
+    outfile = open("output.csv", "w")
     csv.register_dialect('ebas', delimiter=',', quotechar='"')
     csvwriter = csv.writer(outfile, dialect='ebas', quoting=csv.QUOTE_MINIMAL)
     header = ["Set type code",