You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ed...@apache.org on 2003/07/01 19:56:43 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/content/info paste.xsp copy.xsp cut.xsp
edith 2003/07/01 10:56:43
Modified: src/webapp/lenya/content/info paste.xsp copy.xsp cut.xsp
Log:
Get parameters from GUI through cookies and session
Revision Changes Path
1.4 +5 -30 cocoon-lenya/src/webapp/lenya/content/info/paste.xsp
Index: paste.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/info/paste.xsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- paste.xsp 25 Jun 2003 17:14:32 -0000 1.3
+++ paste.xsp 1 Jul 2003 17:56:43 -0000 1.4
@@ -3,41 +3,16 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://apache.org/cocoon/lenya/xsp/1.0"
- xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
+ xmlns:xsp-request="http://apache.org/xsp/request/2.0"
xmlns:xsp-cookie="http://apache.org/xsp/cookie/2.0"
xmlns:xsp-session="http://apache.org/xsp/session/2.0"
create-session="true">
-<!--
- <xsp:structure>
- <xsp:include>org.apache.cocoon.environment.Session</xsp:include>
- </xsp:structure>
--->
-
<info>
-<!--
- <xsp:logic>
- String firstdocumentid = <xsp-session:get-attribute as="string" name="org.apache.lenya.cms.info.documentid"/>;
- String documentid = <xsp-cookie:getCookie as="string" name="document-id"/>;
- StringTokenizer st = new StringTokenizer(documentid, "/", true);
- int l = st.countTokens();
- for (i=1; i<l; i++) {
- st.nextToken();
- }
- String secdocumentid = firstdocumentid+"/"+st.nextToken();
- </xsp:logic>
- <first-document-id>firstdocumentid</first-document-id>
- <sec-document-id>secdocumentid</sec-document-id>
- <task-id><xsp-session:get-attribute as="string" name="org.apache.lenya.cms.info.action"/></task-id>
--->
-
- <first-document-id>/tutorial</first-document-id>
- <sec-document-id>/features</sec-document-id>
- <task-id>copyDocument</task-id>
-<!--
- <task-id>moveDocument<task-id>
--->
+ <first-document-id><xsp-session:get-attribute name="org.apache.lenya.cms.info.documentid"/></first-document-id>
+ <sec-document-id><xsp-cookie:getValue name="org.apache.lenya.cms.info.targett2"/></sec-document-id>
+ <task-id><xsp-session:get-attribute name="org.apache.lenya.cms.info.action"/></task-id>
+ <request-uri><xsp-request:get-uri/></request-uri>
</info>
</xsp:page>
1.4 +7 -9 cocoon-lenya/src/webapp/lenya/content/info/copy.xsp
Index: copy.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/info/copy.xsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- copy.xsp 25 Jun 2003 17:14:32 -0000 1.3
+++ copy.xsp 1 Jul 2003 17:56:43 -0000 1.4
@@ -3,18 +3,16 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://apache.org/cocoon/lenya/xsp/1.0"
- xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
+ xmlns:xsp-request="http://apache.org/xsp/request/2.0"
xmlns:xsp-cookie="http://apache.org/xsp/cookie/2.0">
-<xsp:structure>
- <xsp:include>org.apache.cocoon.environment.Cookie</xsp:include>
-</xsp:structure>
-
<info>
- <document-id>
- <xsp-cookie:getCookie as="string" name="org.apache.lenya.cms.info.target"/>
- </document-id>
+ <xsp:logic>
+ String documentid= <xsp-cookie:getValue name="org.apache.lenya.cms.info.targett2"/>;
+ </xsp:logic>
+
+ <request-uri><xsp-request:get-uri/></request-uri>
+ <document-id><xsp:expr>documentid</xsp:expr></document-id>
<action>copyDocument</action>
</info>
1.4 +8 -12 cocoon-lenya/src/webapp/lenya/content/info/cut.xsp
Index: cut.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/info/cut.xsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cut.xsp 25 Jun 2003 17:14:32 -0000 1.3
+++ cut.xsp 1 Jul 2003 17:56:43 -0000 1.4
@@ -3,23 +3,19 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://apache.org/cocoon/lenya/xsp/1.0"
- xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
+ xmlns:xsp-request="http://apache.org/xsp/request/2.0"
xmlns:xsp-cookie="http://apache.org/xsp/cookie/2.0"
>
-<xsp:structure>
- <xsp:include>org.apache.cocoon.environment.Cookie</xsp:include>
-</xsp:structure>
-
<info>
-<!--
- <document-id><input:get-attribute module="page-envelope" name="document-id" as="string"/></document-id>
--->
- <document-id>
- <xsp-cookie:getCookie as="string" name=" org.apache.lenya.cms.info.target"/>
- </document-id>
+ <xsp:logic>
+ String documentid= <xsp-cookie:getValue name="org.apache.lenya.cms.info.targett2"/>;
+ </xsp:logic>
+
+ <request-uri><xsp-request:get-uri/></request-uri>
+ <document-id><xsp:expr>documentid</xsp:expr></document-id>
<action>moveDocument</action>
+
</info>
</xsp:page>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org