Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Null bytes fix, updated to SR28 data #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Null bytes fix, updated to SR28 data #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2ad325
Forked and first pass at using newer SR28 data
bglusman Feb 10, 2017
1ddca2d
Don’t write EOF to CSV
bglusman Feb 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ data_cleanup:
go build -o data_cleanup data_cleanup.go

sr26.zip:
curl -O https://www.ars.usda.gov/SP2UserFiles/Place/12354500/Data/SR26/dnload/sr26.zip
curl -O https://www.ars.usda.gov/ARSUserFiles/80400525/Data/SR/SR28/dnload/sr28asc.zip

sr26: sr26.zip
mkdir sr26
tar -C sr26 -xvf sr26.zip
tar -C sr26 -xvf sr28asc.zip

data_src.csv: sr26 data_cleanup
$(C) sr26/DATA_SRC.txt data_src.csv
Expand Down
3 changes: 3 additions & 0 deletions data_cleanup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ func main() {

for err == nil {
r, _, err = rd.ReadRune()
if err != nil {
break
}
switch r {
case '"':
switch lastR {
Expand Down
24 changes: 12 additions & 12 deletions import.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ BEGIN;

SET CONSTRAINTS ALL DEFERRED;

COPY food_groups FROM '/Users/eric/code/nutr/sr26/fd_group.csv' DELIMITER ' ' CSV;
COPY foods FROM '/Users/eric/code/nutr/sr26/food_des.csv' DELIMITER ' ' CSV;
COPY langua_l_desc FROM '/Users/eric/code/nutr/sr26/langdesc.csv' DELIMITER ' ' CSV;
COPY langua_l_factors FROM '/Users/eric/code/nutr/sr26/langual.csv' DELIMITER ' ' CSV;
COPY nutrients FROM '/Users/eric/code/nutr/sr26/nutr_def.csv' DELIMITER ' ' CSV;
COPY source_codes FROM '/Users/eric/code/nutr/sr26/src_cd.csv' DELIMITER ' ' CSV;
COPY data_derivation_codes FROM '/Users/eric/code/nutr/sr26/deriv_cd.csv' DELIMITER ' ' CSV;
COPY nutrient_data FROM '/Users/eric/code/nutr/sr26/nut_data.csv' DELIMITER ' ' CSV;
COPY weights FROM '/Users/eric/code/nutr/sr26/weight.csv' DELIMITER ' ' CSV;
COPY footnotes FROM '/Users/eric/code/nutr/sr26/footnote.csv' DELIMITER ' ' CSV;
COPY sources_of_data FROM '/Users/eric/code/nutr/sr26/data_src.csv' DELIMITER ' ' CSV;
COPY sources_of_data_assoc FROM '/Users/eric/code/nutr/sr26/datsrcln.csv' DELIMITER ' ' CSV;
COPY food_groups FROM '/Users/brianglusman/open_pantry/nutes/fd_group.csv' DELIMITER ' ' CSV;
COPY foods FROM '/Users/brianglusman/open_pantry/nutes/food_des.csv' DELIMITER ' ' CSV;
COPY langua_l_desc FROM '/Users/brianglusman/open_pantry/nutes/langdesc.csv' DELIMITER ' ' CSV;
COPY langua_l_factors FROM '/Users/brianglusman/open_pantry/nutes/langual.csv' DELIMITER ' ' CSV;
COPY nutrients FROM '/Users/brianglusman/open_pantry/nutes/nutr_def.csv' DELIMITER ' ' CSV;
COPY source_codes FROM '/Users/brianglusman/open_pantry/nutes/src_cd.csv' DELIMITER ' ' CSV;
COPY data_derivation_codes FROM '/Users/brianglusman/open_pantry/nutes/deriv_cd.csv' DELIMITER ' ' CSV;
COPY nutrient_data FROM '/Users/brianglusman/open_pantry/nutes/nut_data.csv' DELIMITER ' ' CSV;
COPY weights FROM '/Users/brianglusman/open_pantry/nutes/weight.csv' DELIMITER ' ' CSV;
COPY footnotes FROM '/Users/brianglusman/open_pantry/nutes/footnote.csv' DELIMITER ' ' CSV;
COPY sources_of_data FROM '/Users/brianglusman/open_pantry/nutes/data_src.csv' DELIMITER ' ' CSV;
COPY sources_of_data_assoc FROM '/Users/brianglusman/open_pantry/nutes/datsrcln.csv' DELIMITER ' ' CSV;

COMMIT;