allows AmArgArray as return value to xmlrpc array (also nested)

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@370 8eb893ce-cfd4-0310-b710-fb5ebe64c474

apps/examples/xmlrpc2di/XMLRPC2DI.cpp

@@ -106,7 +106,6 @@ void XMLRPC2DIServerSetLoglevelMethod::execute(XmlRpcValue& params, XmlRpcValue&
   result = "200 OK";
 }
 
-
 void XMLRPC2DIServerDIMethod::execute(XmlRpcValue& params, XmlRpcValue& result) {
   try {
     if (params.size() < 2) {
@@ -148,16 +147,7 @@ void XMLRPC2DIServerDIMethod::execute(XmlRpcValue& params, XmlRpcValue& result)
     
       for (unsigned int i=0;i<ret.size();i++) {
 	const AmArg& r = ret.get(i);
-	switch (r.getType()) {
-	case AmArg::CStr:  
-	  result[i]= string(r.asCStr()); break;
-	case AmArg::Int:  
-	  result[i]=r.asInt(); break;
-	case AmArg::Double: 
-	  result[i]=r.asDouble(); break;
-	default: break;
-	  // TODO: do sth with the data here
-	}
+	add2result(r, result, i);
       }
     }
   } catch (const XmlRpcException& e) {
@@ -173,3 +163,34 @@ void XMLRPC2DIServerDIMethod::execute(XmlRpcValue& params, XmlRpcValue& result)
     throw XmlRpcException("Exception occured.", 500);
   }
 }
+
+// WARNING: AmArgArrays are deleted by this function!
+void XMLRPC2DIServerDIMethod::add2result(const AmArg& a, XmlRpcValue& result, unsigned int pos) {
+  switch (a.getType()) {
+  case AmArg::CStr:  
+    result[pos]= string(a.asCStr()); break;
+
+  case AmArg::Int:  
+    result[pos]=a.asInt(); break;
+
+  case AmArg::Double: 
+    result[pos]=a.asDouble(); break;
+
+  case AmArg::AObject: {
+    AmArgArray* arr = dynamic_cast<AmArgArray*>(a.asObject());
+    if (NULL != arr) {
+      result[pos].setSize(arr->size());
+    
+      for (unsigned int i=0;i<arr->size();i++) {
+	const AmArg& r = arr->get(i);
+	add2result(r, result[pos], i);
+      }
+      delete arr; 
+    } else {
+      WARN("unsupported return value type of parameter %d (not AmArgArray)\n", pos);
+    }
+  } break;
+  default: { WARN("unsupported return value type %d\n", a.getType()); } break;
+    // TODO: do sth with the data here ?
+  }
+}

apps/examples/xmlrpc2di/XMLRPC2DI.h

@@ -48,7 +48,18 @@ public: \
 DEF_XMLRPCSERVERMETHOD(XMLRPC2DIServerCallsMethod,       "calls") 
 DEF_XMLRPCSERVERMETHOD(XMLRPC2DIServerSetLoglevelMethod, "set_loglevel") 
 DEF_XMLRPCSERVERMETHOD(XMLRPC2DIServerGetLoglevelMethod, "get_loglevel") 
-DEF_XMLRPCSERVERMETHOD(XMLRPC2DIServerDIMethod,          "di") 
+
+class XMLRPC2DIServerDIMethod 
+       :  public XmlRpcServerMethod { 
+
+public: 
+	XMLRPC2DIServerDIMethod(XmlRpcServer* s) : 
+		XmlRpcServerMethod("di", s) { } 
+
+	void execute(XmlRpcValue& params, XmlRpcValue& result); 
+	void add2result(const AmArg& a, XmlRpcValue& result, unsigned int pos);
+};
+
 
 
      class XMLRPC2DIServer : public AmThread {