send subdialog namelist to server

BugHunterPhilosopher · Nov 10, 2011 · c3f247d · c3f247d
1 parent c39e1ab
commit c3f247d
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 140 deletions.
diff --git a/VxmlInterpreter/src/cudl/VoiceXmlNode.java b/VxmlInterpreter/src/cudl/VoiceXmlNode.java
@@ -16,6 +16,7 @@
 
 import org.mozilla.javascript.EcmaError;
 import org.mozilla.javascript.Undefined;
+import org.mozilla.javascript.ast.Yield;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -949,28 +950,25 @@ public Object interpret(InterpreterContext context) throws InterpreterException,
 		if (src != null && srcexpr != null) {
 			throw new EventException("error.badfetch");
 		}
-		if(src == null && srcexpr != null)
-		{
-			src = context.getDeclaration().evaluateScript(srcexpr, 50)+"";
+		if (src == null && srcexpr != null) {
+			src = context.getDeclaration().evaluateScript(srcexpr, 50) + "";
 		}
 		InternalInterpreter internalInterpreter = null;
 		if (src != null) {
 			String url = Utils.tackWeelFormedUrl(context.getCurrentFileName(), src);
 
 			// if remote url, put namelist values in GET parameters
-			if (!url.startsWith("#")) {
-				String nameList = getNodeAttributeValue(node, "namelist");
-				if (nameList != null) {
-					StringTokenizer tokenizer = new StringTokenizer(nameList);
-					String urlSuite = "?";
-					while (tokenizer.hasMoreElements()) {
-						String data = tokenizer.nextToken();
-						urlSuite += data + "=" + context.getDeclaration().getValue(data) + "&";
-					}
-					url += urlSuite;
+			String nameList = getNodeAttributeValue(node, "namelist");
+			if (nameList != null) {
+				StringTokenizer tokenizer = new StringTokenizer(nameList);
+				String urlSuite = "?";
+				while (tokenizer.hasMoreElements()) {
+					String data = tokenizer.nextToken();
+					urlSuite += data + "=" + context.getDeclaration().getValue(data) + "&";
 				}
+				url += urlSuite;
 			}
-
+			System.err.println("subdialog url" + url);
 			// TODO put namelist values in child context
 
 			// FIXME this is not a viable way to handle subdialogs ;(

diff --git a/VxmlInterpreter/test/cudl/InterpreterTest.java b/VxmlInterpreter/test/cudl/InterpreterTest.java
@@ -596,16 +596,25 @@ public void subdialogSrcExprIsEvaluateAndExecute() throws IOException, ParserCon
 		assertEquals(1, interpreter.getLogs().size());
 		assertEquals("return_value", interpreter.getLogs().get(0));
 	}
-	
+
 	@Test
-	public void sessionVariableInConstructor() throws IOException, SAXException, ParserConfigurationException{
-		String sessionVariables ="test = {variable: 'value'}";
-		
+	public void sessionVariableInConstructor() throws IOException, SAXException, ParserConfigurationException {
+		String sessionVariables = "test = {variable: 'value'}";
+
 		Interpreter interpreter = new Interpreter(url + "sessionVariablesLogger.vxml", sessionVariables);
 		interpreter.start();
-
 
 		assertEquals(1, interpreter.getLogs().size());
 		assertEquals("value", interpreter.getLogs().get(0));
 	}
+
+	//trouver un autre moyen de test
+//	@Test
+//	public void subdialogNamelistIsSubmitedToServer() throws ParserConfigurationException, SAXException,
+//			IOException {
+//		Interpreter interpreter = new Interpreter(url + "subdialogNamelist.vxml");
+//		interpreter.start();
+//	
+//		assertEquals("pass", interpreter.getPrompts().get(0).tts);
+//	}
 }