updates

NeotomaDB · Nov 14, 2023 · a3b90fe · a3b90fe
1 parent 044e0aa
commit a3b90fe
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/neotomaUploader/insert_analysisunit.py b/neotomaUploader/insert_analysisunit.py
@@ -30,15 +30,19 @@ def insert_analysisunit(cur, yml_dict, csv_template, uploader):
 
     params = ["analysisunitname", "depth", "thickness", "faciesid", "mixed", "igsn", "notes"]
     inputs = pull_params(params, yml_dict, csv_template, 'ndb.analysisunits')
-
+   
     anunits = []
     for i, value in enumerate(inputs['depth']):
+        if inputs['mixed'][i] == None:
+            mixed_input = False
+        else:
+            mixed_input = inputs['mixed'][i]
         cur.execute(add_unit, {'collunitid': uploader['collunitid'],
                                 'depth': inputs['depth'][i],
                                 'thickness': inputs['thickness'][i],
-                                'faciesid': 5, #inputs['faciesid'][i],
-                                'mixed': "N", #inputs['mixed'][i],
-                                'igsn': "N", #inputs['igsn'][i],
-                                'notes': "N" })#inputs['notes'][i]})
+                                'faciesid': inputs['faciesid'][i],
+                                'mixed': mixed_input,
+                                'igsn': inputs['igsn'][i],
+                                'notes': inputs['notes'][i]})
         anunits.append(cur.fetchone()[0])
     return anunits
diff --git a/neotomaUploader/insert_collunit.py b/neotomaUploader/insert_collunit.py
@@ -52,7 +52,7 @@ def insert_collunit(cur, yml_dict, csv_template, uploader):
            'depenvtid': 19, # to do: put it as input
            'newdate': inputs['colldate'][0],
            'location': inputs['location'][0],
-           'ns': coords[0], 
-           'ew': coords[1]})
+           'ew': coords[0],  
+           'ns': coords[1]})
     collunitid = cur.fetchone()[0]
     return collunitid
diff --git a/template_upload.py b/template_upload.py
@@ -7,7 +7,7 @@
 
 load_dotenv()
 
-data = json.loads(os.getenv('PGDB_LOCAL2'))
+data = json.loads(os.getenv('PGDB_LOCAL'))
 
 conn = psycopg2.connect(**data, connect_timeout = 5)
 
@@ -225,8 +225,8 @@
 
     if all_true:
         print(f"{filename} was uploaded.")
-        #conn.commit()
-        conn.rollback()
+        conn.commit()
+        #conn.rollback()
     else:
         if not os.path.exists(corrupted_files):
             os.makedirs(corrupted_files)