diff --git a/.github/actions/ParlaMintStatus/status.sh b/.github/actions/ParlaMintStatus/status.sh index 1bed4486c..01de61745 100755 --- a/.github/actions/ParlaMintStatus/status.sh +++ b/.github/actions/ParlaMintStatus/status.sh @@ -2,9 +2,9 @@ pwd cd ParlaMint changed_files=$(git diff --name-only HEAD HEAD~1) -parla_changed=$(echo "$changed_files"|grep 'Sample/ParlaMint-.*/'|sed -n 's/^Sample\/ParlaMint-\([-A-Z]*\).*.xml$/\1/p'|sort|uniq|tr '\n' ' '|sed 's/ *$//') +parla_changed=$(echo "$changed_files"|grep 'Samples/ParlaMint-.*/'|sed -n 's/^Samples\/ParlaMint-\([-A-Z]*\).*.xml$/\1/p'|sort|uniq|tr '\n' ' '|sed 's/ *$//') scripts_changed=$(echo "$changed_files"|egrep "^(Schema|Scripts)") -parla_all=$(echo Sample/ParlaMint-*|sed 's/Sample\/ParlaMint-\([-A-Z]*\)/\1/g'|sort) +parla_all=$(echo Samples/ParlaMint-*|sed 's/Samples\/ParlaMint-\([-A-Z]*\)/\1/g'|sort) parla_process=$(test -z "${parla_changed}" && echo "${parla_all}" || echo "${parla_changed}") @@ -13,8 +13,8 @@ parla_process=$(echo "[\"$parla_process\"]"|sed 's/ */","/g'| sed 's/^\[""\]$/[ parla_changed_size=0 for parla in $parla_changed; do - size=$(find Sample/ParlaMint-$parla -type f -name "ParlaMint-$parla*.xml" -print0 | du -c --block-size=1000000 --files0-from=-|tail -1|cut -f 1) - echo "::notice:: Sample/ParlaMint-$parla size =${size} MB" + size=$(find Samples/ParlaMint-$parla -type f -name "ParlaMint-$parla*.xml" -print0 | du -c --block-size=1000000 --files0-from=-|tail -1|cut -f 1) + echo "::notice:: Samples/ParlaMint-$parla size =${size} MB" parla_changed_size=$(echo "$parla_changed_size+$size"|bc) done diff --git a/.github/actions/ParlaMintValidate/validate.sh b/.github/actions/ParlaMintValidate/validate.sh index bd19e634a..a6505f49f 100755 --- a/.github/actions/ParlaMintValidate/validate.sh +++ b/.github/actions/ParlaMintValidate/validate.sh @@ -3,7 +3,7 @@ cd ParlaMint FAIL=0 -DATADIR=Sample +DATADIR=Samples TESTDIR="SAMPLE/Parla-CLARIN" mkdir -p $TESTDIR diff --git a/.github/workflows/createSample.yml b/.github/workflows/createSample.yml index b57758ee5..2f4a19c77 100644 --- a/.github/workflows/createSample.yml +++ b/.github/workflows/createSample.yml @@ -54,16 +54,16 @@ jobs: DIR="${{env.SAMPLE_DIR}}/$parla" mkdir $DIR echo "::notice::New sample files [$parla] TEXT" - java -jar $GITHUB_WORKSPACE/Saxon.jar outDir=$DIR revRespPers='GitHub Action' -xsl:${{env.SAMPLE_SCRIPT}} Sample/ParlaMint-$parla/ParlaMint-$parla.xml + java -jar $GITHUB_WORKSPACE/Saxon.jar outDir=$DIR revRespPers='GitHub Action' -xsl:${{env.SAMPLE_SCRIPT}} Samples/ParlaMint-$parla/ParlaMint-$parla.xml echo "::notice::New sample files [$parla] ANNOTATED" - if [ -f "Sample/ParlaMint-$parla/ParlaMint-$parla.ana.xml" ] ; then - java -jar $GITHUB_WORKSPACE/Saxon.jar outDir=$DIR revRespPers='GitHub Action' -xsl:${{env.SAMPLE_SCRIPT}} Sample/ParlaMint-$parla/ParlaMint-$parla.ana.xml + if [ -f "Samples/ParlaMint-$parla/ParlaMint-$parla.ana.xml" ] ; then + java -jar $GITHUB_WORKSPACE/Saxon.jar outDir=$DIR revRespPers='GitHub Action' -xsl:${{env.SAMPLE_SCRIPT}} Samples/ParlaMint-$parla/ParlaMint-$parla.ana.xml else echo "::warning::skipping annotated conversion - missing corpus root file" fi - echo "::notice::Move new sample files to Sample/ParlaMint-$parla" - ls $DIR|grep "ParlaMint-$parla[\.\_]"|xargs -I {} mv $DIR/{} Sample/ParlaMint-$parla/ + echo "::notice::Move new sample files to Samples/ParlaMint-$parla" + ls $DIR|grep "ParlaMint-$parla[\.\_]"|xargs -I {} mv $DIR/{} Samples/ParlaMint-$parla/ echo "::endgroup::" done - name: Remove unused data from repository @@ -71,10 +71,10 @@ jobs: cd $GITHUB_WORKSPACE/ParlaMint shopt -s globstar for parla in $(jq -r '.[]' <<< '${{needs.Changes.outputs.parla_changed}}' ); do - for file in $(echo Sample/ParlaMint-$parla/**/ParlaMint-$parla\_*) ; do + for file in $(echo Samples/ParlaMint-$parla/**/ParlaMint-$parla\_*) ; do echo "testing $file" - xmlfile=$(echo $file|sed -E 's/(-meta\.tsv|\.conllu|\.txt|\.vert)$/.xml/;s/^Sample\/ParlaMint-[^\/]*\///') - cat Sample/ParlaMint-$parla/ParlaMint-$parla{,.ana}.xml | grep -Fq "$xmlfile" || git rm "$file" + xmlfile=$(echo $file|sed -E 's/(-meta\.tsv|\.conllu|\.txt|\.vert)$/.xml/;s/^Samples\/ParlaMint-[^\/]*\///') + cat Samples/ParlaMint-$parla/ParlaMint-$parla{,.ana}.xml | grep -Fq "$xmlfile" || git rm "$file" done done - name: Create Derived files and Validate ${{needs.Changes.outputs.parla_changed}} @@ -87,8 +87,8 @@ jobs: run: | cd $GITHUB_WORKSPACE/ParlaMint for parla in $(jq -r '.[]' <<< '${{needs.Changes.outputs.parla_changed}}' ); do - git add Sample/ParlaMint-$parla/ParlaMint-*.{txt,tsv,conllu,vert,xml} || echo "::warning:: $parla suppress fatal: pathspec '' did not match any files" - git diff --name-only Sample/ParlaMint-$parla + git add Samples/ParlaMint-$parla/ParlaMint-*.{txt,tsv,conllu,vert,xml} || echo "::warning:: $parla suppress fatal: pathspec '' did not match any files" + git diff --name-only Samples/ParlaMint-$parla done git status git commit -a -m "action: generating ParlaMint-${{needs.Changes.outputs.parla_changed}} sample files with #${{github.event.number}}" diff --git a/Corpora/Taxonomies/ParlaMint-taxonomy-politicalOrientation.template.xml b/Corpora/Taxonomies/ParlaMint-taxonomy-politicalOrientation.template.xml index 9906b64d5..d4b999f14 100644 --- a/Corpora/Taxonomies/ParlaMint-taxonomy-politicalOrientation.template.xml +++ b/Corpora/Taxonomies/ParlaMint-taxonomy-politicalOrientation.template.xml @@ -40,28 +40,17 @@ Right to far-right - Big tent: - Big tent refers to politics that are ... - + Big tent: Big tent or catch-all refers to political parties that have members covering a broad spectrum of beliefs. - - Nonpartisanism: - Nonpartisanism refers to politics that are ... - + Nonpartisanism: Nonpartisanism refers to a political stance that does not agree with the current political party system. - - Pirate Party: - Pirate Party refers to politics that are ... - + Pirate Party: Pirate Party refers to political parties that support civil rights, direct democracy, encourage innovation and creativity, free sharing of knowledge, information privacy, free speech, anti-corruption, net neutrality and oppose mass surveillance, censorship and Big Tech. - Single Issue Politics: - Single Issue Politics refers to politics that are ... - + Single Issue Politics: Single Issue Politics refers to a political stance that is based on one essential policy area or idea. Syncretic politics: - Syncretic politics refers to politics that are ... - + Syncretic politics refers to politics that combine elements from across the conventional left–right political spectrum. diff --git a/Corpora/Taxonomies/ParlaMint-taxonomy-politicalOrientation.xml b/Corpora/Taxonomies/ParlaMint-taxonomy-politicalOrientation.xml index 9906b64d5..d4b999f14 100644 --- a/Corpora/Taxonomies/ParlaMint-taxonomy-politicalOrientation.xml +++ b/Corpora/Taxonomies/ParlaMint-taxonomy-politicalOrientation.xml @@ -40,28 +40,17 @@ Right to far-right - Big tent: - Big tent refers to politics that are ... - + Big tent: Big tent or catch-all refers to political parties that have members covering a broad spectrum of beliefs. - - Nonpartisanism: - Nonpartisanism refers to politics that are ... - + Nonpartisanism: Nonpartisanism refers to a political stance that does not agree with the current political party system. - - Pirate Party: - Pirate Party refers to politics that are ... - + Pirate Party: Pirate Party refers to political parties that support civil rights, direct democracy, encourage innovation and creativity, free sharing of knowledge, information privacy, free speech, anti-corruption, net neutrality and oppose mass surveillance, censorship and Big Tech. - Single Issue Politics: - Single Issue Politics refers to politics that are ... - + Single Issue Politics: Single Issue Politics refers to a political stance that is based on one essential policy area or idea. Syncretic politics: - Syncretic politics refers to politics that are ... - + Syncretic politics refers to politics that combine elements from across the conventional left–right political spectrum. diff --git a/Scripts/parlamint2release.xsl b/Scripts/parlamint2release.xsl index c39fb2024..1da671bdc 100644 --- a/Scripts/parlamint2release.xsl +++ b/Scripts/parlamint2release.xsl @@ -405,12 +405,13 @@ - + +