pfc-prolog-cvs Mailing List for pfc-prolix (Page 12)

Status: Beta

Brought to you by: ivanfrade

pfc-prolog-cvs — mail list with cvs-commit messages

You can subscribe to this list here.

2003	_Jan	_Feb	_Mar	_Apr	_May (77)	_Jun (37)	_Jul (152)	_Aug (180)	_Sep (45)	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 .. 10 11 12 13 14 .. 20 > >> (Page 12 of 20)

[Pfc-prolog-cvs] prolix/web consult.jsp,1.13,1.14 solutions.jsp,1.11,1.12

From: <iva...@us...> - 2003-07-17 17:17:27

Update of /cvsroot/pfc-prolog/prolix/web
In directory sc8-pr-cvs1:/tmp/cvs-serv11378/web

Modified Files:
	consult.jsp solutions.jsp 
Log Message:
All links text from resources file - Disable next solution button when no more solutions

Index: consult.jsp
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/web/consult.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** consult.jsp	16 Jul 2003 22:48:14 -0000	1.13
--- consult.jsp	17 Jul 2003 17:17:25 -0000	1.14
***************
*** 54,58 ****
         <html:submit><bean:message key="button.load"/></html:submit>
       </html:form>
!      <a href="/prolixjsp/program.jsp">Load a new program </a>
       <html:errors/>
      </td>
--- 54,58 ----
         <html:submit><bean:message key="button.load"/></html:submit>
       </html:form>
!      <a href="/prolixjsp/program.jsp"><bean:message key="message.load.other.program"/></a>
       <html:errors/>
      </td>

Index: solutions.jsp
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/web/solutions.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** solutions.jsp	17 Jul 2003 12:47:18 -0000	1.11
--- solutions.jsp	17 Jul 2003 17:17:25 -0000	1.12
***************
*** 57,66 ****
  <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/>
! <a href="/prolixjsp/program.jsp"></a>
! <a href="/prolixjsp/consult.jsp"></a>
  </body>
  </html>		
--- 57,70 ----
  <br>
  <hr align="left" size="10">
! 
! <c:if test="${!prologData.noMoreSolutions}">
!   <html:form action="/actions/solutions">
!      <html:submit><bean:message key="button.next.solution"/></html:submit>
!   </html:form>
  <html:errors/>
! </c:if>
! 
! <a href="/prolixjsp/program.jsp"><bean:message key="message.load.other.program"/></a>
! <a href="/prolixjsp/consult.jsp"><bean:message key="message.load.other.consult"/></a>
  </body>
  </html>

[Pfc-prolog-cvs] prolix/web solutions.jsp,1.10,1.11

From: <iva...@us...> - 2003-07-17 12:47:23

Update of /cvsroot/pfc-prolog/prolix/web
In directory sc8-pr-cvs1:/tmp/cvs-serv29474/web

Modified Files:
	solutions.jsp 
Log Message:
Corrected solutions page

Index: solutions.jsp
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/web/solutions.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** solutions.jsp	16 Jul 2003 22:48:14 -0000	1.10
--- solutions.jsp	17 Jul 2003 12:47:18 -0000	1.11
***************
*** 45,55 ****
  
  
! <% 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" />
--- 45,49 ----
  
  
! <c:if test="${prologData.currentResult != null}" >
    <c:set var="xsl">
      <c:import url="xsl/solution.xslt" />
***************
*** 57,61 ****
  
    <x:transform xslt="${xsl}">
!     <% out.println(resultInXml); %>
    </x:transform>
  </c:if>
--- 51,55 ----
  
    <x:transform xslt="${xsl}">
!     <% out.println(prologData.getCurrentResult()); %>
    </x:transform>
  </c:if>
***************
*** 67,70 ****
--- 61,66 ----
  </html:form>
  <html:errors/>
+ <a href="/prolixjsp/program.jsp"></a>
+ <a href="/prolixjsp/consult.jsp"></a>
  </body>
  </html>

[Pfc-prolog-cvs] prolix/src/org/asturlinux/frade/prolix/web/beans CurrentStateBean.java,1.2,1.3

From: <iva...@us...> - 2003-07-17 12:47:23

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

Modified Files:
	CurrentStateBean.java 
Log Message:
Corrected solutions page

Index: CurrentStateBean.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/beans/CurrentStateBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CurrentStateBean.java	16 Jul 2003 22:38:36 -0000	1.2
--- CurrentStateBean.java	17 Jul 2003 12:47:18 -0000	1.3
***************
*** 7,11 ****
      private String consult;
      private String result;
!     private boolean NoMoreSolutions;
  
      /**
--- 7,11 ----
      private String consult;
      private String result;
!     private boolean noMoreSolutions;
  
      /**
***************
*** 14,18 ****
       */
      public boolean isNoMoreSolutions() {
! 	return NoMoreSolutions;
      }
  
