From 27b74831fd9fe3b32919fe3f62e781e6073ad3ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2EFernando=20S=C3=A1nchez?= <balkian@gmail.com>
Date: Sun, 22 Apr 2012 05:53:16 +0200
Subject: [PATCH] Updated conversion and example

---
 nodeTest/app.js                               |  2 +-
 src/asl/testAgent.asl                         |  2 +-
 .../dit/gsi/jason/utils/CollectionUtils.java  | 32 +++++++++++++++++--
 .../services/socketio/SocketIOConnector.java  |  7 ++--
 4 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/nodeTest/app.js b/nodeTest/app.js
index 2d95815..a809a2c 100644
--- a/nodeTest/app.js
+++ b/nodeTest/app.js
@@ -3,7 +3,7 @@ io.sockets.on('connection', function (socket) {
   console.log("New connection!");
   socket.on('test', function (data,ack) {
     console.log(data);
-    ack("hola");
+    ack({"success":"yes"});
     console.log("I acked");
   });
 });
diff --git a/src/asl/testAgent.asl b/src/asl/testAgent.asl
index 0ca6e4f..ea835cb 100644
--- a/src/asl/testAgent.asl
+++ b/src/asl/testAgent.asl
@@ -8,5 +8,5 @@
 		.wait(1000);
 		sendSocket("test","hola").
 		
-+success(yes): true
++success("yes"): true
 	<- .print("Succes!!!!!").
diff --git a/src/java/es/upm/dit/gsi/jason/utils/CollectionUtils.java b/src/java/es/upm/dit/gsi/jason/utils/CollectionUtils.java
index ce434de..065d8f2 100644
--- a/src/java/es/upm/dit/gsi/jason/utils/CollectionUtils.java
+++ b/src/java/es/upm/dit/gsi/jason/utils/CollectionUtils.java
@@ -133,7 +133,7 @@ public abstract class CollectionUtils {
 	 * @return String Percept representation of the JSONArray
 	 */
 	
-	private static String toPerceptsArray(JSONArray jsa){
+	private static String toPerceptsJSONArray(JSONArray jsa){
 		StringBuilder sb = new StringBuilder();
 		int top = jsa.length();
 		int topm = top-1;
@@ -152,6 +152,30 @@ public abstract class CollectionUtils {
 		return sb.toString();
 	}
 	
+	/**
+	 * 
+	 * @param jsa Array to be converted
+	 * @return String Percept representation of the JSONArray
+	 */
+	
+	private static String toPerceptsArray(Object[] jsa){
+		if(jsa.length<2){
+			return toPercepts(jsa[0]);
+		}
+		StringBuilder sb = new StringBuilder();
+		int top = jsa.length;
+		int topm = top-1;
+		sb.append("[");
+		for(int i=0;i<jsa.length;i++){
+			sb.append(toPercepts(jsa[i]));
+			if(i<topm){
+				sb.append(",");
+			}
+		}
+		sb.append("]");
+		return sb.toString();
+	}
+	
 	
 	/**
 	 * String representation of a Percept, from a JSON-like object
@@ -172,8 +196,12 @@ public abstract class CollectionUtils {
 	 */
 	
 	public static String toPercepts(Object obj){
+		if(obj instanceof Object[]){
+			return toPerceptsArray((Object[]) obj);
+			
+		}
 		if(obj instanceof JSONArray){
-			return toPerceptsArray((JSONArray) obj);
+			return toPerceptsJSONArray((JSONArray) obj);
 		}
 		else if (obj instanceof JSONObject) {
 			return toPerceptsObject((JSONObject) obj);
diff --git a/src/java/es/upm/dit/gsi/sojason/services/socketio/SocketIOConnector.java b/src/java/es/upm/dit/gsi/sojason/services/socketio/SocketIOConnector.java
index bbf7428..a8ec419 100644
--- a/src/java/es/upm/dit/gsi/sojason/services/socketio/SocketIOConnector.java
+++ b/src/java/es/upm/dit/gsi/sojason/services/socketio/SocketIOConnector.java
@@ -10,8 +10,10 @@ import jason.asSyntax.Literal;
 import java.net.MalformedURLException;
 import java.util.logging.Logger;
 
+import net.sf.json.JSONArray;
 import net.sf.json.JSONException;
 import net.sf.json.JSONObject;
+import es.upm.dit.gsi.jason.utils.CollectionUtils;
 import es.upm.dit.gsi.sojason.SOModel;
 import es.upm.dit.gsi.sojason.services.AsyncWebServiceConnector;
 
@@ -94,9 +96,10 @@ public class SocketIOConnector implements AsyncWebServiceConnector{
 				@Override
 				public void ack(Object... args) {
 					logger.info("Package ack'ed");
-					Literal lit = Literal.parseLiteral("success(yes)");
+					String str = CollectionUtils.toPercepts(args);
+					Literal lit = Literal.parseLiteral(str);
 					model.setDataInbox(agName, lit);
-					logger.info("DataInbox set");
+					logger.info("DataInbox set to "+str);
 				}
 			}, new JSONObject().put("Sending", "From Jason"));
 		} catch (JSONException e) {