[Pfc-prolog-cvs] prolix/src/org/asturlinux/frade/prolix/web/actions LoadConsultAction.java,1.6,1.7 LoadProgramAction.java,1.9,1.10 SolutionAction.java,1.3,1.4

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions
In directory sc8-pr-cvs1:/tmp/cvs-serv24207/src/org/asturlinux/frade/prolix/web/actions

Modified Files:
	LoadConsultAction.java LoadProgramAction.java 
	SolutionAction.java 
Log Message:
Added javaBean to manage data between JSP and interpreter

Index: LoadConsultAction.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions/LoadConsultAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LoadConsultAction.java	15 Jul 2003 15:37:29 -0000	1.6
--- LoadConsultAction.java	15 Jul 2003 22:42:37 -0000	1.7
***************
*** 8,11 ****
--- 8,12 ----
  import org.apache.struts.action.*;
  import org.apache.struts.util.*;
+ import org.asturlinux.frade.prolix.web.beans.*;
  import org.asturlinux.frade.prolix.web.formbeans.*;
  import org.asturlinux.frade.prolix.ejb.interfaces.*;
***************
*** 46,64 ****
  	String consult = ((LoadConsultFormBean)form).getConsult();
  	
- 	//String action = (String)request.getParameter("load");
- 	//if (action == null)
- 	//    {
- 	//	action = (String)request.getParameter("programAgain");
- 	//	if (action == null)
- 	//	    {
- 	//		//FIXME Something is going BAD
- 	//		return (mapping.findForward("failure"));
- 	//	    }
- 	//	else   // Wants to load another program
- 	//	    {
- 	//		return (mapping.findForward("otherProgram"));
- 	//	    }
- 	//   }
- 	//	
  	try
  	    {
--- 47,50 ----
***************
*** 66,69 ****
--- 52,58 ----
  		ProlixMain interpreter = (ProlixMain)session.getAttribute("interpreter");
  		interpreter.loadConsult(consult);
+ 		CurrentStateBean ib = (CurrentStateBean)session.getAttribute("prologData");
+ 		if (ib != null)
+ 		    ib.setCurrentConsult(consult);
  	    }
  	catch (SyntaxException se)

Index: LoadProgramAction.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions/LoadProgramAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** LoadProgramAction.java	15 Jul 2003 15:37:30 -0000	1.9
--- LoadProgramAction.java	15 Jul 2003 22:42:37 -0000	1.10
***************
*** 8,11 ****
--- 8,12 ----
  import org.apache.struts.action.*;
  import org.apache.struts.util.*;
+ import org.asturlinux.frade.prolix.web.beans.*;
  import org.asturlinux.frade.prolix.web.formbeans.*;
  import org.asturlinux.frade.prolix.ejb.interfaces.*;
***************
*** 48,52 ****
  		ProlixMain interpreter = (ProlixMain)session.getAttribute("interpreter");
  		if (interpreter != null)
! 		    interpreter.loadProgram(program);
  		else
  		    errors.add("program",new ActionError("error.no.interpreter"));
--- 49,58 ----
  		ProlixMain interpreter = (ProlixMain)session.getAttribute("interpreter");
  		if (interpreter != null)
! 		    {
! 			interpreter.loadProgram(program);
! 			CurrentStateBean ib = (CurrentStateBean)session.getAttribute("prologData");
! 			if (ib != null)
! 			    ib.setCurrentProgram(program);
! 		    }
  		else
  		    errors.add("program",new ActionError("error.no.interpreter"));

Index: SolutionAction.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions/SolutionAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SolutionAction.java	15 Jul 2003 15:37:30 -0000	1.3
--- SolutionAction.java	15 Jul 2003 22:42:37 -0000	1.4
***************
*** 8,11 ****
--- 8,12 ----
  import org.apache.struts.action.*;
  import org.apache.struts.util.*;
+ import org.asturlinux.frade.prolix.web.beans.*;
  import org.asturlinux.frade.prolix.web.formbeans.*;
  import org.asturlinux.frade.prolix.ejb.interfaces.*;
***************
*** 23,26 ****
--- 24,33 ----
   *                          path="/solutions.jsp"
   *
+  *   @struts.action-forward name="noProgram"
+  *                          path="/program.jsp"
+  *
+  *   @struts.action-forward name="noQuery"
+  *                          path="/consult.jsp"
+  *
   */
  
***************
*** 37,40 ****
--- 44,67 ----
  	Locale locale = getLocale(request);
  	MessageResources messages = getResources(request);
+ 	try
+ 	    {
+ 		HttpSession session = request.getSession();
+ 		ProlixMain interpreter = (ProlixMain)session.getAttribute("interpreter");
+ 		String result = interpreter.step();
+ 		CurrentStateBean ib = (CurrentStateBean)session.getAttribute("prologData");
+ 		if (ib != null)
+ 		    ib.setCurrentResult(result);
+ 	    }
+ 	catch (ProgramNotLoadedException pnle)
+ 	    {
+ 		errors.add("solution",new ActionError("error.program.not.loaded"));
+ 		return (mapping.findForward("noProgram"));
+ 	    }
+ 	catch (QueryNotLoadedException qnle)
+ 	    {
+ 		errors.add("solution",new ActionError("error.query.not.loaded"));
+ 		return (mapping.findForward("noQuery"));
+ 	    }
+ 
  	return (mapping.findForward("success"));
      }