From b6f393c1cbf80f0e8d5c324368773d7a09e8a94b Mon Sep 17 00:00:00 2001 From: Shane Jaroch Date: Mon, 3 Aug 2020 11:58:33 -0400 Subject: [PATCH] move, start work on process.py --- data/process.py | 13 ++++++++----- data/{sr => res}/dep-graph.yml | 0 data/{sr => res}/flav/tables.sql | 0 data/{sr => res}/import.sql | 0 data/{sr => res}/isoflav/tables.sql | 0 data/{sr => res}/proanth/tables.sql | 0 data/{sr => res}/tables.sql | 0 7 files changed, 8 insertions(+), 5 deletions(-) rename data/{sr => res}/dep-graph.yml (100%) rename data/{sr => res}/flav/tables.sql (100%) rename data/{sr => res}/import.sql (100%) rename data/{sr => res}/isoflav/tables.sql (100%) rename data/{sr => res}/proanth/tables.sql (100%) rename data/{sr => res}/tables.sql (100%) diff --git a/data/process.py b/data/process.py index ed9d93b..ff5ab09 100644 --- a/data/process.py +++ b/data/process.py @@ -20,7 +20,7 @@ import sys # change to script's dir os.chdir(os.path.dirname(os.path.abspath(__file__))) -os.makedirs("csv/nt", 0o755, True) +os.makedirs("nt", 0o755, True) # -------------------- @@ -40,8 +40,9 @@ special_interests_dirs = [ # -------------------- # RDAs # -------------------- -rdas = {"NUTR_NO": ("rda", "tagname")} -with open("csv/RDA.csv") as file: +# rdas = {"NUTR_NO": ("rda", "tagname")} +rdas = {} +with open("rda.csv") as file: reader = csv.reader(file) for row in reader: rdas[row[0].upper()] = row[1], row[3] @@ -99,7 +100,9 @@ def process_nutr_def(): def process_main(rows): result = [] for row in rows: - rda, tagname = rdas[row[0].upper()] + id = row[0].upper().replace("NUTR_NO", "ID") + row[0] = id.lower() + rda, tagname = rdas[id] row = row[:4] row[2] = tagname row.insert(1, rda) @@ -142,7 +145,7 @@ def process_nutr_def(): result = [] # Main USDA files - main_nutr = "csv/usda/NUTR_DEF.csv" + main_nutr = "SR-Leg_DB/NUTR_DEF.csv" print(main_nutr) with open(main_nutr) as file: reader = csv.reader(file) diff --git a/data/sr/dep-graph.yml b/data/res/dep-graph.yml similarity index 100% rename from data/sr/dep-graph.yml rename to data/res/dep-graph.yml diff --git a/data/sr/flav/tables.sql b/data/res/flav/tables.sql similarity index 100% rename from data/sr/flav/tables.sql rename to data/res/flav/tables.sql diff --git a/data/sr/import.sql b/data/res/import.sql similarity index 100% rename from data/sr/import.sql rename to data/res/import.sql diff --git a/data/sr/isoflav/tables.sql b/data/res/isoflav/tables.sql similarity index 100% rename from data/sr/isoflav/tables.sql rename to data/res/isoflav/tables.sql diff --git a/data/sr/proanth/tables.sql b/data/res/proanth/tables.sql similarity index 100% rename from data/sr/proanth/tables.sql rename to data/res/proanth/tables.sql diff --git a/data/sr/tables.sql b/data/res/tables.sql similarity index 100% rename from data/sr/tables.sql rename to data/res/tables.sql -- 2.52.0