Skip to content

Commit

Permalink
validated references to translated objects (claeis/ilivalidator#361)
Browse files Browse the repository at this point in the history
  • Loading branch information
@claeis
claeis committed Jan 24, 2023
1 parent 488ee45 commit 6a74ec2
Show file tree
Hide file tree
Showing 12 changed files with 417 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ configurations {
ftpAntTask
}
dependencies {
implementation group: 'ch.interlis', name: 'iox-ili', version: '1.21.15'
implementation group: 'ch.interlis', name: 'iox-ili', version: '1.21.16'
implementation group: 'ch.interlis', name: 'ili2c-tool', version: "5.3.2"
implementation group: 'ch.interlis', name: 'ili2c-core', version: "5.3.2"
implementation group: 'ch.ehi', name: 'ehisqlgen', version: "1.15.0"
Expand Down
3 changes: 2 additions & 1 deletion docs/CHANGELOG.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ ideas/open issues/questions
- einfache Liste mit den neu erzeugten Vertexpunkte (aufgrund der Overlap-Bereinigung)
- Schalter f�r das "disablen" der Overlaps-Bereinigung. Bei vorhandenen gueltigen Overlaps erfolgen: a) Import mit NULL als Polygon, ohne Fehlermeldung, b) Import mit NULL als Polygon, mit Warning, c) kein Import, Fehlermeldung

LATEST
ili2db 4.10.1 (LATEST)
---------------------------
- iox-ili-1.21.16

ili2db 4.10.0 (2022-12-30)
------------------------------
Expand Down
70 changes: 70 additions & 0 deletions test/data/Translation/Translation23.ili
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
INTERLIS 2.3;

MODEL Translation23_de (de)
AT "mailto:noreply@localhost" VERSION "2021-09-07" =

TOPIC TestA_de =
OID AS INTERLIS.UUIDOID;

CLASS ClassA1_de =
attrA_de : TEXT*60;
END ClassA1_de;

END TestA_de;

TOPIC TestB_de =
OID AS INTERLIS.UUIDOID;
DEPENDS ON TestA_de;

STRUCTURE StructB0_de =
refA_de : MANDATORY REFERENCE TO (EXTERNAL) Translation23_de.TestA_de.ClassA1_de;
END StructB0_de;

CLASS ClassB1_de =
attrB_de : TEXT*60;
attrRef_de : StructB0_de;
END ClassB1_de;

ASSOCIATION a2b_de =
a_de (EXTERNAL) -- {0..1} Translation23_de.TestA_de.ClassA1_de;
b_de -- {0..*} ClassB1_de;
END a2b_de;

END TestB_de;

END Translation23_de.

MODEL Translation23_fr (fr)
AT "mailto:noreply@localhost" VERSION "2021-09-07"
TRANSLATION OF Translation23_de ["2021-09-07"]
=
TOPIC TestA_fr =
OID AS INTERLIS.UUIDOID;

CLASS ClassA1_fr =
attrA_fr : TEXT*60;
END ClassA1_fr;

END TestA_fr;

TOPIC TestB_fr =
OID AS INTERLIS.UUIDOID;
DEPENDS ON TestA_fr;

STRUCTURE StructB0_fr =
refA_fr : MANDATORY REFERENCE TO (EXTERNAL) Translation23_fr.TestA_fr.ClassA1_fr;
END StructB0_fr;

CLASS ClassB1_fr =
attrB_fr : TEXT*60;
attrRef_fr : StructB0_fr;
END ClassB1_fr;

ASSOCIATION a2b_fr =
a_fr (EXTERNAL) -- {0..1} Translation23_fr.TestA_fr.ClassA1_fr;
b_fr -- {0..*} ClassB1_fr;
END a2b_fr;

END TestB_fr;

