small changes

diff --git a/README.rst b/README.rst
index f64d7ef0f19bb060f7a1d51585cc701bb04d2447..90e23d570f02a8da9f6189c9d1f7a9a045c4e17e 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -22,7 +22,14 @@ Building the database
     bash setup.sh
     python3 process.py
 
-3. Create the database with :code:`sqlite3 nutra.db`, AND FOLLOW STEP 4 FROM INSIDE THE SQL SHELL
+3. Create the database with
+
+.. code-block:: bash
+
+    cd ../sql
+    sqlite3 nutra.db
+
+NOTE: FOLLOW STEP 4 FROM INSIDE THE SQL SHELL
 
 4. Create the tables, import the data, and save:
 

diff --git a/docs/nutra.svg b/docs/nutra.svg
index 37e129d5826ad47fe93209792f26e4e49ed2ab95..9d4577748df300d23da8618781070a500d8660b8 100644 (file)
--- a/docs/nutra.svg
+++ b/docs/nutra.svg
@@ -4,14 +4,38 @@
 <!-- Generated by graphviz version 2.43.0 (0)
  -->
 <!-- Title: undefined Pages: 1 -->
-<svg width="1012pt" height="1516pt"
- viewBox="0.00 0.00 1011.60 1515.60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="1007pt" height="1516pt"
+ viewBox="0.00 0.00 1006.60 1515.60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(28.8 1465.8)">
 <title>undefined</title>
-<polygon fill="white" stroke="transparent" points="-28.8,49.8 -28.8,-1465.8 982.8,-1465.8 982.8,49.8 -28.8,49.8"/>
-<text text-anchor="start" x="448" y="12.6" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">nutra.db</text>
-<!-- nutr_def -->
+<polygon fill="white" stroke="transparent" points="-28.8,49.8 -28.8,-1465.8 977.8,-1465.8 977.8,49.8 -28.8,49.8"/>
+<text text-anchor="start" x="445.5" y="12.6" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">nutra.db</text>
+<!-- nt_ver -->
 <g id="node1" class="node">
+<title>nt_ver</title>
+<path fill="none" stroke="black" d="M815.24,-730.14C815.24,-730.14 935.24,-730.14 935.24,-730.14 941.24,-730.14 947.24,-736.14 947.24,-742.14 947.24,-742.14 947.24,-805.14 947.24,-805.14 947.24,-811.14 941.24,-817.14 935.24,-817.14 935.24,-817.14 815.24,-817.14 815.24,-817.14 809.24,-817.14 803.24,-811.14 803.24,-805.14 803.24,-805.14 803.24,-742.14 803.24,-742.14 803.24,-736.14 809.24,-730.14 815.24,-730.14"/>
+<text text-anchor="start" x="852.24" y="-796.74" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="13.00">nt_ver</text>
+<polyline fill="none" stroke="black" points="803.24,-787.14 947.24,-787.14 "/>
+<text text-anchor="start" x="810.24" y="-773.04" font-family="Helvetica,sans-Serif" font-size="12.00">id* </text>
+<text text-anchor="start" x="831.24" y="-773.04" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">integer</text>
+<text text-anchor="start" x="810.24" y="-756.04" font-family="Helvetica,sans-Serif" font-size="12.00">version </text>
+<text text-anchor="start" x="858.24" y="-756.04" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">text</text>
+<text text-anchor="start" x="810.24" y="-739.04" font-family="Helvetica,sans-Serif" font-size="12.00">created </text>
+<text text-anchor="start" x="860.24" y="-739.04" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">timestamp</text>
+</g>
+<!-- sqlite_sequence -->
+<g id="node2" class="node">
+<title>sqlite_sequence</title>
+<path fill="none" stroke="black" d="M815.24,-949.64C815.24,-949.64 935.24,-949.64 935.24,-949.64 941.24,-949.64 947.24,-955.64 947.24,-961.64 947.24,-961.64 947.24,-1007.64 947.24,-1007.64 947.24,-1013.64 941.24,-1019.64 935.24,-1019.64 935.24,-1019.64 815.24,-1019.64 815.24,-1019.64 809.24,-1019.64 803.24,-1013.64 803.24,-1007.64 803.24,-1007.64 803.24,-961.64 803.24,-961.64 803.24,-955.64 809.24,-949.64 815.24,-949.64"/>
+<text text-anchor="start" x="817.24" y="-999.24" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="13.00">sqlite_sequence</text>
+<polyline fill="none" stroke="black" points="803.24,-989.64 947.24,-989.64 "/>
+<text text-anchor="start" x="810.24" y="-976.04" font-family="Helvetica,sans-Serif" font-size="12.00">name </text>
+<text text-anchor="start" x="849.24" y="-976.04" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00"> </text>
+<text text-anchor="start" x="810.24" y="-959.04" font-family="Helvetica,sans-Serif" font-size="12.00">seq </text>
+<text text-anchor="start" x="835.24" y="-959.04" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00"> </text>
+</g>
+<!-- nutr_def -->
+<g id="node3" class="node">
 <title>nutr_def</title>
 <path fill="none" stroke="black" d="M11.97,-646.9C11.97,-646.9 135.97,-646.9 135.97,-646.9 141.97,-646.9 147.97,-652.9 147.97,-658.9 147.97,-658.9 147.97,-823.9 147.97,-823.9 147.97,-829.9 141.97,-835.9 135.97,-835.9 135.97,-835.9 11.97,-835.9 11.97,-835.9 5.97,-835.9 -0.03,-829.9 -0.03,-823.9 -0.03,-823.9 -0.03,-658.9 -0.03,-658.9 -0.03,-652.9 5.97,-646.9 11.97,-646.9"/>
 <text text-anchor="start" x="42.97" y="-815.5" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="13.00">nutr_def</text>
