Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix errors in validity directory, and make up to date with current version #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix errors in validity directory, and make up to date with current version #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cc6be7
Fix lots of errors in the validity package
pieterbos Oct 30, 2017
c72ff1c
And one fix in the features directory
pieterbos Oct 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...eference/features/specialisation/openEHR-EHR-OBSERVATION.redefine_occurrences.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ definition
}
}

ontology
terminology
term_definitions = <
["en"] = <
["id1.1"] = <
Expand Down
2 changes: 1 addition & 1 deletion .../validity/annotations/openEHR-EHR-COMPOSITION.VRANP_annotations_wrong_rm_path.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-EHR-COMPOSITION.VRANP_annotations_wrong_rm_path.v1.0.0

language
Expand Down
2 changes: 1 addition & 1 deletion ...ence/validity/annotations/openEHR-EHR-EVALUATION.VRANP_annotations_wrong_path.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-EHR-EVALUATION.VRANP_annotations_wrong_path.v1.0.0

language
Expand Down
2 changes: 1 addition & 1 deletion ADL2-reference/validity/basics/openEHR-DEMOGRAPHIC-ROLE.whitespace.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=2.0.5; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-DEMOGRAPHIC-ROLE.whitespace.v1.0.0

language
Expand Down
2 changes: 1 addition & 1 deletion ...eference/validity/basics/openEHR-EHR-OBSERVATION.FAIL_dadl_spurious_delimiter.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-EHR-OBSERVATION.FAIL_dadl_spurious_delimiter.v1.0.0

language
Expand Down
2 changes: 1 addition & 1 deletion ...ference/validity/basics/openEHR-EHR-OBSERVATION.VRDLA_inconsistent_lang_codes.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ definition
HISTORY[id2] matches { -- history
events cardinality matches {1..*; unordered} matches {
EVENT[id7] occurrences matches {0..*} matches { -- any event
data matches {*}
data
}
}
}
Expand Down
18 changes: 7 additions & 11 deletions ADL2-reference/validity/basics/openEHR-TEST_PKG-ENTRY.FAIL_archetype_id_empty.v1.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
archetype (adl_version=1.5)
archetype (adl_version=2.0.7; rm_release=1.0.2)

concept
[at0000]
language
original_language = <[ISO_639-1::en]>
description
Expand All @@ -22,16 +20,14 @@ description
lifecycle_state = <"draft">

definition
ENTRY[at0000] matches {*}
ENTRY[id1]

ontology
terminology
term_definitions = <
["en"] = <
items = <
["at0000"] = <
text = <"">
description = <"">
>
>
["id1"] = <
text = <" ">
description = <" ">
>
>
>
16 changes: 6 additions & 10 deletions ADL2-reference/validity/basics/openEHR-TEST_PKG-ENTRY.FAIL_archetype_id_missing.v1.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
concept
[at0000]
language
original_language = <[ISO_639-1::en]>
description
Expand All @@ -20,16 +18,14 @@ description
lifecycle_state = <"draft">

definition
ENTRY[at0000] matches {*}
ENTRY[id1]

ontology
terminology
term_definitions = <
["en"] = <
items = <
["at0000"] = <
text = <"">
description = <"">
>
>
["id1"] = <
text = <"">
description = <"">
>
>
>
2 changes: 1 addition & 1 deletion ADL2-reference/validity/basics/openEHR-TEST_PKG-ENTRY.FAIL_definition_empty.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.FAIL_definition_empty.v1

language
Expand Down
4 changes: 2 additions & 2 deletions ADL2-reference/validity/basics/openEHR-TEST_PKG-ENTRY.FAIL_definition_missing.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.FAIL_definition_missing.v1
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.FAIL_definition_missing.v1.0.0

language
original_language = <[ISO_639-1::en]>
Expand Down
2 changes: 1 addition & 1 deletion ...erence/validity/basics/openEHR-TEST_PKG-ENTRY.FAIL_terminology_extra_end_mark.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.FAIL_terminology_extra_end_mark.v1.0.0

language
Expand Down
2 changes: 1 addition & 1 deletion ADL2-reference/validity/basics/openEHR-TEST_PKG-ENTRY.FAIL_terminology_missing.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.FAIL_terminology_missing.v1.0.0

