Bladeren bron

Fixed output call when the data is irrelevant at that point in time

Yentl Van Tendeloo 8 jaren geleden
bovenliggende
commit
2b455994f4
3 gewijzigde bestanden met toevoegingen van 17 en 12 verwijderingen
  1. 3 0
      wrappers/classes/modelverse.xml
  2. 12 11
      wrappers/modelverse.py
  3. 2 1
      wrappers/modelverse_SCCD.py

+ 3 - 0
wrappers/classes/modelverse.xml

@@ -1048,6 +1048,9 @@
                         </onentry>
 
                         <transition cond="self.expect_response_partial('Success: ', pop=False)" target="../../wait_for_action/history">
+                            <script>
+                                print("ELN returns: " + str(json.loads(self.split_response(self.responses[0])[0])))
+                            </script>
                             <raise event="result">
                                 <parameter expr="json.loads(self.split_response(self.responses.pop(0))[0])"/>
                             </raise>

+ 12 - 11
wrappers/modelverse.py

@@ -63,17 +63,18 @@ def INPUT(action, context, parameters):
     controller.addInput(Event("action", "action_in", [action, _next_ID(), context, parameters]))
 
 def OUTPUT():
-    response = responses.fetch(-1)
-    print("Got response with name: " + str(response.name))
-    if response.name == "result":
-        print("Value: " + str(response.parameters[1]))
-        return response.parameters[1]
-    elif response.name == "exception":
-        print("Exception: " + str(response.parameters))
-        if response.parameters[1] == "UnknownIdentifier":
-            raise UnknownIdentifier()
-        elif response.parameters[1] == "UnknownMetamodellingHierarchy":
-            raise UnknownMetamodellingHierarchy()
+    while 1:
+        response = responses.fetch(-1)
+        print("Got response with name: " + str(response.name))
+        if response.name == "result":
+            print("Value: " + str(response.parameters[1]))
+            return response.parameters[1]
+        elif response.name == "exception":
+            print("Exception: " + str(response.parameters))
+            if response.parameters[1] == "UnknownIdentifier":
+                raise UnknownIdentifier()
+            elif response.parameters[1] == "UnknownMetamodellingHierarchy":
+                raise UnknownMetamodellingHierarchy()
 
 def init(address_param="127.0.0.1:8001", timeout=20.0):
     INPUT("init", None, [address_param, timeout])

+ 2 - 1
wrappers/modelverse_SCCD.py

@@ -1,7 +1,7 @@
 """
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
-Date:   Wed Sep  6 09:54:14 2017
+Date:   Wed Sep  6 10:13:32 2017
 
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server
@@ -2480,6 +2480,7 @@ class Modelverse(RuntimeClassBase):
         return self.expect_response_partial('Success: ', pop=False)
     
     def _initialized_behaviour_operations_element_list_nice_0_exec(self, parameters):
+        print("ELN returns: " + str(json.loads(self.split_response(self.responses[0])[0])))
         self.raiseInternalEvent(Event("result", None, [json.loads(self.split_response(self.responses.pop(0))[0])]))
     
     def _initialized_behaviour_operations_element_list_nice_0_guard(self, parameters):