share/db/update.sh

diff --git a/share/db/0-pre.sql b/share/db/0-pre.sql
index dacbedf07acd086da78a3511502b290571b50758..b49af9bee3568609ad3eaaad6206f63ec6db2b27 100644 (file)
--- a/share/db/0-pre.sql
+++ b/share/db/0-pre.sql
@@ -19,3 +19,4 @@
 -- NB 25.10.17 );
 
 PRAGMA encoding="UTF-8";
+PRAGMA foreign_keys=OFF;

diff --git a/share/db/nb.db b/share/db/nb.db
index 382d75fe364c423c10a995af506447e8316c6e37..5cae0013ba96c4f55c2871e1d9e773ba3ae2f03b 100644 (file)
Binary files a/share/db/nb.db and b/share/db/nb.db differ

diff --git a/share/db/update.sh b/share/db/update.sh
index 7fd229cabcaebe8070d53d04ad54f2e57a3148ff..9845927af7a2c03222198793e03d1f2c4f698b27 100755 (executable)
--- a/share/db/update.sh
+++ b/share/db/update.sh
@@ -5,17 +5,20 @@
 #
 #
 set +e
-cd $(dirname "$0")
 TMP=`mktemp -d`
+DIR=$(dirname "$0")
+cd "$DIR"
 
 main() {
 (
 
 cat << EOF
 .separator \t
-`cat "*.sql"`
-PRAGMA foreign_keys=OFF;
-`data_src`
+`cat *.sql`
+
+`./port > "$TMP/port.csv" && csv2table port "$TMP/port.csv"`
+`./shell_function`
+
 VACUUM;
 EOF
 
@@ -23,8 +26,9 @@ EOF
 
 for f in $(shell_replace -find $NB_ROOT/*); do
 
-       echo "Update $f" | sed "s; $NB_ROOT/; ;"
+       echo "shell_replace $f" | sed "s; $NB_ROOT/; ;"
        shell_replace -i.shell_replace "$f"
+       #shell_replace "$f" | wc -l
 
 done
 
@@ -33,13 +37,6 @@ done
 rm -rf "$TMP"
 }
 
-data_src() {
-
-       ./port > "$TMP/port.csv"
-       csv2table port "$TMP/port.csv"
-
-}
-
 csv2table() {
        local name="$1"; shift
        local file="$1"; shift