fixes for ingen

CaboLabs · Nov 17, 2023 · ba02134 · ba02134
1 parent a0a7d46
commit ba02134
Show file tree

Hide file tree

Showing 9 changed files with 854 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -212,7 +212,7 @@ String path = "vital_signs.xml"
 File file = new File(getClass().getResource(path).toURI())
 String xml = file.text
 def parser = new OpenEhrXmlParser()
-Composition c = (Composition)parser.parseXml(xml)
+Composition c = (Composition)parser.parseLocatable(xml)
 ```
 
 ### Serialize a COMPOSITION to XML
@@ -249,7 +249,7 @@ report.errors.each { error ->
 ```groovy
 String xml = ...
 def parser = new OpenEhrXmlParser()
-Composition c = (Composition)parser.parseXml(xml)
+Composition c = (Composition)parser.parseLocatable(xml)
 def serializer = new OpenEhrJsonSerializer()
 String json = serializer.serialize(c)
 ```

diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-version = 1.9.10
+version = 1.9.11
 group = com.cabolabs
diff --git a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParser.groovy b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParser.groovy
@@ -162,6 +162,7 @@ class OpenEhrJsonParser {
       return ehr
    }
 
+   // FIXME: this should be parseLocatable
    // used to parse compositions and other descendant from Locatable
    // TODO: FOLDER and EHR_STATUS are above, we might need to use this one instead
    Locatable parseJson(String json)

diff --git a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonSerializer.groovy b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonSerializer.groovy
@@ -186,6 +186,8 @@ class OpenEhrJsonSerializer {
    {
       this.fillPartyDto(a, out)
 
+      def method
+
       // optional
       if (a.languages)
       {
@@ -218,6 +220,8 @@ class OpenEhrJsonSerializer {
    {
       this.fillParty(a, out)
 
+      def method
+
       // optional
       if (a.languages)
       {
@@ -674,8 +678,7 @@ class OpenEhrJsonSerializer {
 
       out.system_id = a.system_id
 
-      String method
-      method = this.method(a.committer)
+      String method = this.method(a.committer)
       out.committer = [_type: this.openEhrType(a.committer)] + this."$method"(a.committer)
 
       out.time_committed = this.serializeDvDateTime(a.time_committed)
@@ -698,8 +701,7 @@ class OpenEhrJsonSerializer {
       // AuditDetails fields
       out.system_id = a.system_id
 
-      def method
-      method = this.method(a.committer)
+      def method = this.method(a.committer)
       out.committer = [_type: this.openEhrType(a.committer)] + this."$method"(a.committer)
 
       out.time_committed = this.serializeDvDateTime(a.time_committed)
@@ -911,9 +913,11 @@ class OpenEhrJsonSerializer {
    {
       this.fillEntry(o, out)
 
+      String method
+
       if (o.protocol)
       {
-         String method = this.method(o.protocol)
+         method = this.method(o.protocol)
          out.protocol = [_type: this.openEhrType(o.protocol)] + this."$method"(o.protocol)
 
          // TODO: check if this is needed

diff --git a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrXmlParser.groovy b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrXmlParser.groovy
@@ -215,7 +215,7 @@ class OpenEhrXmlParser {
       catch (Exception e)
       {
          println e.message
-         throw new XmlParseException("Can't parse XML, check ${type} is a VERSION type. If you tried to parse a LOCATABLE, use the parseXml method", e)
+         throw new XmlParseException("Can't parse XML, check ${type} is a VERSION type. If you tried to parse a LOCATABLE, use the parseLocatable method", e)
       }
       return out
    }

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/Main.groovy b/src/main/groovy/com/cabolabs/openehr/opt/Main.groovy
@@ -115,7 +115,6 @@ class Main {
             def destination_path = args[2]
             verifyFolder(destination_path)
 
-            // TODO: separate xml/json from the composition/version in two params
             def format = 'json'
             def generate = 'locatable'
 
@@ -282,6 +281,7 @@ class Main {
                   printer.flush()
                   printer.close()
                break
+               // TODO: trans FOLDER, EHR_STATUS, ACTOR, PARTY_RELATIONSHIP
                case "composition":
 
                   String path = args[2] // composition
@@ -302,7 +302,7 @@ class Main {
                      // Parse XML
                      String xml = f.text
                      def parser = new OpenEhrXmlParser()
-                     Composition c = (Composition)parser.parseXml(xml)
+                     Composition c = (Composition)parser.parseLocatable(xml)
 
                      // debug
                      // out = JsonOutput.toJson(c)
@@ -457,7 +457,7 @@ class Main {
    static validateXMLWithOPT(File xml)
    {
       def parser = new OpenEhrXmlParser()
-      def instance = parser.parseXml(xml.text) // should be a composition, if the file is a version it won't parse
+      def instance = parser.parseLocatable(xml.text) // xml should be a locatable
       validateCompositionWithOPT(instance)
    }
 

diff --git a/src/main/groovy/com/cabolabs/openehr/opt/instance_generator/RmInstanceGenerator.groovy b/src/main/groovy/com/cabolabs/openehr/opt/instance_generator/RmInstanceGenerator.groovy
@@ -930,7 +930,7 @@ class RmInstanceGenerator {
             _denominator = 1
          break
          case 2: // percent
-            _numerator = (random_gen.nextFloat() * (num_hi - num_lo) + num_lo).round(1)
+            _numerator = (random_gen.nextFloat() * 100).round(1) // NOTE: for a percentage, 100 is the high value
             _denominator = 100
          break
          case [3,4]: // fraction, integer_fraction