cleaning the code

totoro
1 parent 726439d3
Showing 2 changed files with 10 additions and 22 deletions Show diff stats
asterisk/ami.anubis
asterisk/ami_commands.anubis
@@ -10,9 +10,9 @@ read system/string.anubis
 read tools/basis.anubis
 read tools/connections.anubis
  
-read asterisk/ami_types.anubis
-read asterisk/ami_commands.anubis
-read web/CXM_http_get_common.anubis
+read calexium_lib/asterisk/ami_types.anubis
+read calexium_lib/asterisk/ami_commands.anubis
+read calexium_lib/web/CXM_http_get_common.anubis
  
  
  
@@ -34,23 +34,11 @@ define Maybe(One)
       with ami_response = to_string(ba),
       //   typed_response = xml_rpc_get_response(xml_response),
       if print_dump then
-      
-        success(println("=== ASTERISK SERVER answer ==="+crlf +"["+ ami_response + "]" ))
-        //println("=== XML_RPC Anubis interpretation ===");
-
-       /* if typed_response is
-        {
-          failure         then println("Interpretation error"),
-          success(result) then 
-            if result is
-            {
-              ok(ok_res)    then println(format_xml_rpc_parameters(ok_res,1)),
-              fault(fault)  then println(format_xml_rpc_fault(fault,1))
-            }
-           
-        } */
-        
-      else success(unique)
+        println("=== ASTERISK SERVER answer ==="+crlf +"["+ ami_response + "]" );
+        receive(print_dump, conn)
+       
+      else 
+        receive(print_dump, conn)
   }
   .
  
@@ -158,7 +146,7 @@ global define One
   (
     List(String) args
   )=
-  if asterisk_new_client("192.168.3.20:5038", auth("admin","admin")) is
+  if asterisk_new_client("192.168.3.118:5038", auth("anubix","anubix")) is
   {
     failure             then println(" asterisk new client failure"),
     success(ami_client) then unique
@@ -6,7 +6,7 @@
  * 
  */
  
-read asterisk/ami_types.anubis
+read calexium_lib/asterisk/ami_types.anubis
  
 public define AMI_Action ami_login(String user, String password, Bool events) =
   action("Login", [