--- 14,18 ----
       */
      public boolean isNoMoreSolutions() {
! 	return noMoreSolutions;
      }
  
***************
*** 22,26 ****
       */
      public void setNoMoreSolutions(boolean newNoMoreSolutions) {
! 	this.NoMoreSolutions = newNoMoreSolutions;
      }
  
--- 22,26 ----
       */
      public void setNoMoreSolutions(boolean newNoMoreSolutions) {
! 	this.noMoreSolutions = newNoMoreSolutions;
      }

[Pfc-prolog-cvs] prolix/web consult.jsp,1.12,1.13 solutions.jsp,1.9,1.10

From: <iva...@us...> - 2003-07-16 22:48:19

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/>

[Pfc-prolog-cvs] prolix/src/org/asturlinux/frade/prolix/web/actions SolutionAction.java,1.4,1.5

From: <iva...@us...> - 2003-07-16 22:48:18

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

Modified Files:
	SolutionAction.java 
Log Message:
Fixed navigation problems - detected null collection of consults

Index: SolutionAction.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions/SolutionAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SolutionAction.java	15 Jul 2003 22:42:37 -0000	1.4
--- SolutionAction.java	16 Jul 2003 22:48:14 -0000	1.5
***************
*** 14,19 ****
  
  /**
!  *   @struts.action name="SolutionForm"
!  *                  path="/actions/solution"
   *                  scope="request"
   *                  input="/consult.jsp"
--- 14,19 ----
  
  /**
!  *   @struts.action name="solutionsForm"
!  *                  path="/actions/solutions"
   *                  scope="request"
   *                  input="/consult.jsp"
***************
*** 44,55 ****
  	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)
--- 44,59 ----
  	Locale locale = getLocale(request);
  	MessageResources messages = getResources(request);
+ 	String result;
  	try
  	    {
  		HttpSession session = request.getSession();
  		ProlixMain interpreter = (ProlixMain)session.getAttribute("interpreter");
! 		result = interpreter.step();
! 		CurrentStateBean data = (CurrentStateBean)session.getAttribute("prologData");
! 		if (data != null)
! 		    {
! 			data.setCurrentResult(result);
! 			session.setAttribute("prologData",data);
! 		    }
  	    }
  	catch (ProgramNotLoadedException pnle)

[Pfc-prolog-cvs] prolix/etc WebClientResources.properties,1.4,1.5

From: <iva...@us...> - 2003-07-16 22:48:18

Update of /cvsroot/pfc-prolog/prolix/etc
In directory sc8-pr-cvs1:/tmp/cvs-serv5402/etc

Modified Files:
	WebClientResources.properties 
Log Message:
Fixed navigation problems - detected null collection of consults

Index: WebClientResources.properties
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/etc/WebClientResources.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** WebClientResources.properties	15 Jul 2003 22:42:37 -0000	1.4
--- WebClientResources.properties	16 Jul 2003 22:48:13 -0000	1.5
***************
*** 12,13 ****
--- 12,14 ----
  button.load=Cargar
  button.clear=Limpiar
+ button.next.solution=Siguiente solución

[Pfc-prolog-cvs] prolix/src/org/asturlinux/frade/prolix/web/beans CurrentStateBean.java,1.1,1.2

From: <iva...@us...> - 2003-07-16 22:38:39

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

Modified Files:
	CurrentStateBean.java 
Log Message:
Added new attribute NoMoreSOlutions in CurrentStateBean

Index: CurrentStateBean.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/beans/CurrentStateBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CurrentStateBean.java	15 Jul 2003 22:42:37 -0000	1.1
--- CurrentStateBean.java	16 Jul 2003 22:38:36 -0000	1.2
***************
*** 7,11 ****
--- 7,29 ----
      private String consult;
      private String result;
+     private boolean NoMoreSolutions;
+ 
+     /**
+      * Get the NoMoreSolutions value.
+      * @return the NoMoreSolutions value.
+      */
+     public boolean isNoMoreSolutions() {
+ 	return NoMoreSolutions;
+     }
  
