Merge pull request #174 from openEHR/fix_metadata

Fix parsing of controlled and generated tags, test build_uid
openEHR · Apr 24, 2020 · 7a35408 · 7a35408
2 parents 616683a + 02d3800
commit 7a35408
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/grammars/src/main/antlr/Adl.g4 b/grammars/src/main/antlr/Adl.g4
@@ -92,5 +92,5 @@ meta_data_tag_adl_version   : 'adl_version' ;
 meta_data_tag_uid           : 'uid' ;
 meta_data_tag_build_uid     : 'build_uid' ;
 meta_data_tag_rm_release    : 'rm_release' ;
-meta_data_tag_is_controlled : 'is_controlled' ;
-meta_data_tag_is_generated  : 'is_generated' ;
+meta_data_tag_is_controlled : 'controlled' ;
+meta_data_tag_is_generated  : 'generated' ;
diff --git a/grammars/src/main/antlr/Adl14.g4 b/grammars/src/main/antlr/Adl14.g4
@@ -62,5 +62,5 @@ meta_data_tag_adl_version   : 'adl_version' ;
 meta_data_tag_uid           : 'uid' ;
 meta_data_tag_build_uid     : 'build_uid' ;
 meta_data_tag_rm_release    : 'rm_release' ;
-meta_data_tag_is_controlled : 'is_controlled' ;
-meta_data_tag_is_generated  : 'is_generated' ;
+meta_data_tag_is_controlled : 'controlled' ;
+meta_data_tag_is_generated  : 'generated' ;
diff --git a/tools/src/test/java/com/nedap/archie/adlparser/MetadataTest.java b/tools/src/test/java/com/nedap/archie/adlparser/MetadataTest.java
@@ -38,6 +38,9 @@ public void metadataTest() throws Exception {
         //(adl_version=2.0.5; rm_release=1.0.2)
         assertEquals("2.0.5", archetype.getAdlVersion());
         assertEquals("1.0.2", archetype.getRmRelease());
+        assertTrue(archetype.getGenerated());
+        assertTrue(archetype.getControlled());
+        assertEquals("B430138C-1DD2-42EF-B54C-633909437054", archetype.getBuildUid());
     }
 
 }
diff --git a/tools/src/test/resources/basic.adl b/tools/src/test/resources/basic.adl
@@ -1,4 +1,4 @@
-archetype (adl_version=2.0.5; rm_release=1.0.2)
+archetype (adl_version=2.0.5; rm_release=1.0.2; generated; controlled; build_uid=B430138C-1DD2-42EF-B54C-633909437054)
 	openEHR-EHR-COMPOSITION.annotations_rm_path.v1.0.0
 
 language