better

diff --git a/data/process.py b/data/process.py
index 83a2f1fa6167fb28057be19ead3775fd85eee608..579b3421fba0812730abe88ed109a7664473c3d6 100644 (file)
--- a/data/process.py
+++ b/data/process.py
@@ -211,8 +211,10 @@ def process_nut_data():
     with open(main_nutr) as file:
         reader = csv.reader(file)
         rows = list(reader)
+        rows[0].append("cc")  # CC, see: Flav_R03-1.pdf
         # Add to final solution
         for row in rows:
+            row.append(None)  # CC, see: Flav_R03-1.pdf
             result.append(row)
 
     # Special interests DB
@@ -224,16 +226,17 @@ def process_nut_data():
             rows = list(reader)
             # Add to final solution
             for row in rows[1:]:
-                _row = None * 17
+                _row = [None] * 18
                 _row[0] = row[0]  # food_id
                 _row[1] = row[1]  # nutr_id
                 _row[2] = row[2]  # nutr_val
                 _row[3] = row[4]  # num_data_pts
                 _row[4] = row[3]  # std_err / std_dev
-                _row[5] = row[8]  # data_src_id
+                if len(row) > 8:
+                    _row[5] = row[8]  # data_src_id
                 _row[10] = row[5]  # min
                 _row[11] = row[6]  # max
-                _row[?] = row[7]  # CC
+                _row[17] = row[7]  # CC
                 result.append(_row)
 
     #########################

diff --git a/data/setup.sh b/data/setup.sh
index 987b120a6f15cdc5c6d3522e973c5e36fae496bd..c91cea01acb2f07589ea2692f0af939855c7a110 100755 (executable)
--- a/data/setup.sh
+++ b/data/setup.sh
@@ -41,7 +41,7 @@ curl -L "https://www.ars.usda.gov/ARSUserFiles/80400525/Data/PA/PA02.accdb" -o P
 # git clone git@github.com:AccelerationNet/access2csv.git
 
 # cd access2csv
-# mvn clean install -Dmaven.test.skip=true
+# mvn clean install -Dmaven.test.skip=true  # the install is handled by command
 cd ../access2csv
 ./access2csv --schema --quote-all false --input ../tmp/SR_Legacy.accdb --output ../tmp/usda --with-header
 ./access2csv --schema --quote-all false --input ../tmp/Flav_R03-3.accdb --output ../tmp/usda/flav --with-header
@@ -50,43 +50,24 @@ cd ../access2csv
 cd ..
 
 
-# -----------------
-# Move to permanent home
-# -----------------
-mkdir -p sr28-csv
-cd sr28-csv
-mv ../tmp/usda/* .
+# --------------------------------------
+# Move to permanent home, and clean up
+# --------------------------------------
+rm -rf SR-Leg_DB
 
+mkdir -p SR-Leg_DB
+cd SR-Leg_DB
+
+mv ../tmp/usda/* .
 
-# -----------------
 # Clean up
-# -----------------
 rm -rf ../tmp
-# cd usda
-
-# rm DATSRCLN.csv
-# rm LANGUAL.csv
-# rm DATA_SRC.csv
-# rm FOOTNOTE.csv
-# rm LANGDESC.csv
-# rm DERIV_CD.csv
-# rm SRC_CD.csv
 
 cd flav
-# rm DATA_SRC.csv
-# rm DATSRCLN.csv
-# rm FD_GROUP.csv
-# rm FLAV_IND.csv
 mv FLAV_DAT.csv NUT_DATA.csv
 
 cd ../isoflav
-# rm DATA_SRC.csv
-# rm DATSRCLN.csv
-# rm SYBN_DTL.csv
 mv ISFL_DAT.csv NUT_DATA.csv
 
 cd ../proanth
-# rm DATA_SRC.csv
-# rm DATSRCLN.csv
-# rm FD_GROUP.csv
 mv PA_DAT.csv NUT_DATA.csv