FINAL GOTO IN SAME VXML FILE

Author: sdiawara

voicextt/src/main/java/com/sdiawara/voicextt/FormInterpretationAlgorithm.java

@@ -226,6 +226,7 @@ public void run() {
 			try {
 				collect();
 			} catch (VoiceXTTException e) {
+				System.err.println("* "+ e +" *"+((GotoException)e).getGoto().getNext()+"=next expr="+((GotoException)e).getGoto().getExpr());
 				throw new RuntimeException(e);
 			}
 		}

voicextt/src/main/java/com/sdiawara/voicextt/Interpreter.java

@@ -9,8 +9,6 @@
 import org.xml.sax.SAXException;
 
 import com.sdiawara.voicextt.exception.GotoException;
-import com.sdiawara.voicextt.exception.VoiceXTTException;
-import com.sdiawara.voicextt.node.VoiceXmlNode;
 import com.sdiawara.voicextt.node.Vxml;
 
 public class Interpreter {
@@ -24,62 +22,53 @@ public class Interpreter {
 	public Interpreter(String startFileName) throws ParserConfigurationException, IOException, SAXException {
 		this.interpreterContext = new InterpreterContext(startFileName); // session
 		this.speaker = new Speaker(userInput);
-		this.vxml = new Vxml(interpreterContext.getDocumentAcces().get(startFileName, null)
-				.getDocumentElement());
-		resetFia(vxml.getFirstDialog());
-	}
-
-	private void resetFia(VoiceXmlNode dialog) throws IOException, SAXException {
-		this.fia = new FormInterpretationAlgorithm(dialog, interpreterContext.getScripting(), outPut, userInput);
-		UncaughtExceptionHandler eh = new UncaughtExceptionHandler() {
-
-			public void uncaughtException(Thread t, Throwable e) {
-				Throwable exception = e.getCause();
-				System.err.println(exception);
-				if (exception instanceof GotoException) {
-					String next = ((GotoException) exception).getGoto().getNext();
-					String expr = ((GotoException) exception).getGoto().getExpr();
-					if (next == null && expr == null) {
-						throw new RuntimeException("Semantic error");
-					}
-					System.err.println(next);
-					next = ((next == null) ? ((String) interpreterContext.getScripting().eval(expr)) : next);
-					if (next.startsWith("#")) {
-						System.err.println("next " + next.replace("#", "") + " fia is a live= " + fia.isAlive()
-								+ "test isinterrupt " + t.isInterrupted());
-						fia.setCurrentDialog(vxml.getDialogById(next.replace("#", "")));
-						System.err.println("next " + next.replace("#", "") + " fia is a live= " + fia.isAlive()
-								+ "test isinterrupt " + t.isInterrupted());
-						fia.run();
-						System.err.println("after fia is a live= " + fia.isAlive()
-								+ "test isinterrupt " + t.isInterrupted());
-						fia.setUncaughtExceptionHandler(this);
-					}
-				}
-			}
-
-		};
-		fia.setUncaughtExceptionHandler(eh);
+		this.vxml = new Vxml(interpreterContext.getDocumentAcces().get(startFileName, null).getDocumentElement());
+		this.fia = new FormInterpretationAlgorithm(vxml.getFirstDialog(), interpreterContext.getScripting(), outPut, userInput);
+		FormInterpretationAlgorithm.setDefaultUncaughtExceptionHandler(getDefaultUncaughtExceptionHandler());
 	}
 
 	public void start() throws IOException, SAXException {
-		// if (!fia.isAlive()) {
 		this.fia.start();
 		waitSpeaker();
-		System.err.println("fin");
-		// }
 	}
 
 	private void waitSpeaker() {
 		try {
 			fia.join();
 			speaker.join();
 		} catch (InterruptedException e) {
-			// System.err.println(e);
+			System.err.println(e);
 		}
 	}
 
 	public List<String> getPrompts() {
 		return outPut.getTTS();
 	}
+
+	private UncaughtExceptionHandler getDefaultUncaughtExceptionHandler() {
+		return new UncaughtExceptionHandler() {
+			public void uncaughtException(Thread t, Throwable e) {
+				Throwable exception = e.getCause();
+				if (exception instanceof GotoException) {
+					String next = ((GotoException) exception).getGoto().getNext();
+					String expr = ((GotoException) exception).getGoto().getExpr();
+					if (next == null && expr == null) {
+						throw new RuntimeException("Semantic error");
+					}
+					next = ((next == null) ? ((String) interpreterContext.getScripting().eval(expr)) : next);
+					if (next.contains("#")) {
+						fia = new FormInterpretationAlgorithm(vxml.getDialogById(next.replace("#", "")), interpreterContext.getScripting(), outPut,
+								userInput);
+						try {
+							fia.start();
+							Interpreter.this.waitSpeaker();
+						} catch (Exception e1) {
+							System.err.println(e1);
+						}
+					}
+				}
+			}
+
+		};
+	}
 }

voicextt/src/test/java/com/sdiawara/voicextt/FormInterpretationAlgorithmTest.java

@@ -78,8 +78,6 @@ public void blockVisitor() throws ParserConfigurationException, IOException, SAX
 		fia.initialize();
 		fia.setSelectedFormItem(fia.select());
 		fia.collect();
-		//goto nextItem
-		
 		fia.setSelectedFormItem(fia.select());
 		fia.collect();
 

voicextt/src/test/java/com/sdiawara/voicextt/InterpreterTest.java

@@ -30,6 +30,6 @@ public void testSimple() throws ParserConfigurationException, IOException, SAXEx
 		assertEquals("simple prompt in block 3", interpreter.getPrompts().get(3));	
 		assertEquals("simple prompt in block 4", interpreter.getPrompts().get(4));
 		assertEquals("simple prompt in block 5", interpreter.getPrompts().get(5));
-//		assertEquals("simple prompt in another form", interpreter.getPrompts().get(6));
+		//assertEquals("simple prompt in another form", interpreter.getPrompts().get(6));
 	}
 }

voicextt/src/test/java/vxml/simple.vxml

@@ -27,12 +27,11 @@
 	<form id="test">
 		<block name="toto">
 	   		<prompt>simple prompt in block 4</prompt>
-	   		<prompt>simple prompt in block 5</prompt>
-	   		<goto next="#test1"/>
+	   		<goto expr="'#test1'"/>
 	   </block>   	   
 	</form>
 	<form id="test1">
-		<block name="toto2">
+		<block name="toto">
 	   		<prompt>simple prompt in block 5</prompt>
 	   </block>   	   
 	</form>