@@ -35,19 +59,8 @@
 <text text-anchor="start" x="6.97" y="-655.8" font-family="Helvetica,sans-Serif" font-size="12.00">flav_class </text>
 <text text-anchor="start" x="67.97" y="-655.8" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">text</text>
 </g>
-<!-- sqlite_sequence -->
-<g id="node2" class="node">
-<title>sqlite_sequence</title>
-<path fill="none" stroke="black" d="M822.24,-360.64C822.24,-360.64 942.24,-360.64 942.24,-360.64 948.24,-360.64 954.24,-366.64 954.24,-372.64 954.24,-372.64 954.24,-418.64 954.24,-418.64 954.24,-424.64 948.24,-430.64 942.24,-430.64 942.24,-430.64 822.24,-430.64 822.24,-430.64 816.24,-430.64 810.24,-424.64 810.24,-418.64 810.24,-418.64 810.24,-372.64 810.24,-372.64 810.24,-366.64 816.24,-360.64 822.24,-360.64"/>
-<text text-anchor="start" x="824.24" y="-410.24" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="13.00">sqlite_sequence</text>
-<polyline fill="none" stroke="black" points="810.24,-400.64 954.24,-400.64 "/>
-<text text-anchor="start" x="817.24" y="-387.04" font-family="Helvetica,sans-Serif" font-size="12.00">name </text>
-<text text-anchor="start" x="856.24" y="-387.04" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00"> </text>
-<text text-anchor="start" x="817.24" y="-370.04" font-family="Helvetica,sans-Serif" font-size="12.00">seq </text>
-<text text-anchor="start" x="842.24" y="-370.04" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00"> </text>
-</g>
 <!-- fdgrp -->
-<g id="node3" class="node">
+<g id="node4" class="node">
 <title>fdgrp</title>
 <path fill="none" stroke="black" d="M817.16,-543.88C817.16,-543.88 937.16,-543.88 937.16,-543.88 943.16,-543.88 949.16,-549.88 949.16,-555.88 949.16,-555.88 949.16,-601.88 949.16,-601.88 949.16,-607.88 943.16,-613.88 937.16,-613.88 937.16,-613.88 817.16,-613.88 817.16,-613.88 811.16,-613.88 805.16,-607.88 805.16,-601.88 805.16,-601.88 805.16,-555.88 805.16,-555.88 805.16,-549.88 811.16,-543.88 817.16,-543.88"/>
 <text text-anchor="start" x="857.16" y="-593.48" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="13.00">fdgrp</text>
@@ -58,7 +71,7 @@
 <text text-anchor="start" x="882.16" y="-553.28" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">text</text>
 </g>
 <!-- food_des -->
-<g id="node4" class="node">
+<g id="node5" class="node">
 <title>food_des</title>
 <path fill="none" stroke="black" d="M508.73,-469.21C508.73,-469.21 628.73,-469.21 628.73,-469.21 634.73,-469.21 640.73,-475.21 640.73,-481.21 640.73,-481.21 640.73,-731.21 640.73,-731.21 640.73,-737.21 634.73,-743.21 628.73,-743.21 628.73,-743.21 508.73,-743.21 508.73,-743.21 502.73,-743.21 496.73,-737.21 496.73,-731.21 496.73,-731.21 496.73,-481.21 496.73,-481.21 496.73,-475.21 502.73,-469.21 508.73,-469.21"/>
 <text text-anchor="start" x="535.73" y="-722.81" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="13.00">food_des</text>
