소스 검색

Patch handling of model_overwrite with search

Yentl Van Tendeloo 7 년 전
부모
커밋
cb3feb7f3e
2개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 3 3
      wrappers/classes/modelverse.xml
  2. 3 3
      wrappers/modelverse_SCCD.py

+ 3 - 3
wrappers/classes/modelverse.xml

@@ -476,9 +476,9 @@
                                 <script>
                                     response = self.split_response(self.responses.pop(0))
                                     if response:
-                                        self.registered_metamodel[self.current_model] = set(response).pop().split(", ")[0]
+                                        self.registered_metamodel[self.parameters[0]] = set(response).pop().split(", ")[0]
                                     else:
-                                        self.registered_metamodel[self.current_model] = None
+                                        self.registered_metamodel[self.parameters[0]] = None
                                 </script>
                             </transition>
                         </state>
@@ -491,7 +491,7 @@
                                 </raise>
                             </transition>
 
-                            <transition cond="self.registered_metamodel[self.current_model] != None" target="../send_metadata"/>
+                            <transition cond="self.registered_metamodel[self.parameters[0]] != None" target="../send_metadata"/>
                         </state>
 
                         <state id="send_metadata">

+ 3 - 3
wrappers/modelverse_SCCD.py

@@ -2807,9 +2807,9 @@ class Modelverse(RuntimeClassBase):
     def _initialized_behaviour_operations_model_overwrite_search_0_exec(self, parameters):
         response = self.split_response(self.responses.pop(0))
         if response:
-            self.registered_metamodel[self.current_model] = set(response).pop().split(", ")[0]
+            self.registered_metamodel[self.parameters[0]] = set(response).pop().split(", ")[0]
         else:
-            self.registered_metamodel[self.current_model] = None
+            self.registered_metamodel[self.parameters[0]] = None
     
     def _initialized_behaviour_operations_model_overwrite_search_0_guard(self, parameters):
         return self.expect_response_partial('Success: ')
@@ -2821,7 +2821,7 @@ class Modelverse(RuntimeClassBase):
         return self.registered_metamodel[self.current_model] == None
     
     def _initialized_behaviour_operations_model_overwrite_prepare_call_1_guard(self, parameters):
-        return self.registered_metamodel[self.current_model] != None
+        return self.registered_metamodel[self.parameters[0]] != None
     
     def _initialized_behaviour_operations_model_overwrite_send_metadata_0_guard(self, parameters):
         return self.expect_response('Waiting for model constructors...')