END Translation23_fr.
11 changes: 11 additions & 0 deletions test/data/Translation/assoc_root2root_Ok.xtf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><TRANSFER xmlns="http://www.interlis.ch/INTERLIS2.3">
<HEADERSECTION SENDER="IOX" VERSION="2.3"><MODELS><MODEL NAME="Translation23_de" VERSION="2021-09-07" URI="mailto:noreply@localhost"></MODEL><MODEL NAME="Translation23_fr" VERSION="2021-09-07" URI="mailto:noreply@localhost"></MODEL></MODELS></HEADERSECTION>
<DATASECTION>
<Translation23_de.TestA_de BID="b1">
<Translation23_de.TestA_de.ClassA1_de TID="f72512fe-6813-4f00-9564-8682cdc8d5e6"></Translation23_de.TestA_de.ClassA1_de>
</Translation23_de.TestA_de>
<Translation23_de.TestB_de BID="b2">
<Translation23_de.TestB_de.ClassB1_de TID="82e60911-1779-4a4e-bcd4-ce3f3573f410"><a_de REF="f72512fe-6813-4f00-9564-8682cdc8d5e6"></a_de></Translation23_de.TestB_de.ClassB1_de>
</Translation23_de.TestB_de>
</DATASECTION>
</TRANSFER>
11 changes: 11 additions & 0 deletions test/data/Translation/assoc_root2translated_Ok.xtf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><TRANSFER xmlns="http://www.interlis.ch/INTERLIS2.3">
<HEADERSECTION SENDER="IOX" VERSION="2.3"><MODELS><MODEL NAME="Translation23_de" VERSION="2021-09-07" URI="mailto:noreply@localhost"></MODEL><MODEL NAME="Translation23_fr" VERSION="2021-09-07" URI="mailto:noreply@localhost"></MODEL></MODELS></HEADERSECTION>
<DATASECTION>
<Translation23_de.TestA_de BID="b1">
<Translation23_fr.TestA_fr.ClassA1_fr TID="f72512fe-6813-4f00-9564-8682cdc8d5e6"></Translation23_fr.TestA_fr.ClassA1_fr>
</Translation23_de.TestA_de>
<Translation23_fr.TestB_fr BID="b2">
<Translation23_de.TestB_de.ClassB1_de TID="82e60911-1779-4a4e-bcd4-ce3f3573f410"><a_de REF="f72512fe-6813-4f00-9564-8682cdc8d5e6"></a_de></Translation23_de.TestB_de.ClassB1_de>
</Translation23_fr.TestB_fr>
</DATASECTION>
</TRANSFER>
11 changes: 11 additions & 0 deletions test/data/Translation/assoc_translated2root_Ok.xtf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><TRANSFER xmlns="http://www.interlis.ch/INTERLIS2.3">
<HEADERSECTION SENDER="IOX" VERSION="2.3"><MODELS><MODEL NAME="Translation23_de" VERSION="2021-09-07" URI="mailto:noreply@localhost"></MODEL><MODEL NAME="Translation23_fr" VERSION="2021-09-07" URI="mailto:noreply@localhost"></MODEL></MODELS></HEADERSECTION>
<DATASECTION>
<Translation23_de.TestA_de BID="b1">
<Translation23_de.TestA_de.ClassA1_de TID="f72512fe-6813-4f00-9564-8682cdc8d5e6"></Translation23_de.TestA_de.ClassA1_de>
</Translation23_de.TestA_de>
<Translation23_fr.TestB_fr BID="b2">
<Translation23_fr.TestB_fr.ClassB1_fr TID="82e60911-1779-4a4e-bcd4-ce3f3573f410"><a_fr REF="f72512fe-6813-4f00-9564-8682cdc8d5e6"></a_fr></Translation23_fr.TestB_fr.ClassB1_fr>
</Translation23_fr.TestB_fr>
</DATASECTION>
</TRANSFER>
11 changes: 11 additions & 0 deletions test/data/Translation/assoc_translated2translated_Ok.xtf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><TRANSFER xmlns="http://www.interlis.ch/INTERLIS2.3">
<HEADERSECTION SENDER="IOX" VERSION="2.3"><MODELS><MODEL NAME="Translation23_de" VERSION="2021-09-07" URI="mailto:noreply@localhost"></MODEL><MODEL NAME="Translation23_fr" VERSION="2021-09-07" URI="mailto:noreply@localhost"></MODEL></MODELS></HEADERSECTION>
<DATASECTION>
<Translation23_fr.TestA_fr BID="b1">
<Translation23_fr.TestA_fr.ClassA1_fr TID="f72512fe-6813-4f00-9564-8682cdc8d5e6"></Translation23_fr.TestA_fr.ClassA1_fr>
</Translation23_fr.TestA_fr>
<Translation23_fr.TestB_fr BID="b2">
<Translation23_fr.TestB_fr.ClassB1_fr TID="82e60911-1779-4a4e-bcd4-ce3f3573f410"><a_fr REF="f72512fe-6813-4f00-9564-8682cdc8d5e6"></a_fr></Translation23_fr.TestB_fr.ClassB1_fr>
</Translation23_fr.TestB_fr>
</DATASECTION>
</TRANSFER>
11 changes: 11 additions & 0 deletions test/data/Translation/refattr_root2root_Ok.xtf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><TRANSFER xmlns="http://www.interlis.ch/INTERLIS2.3">
<HEADERSECTION SENDER="IOX" VERSION="2.3"><MODELS><MODEL NAME="Translation23_de" VERSION="2021-09-07" URI="mailto:noreply@localhost"></MODEL><MODEL NAME="Translation23_fr" VERSION="2021-09-07" URI="mailto:noreply@localhost"></MODEL></MODELS></HEADERSECTION>
<DATASECTION>
<Translation23_de.TestA_de BID="b1">
<Translation23_de.TestA_de.ClassA1_de TID="f72512fe-6813-4f00-9564-8682cdc8d5e6"></Translation23_de.TestA_de.ClassA1_de>
</Translation23_de.TestA_de>
<Translation23_de.TestB_de BID="b2">
<Translation23_de.TestB_de.ClassB1_de TID="82e60911-1779-4a4e-bcd4-ce3f3573f410"><attrRef_de><Translation23_de.TestB_de.StructB0_de><refA_de REF="f72512fe-6813-4f00-9564-8682cdc8d5e6"></refA_de></Translation23_de.TestB_de.StructB0_de></attrRef_de></Translation23_de.TestB_de.ClassB1_de>
</Translation23_de.TestB_de>
</DATASECTION>
</TRANSFER>
11 changes: 11 additions & 0 deletions test/data/Translation/refattr_root2translated_Ok.xtf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><TRANSFER xmlns="http://www.interlis.ch/INTERLIS2.3">
<HEADERSECTION SENDER="IOX" VERSION="2.3"><MODELS><MODEL NAME="Translation23_de" VERSION="2021-09-07" URI="mailto:noreply@localhost"></MODEL><MODEL NAME="Translation23_fr" VERSION="2021-09-07" URI="mailto:noreply@localhost"></MODEL></MODELS></HEADERSECTION>
<DATASECTION>
<Translation23_de.TestA_de BID="b1">
<Translation23_fr.TestA_fr.ClassA1_fr TID="f72512fe-6813-4f00-9564-8682cdc8d5e6"></Translation23_fr.TestA_fr.ClassA1_fr>
</Translation23_de.TestA_de>
<Translation23_fr.TestB_fr BID="b2">
<Translation23_de.TestB_de.ClassB1_de TID="82e60911-1779-4a4e-bcd4-ce3f3573f410"><attrRef_de><Translation23_de.TestB_de.StructB0_de><refA_de REF="f72512fe-6813-4f00-9564-8682cdc8d5e6"></refA_de></Translation23_de.TestB_de.StructB0_de></attrRef_de></Translation23_de.TestB_de.ClassB1_de>
</Translation23_fr.TestB_fr>
</DATASECTION>
</TRANSFER>
11 changes: 11 additions & 0 deletions test/data/Translation/refattr_translated2root_Ok.xtf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><TRANSFER xmlns="http://www.interlis.ch/INTERLIS2.3">
<HEADERSECTION SENDER="IOX" VERSION="2.3"><MODELS><MODEL NAME="Translation23_de" VERSION="2021-09-07" URI="mailto:noreply@localhost"></MODEL><MODEL NAME="Translation23_fr" VERSION="2021-09-07" URI="mailto:noreply@localhost"></MODEL></MODELS></HEADERSECTION>
<DATASECTION>
<Translation23_de.TestA_de BID="b1">
<Translation23_de.TestA_de.ClassA1_de TID="f72512fe-6813-4f00-9564-8682cdc8d5e6"></Translation23_de.TestA_de.ClassA1_de>
</Translation23_de.TestA_de>
<Translation23_fr.TestB_fr BID="b2">
<Translation23_fr.TestB_fr.ClassB1_fr TID="82e60911-1779-4a4e-bcd4-ce3f3573f410"><attrRef_fr><Translation23_fr.TestB_fr.StructB0_fr><refA_fr REF="f72512fe-6813-4f00-9564-8682cdc8d5e6"></refA_fr></Translation23_fr.TestB_fr.StructB0_fr></attrRef_fr></Translation23_fr.TestB_fr.ClassB1_fr>
</Translation23_fr.TestB_fr>
</DATASECTION>
</TRANSFER>
11 changes: 11 additions & 0 deletions test/data/Translation/refattr_translated2translated_Ok.xtf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><TRANSFER xmlns="http://www.interlis.ch/INTERLIS2.3">
<HEADERSECTION SENDER="IOX" VERSION="2.3"><MODELS><MODEL NAME="Translation23_de" VERSION="2021-09-07" URI="mailto:noreply@localhost"></MODEL><MODEL NAME="Translation23_fr" VERSION="2021-09-07" URI="mailto:noreply@localhost"></MODEL></MODELS></HEADERSECTION>
<DATASECTION>
<Translation23_fr.TestA_fr BID="b1">
<Translation23_fr.TestA_fr.ClassA1_fr TID="f72512fe-6813-4f00-9564-8682cdc8d5e6"></Translation23_fr.TestA_fr.ClassA1_fr>
</Translation23_fr.TestA_fr>
<Translation23_fr.TestB_fr BID="b2">
<Translation23_fr.TestB_fr.ClassB1_fr TID="82e60911-1779-4a4e-bcd4-ce3f3573f410"><attrRef_fr><Translation23_fr.TestB_fr.StructB0_fr><refA_fr REF="f72512fe-6813-4f00-9564-8682cdc8d5e6"></refA_fr></Translation23_fr.TestB_fr.StructB0_fr></attrRef_fr></Translation23_fr.TestB_fr.ClassB1_fr>
</Translation23_fr.TestB_fr>
</DATASECTION>
</TRANSFER>
Loading

0 comments on commit 6a74ec2

Please sign in to comment.