You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2005/03/03 08:26:41 UTC
cvs commit: embperl/test/html execwithsub.htm execwithsub2.htm
richter 2005/03/02 23:26:41
Modified: . Changes.pod MANIFEST TODO epinit.c test.pl
Added: test/cmp execwithsub.htm
test/html execwithsub.htm execwithsub2.htm
Log:
fix execute problem
Revision Changes Path
1.267 +2 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- Changes.pod 28 Feb 2005 06:30:59 -0000 1.266
+++ Changes.pod 3 Mar 2005 07:26:39 -0000 1.267
@@ -40,6 +40,8 @@
Execute).
- Using ErrorDocument by setting optReturnError now also works
under EmbperlObject. Reported by Robert Noris.
+ - Fixed problem when calling Embperl sub via Execute inside a
+ file that is called via Execute. Reported by Michael Smith.
=head1 2.0rc2 21. November 2004
1.102 +3 -0 embperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/embperl/MANIFEST,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- MANIFEST 28 Feb 2005 06:33:40 -0000 1.101
+++ MANIFEST 3 Mar 2005 07:26:40 -0000 1.102
@@ -253,6 +253,7 @@
test/cmp/execsecond.htm
test/cmp/executesub.htm
test/cmp/execviamod.htm
+test/cmp/execwithsub.htm
test/cmp/exit.htm
test/cmp/exit2.htm
test/cmp/exit3.htm
@@ -447,6 +448,8 @@
test/html/executesub.htm
test/html/execviamod.htm
test/html/execviamod.pm
+test/html/execwithsub.htm
+test/html/execwithsub2.htm
test/html/exit.htm
test/html/exit2.htm
test/html/exit3.htm
1.134 +0 -2 embperl/TODO
Index: TODO
===================================================================
RCS file: /home/cvs/embperl/TODO,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- TODO 27 Feb 2005 22:16:41 -0000 1.133
+++ TODO 3 Mar 2005 07:26:40 -0000 1.134
@@ -11,8 +11,6 @@
- make test fedora 1 [13.12.04]
-- EmbperlObject and ErrorDocument [Robert Noris 24.2.05]
-
TODO for Embperl 2.1 and later
1.27 +6 -1 embperl/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/epinit.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- epinit.c 28 Feb 2005 06:31:00 -0000 1.26
+++ epinit.c 3 Mar 2005 07:26:40 -0000 1.27
@@ -2024,7 +2024,12 @@
else if (pParam -> sObject)
pParam -> sInputfile = pParam -> sObject ;
else
- pParam -> sInputfile = r -> Param.sFilename ;
+ {
+ if (pPrev)
+ pParam -> sInputfile = pPrev -> sSourcefile ;
+ if (!pParam -> sInputfile)
+ pParam -> sInputfile = r -> Param.sFilename ;
+ }
}
else if ((p = strchr(pParam -> sInputfile, '#')))
{
1.154 +5 -2 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- test.pl 28 Feb 2005 06:31:00 -0000 1.153
+++ test.pl 3 Mar 2005 07:26:40 -0000 1.154
@@ -445,8 +445,11 @@
'repeat' => 2,
'query_info' => 'summary=a1&title=b2&pubdate=c3&content=d4&more=e5',
},
- 'recursexec.htm' => {
- 'version' => 1,
+ 'subtextarea.htm' => {
+ 'repeat' => 2,
+ 'query_info' => 'summary=a1&title=b2&pubdate=c3&content=d4&more=e5',
+ },
+ 'execwithsub.htm' => {
},
'nph/div.htm' => {
'option' => '64',
1.1 embperl/test/cmp/execwithsub.htm
Index: execwithsub.htm
===================================================================
test
1.1 embperl/test/html/execwithsub.htm
Index: execwithsub.htm
===================================================================
[- Execute('execwithsub2.htm') -]
1.1 embperl/test/html/execwithsub2.htm
Index: execwithsub2.htm
===================================================================
[$ sub test $]
test
[$ endsub $]
[- Execute({sub => 'test'}) -]
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org