@@ -85,10 +98,10 @@
 <text text-anchor="start" x="564.73" y="-546.61" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">text</text>
 <text text-anchor="start" x="503.73" y="-529.61" font-family="Helvetica,sans-Serif" font-size="12.00">n_factor </text>
 <text text-anchor="start" x="557.73" y="-529.61" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">float</text>
-<text text-anchor="start" x="503.73" y="-512.61" font-family="Helvetica,sans-Serif" font-size="12.00">pro_factor_ </text>
-<text text-anchor="start" x="575.73" y="-512.61" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">float</text>
-<text text-anchor="start" x="503.73" y="-495.61" font-family="Helvetica,sans-Serif" font-size="12.00">fat_factor_ </text>
-<text text-anchor="start" x="572.73" y="-495.61" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">float</text>
+<text text-anchor="start" x="503.73" y="-512.61" font-family="Helvetica,sans-Serif" font-size="12.00">pro_factor </text>
+<text text-anchor="start" x="569.73" y="-512.61" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">float</text>
+<text text-anchor="start" x="503.73" y="-495.61" font-family="Helvetica,sans-Serif" font-size="12.00">fat_factor </text>
+<text text-anchor="start" x="566.73" y="-495.61" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">float</text>
 <text text-anchor="start" x="503.73" y="-478.61" font-family="Helvetica,sans-Serif" font-size="12.00">cho_factor </text>
 <text text-anchor="start" x="571.73" y="-478.61" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">float</text>
 </g>
@@ -99,7 +112,7 @@
 <polygon fill="black" stroke="black" stroke-width="0.9" points="797.31,-588.76 805.03,-585.27 796.82,-583.19 797.31,-588.76"/>
 </g>
 <!-- src_cd -->
-<g id="node5" class="node">
+<g id="node6" class="node">
 <title>src_cd</title>
 <path fill="none" stroke="black" d="M263.66,-1366.74C263.66,-1366.74 383.66,-1366.74 383.66,-1366.74 389.66,-1366.74 395.66,-1372.74 395.66,-1378.74 395.66,-1378.74 395.66,-1424.74 395.66,-1424.74 395.66,-1430.74 389.66,-1436.74 383.66,-1436.74 383.66,-1436.74 263.66,-1436.74 263.66,-1436.74 257.66,-1436.74 251.66,-1430.74 251.66,-1424.74 251.66,-1424.74 251.66,-1378.74 251.66,-1378.74 251.66,-1372.74 257.66,-1366.74 263.66,-1366.74"/>
 <text text-anchor="start" x="300.66" y="-1416.34" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="13.00">src_cd</text>
@@ -110,7 +123,7 @@
 <text text-anchor="start" x="328.66" y="-1376.14" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">text</text>
 </g>
 <!-- deriv_cd -->
-<g id="node6" class="node">
+<g id="node7" class="node">
 <title>deriv_cd</title>
 <path fill="none" stroke="black" d="M637.25,-1249.77C637.25,-1249.77 757.25,-1249.77 757.25,-1249.77 763.25,-1249.77 769.25,-1255.77 769.25,-1261.77 769.25,-1261.77 769.25,-1307.77 769.25,-1307.77 769.25,-1313.77 763.25,-1319.77 757.25,-1319.77 757.25,-1319.77 637.25,-1319.77 637.25,-1319.77 631.25,-1319.77 625.25,-1313.77 625.25,-1307.77 625.25,-1307.77 625.25,-1261.77 625.25,-1261.77 625.25,-1255.77 631.25,-1249.77 637.25,-1249.77"/>
 <text text-anchor="start" x="667.25" y="-1299.37" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="13.00">deriv_cd</text>
@@ -121,7 +134,7 @@
 <text text-anchor="start" x="702.25" y="-1259.17" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">text</text>
 </g>
 <!-- nut_data -->
