From 0fbdf39ebae4d823ee846ed8c65ebb039cfa5cb0 Mon Sep 17 00:00:00 2001 From: whalekeykeeper <46596921+whalekeykeeper@users.noreply.github.com> Date: Wed, 18 Aug 2021 02:03:23 +0200 Subject: [PATCH] modify the first sql query so that titles not in 'zh' and not in 'zh_Latn_pinyin' will be returned --- .github/workflows/ci.yml | 2 +- .gitignore | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be8bd83f..81200d06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,7 +77,7 @@ jobs: path: xml - name: Update csv view data run: | - docker run --rm -t -v $(pwd):/tmp duncdrum/textql:alpine -output-header -output-file csv/views/view01a_txt-titles.csv -header -sql "select distinct a.act_id, a.act_object, ps.title from Act a, PrimarySource ps inner join PrimarySource on a.act_object = ps.prim_source_id where ps.title_lang = a.id_lang and a.act_object!='W0414'" csv/data/ + docker run --rm -t -v $(pwd):/tmp duncdrum/textql:alpine -output-header -output-file csv/views/view01a_txt-titles.csv -header -sql "select distinct a.act_id, a.act_object, ps.title from Act a, PrimarySource ps inner join PrimarySource on a.act_object = ps.prim_source_id where ps.title_lang != 'zh' and ps.title_lang != 'zh-Latn-pinyin' and a.act_object!='W0414'" csv/data/ docker run --rm -t -v $(pwd):/tmp duncdrum/textql:alpine -output-header -output-file csv/views/view01b_art-titles.csv -header -sql "select distinct a.act_id, a.act_object, aw.title from Act a, ArtWork aw inner join ArtWork on a.act_object = aw.artwork_id where aw.title_lang = a.id_lang and a.act_object!='W0554'" csv/data/ docker run --rm -t -v $(pwd):/tmp duncdrum/textql:alpine -output-header -output-file csv/views/view02_creator-matrix.csv -header -sql "select distinct a.act_id, a.act_object, w.creator, (select distinct ps.title from PrimarySource ps where a.act_object = ps.prim_source_id) as title, (select distinct coalesce(p.family_name, '') || ' ' || coalesce(p.first_name, '') from Person p where w.creator = p.person_id) as name from Act a, Work w inner join Work on a.act_object = w.work_id where a.act_object!='W0414'" csv/data/ docker run --rm -t -v $(pwd):/tmp duncdrum/textql:alpine -output-header -output-file csv/views/view03a_reader-author-nodes.csv -header -sql "select distinct a.agent_id as node_id from Agent a" csv/data/ diff --git a/.gitignore b/.gitignore index 461fcdba..dc367c84 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ Temporary Items .notes xml/expand/ +.idea/ \ No newline at end of file