+     /**
+      * Set the NoMoreSolutions value.
+      * @param newNoMoreSolutions The new NoMoreSolutions value.
+      */
+     public void setNoMoreSolutions(boolean newNoMoreSolutions) {
+ 	this.NoMoreSolutions = newNoMoreSolutions;
+     }
+ 
+     
  
      /**

[Pfc-prolog-cvs] prolix/src/org/asturlinux/frade/prolix/web/beans LastConsultsBean.java,NONE,1.1

From: <iva...@us...> - 2003-07-16 20:37:22

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

Added Files:
	LastConsultsBean.java 
Log Message:
Added new JB to recent consults

--- NEW FILE: LastConsultsBean.java ---
package org.asturlinux.frade.prolix.web.beans;

import java.util.*;


public class LastConsultsBean
{
    private Vector lastConsults;

    /**
     * Get the LastConsults value.
     * @return the LastConsults value.
     */
    public Vector getLastConsults() {
	return lastConsults;
    }

    /**
     * Set the LastConsults value.
     * @param newLastConsults The new LastConsults value.
     */
    public void setLastConsults(Vector newLastConsults) {
	this.lastConsults = newLastConsults;
    }

    

}

[Pfc-prolog-cvs] prolix/web consult.jsp,1.11,1.12

From: <iva...@us...> - 2003-07-16 20:37:22

Update of /cvsroot/pfc-prolog/prolix/web
In directory sc8-pr-cvs1:/tmp/cvs-serv14508/web

Modified Files:
	consult.jsp 
Log Message:
Added new JB to recent consults

Index: consult.jsp
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/web/consult.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** consult.jsp	15 Jul 2003 22:42:38 -0000	1.11
--- consult.jsp	16 Jul 2003 20:37:17 -0000	1.12
***************
*** 11,18 ****
--- 11,22 ----
  <%@ 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" 
  	class="org.asturlinux.frade.prolix.web.beans.CurrentStateBean" />
  
+ <jsp:useBean id="oldConsults" scope="session"
+ 	  class="org.asturlinux.frade.prolix.web.beans.LastConsultsBean" />
+ 
  <!-- Obtain Home reference-->
  <ejb:useHome id="prolixHome" 
***************
*** 33,36 ****
--- 37,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,42 ****
  
  <table>
-   <tr>
      <td>
  	<hr align="left" size="1">
--- 49,52 ----
***************
*** 53,60 ****
       <html:errors/>
      </td>
- 
      <td valign="top">
  <!-- At moment dont used
!      <form method="GET" enctype="text/plain">
  	Ultimas consultas:<br>
  	<input TYPE="radio" NAME="old-consult" VALUE="ditu1" checked>hermano(carlos,X).<br>
--- 63,74 ----
       <html:errors/>
      </td>
      <td valign="top">
+     <logic:notEmpty name="oldConsults" property="lastConsults">
+     <logic:iterate id="iterator" name="oldConsults" property="lastConsults">
+ 	  <tr>
+ 	    <%= iterator %>
+ 	  </tr>
  <!-- At moment dont used
!      <form action="/actions/">
  	Ultimas consultas:<br>
  	<input TYPE="radio" NAME="old-consult" VALUE="ditu1" checked>hermano(carlos,X).<br>
***************
*** 63,69 ****
       </form>
  -->
      </td>
- 
-    </tr>
  </table>
      
--- 77,83 ----
       </form>
  -->
+     </logic:iterate>
+     </logic:notEmpty>	  
      </td>
  </table>

[Pfc-prolog-cvs] prolix/etc WebClientResources.properties,1.3,1.4

From: <iva...@us...> - 2003-07-15 22:42:42

Update of /cvsroot/pfc-prolog/prolix/etc
In directory sc8-pr-cvs1:/tmp/cvs-serv24207/etc

Modified Files:
	WebClientResources.properties 
Log Message:
Added javaBean to manage data between JSP and interpreter

Index: WebClientResources.properties
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/etc/WebClientResources.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WebClientResources.properties	15 Jul 2003 20:27:45 -0000	1.3
--- WebClientResources.properties	15 Jul 2003 22:42:37 -0000	1.4
***************
*** 5,11 ****
  error.no.interpreter=<li>No hay intérprete disponible</li>
  error.program.not.loaded=<li>No ha cargado un programa previamente en el intérprete</li>
  errors.footer=</ul>
  errors.header=<h3>Se han producido los siguientes errores</h3><ul>
  errors.prefix=Prefix
  errors.suffix=Suffix
! button.load=Cargar
\ No newline at end of file
--- 5,13 ----
  error.no.interpreter=<li>No hay intérprete disponible</li>
  error.program.not.loaded=<li>No ha cargado un programa previamente en el intérprete</li>
+ error.query.not.loaded=<li>No ha cargado una consulta previamente en el intérprete</li>
  errors.footer=</ul>
  errors.header=<h3>Se han producido los siguientes errores</h3><ul>
  errors.prefix=Prefix
  errors.suffix=Suffix
! button.load=Cargar
! button.clear=Limpiar

[Pfc-prolog-cvs] prolix/web consult.jsp,1.10,1.11 program.jsp,1.8,1.9 solutions.jsp,1.8,1.9