1 files changed, 5 insertions, 6 deletions

diff --git a/python/markit/loans.py b/python/markit/loans.py
index f038aa38..f9fbe065 100644
--- a/python/markit/loans.py
+++ b/python/markit/loans.py
@@ -3,7 +3,6 @@ import logging
 import os

 import requests

 

-from common import root

 from db import with_connection

 from psycopg2 import IntegrityError

 

@@ -11,13 +10,13 @@ logger = logging.getLogger(__name__)
 

 def download_facility(workdate, payload):

     r = requests.get('https://loans.markit.com/loanx/LoanXFacilityUpdates.csv', params=payload)

-    facility_filename = os.path.join(root, "data", "Facility files", "facility_{0}.csv".format(workdate))

+    facility_filename = os.path.join(os.environ['DATA_DIR'], "Facility files", "facility_{0}.csv".format(workdate))

     with open( facility_filename, "wb") as fh:

         fh.write(r.content)

 

 @with_connection('etdb')

 def insert_facility(conn, workdate):

-    facility_filename = os.path.join(root, "data", "Facility files", "facility_{0}.csv".format(workdate))

+    facility_filename = os.path.join(os.environ['DATA_DIR'], "Facility files", "facility_{0}.csv".format(workdate))

     sqlstring = "INSERT INTO markit_facility VALUES( {0} )".format( ",".join(["%s"] * 13))

     with open( facility_filename, "r") as fh:

         reader = csv.reader(fh)

@@ -39,7 +38,7 @@ def insert_facility(conn, workdate):
 @with_connection('etdb')

 def download_marks(conn, workdate, payload):

     r = requests.get('https://loans.markit.com/loanx/LoanXMarks.csv', params=payload)

-    marks_filename = os.path.join(root, "data", "markit", "markit_data_{0}.csv".format(workdate))

+    marks_filename = os.path.join(os.environ['DATA_DIR'], "markit", "markit_data_{0}.csv".format(workdate))

     with open(marks_filename, "wb") as fh:

         fh.write(r.content)

     sqlstring = "INSERT INTO markit_prices VALUES( {0} )".format( ",".join([ "%s" ] * 5))

@@ -60,14 +59,14 @@ def download_marks(conn, workdate, payload):
 def update_facility(conn, workdate, payload):

     #we update the missing facility loanxids

     sqlstring = "SELECT loanxid FROM markit_prices EXCEPT SELECT loanxid FROM markit_facility";

-    facility_diff_filename = os.path.join(root, "data", "Facility files",

+    facility_diff_filename = os.path.join(os.environ['DATA_DIR'], "Facility files",

                                           "facility_diff_{0}.csv".format(workdate))

     with open( facility_diff_filename, "wb") as fh:

         flag = False

         with conn.cursor() as c:

             c.execute(sqlstring)

             for loanxid in c:

-                payload.update({'LOANXID':loanxid[0]})

+                payload.update({'LOANXID': loanxid[0]})

                 r = requests.get('https://loans.markit.com/loanx/LoanXOneFacility.csv', params=payload)

                 if flag:

                     fh.write(r.content.split('\n')[1] + "\n")