Update of /cvsroot/pfc-prolog/prolix/web
In directory sc8-pr-cvs1:/tmp/cvs-serv5402/web
Modified Files:
consult.jsp solutions.jsp
Log Message:
Fixed navigation problems - detected null collection of consults
Index: consult.jsp
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/web/consult.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** consult.jsp 16 Jul 2003 20:37:17 -0000 1.12
--- consult.jsp 16 Jul 2003 22:48:14 -0000 1.13
***************
*** 38,47 ****
<% String loadedProgram = prologData.getCurrentProgram(); %>
<!-- False consults to debug -->
- <%
- Vector consultas = new Vector();
- consultas.add("tonteria1");
- consultas.add("tonteria2");
- oldConsults.setLastConsults(consultas);
- %>
<body bgcolor="#768FDD">
--- 38,41 ----
Index: solutions.jsp
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/web/solutions.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** solutions.jsp 15 Jul 2003 22:42:38 -0000 1.9
--- solutions.jsp 16 Jul 2003 22:48:14 -0000 1.10
***************
*** 9,12 ****
--- 9,14 ----
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+ <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
+
<jsp:useBean id="prologData" scope="session"
***************
*** 44,60 ****
<% String resultInXml = prologData.getCurrentResult(); %>
! <c:set var="xsl">
! <c:import url="xsl/solution.xslt" />
! </c:set>
!
! <x:transform xslt="${xsl}">
! <% out.println(resultInXml); %>
! </x:transform>
<br>
<hr align="left" size="10">
! <html:form action="/actions/solution">
! <html:submit><bean:message key="next.solution"/></html:submit>
</html:form>
<html:errors/>
--- 46,68 ----
<% String resultInXml = prologData.getCurrentResult(); %>
+ <% if (resultInXml == null)
+ out.println("Vale null el resultado");
+ else
+ out.println(resultInXml);
+ %>
+ <c:if test="${resultInXml!=null}" >
+ <c:set var="xsl">
+ <c:import url="xsl/solution.xslt" />
+ </c:set>
! <x:transform xslt="${xsl}">
! <% out.println(resultInXml); %>
! </x:transform>
! </c:if>
<br>
<hr align="left" size="10">
! <html:form action="/actions/solutions">
! <html:submit><bean:message key="button.next.solution"/></html:submit>
</html:form>
<html:errors/>
|