-<g id="node7" class="node">
+<g id="node8" class="node">
 <title>nut_data</title>
 <path fill="none" stroke="black" d="M309.32,-879.67C309.32,-879.67 429.32,-879.67 429.32,-879.67 435.32,-879.67 441.32,-885.67 441.32,-891.67 441.32,-891.67 441.32,-1209.67 441.32,-1209.67 441.32,-1215.67 435.32,-1221.67 429.32,-1221.67 429.32,-1221.67 309.32,-1221.67 309.32,-1221.67 303.32,-1221.67 297.32,-1215.67 297.32,-1209.67 297.32,-1209.67 297.32,-891.67 297.32,-891.67 297.32,-885.67 303.32,-879.67 309.32,-879.67"/>
 <text text-anchor="start" x="337.32" y="-1201.27" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="13.00">nut_data</text>
@@ -188,7 +201,7 @@
 <polygon fill="black" stroke="black" stroke-width="0.9" points="639.78,-1247.19 647.92,-1249.56 643.04,-1242.63 639.78,-1247.19"/>
 </g>
 <!-- lang_desc -->
-<g id="node8" class="node">
+<g id="node9" class="node">
 <title>lang_desc</title>
 <path fill="none" stroke="black" d="M796.72,-0.95C796.72,-0.95 916.72,-0.95 916.72,-0.95 922.72,-0.95 928.72,-6.95 928.72,-12.95 928.72,-12.95 928.72,-58.95 928.72,-58.95 928.72,-64.95 922.72,-70.95 916.72,-70.95 916.72,-70.95 796.72,-70.95 796.72,-70.95 790.72,-70.95 784.72,-64.95 784.72,-58.95 784.72,-58.95 784.72,-12.95 784.72,-12.95 784.72,-6.95 790.72,-0.95 796.72,-0.95"/>
 <text text-anchor="start" x="820.72" y="-50.55" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="13.00">lang_desc</text>
@@ -199,7 +212,7 @@
 <text text-anchor="start" x="861.72" y="-10.35" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">text</text>
 </g>
 <!-- langual -->
-<g id="node9" class="node">
+<g id="node10" class="node">
 <title>langual</title>
 <path fill="none" stroke="black" d="M501.46,-271.92C501.46,-271.92 621.46,-271.92 621.46,-271.92 627.46,-271.92 633.46,-277.92 633.46,-283.92 633.46,-283.92 633.46,-329.92 633.46,-329.92 633.46,-335.92 627.46,-341.92 621.46,-341.92 621.46,-341.92 501.46,-341.92 501.46,-341.92 495.46,-341.92 489.46,-335.92 489.46,-329.92 489.46,-329.92 489.46,-283.92 489.46,-283.92 489.46,-277.92 495.46,-271.92 501.46,-271.92"/>
 <text text-anchor="start" x="534.46" y="-321.52" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="13.00">langual</text>
@@ -222,7 +235,7 @@
 <polygon fill="black" stroke="black" stroke-width="0.9" points="814.49,-78.51 818.49,-71.03 810.7,-74.38 814.49,-78.51"/>
 </g>
 <!-- data_src -->
-<g id="node10" class="node">
+<g id="node11" class="node">
 <title>data_src</title>
 <path fill="none" stroke="black" d="M125.56,-7.99C125.56,-7.99 245.56,-7.99 245.56,-7.99 251.56,-7.99 257.56,-13.99 257.56,-19.99 257.56,-19.99 257.56,-184.99 257.56,-184.99 257.56,-190.99 251.56,-196.99 245.56,-196.99 245.56,-196.99 125.56,-196.99 125.56,-196.99 119.56,-196.99 113.56,-190.99 113.56,-184.99 113.56,-184.99 113.56,-19.99 113.56,-19.99 113.56,-13.99 119.56,-7.99 125.56,-7.99"/>
 <text text-anchor="start" x="154.56" y="-176.59" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="13.00">data_src</text>
@@ -247,7 +260,7 @@
 <text text-anchor="start" x="183.56" y="-16.89" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">text</text>
 </g>
 <!-- datsrcln -->
-<g id="node11" class="node">
+<g id="node12" class="node">
 <title>datsrcln</title>
 <path fill="none" stroke="black" d="M76.95,-321.59C76.95,-321.59 196.95,-321.59 196.95,-321.59 202.95,-321.59 208.95,-327.59 208.95,-333.59 208.95,-333.59 208.95,-396.59 208.95,-396.59 208.95,-402.59 202.95,-408.59 196.95,-408.59 196.95,-408.59 76.95,-408.59 76.95,-408.59 70.95,-408.59 64.95,-402.59 64.95,-396.59 64.95,-396.59 64.95,-333.59 64.95,-333.59 64.95,-327.59 70.95,-321.59 76.95,-321.59"/>
 <text text-anchor="start" x="106.95" y="-388.19" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="13.00">datsrcln</text>
