首页 发现 帮助
登录
lucas
/
modelverse
派生自 yentl/modelverse
关注 1
点赞 0
派生 0
文件
浏览代码

Fixed model_list

Yentl Van Tendeloo 8 年之前
父节点
76dd61659a
当前提交
95cde3b841
共有 3 个文件被更改，包括 18 次插入 和 20 次删除
合并视图 显示文件统计
  1. 0 3
      bootstrap/core_algorithm.alc
  2. 15 15
      wrappers/classes/modelverse.xml
  3. 3 2
      wrappers/modelverse.py

+ 0 - 3
bootstrap/core_algorithm.alc
查看文件 

@@ -1374,7 +1374,6 @@ String function cmd_model_delete(model_name : String):
 
 
 
 String function cmd_model_list(location : String):
 
 String function cmd_model_list(location : String):
 
 	// List all models
 
 	// List all models
 
-	log("Got model list!")
 
 	if (get_entry_id(location) != ""):
 
 	if (get_entry_id(location) != ""):
 
 		if (allow_read(current_user_id, get_entry_id(location))):
 
 		if (allow_read(current_user_id, get_entry_id(location))):
 
 			Element models
 
 			Element models
 
@@ -2033,8 +2032,6 @@ String function cmd_model_types(model_name : String):
 
 		types = allAssociationDestinations(core, model_id, "instanceOf")
 
 		types = allAssociationDestinations(core, model_id, "instanceOf")
 
 		while (set_len(types) > 0):
 
 		while (set_len(types) > 0):
 
 			type = set_pop(types)
 
 			type = set_pop(types)
 
-			log("Checking type: " + cast_v2s(type))
 
-			log("Name attr: " + cast_v2s(read_attribute(core, type, "name")))
 
 			result = string_join(result, full_name(type) + "\n")
 
 			result = string_join(result, full_name(type) + "\n")
 
 
 
 		return result!
 
 		return result!

+ 15 - 15
wrappers/classes/modelverse.xml
查看文件 

@@ -12,6 +12,17 @@
 
         </body>
 
         </body>
 
     </method>
 
     </method>
 
 
 
+    <method name="split_response">
 
+        <parameter name="response"/>
 
+        <body>
 
+            splitted = response.strip().split(": ", 1)
 
+            if len(splitted) > 1:
 
+                return splitted[1].split("\n")
 
+            else:
 
+                return []
 
+        </body>
 
+    </method>
 
+
 
     <method name="expect_response">
 
     <method name="expect_response">
 
         <parameter name="expected"/>
 
         <parameter name="expected"/>
 
         <parameter name="pop" default="False"/>
 
         <parameter name="pop" default="False"/>
 
@@ -29,8 +40,7 @@
 
         <parameter name="expected"/>
 
         <parameter name="expected"/>
 
         <parameter name="pop" default="False"/>
 
         <parameter name="pop" default="False"/>
 
         <body>
 
         <body>
 
-            print("Checking for partial resonse, got: " + str(self.responses))
 
-            if self.responses and self.responses.startswith(expected):
 
+            if self.responses and self.responses[0].startswith(expected):
 
                 if pop:
 
                 if pop:
 
                     del self.responses[0]
 
                     del self.responses[0]
 
                 return True
 
                 return True
 
@@ -99,9 +109,6 @@
 
                             <parameter expr='urllib.urlencode({"op": "set_input", "data": json.dumps(value), "taskname": self.taskname})'/>
 
                             <parameter expr='urllib.urlencode({"op": "set_input", "data": json.dumps(value), "taskname": self.taskname})'/>
 
                             <parameter expr='None'/>
 
                             <parameter expr='None'/>
 
                         </raise>
 
                         </raise>
 
-                        <script>
 
-                            print("Sent out value: " + str(urllib.urlencode({"op": "set_input", "data": json.dumps(value), "taskname": self.taskname})))
 