language
Expand Down
6 changes: 3 additions & 3 deletions ...ence/validity/basics/openEHR-TEST_PKG-ENTRY.SADF_definition_after_terminology.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.SADF_definition_after_terminology.v1
archetype (adl_version=2.0.6; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.SADF_definition_after_terminology.v1.0.0

language
original_language = <[ISO_639-1::en]>
Expand Down Expand Up @@ -31,4 +31,4 @@ terminology
>

definition
ENTRY[id1] matches {*}
ENTRY[id1]
2 changes: 1 addition & 1 deletion ADL2-reference/validity/basics/openEHR-TEST_PKG-ENTRY.SCAS_attribute_empty.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7 rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.SCAS_attribute_empty.v1.0.0

language
Expand Down
8 changes: 4 additions & 4 deletions ADL2-reference/validity/basics/openEHR-TEST_PKG-ENTRY.SCOAT_object_empty.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.SCOAT_object_empty.v1.0.0

language
Expand All @@ -11,7 +11,7 @@ description
details = <
["en"] = <
language = <[ISO_639-1::en]>
purpose = <"Test SCOAT syntax validity check, triggered by object constraint that is empty (should be either '*' or something specific)">
purpose = <"Test SCOAT syntax validity check, triggered by object constraint that is empty (should be something specific or left out)">
copyright = <"copyright (c) 2008 The openEHR Foundation">
>
>
Expand All @@ -31,8 +31,8 @@ terminology
term_definitions = <
["en"] = <
["id1"] = <
text = <"">
description = <"">
text = <" ">
description = <" ">
>
>
>
4 changes: 2 additions & 2 deletions ADL2-reference/validity/basics/openEHR-TEST_PKG-ENTRY.VARCN_illegal_concept_code.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VARCN_illegal_concept_code.v1.0.0

language
Expand All @@ -21,7 +21,7 @@ description
lifecycle_state = <"draft">

definition
ENTRY[id2] matches {*}
ENTRY[id2]

terminology
term_definitions = <
Expand Down
12 changes: 6 additions & 6 deletions ...openEHR-TEST_PKG-ENTRY.VCOID_container_attribute_children_no_node_identifiers.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VCOID_container_attribute_children_no_node_identifiers.v1
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VCOID_container_attribute_children_no_node_identifiers.v1.0.0

language
original_language = <[ISO_639-1::en]>
Expand All @@ -10,7 +10,7 @@ description
details = <
["en"] = <
language = <[ISO_639-1::en]>
purpose = <"Test VCOID validity check, triggered when child objects of a container attribute don't have node identifiers.">
purpose = <"Test VCOID validity check, triggered when any object nodes don't have node identifiers">
keywords = <"ADL", "validation", "test">
copyright = <"copyright (c) 2008 The openEHR Foundation">
>
Expand All @@ -25,18 +25,18 @@ definition
element_attr_2 cardinality matches {2} matches {
ELEMENT matches {
value matches {
DV_TEXT matches {*}
DV_TEXT
}
}
ELEMENT matches {
value matches {
DV_TEXT matches {*}
DV_TEXT
}
}
}
}

ontology
terminology
term_definitions = <
["en"] = <
["id1"] = <
Expand Down
2 changes: 1 addition & 1 deletion ...idity/basics/openEHR-TEST_PKG-ENTRY.VCOID_missing_ids_on_alternative_children.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.6; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VCOID_missing_ids_on_alternative_children.v1.0.0

language
Expand Down
2 changes: 1 addition & 1 deletion ...validity/basics/openEHR-TEST_PKG-ENTRY.VCOID_objects_with_no_node_identifiers.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=2.0.5; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VCOID_objects_with_no_node_identifiers.v1.0.0

language
Expand Down
15 changes: 6 additions & 9 deletions ADL2-reference/validity/basics/openehr-TEST_PKG-WHOLE.VCOID_missing_root_node_id.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=2.0.5; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openehr-TEST_PKG-WHOLE.VCOID_missing_root_node_id.v1.0.0

language
Expand All @@ -22,17 +22,14 @@ description
>

definition
WHOLE matches {*}
}
WHOLE

terminology
term_definitions = <
["en"] = <
items = <
["at1"] = <
description = <"test entry">
text = <"test entry">
>
>
["at1"] = <
description = <"test entry">
text = <"test entry">
>
>
>
4 changes: 2 additions & 2 deletions ...istency/openEHR-TEST_PKG-ENTRY.VACDF_ac_code_in_definition_not_in_terminology.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VACDF_ac_code_in_definition_not_in_terminology.v1
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VACDF_ac_code_in_definition_not_in_terminology.v1.0.0

language
original_language = <[ISO_639-1::en]>
Expand Down
2 changes: 1 addition & 1 deletion ...onsistency/openEHR-TEST_PKG-ENTRY.VATDF_at_code_in_ordinal_not_in_terminology.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VATDF_at_code_in_ordinal_not_in_terminology.v1.0.0