@@ -278,7 +291,7 @@
 <polygon fill="black" stroke="black" stroke-width="0.9" points="169.32,-205.61 168.02,-197.23 163.82,-204.59 169.32,-205.61"/>
 </g>
 <!-- footnote -->
-<g id="node12" class="node">
+<g id="node13" class="node">
 <title>footnote</title>
 <path fill="none" stroke="black" d="M191.99,-565.29C191.99,-565.29 311.99,-565.29 311.99,-565.29 317.99,-565.29 323.99,-571.29 323.99,-577.29 323.99,-577.29 323.99,-674.29 323.99,-674.29 323.99,-680.29 317.99,-686.29 311.99,-686.29 311.99,-686.29 191.99,-686.29 191.99,-686.29 185.99,-686.29 179.99,-680.29 179.99,-674.29 179.99,-674.29 179.99,-577.29 179.99,-577.29 179.99,-571.29 185.99,-565.29 191.99,-565.29"/>
 <text text-anchor="start" x="219.99" y="-665.89" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="13.00">footnote</text>
@@ -307,7 +320,7 @@
 <polygon fill="black" stroke="black" stroke-width="0.9" points="488.68,-613.96 496.5,-610.67 488.34,-608.37 488.68,-613.96"/>
 </g>
 <!-- serv_desc -->
-<g id="node13" class="node">
+<g id="node14" class="node">
 <title>serv_desc</title>
 <path fill="none" stroke="black" d="M93.98,-1027.27C93.98,-1027.27 213.98,-1027.27 213.98,-1027.27 219.98,-1027.27 225.98,-1033.27 225.98,-1039.27 225.98,-1039.27 225.98,-1085.27 225.98,-1085.27 225.98,-1091.27 219.98,-1097.27 213.98,-1097.27 213.98,-1097.27 93.98,-1097.27 93.98,-1097.27 87.98,-1097.27 81.98,-1091.27 81.98,-1085.27 81.98,-1085.27 81.98,-1039.27 81.98,-1039.27 81.98,-1033.27 87.98,-1027.27 93.98,-1027.27"/>
 <text text-anchor="start" x="117.98" y="-1076.87" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="13.00">serv_desc</text>
@@ -318,7 +331,7 @@
 <text text-anchor="start" x="156.98" y="-1036.67" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="12.00">text</text>
 </g>
 <!-- serving -->
-<g id="node14" class="node">
+<g id="node15" class="node">
 <title>serving</title>
 <path fill="none" stroke="black" d="M545.41,-799.49C545.41,-799.49 665.41,-799.49 665.41,-799.49 671.41,-799.49 677.41,-805.49 677.41,-811.49 677.41,-811.49 677.41,-908.49 677.41,-908.49 677.41,-914.49 671.41,-920.49 665.41,-920.49 665.41,-920.49 545.41,-920.49 545.41,-920.49 539.41,-920.49 533.41,-914.49 533.41,-908.49 533.41,-908.49 533.41,-811.49 533.41,-811.49 533.41,-805.49 539.41,-799.49 545.41,-799.49"/>
 <text text-anchor="start" x="578.41" y="-900.09" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="13.00">serving</text>

diff --git a/docs/sqleton.sh b/docs/sqleton.sh
index feb12dd02f2899d4e86cd7e521a419bdc1157344..e5e52c1b3f99bc4f0a2a54c73c61d4f44f09e035 100755 (executable)
--- a/docs/sqleton.sh
+++ b/docs/sqleton.sh
@@ -2,6 +2,6 @@
 
 # cd to script's directory
 cd "$(dirname "$0")"
-cd ../data
+cd ../sql
 
 sqleton -o ../docs/nutra.svg nutra.db

diff --git a/sql/format-sql.sh b/sql/format-sql.sh
index 07a986b10fe421535658cc1ddb4046c5ed16a99e..32b0965fed7d48b34cfb0a94aa4a5923eb837841 100755 (executable)
--- a/sql/format-sql.sh
+++ b/sql/format-sql.sh
@@ -3,4 +3,4 @@
 cd "$(dirname "$0")"
 
 pg_format -s 2 tables.sql -o tables.sql
-# pg_format -s 2 functions.sql -o import.sql
+# pg_format -s 2 import.sql -o import.sql