abspoath for EMSL_DUMP

This commit is contained in:
Thomas Applencourt 2015-03-23 15:05:24 +01:00
parent ba894264d4
commit 9a70c61df8
2 changed files with 7 additions and 10 deletions

View File

@ -44,7 +44,7 @@ import os
from src.misc.docopt import docopt
from src.EMSL_dump import EMSL_dump
from src.EMSL_local import EMSL_local, checkSQLite3
from src.EMSL_local import EMSL_local
if __name__ == '__main__':
@ -63,6 +63,7 @@ if __name__ == '__main__':
# Check the db
try:
if not(arguments['create_db']):
from src.EMSL_local import checkSQLite3
db_path, db_path_changed = checkSQLite3(db_path)
except:
raise

View File

@ -32,7 +32,6 @@ def install_with_pip(name):
class EMSL_dump:
"""
This call implement all you need for download the EMSL and save it localy
"""
@ -50,10 +49,11 @@ class EMSL_dump:
self.db_path = db_path
else:
head_path = os.path.dirname(__file__)
self.db_path = "{0}/../db/{1}.db".format(head_path, self.format)
db_path = "{0}/../db/{1}.db".format(head_path, self.format)
self.db_path = os.path.abspath(db_path)
self.contraction = str(contraction)
self.debug = False
self.debug = True
try:
import requests
@ -82,13 +82,9 @@ class EMSL_dump:
dbcache = 'db/cache'
if not os.path.isfile(dbcache):
page = self.requests.get(url).text
file = open(dbcache, 'w')
pickle.dump(page, file)
pickle.dump(page, open(dbcache, 'wb'))
else:
file = open(dbcache, 'r')
page = pickle.load(file)
file.close()
page = pickle.load(open(dbcache, 'rb'))
else:
page = self.requests.get(url).text