Browse Source

Patched attr_assign_code

Yentl Van Tendeloo 5 years ago
parent
commit
7ff1563737
1 changed files with 23 additions and 9 deletions
  1. 23 9
      wrappers/classes/modelverse.xml

+ 23 - 9
wrappers/classes/modelverse.xml

@@ -139,7 +139,7 @@
                             <parameter expr='None'/>
                         </raise>
                         <script>
-                            #print("Request: " + str(value))
+                            print("Request: " + str(value))
                         </script>
                     </transition>
 
@@ -150,7 +150,7 @@
                             <parameter expr='None'/>
                         </raise>
                         <script>
-                            #print("Request: " + str(value))
+                            print("Request: " + str(value))
                         </script>
                     </transition>
 
@@ -172,7 +172,7 @@
                         </raise>
                         <script>
                             self.responses.append(json.loads(data))
-                            #print("Got data at %s: %s" % (self.controller.taskname, str(json.loads(data))))
+                            print("Got data at %s: %s" % (self.controller.taskname, str(json.loads(data))))
                         </script>
                     </transition>
 
@@ -1128,15 +1128,29 @@
                     <state id="attr_assign_code">
                         <onentry>
                             <raise event="request">
-                                <parameter expr="['attr_add_code', self.parameters[1], self.parameters[2], self.parameters[3]]"/>
+                                <parameter expr="['attr_add_code', self.parameters[1], self.parameters[2]]"/>
                             </raise>
                         </onentry>
 
-                        <transition cond="self.expect_response('Success')" target="../../wait_for_action/history">
-                            <raise event="result">
-                                <parameter expr="None"/>
-                            </raise>
-                        </transition>
+                        <state id="sent">
+                            <transition cond="self.expect_response('Waiting for code constructors...')" target=".">
+                                <script>
+                                    print("UPLOAD CODE")
+                                </script>
+                                <raise event="request">
+                                    <parameter expr="[self.parameters[3]]"/>
+                                </raise>
+                            </transition>
+
+                            <transition cond="self.expect_response('Success')" target="../../../wait_for_action/history">
+                                <script>
+                                    print("Got success")
+                                </script>
+                                <raise event="result">
+                                    <parameter expr="None"/>
+                                </raise>
+                            </transition>
+                        </state>
                     </state>
 
                     <state id="attr_delete">