language
Expand Down
13 changes: 6 additions & 7 deletions ...dity/consistency/openEHR-TEST_PKG-ENTRY.VATID_concept_code_not_in_terminology.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VATID_concept_code_not_in_terminology.v1.0.0

language
Expand Down Expand Up @@ -27,10 +27,9 @@ definition
terminology
term_definitions = <
["en"] = <
["id2"] = <
text = <"">
description = <"">
>
["id2"] = <
text = <"">
description = <"">
>
>
>
>
>
2 changes: 1 addition & 1 deletion ...y/consistency/openEHR-TEST_PKG-ENTRY.VATID_id_code_in_node_not_in_terminology.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VATID_id_code_in_node_not_in_terminology.v1.0.0

language
Expand Down
2 changes: 1 addition & 1 deletion ...ty/consistency/openEHR-TEST_PKG-ENTRY.VOTM_terminology_term_definitions_empty.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VOTM_terminology_term_definitions_empty.v1.0.0

language
Expand Down
4 changes: 2 additions & 2 deletions ...TEST_PKG-ENTRY.VOTM_terminology_term_definitions_of_original_language_missing.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VOTM_terminology_term_definitions_of_original_language_missing.v1.0.0

language
Expand All @@ -22,7 +22,7 @@ description
lifecycle_state = <"unstable">

definition
ENTRY[id1] matches {*}
ENTRY[id1]

terminology
term_definitions = <
Expand Down
2 changes: 1 addition & 1 deletion ...HR-TEST_PKG-ENTRY.VOTM_terminology_term_definitions_of_other_language_missing.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VOTM_terminology_term_definitions_of_other_language_missing.v1.0.0

language
Expand Down
2 changes: 1 addition & 1 deletion ...validity/consistency/openEHR-TEST_PKG-ENTRY.VTLC_ac_code_not_in_all_languages.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VTLC_ac_code_not_in_all_languages.v1.0.0

language
Expand Down
2 changes: 1 addition & 1 deletion ...stency/openEHR-TEST_PKG-ENTRY.VTLC_at_code_in_coded_term_not_in_all_languages.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VTLC_at_code_in_coded_term_not_in_all_languages.v1.0.0

language
Expand Down
2 changes: 1 addition & 1 deletion ...nsistency/openEHR-TEST_PKG-ENTRY.VTLC_at_code_in_ordinal_not_in_all_languages.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VTLC_at_code_in_ordinal_not_in_all_languages.v1.0.0

language
Expand Down
2 changes: 1 addition & 1 deletion ...cy/openEHR-TEST_PKG-ENTRY.VTLC_missing_constraint_definitions_in_one_language.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VTLC_missing_constraint_definitions_in_one_language.v1.0.0

language
Expand Down
2 changes: 1 addition & 1 deletion ...validity/consistency/openEHR-TEST_PKG-ENTRY.VTLC_node_id_not_in_all_languages.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VTLC_node_id_not_in_all_languages.v1.0.0

language
Expand Down
2 changes: 1 addition & 1 deletion ...stency/openEHR-TEST_PKG-ENTRY.VTVSMD_at_code_in_coded_term_not_in_terminology.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VTVSMD_at_code_in_coded_term_not_in_terminology.v1.0.0

language
Expand Down
2 changes: 1 addition & 1 deletion ...dity/domain_types/openEHR-TEST_PKG-ENTRY.VTVSUQ_at_code_duplicated_in_ordinal.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=2.0.5; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-ENTRY.VTVSUQ_at_code_duplicated_in_ordinal.v1.0.0

language
Expand Down
2 changes: 1 addition & 1 deletion ADL2-reference/validity/paths/openEHR-TEST_PKG-CAR.VCOID_uncoded_interior_nodes.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-CAR.VCOID_uncoded_interior_nodes.v1.0.0

language
Expand Down
2 changes: 1 addition & 1 deletion ADL2-reference/validity/paths/openEHR-TEST_PKG-CAR.VUNP_internal_ref_bad_path.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=2.0.5; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-TEST_PKG-CAR.VUNP_internal_ref_bad_path.v1.0.0

language
Expand Down
2 changes: 1 addition & 1 deletion ...m_checking/openEHR-DEMOGRAPHIC-ORGANISATION.VCAEX_rm_non_conformant_existence.v1.0.0.adls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
archetype (adl_version=1.5.1; rm_release=1.0.2)
archetype (adl_version=2.0.7; rm_release=1.0.2)
openEHR-DEMOGRAPHIC-ORGANISATION.VCAEX_rm_non_conformant_existence.v1.0.0

language
Expand Down
Loading