Skip to content

Commit faf6d05

Browse files
committed
Adding sorting for list of rules.
1 parent 3fd59c1 commit faf6d05

14 files changed

+5031
-2833
lines changed

.postasciidoctor.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22

3-
mv /target/guide/* /target/
3+
mv /target/guide/* /target/site
44
rm -r /target/guide

.preasciidoctor.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

.travis.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,5 @@ sudo: required
33
services:
44
- docker
55

6-
env:
7-
- PERFORM=guides
8-
- PERFORM=rules
9-
- PERFORM=structure
10-
116
script:
12-
- sh tools/travis/$PERFORM.sh
7+
- sh build.sh

build.sh

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/bin/sh
2+
3+
PROJECT=$(dirname $(readlink -f "$0"))
4+
5+
if [ -e $PROJECT/target ]; then
6+
docker run --rm -i -v $PROJECT:/src alpine:3.6 rm -rf /src/target
7+
fi
8+
9+
# Structure
10+
docker run --rm -it \
11+
-v $PROJECT:/src \
12+
-v $PROJECT/target/site/ubl-invoice:/target \
13+
difi/vefa-structure:0.4.1 \
14+
-p /src/structure/ubl-invoice -t /target
15+
16+
docker run --rm -it \
17+
-v $PROJECT:/src \
18+
-v $PROJECT/target/site/ubl-creditnote:/target \
19+
difi/vefa-structure:0.4.1 \
20+
-p /src/structure/ubl-creditnote -t /target
21+
22+
# Validator
23+
docker run --rm -it -v $PROJECT:/src difi/vefa-validator build -x -t -a rules,guide -target target/validator /src
24+
25+
# Generate adoc-files from rules
26+
27+
docker run --rm -it -v $(pwd):/src -v $(pwd)/target/generated:/target --entrypoint java klakegg/saxon:9.8.0-7 -cp /saxon.jar net.sf.saxon.Query -s:/src/rules/sch/CEN-EN16931-CII.sch -q:tools/xquery/rules_asciidoc_light.xquery -o:/target/CEN-EN16931-CII.sch.adoc
28+
docker run --rm -it -v $(pwd):/src -v $(pwd)/target/generated:/target --entrypoint java klakegg/saxon:9.8.0-7 -cp /saxon.jar net.sf.saxon.Query -s:/src/rules/sch/CEN-EN16931-UBL.sch -q:tools/xquery/rules_asciidoc_light.xquery -o:/target/CEN-EN16931-UBL.sch.adoc
29+
30+
docker run --rm -it -v $(pwd):/src -v $(pwd)/target/generated:/target --entrypoint java klakegg/saxon:9.8.0-7 -cp /saxon.jar net.sf.saxon.Query -s:/src/rules/sch/PEPPOL-EN16931-UBL.sch -q:tools/xquery/rules_asciidoc.xquery -o:/target/PEPPOL-EN16931-UBL.sch.adoc
31+
32+
# Guides
33+
docker run --rm -it -v $PROJECT:/documents -v $(pwd)/target:/target difi/asciidoctor
34+
35+
# Fix ownership
36+
docker run --rm -i -v $PROJECT:/src alpine:3.6 chown -R $(id -g $USER).$(id -g $USER) /src/target

guide/cius/images/.adocassets

Whitespace-only changes.

guide/shared/settings.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:rules-dir: /tmp/rules
1+
:rules-dir: ../../../target/generated
22

33
//links used in the BIS document
44

guide/transaction-spec/rules/tc434_rules.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ The following {EN16931} rules apply to invoice and credit note transaction as it
99
|Rule
1010
|Message/Context/Test
1111

12-
include::{rules-dir}/CEN-EN16931-UBL.sch.light.adoc[]
12+
include::{rules-dir}/CEN-EN16931-UBL.sch.adoc[]
1313
|====

rules/sch/CEN-EN16931-CII.sch

Lines changed: 2173 additions & 0 deletions
Large diffs are not rendered by default.

rules/sch/CEN-EN16931-UBL.sch

Lines changed: 2812 additions & 2803 deletions
Large diffs are not rendered by default.

tools/travis/guides.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

tools/travis/rules.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

tools/travis/structure.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

tools/xquery/rules_asciidoc.xquery

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ let $flag := string($x/@flag)
1313
let $assert := string($x/@test)
1414
let $tekst := normalize-space($x/text())
1515

16+
order by $x/@id
17+
1618
return
1719

1820
concat(".3+| ", $RuleId, " *(", $flag , ")* | *", $tekst, "* | [small]#", $rule, "# | [small]#", $assert, "# 
")

tools/xquery/rules_asciidoc_light.xquery

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ let $RuleId := string($x/@id)
1111
let $rule := replace(normalize-space(string($x/../@context)), '\|', '\\|')
1212
let $flag := string($x/@flag)
1313
let $assert := string($x/@test)
14-
let $tekst := normalize-space($x/text())
14+
let $tekst := tokenize(normalize-space($x/text()), '\]\-')[2]
15+
16+
order by $x/@id
1517

1618
return
1719

18-
concat("| ", $RuleId, " *(", $flag , ")* | *", $tekst, "* 
")
20+
concat("| ", $RuleId, " *(", $flag , ")* | ", $tekst, " 
")

0 commit comments

Comments
 (0)