-                        </script>
 
                     </transition>
 
                     </transition>
 
 
 
                     <transition event="request" cond="not isinstance(value, type([]))" target=".">
 
                     <transition event="request" cond="not isinstance(value, type([]))" target=".">
 
@@ -110,9 +117,6 @@
 
                             <parameter expr='urllib.urlencode({"op": "set_input", "value": json.dumps(value), "taskname": self.taskname})'/>
 
                             <parameter expr='urllib.urlencode({"op": "set_input", "value": json.dumps(value), "taskname": self.taskname})'/>
 
                             <parameter expr='None'/>
 
                             <parameter expr='None'/>
 
                         </raise>
 
                         </raise>
 
-                        <script>
 
-                            print("Sent out value: " + str(urllib.urlencode({"op": "set_input", "value": json.dumps(value), "taskname": self.taskname})))
 
-                        </script>
 
                     </transition>
 
                     </transition>
 
 
 
                     <transition event="request_raw" target=".">
 
                     <transition event="request_raw" target=".">
 
@@ -132,7 +136,6 @@
 
                             <parameter expr='"parent"'/>
 
                             <parameter expr='"parent"'/>
 
                         </raise>
 
                         </raise>
 
                         <script>
 
                         <script>
 
-                            print("Got output " + str(data))
 
                             self.responses.append(json.loads(data))
 
                             self.responses.append(json.loads(data))
 
                         </script>
 
                         </script>
 
                     </transition>
 
                     </transition>
 
@@ -239,7 +242,7 @@
 
                                 <parameter expr="'quiet'"/>
 
                                 <parameter expr="'quiet'"/>
 
                             </raise>
 
                             </raise>
 
                             <raise event="result">
 
                             <raise event="result">
 
-                                <parameter expr="[]"/>
 
+                                <parameter expr="None"/>
 
                             </raise>
 
                             </raise>
 
                         </transition>
 
                         </transition>
 
                     </state>
 
                     </state>
 
@@ -248,16 +251,13 @@
 
                 <state id="model_list">
 
                 <state id="model_list">
 
                     <onentry>
 
                     <onentry>
 
                         <raise event="request">
 
                         <raise event="request">
 
-                            <parameter expr="'model_list'"/>
 
+                            <parameter expr="['model_list', self.parameters[0]]"/>
 
                         </raise>
 
                         </raise>
 
-                        <script>
 
-                            print("Raised model_list!")
 
-                        </script>
 
                     </onentry>
 
                     </onentry>
 
 
 
                     <transition cond="self.expect_response_partial('Success: ', pop=False)" target="../wait_for_action/history">
 
                     <transition cond="self.expect_response_partial('Success: ', pop=False)" target="../wait_for_action/history">
 
                         <raise event="result">
 
                         <raise event="result">
 
-                            <parameter expr="self.split_response('Success: ')"/>
 
+                            <parameter expr="self.split_response(self.responses.pop(0))"/>
 
                         </raise>
 
                         </raise>
 
                     </transition>
 
                     </transition>
 
                 </state>
 
                 </state>

+ 3 - 2
wrappers/modelverse.py
查看文件 

@@ -31,7 +31,8 @@ def INPUT(action, context, parameters):
 
     controller.addInput(Event("action", "action_in", [action, _next_ID(), context, parameters]))
 
     controller.addInput(Event("action", "action_in", [action, _next_ID(), context, parameters]))
 
 
 
 def OUTPUT():
 
 def OUTPUT():
 
-    return responses.fetch(-1)
 
+    response = responses.fetch(-1)
 
+    return response.parameters[1]
 
 
 
 def init(address_param="127.0.0.1:8001", timeout=20.0):
 
 def init(address_param="127.0.0.1:8001", timeout=20.0):
 
     INPUT("init", None, [address_param, timeout])
 
     INPUT("init", None, [address_param, timeout])
 
@@ -47,4 +48,4 @@ def model_list(location):
 
 
 
 init()
 
 init()
 
 login("admin", "admin")
 
 login("admin", "admin")
 
-model_list("")
 
+print(model_list(""))