Skip to content

Commit 4a2556e

Browse files
authored
Merge pull request #112 from dagaylord/load_qartod_fix
prevent commented out tests from loading
2 parents 3fc8bd4 + 64dfd24 commit 4a2556e

1 file changed

Lines changed: 14 additions & 9 deletions

File tree

scripts/load_qartod.py

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ def parse_qartod_dict(qartod_dict):
2626
subsite = qartod_dict.get('subsite')
2727
refdes = qartod_dict.get('Reference Designator')
2828
if subsite:
29+
if subsite.startswith('#'):
30+
return
2931
# Climatology Test Inputs
3032
node = qartod_dict.get('node')
3133
sensor = qartod_dict.get('sensor')
@@ -141,14 +143,17 @@ def insert_qartod_records(qartod_list):
141143
try:
142144
connection = psycopg2.connect(user=username, password=password, host=host, port='5432', database='metadata')
143145
for parsed_qartod_dict in qartod_list:
144-
with connection:
145-
with connection.cursor() as cursor:
146-
cursor.execute("SELECT nextval('qartod_test_sequence')")
147-
qartod_id = cursor.fetchone()
148-
parsed_qartod_dict['id'] = qartod_id
149-
fields = sql.SQL(', ').join(map(sql.Identifier, parsed_qartod_dict.keys()))
150-
values = sql.SQL(', ').join(map(sql.Placeholder, parsed_qartod_dict.keys()))
151-
cursor.execute(sql.SQL("INSERT INTO qartod_tests ({}) VALUES ({})").format(fields, values), parsed_qartod_dict)
146+
if parsed_qartod_dict:
147+
148+
with connection:
149+
with connection.cursor() as cursor:
150+
cursor.execute("SELECT nextval('qartod_test_sequence')")
151+
qartod_id = cursor.fetchone()
152+
parsed_qartod_dict['id'] = qartod_id
153+
154+
fields = sql.SQL(', ').join(map(sql.Identifier, parsed_qartod_dict.keys()))
155+
values = sql.SQL(', ').join(map(sql.Placeholder, parsed_qartod_dict.keys()))
156+
cursor.execute(sql.SQL("INSERT INTO qartod_tests ({}) VALUES ({})").format(fields, values), parsed_qartod_dict)
152157
finally:
153158
if connection:
154159
connection.close()
@@ -163,4 +168,4 @@ def main():
163168

164169

165170
if __name__ == '__main__':
166-
main()
171+
main()

0 commit comments

Comments
 (0)