/opt/nb/lib/postgres/lang.sh

diff --git a/lib/postgres/lang.sh b/lib/postgres/lang.sh
index 64e624c78d4bbf8e5cac89cd80a132ebc4eaa2ba..d3089c0448604dbc1ab9ecaa9d254c6a2231249c 100755 (executable)
--- a/lib/postgres/lang.sh
+++ b/lib/postgres/lang.sh
@@ -2,6 +2,6 @@
 curl -s http://download.geonames.org/export/dump/iso-languagecodes.txt \
 | tail -n +2 \
 | cut -f 1,4 \
-| sed -e "s/ *(.*$//" -e "s/\tModern /\t/" \
+| sed -e "s/ *(.*$//" -e "s/\tModern /\t/" -e "s/\r$//" \
 | grep -Ev '^\s' \
 ;

diff --git a/lib/postgres/lang.sql b/lib/postgres/lang.sql
index 410a471939a700ade385c7556fed68b31639c9aa..684399870a68a9c96b250516e666a5480d245b04 100644 (file)
--- a/lib/postgres/lang.sql
+++ b/lib/postgres/lang.sql
@@ -3,11 +3,3 @@ CREATE TABLE IF NOT EXISTS lang (
   id char(3) PRIMARY KEY,
   name varchar(60)
 );
--- NB 02.12.19 BEGIN TRANSACTION;
--- NB 02.12.19 DELETE FROM lang;
--- NB 02.12.19 COPY lang FROM PROGRAM 'curl -s http://download.geonames.org/export/dump/iso-languagecodes.txt \
--- NB 02.12.19 | tail -n +2 \
--- NB 02.12.19 | cut -f 1,4 \
--- NB 02.12.19 | sed -e "s/ *(.*$//" -e "s/\tModern /\t/"
--- NB 02.12.19 ' WITH (format 'text', NULL '');
--- NB 02.12.19 COMMIT;