richter 02/05/28 11:58:02
Modified: . Tag: Embperl2c Changes.pod
Embperl/Syntax Tag: Embperl2c EmbperlBlocks.pm
test/cmp Tag: Embperl2c epobase.htm execviamod.htm
test/conf Tag: Embperl2c httpd.conf.src
test/html Tag: Embperl2c execviamod.pm table.htm
Log:
fix execviamod test
Revision Changes Path
No revision
No revision
1.129.4.74 +10 -7 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.129.4.73
retrieving revision 1.129.4.74
diff -u -r1.129.4.73 -r1.129.4.74
--- Changes.pod 28 May 2002 06:56:02 -0000 1.129.4.73
+++ Changes.pod 28 May 2002 18:58:01 -0000 1.129.4.74
@@ -26,16 +26,19 @@
- Fixed segfault when replacing an attribute. Reported by Michael Stevens.
- Fixed random segfaults, that had occured when Perl had reallocated it's
internal Stack.
- - When apache is started with -D EMBPERL_APDEBUG, it outputs a configuration
- trace.
- - When file is not found, Embperl::Object now returns status 404, instead of
- 500. Reported by Cameron McBride.
+ - When apache is started with -D EMBPERL_APDEBUG, it outputs a
+ configuration trace.
+ - When file is not found, Embperl::Object now returns status 404, instead
+ of 500. Reported by Cameron McBride.
- Fixed a reference count error when using the import parameter. Reported
by Michael Smith.
- Fixed string reference counting problem in RTF&POD syntax.
- - Fixed a segfault that had occured when a file with a syntax error is compiled
- the second time within the same process. Reported by Michael Smith.
-
+ - Fixed a segfault that had occured when a file with a syntax error is
+ compiled the second time within the same process. Reported by
+ Michael Smith.
+ - removed do { } around expressions of [+ +] blocks inside urls, because
+ this cost performance and now all [+ +] behaves the same. Reported by
+ Michael Smith.
=head1 2.0b7 (BETA) 21. Mar. 2002
No revision
No revision
1.1.2.25 +5 -5 embperl/Embperl/Syntax/Attic/EmbperlBlocks.pm
Index: EmbperlBlocks.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/EmbperlBlocks.pm,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- EmbperlBlocks.pm 11 Apr 2002 06:44:14 -0000 1.1.2.24
+++ EmbperlBlocks.pm 28 May 2002 18:58:01 -0000 1.1.2.25
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: EmbperlBlocks.pm,v 1.1.2.24 2002/04/11 06:44:14 richter Exp $
+# $Id: EmbperlBlocks.pm,v 1.1.2.25 2002/05/28 18:58:01 richter Exp $
#
###################################################################################
@@ -534,10 +534,10 @@
embperl => {
perlcode =>
[
- 'if (!defined (_ep_rpurl(%$x%,scalar(do{%#~0:$col%}))))
%#~-0:$row% { if ($col == 0) { _ep_dcp (%^*htmltable%) ; last l%^*htmltable% ; } else
{ _ep_dcp (%^*htmlrow%) ; last l%^*htmlrow% ; }}',
- 'if (!defined (_ep_rpurl(%$x%,scalar(do{%#~0:$col%})))) {
_ep_dcp (%^*htmlrow%) ; last l%^*htmlrow% ; }',
- 'if (!defined (_ep_rpurl(%$x%,scalar(do{%#~0:$row%;})))) {
_ep_dcp (%^*htmltable%) ; last l%^*htmltable% ; }',
- '_ep_rpurl(%$x%,scalar(do{%#0%}));',
+ 'if (!defined (_ep_rpurl(%$x%,scalar(%#~0:$col%))))
%#~-0:$row% { if ($col == 0) { _ep_dcp (%^*htmltable%) ; last l%^*htmltable% ; } else
{ _ep_dcp (%^*htmlrow%) ; last l%^*htmlrow% ; }}',
+ 'if (!defined (_ep_rpurl(%$x%,scalar(%#~0:$col%)))) {
_ep_dcp (%^*htmlrow%) ; last l%^*htmlrow% ; }',
+ 'if (!defined (_ep_rpurl(%$x%,scalar(%#~0:$row%)))) {
_ep_dcp (%^*htmltable%) ; last l%^*htmltable% ; }',
+ '_ep_rpurl(%$x%,scalar(%#0%));',
],
removenode => 4,
mayjump => '%#~0:$col|$row|$cnt% %?*htmlrow% %?*htmltable%',
No revision
No revision
1.1.2.7 +1 -1 embperl/test/cmp/epobase.htm
Index: epobase.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/epobase.htm,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- epobase.htm 27 May 2002 17:53:14 -0000 1.1.2.6
+++ epobase.htm 28 May 2002 18:58:01 -0000 1.1.2.7
@@ -4,7 +4,7 @@
</HEAD><BODY>
<H1>Forbidden</H1>
^.*?You don't have permission to access /embperl/EmbperlObject/epobase.htm
-on this server.<P>
+^on this server
</BODY></HTML>
1.1.2.2 +588 -28 embperl/test/cmp/Attic/execviamod.htm
Index: execviamod.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/execviamod.htm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- execviamod.htm 28 May 2002 06:56:05 -0000 1.1.2.1
+++ execviamod.htm 28 May 2002 18:58:01 -0000 1.1.2.2
@@ -149,11 +149,16 @@
Now without output
+<html>
+<head>
+<title>Some Plain tests Embperl</title>
+</head>
+
+<body>
+
Here it starts with some HTML Text<P>
-All values should be undefined at the first include and
-apear at the second include:
-<P>
+All values should be undefined:
$a = <BR>
$b = <BR>
@@ -169,42 +174,322 @@
Now lets look what we are getting from this:<BR>
-(this is the value in $a) (this is the value in $a)
&auml;&ouml;&uuml;<BR>
+(this is the value in $a) (this is the value in $a) äöü<BR>
-And now a and b together: (this is the value in $a)(this is the value in $a)
&auml;&ouml;&uuml;<P>
+And now a and b together: (this is the value in $a)(this is the value in $a)
äöü<P>
Here we have some HTML tags within the perl code, Embperl will delete them!<BR>
57
-SELECT * <br> FROM a ORDER BY b USING <; Hi There>
-Here we have something which looks like a HTML tag, but does not start with<br>
-a character, Embperl does not change them!<BR>
-
-SELECT * FROM a ORDER BY b USING <; Hi There>
Embperl will also translate HMTL escapes to the right characters i.e. $a &lt; 6
will get the perl expression $a < 6: <BR>
1
Now they should have a value
$a = (this is the value in $a) <BR>
-$b = (this is the value in $a) &auml;&ouml;&uuml; <BR>
+$b = (this is the value in $a) äöü <BR>
$c = 57 <BR>
$d = 1 <BR>
$e = 2 <BR>
-<P>Ok.<P>
+a <br>
+a <br>
+a <br>
+ b is null <br>
+ a <br>
+ b is null <br>
+ a<br>
+ b is null <br>
+ <table></table>
+
+
+<p> $tabmode = default <p>
+
+<hr><p>Display an two dimensional array with one, two and three columns !<BR>
+Please take a look at the source in your browser to see the difference<BR>
+
+$a[0][0] = '1/1' ;<BR>
+ $a[1][0] = '2/1' ;<BR>
+ $a[1][1] = '2/2' ;<BR>
+ $a[2][0] = '3/1' ;<BR>
+ $a[2][1] = '3/2' ;<BR>
+ $a[2][2] = '3/3' ;<BR>
+
+<P>$tabmode = default <P>
+
+<table border="2" width="100%">
+ <tr>
+ <td>a1/1 </td>
+ </tr>
+
+ <tr>
+ <td>a2/1 </td>
+
+ <td>a2/2 </td>
+ </tr>
+
+ <tr>
+ <td>a3/1 </td>
+
+ <td>a3/2 </td>
+
+ <td>a3/3 </td>
+ </tr>
+</table>
+
+<table border="2" width="100%">
+ <tr>
+ <td>a1/1 </td>
+ </tr>
+
+ <tr>
+ <td>a2/1 </td>
+
+ <td>a2/2 </td>
+ </tr>
+
+ <tr>
+ <td>a3/1 </td>
+
+ <td>a3/2 </td>
+
+ <td>a3/3 </td>
+ </tr>
+</table>
+
+<table border="2" width="100%">
+ <tr>
+ <td>a1/1 </td>
+ </tr>
+
+ <tr>
+ <td>a2/1 </td>
+
+ <td>a2/2 </td>
+ </tr>
+
+ <tr>
+ <td>a3/1 </td>
+
+ <td>a3/2 </td>
+
+ <td>a3/3 </td>
+ </tr>
+</table>
+
+<table>
+ <tr>
+ <td>
+ <table>
+ <tr>
+ <td>b1/1 </td>
+ </tr>
+
+ <tr>
+ <td>b2/1 </td>
+
+ <td>b2/2 </td>
+ </tr>
+
+ <tr>
+ <td>b3/1 </td>
+
+ <td>b3/2 </td>
+
+ <td>b3/3 </td>
+ </tr>
+ </table>
+
+ a1/1 </td>
+ </tr>
+
+ <tr>
+ <td>
+ <table>
+ <tr>
+ <td>b1/1 </td>
+ </tr>
+
+ <tr>
+ <td>b2/1 </td>
+
+ <td>b2/2 </td>
+ </tr>
+
+ <tr>
+ <td>b3/1 </td>
+
+ <td>b3/2 </td>
+
+ <td>b3/3 </td>
+ </tr>
+ </table>
+
+ a2/1 </td>
+
+ <td>
+ <table>
+ <tr>
+ <td>b1/1 </td>
+ </tr>
+
+ <tr>
+ <td>b2/1 </td>
+
+ <td>b2/2 </td>
+ </tr>
+
+ <tr>
+ <td>b3/1 </td>
+
+ <td>b3/2 </td>
+
+ <td>b3/3 </td>
+ </tr>
+ </table>
+
+ a2/2 </td>
+ </tr>
+
+ <tr>
+ <td>
+ <table>
+ <tr>
+ <td>b1/1 </td>
+ </tr>
+
+ <tr>
+ <td>b2/1 </td>
+
+ <td>b2/2 </td>
+ </tr>
+
+ <tr>
+ <td>b3/1 </td>
+
+ <td>b3/2 </td>
+
+ <td>b3/3 </td>
+ </tr>
+ </table>
+
+ a3/1 </td>
+
+ <td>
+ <table>
+ <tr>
+ <td>b1/1 </td>
+ </tr>
+
+ <tr>
+ <td>b2/1 </td>
+
+ <td>b2/2 </td>
+ </tr>
+
+ <tr>
+ <td>b3/1 </td>
+
+ <td>b3/2 </td>
+
+ <td>b3/3 </td>
+ </tr>
+ </table>
+
+ a3/2 </td>
+
+ <td>
+ <table>
+ <tr>
+ <td>b1/1 </td>
+ </tr>
+
+ <tr>
+ <td>b2/1 </td>
+
+ <td>b2/2 </td>
+ </tr>
+
+ <tr>
+ <td>b3/1 </td>
+
+ <td>b3/2 </td>
+
+ <td>b3/3 </td>
+ </tr>
+ </table>
+
+ a3/3 </td>
+ </tr>
+</table>
+<P><P>
-Here it starts with some HTML Text<P>
+<P>17<P>
+<P>1<P>
-All values should be undefined at the first include and
-apear at the second include:
<P>
-$a = (this is the value in $a) <BR>
-$b = (this is the value in $a) &auml;&ouml;&uuml; <BR>
-$c = 57 <BR>
-$d = 1 <BR>
+<table>
+ <tr>
+ <td>ii[0] = 0 </td>
+ </tr>
+
+ <tr>
+ <td>ii[1] = 1 </td>
+ </tr>
+
+ <tr>
+ <td>ii[2] = 2 </td>
+ </tr>
+
+ <tr>
+ <td>ii[3] = 3 </td>
+ </tr>
+
+ <tr>
+ <td>ii[4] = 4 </td>
+ </tr>
+
+ <tr>
+ <td>ii[5] = 5 </td>
+ </tr>
+
+ <tr>
+ <td>ii[6] = 6 </td>
+ </tr>
+
+ <tr>
+ <td>ii[7] = 7 </td>
+ </tr>
+
+ <tr>
+ <td>ii[8] = 8 </td>
+ </tr>
+
+ <tr>
+ <td>ii[9] = 9 </td>
+ </tr>
+</table>
+
+</body>
+</html>
+
+<html>
+<head>
+<title>Some Plain tests Embperl</title>
+</head>
+
+<body>
+
+Here it starts with some HTML Text<P>
+
+All values should be undefined:
+
+$a = 1 <BR>
+$b = <BR>
+$c = 5 <BR>
+$d = txt <BR>
$e = 2 <BR>
@@ -215,31 +500,306 @@
Now lets look what we are getting from this:<BR>
-(this is the value in $a) (this is the value in $a)
&auml;&ouml;&uuml;<BR>
+(this is the value in $a) (this is the value in $a) äöü<BR>
-And now a and b together: (this is the value in $a)(this is the value in $a)
&auml;&ouml;&uuml;<P>
+And now a and b together: (this is the value in $a)(this is the value in $a)
äöü<P>
Here we have some HTML tags within the perl code, Embperl will delete them!<BR>
57
-SELECT * <br> FROM a ORDER BY b USING <; Hi There>
-Here we have something which looks like a HTML tag, but does not start with<br>
-a character, Embperl does not change them!<BR>
-
-SELECT * FROM a ORDER BY b USING <; Hi There>
Embperl will also translate HMTL escapes to the right characters i.e. $a &lt; 6
will get the perl expression $a < 6: <BR>
1
Now they should have a value
$a = (this is the value in $a) <BR>
-$b = (this is the value in $a) &auml;&ouml;&uuml; <BR>
+$b = (this is the value in $a) äöü <BR>
$c = 57 <BR>
$d = 1 <BR>
$e = 2 <BR>
-<P>Ok.<P>
+a <br>
+a <br>
+a <br>
+ b is null <br>
+ a <br>
+ b is null <br>
+ a<br>
+ b is null <br>
+ <table></table>
+
+
+<p> $tabmode = default <p>
+
+<hr><p>Display an two dimensional array with one, two and three columns !<BR>
+Please take a look at the source in your browser to see the difference<BR>
+
+$a[0][0] = '1/1' ;<BR>
+ $a[1][0] = '2/1' ;<BR>
+ $a[1][1] = '2/2' ;<BR>
+ $a[2][0] = '3/1' ;<BR>
+ $a[2][1] = '3/2' ;<BR>
+ $a[2][2] = '3/3' ;<BR>
+
+<P>$tabmode = default <P>
+
+<table border="2" width="100%">
+ <tr>
+ <td>a1/1 </td>
+ </tr>
+
+ <tr>
+ <td>a2/1 </td>
+
+ <td>a2/2 </td>
+ </tr>
+
+ <tr>
+ <td>a3/1 </td>
+
+ <td>a3/2 </td>
+
+ <td>a3/3 </td>
+ </tr>
+</table>
+
+<table border="2" width="100%">
+ <tr>
+ <td>a1/1 </td>
+ </tr>
+
+ <tr>
+ <td>a2/1 </td>
+
+ <td>a2/2 </td>
+ </tr>
+
+ <tr>
+ <td>a3/1 </td>
+
+ <td>a3/2 </td>
+
+ <td>a3/3 </td>
+ </tr>
+</table>
+
+<table border="2" width="100%">
+ <tr>
+ <td>a1/1 </td>
+ </tr>
+
+ <tr>
+ <td>a2/1 </td>
+
+ <td>a2/2 </td>
+ </tr>
+
+ <tr>
+ <td>a3/1 </td>
+
+ <td>a3/2 </td>
+
+ <td>a3/3 </td>
+ </tr>
+</table>
+
+<table>
+ <tr>
+ <td>
+ <table>
+ <tr>
+ <td>b1/1 </td>
+ </tr>
+
+ <tr>
+ <td>b2/1 </td>
+
+ <td>b2/2 </td>
+ </tr>
+
+ <tr>
+ <td>b3/1 </td>
+
+ <td>b3/2 </td>
+
+ <td>b3/3 </td>
+ </tr>
+ </table>
+
+ a1/1 </td>
+ </tr>
+
+ <tr>
+ <td>
+ <table>
+ <tr>
+ <td>b1/1 </td>
+ </tr>
+
+ <tr>
+ <td>b2/1 </td>
+
+ <td>b2/2 </td>
+ </tr>
+
+ <tr>
+ <td>b3/1 </td>
+
+ <td>b3/2 </td>
+
+ <td>b3/3 </td>
+ </tr>
+ </table>
+
+ a2/1 </td>
+
+ <td>
+ <table>
+ <tr>
+ <td>b1/1 </td>
+ </tr>
+
+ <tr>
+ <td>b2/1 </td>
+
+ <td>b2/2 </td>
+ </tr>
+
+ <tr>
+ <td>b3/1 </td>
+
+ <td>b3/2 </td>
+
+ <td>b3/3 </td>
+ </tr>
+ </table>
+
+ a2/2 </td>
+ </tr>
+
+ <tr>
+ <td>
+ <table>
+ <tr>
+ <td>b1/1 </td>
+ </tr>
+
+ <tr>
+ <td>b2/1 </td>
+
+ <td>b2/2 </td>
+ </tr>
+
+ <tr>
+ <td>b3/1 </td>
+
+ <td>b3/2 </td>
+
+ <td>b3/3 </td>
+ </tr>
+ </table>
+
+ a3/1 </td>
+
+ <td>
+ <table>
+ <tr>
+ <td>b1/1 </td>
+ </tr>
+
+ <tr>
+ <td>b2/1 </td>
+
+ <td>b2/2 </td>
+ </tr>
+
+ <tr>
+ <td>b3/1 </td>
+
+ <td>b3/2 </td>
+
+ <td>b3/3 </td>
+ </tr>
+ </table>
+
+ a3/2 </td>
+
+ <td>
+ <table>
+ <tr>
+ <td>b1/1 </td>
+ </tr>
+
+ <tr>
+ <td>b2/1 </td>
+
+ <td>b2/2 </td>
+ </tr>
+
+ <tr>
+ <td>b3/1 </td>
+
+ <td>b3/2 </td>
+
+ <td>b3/3 </td>
+ </tr>
+ </table>
+
+ a3/3 </td>
+ </tr>
+</table>
+
+<P><P>
+
+<P>17<P>
+<P>1<P>
+
+<P>
+
+<table>
+ <tr>
+ <td>ii[0] = 0 </td>
+ </tr>
+
+ <tr>
+ <td>ii[1] = 1 </td>
+ </tr>
+
+ <tr>
+ <td>ii[2] = 2 </td>
+ </tr>
+
+ <tr>
+ <td>ii[3] = 3 </td>
+ </tr>
+
+ <tr>
+ <td>ii[4] = 4 </td>
+ </tr>
+
+ <tr>
+ <td>ii[5] = 5 </td>
+ </tr>
+
+ <tr>
+ <td>ii[6] = 6 </td>
+ </tr>
+
+ <tr>
+ <td>ii[7] = 7 </td>
+ </tr>
+
+ <tr>
+ <td>ii[8] = 8 </td>
+ </tr>
+
+ <tr>
+ <td>ii[9] = 9 </td>
+ </tr>
+</table>
+</body>
+</html>
And done!
</body>
No revision
No revision
1.24.4.62 +1 -1 embperl/test/conf/httpd.conf.src
Index: httpd.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.conf.src,v
retrieving revision 1.24.4.61
retrieving revision 1.24.4.62
diff -u -r1.24.4.61 -r1.24.4.62
--- httpd.conf.src 27 May 2002 17:53:14 -0000 1.24.4.61
+++ httpd.conf.src 28 May 2002 18:58:01 -0000 1.24.4.62
@@ -513,7 +513,7 @@
<Location /eg/x>
SetHandler perl-script
PerlHandler Embperl
-Options ExecCGI
+Options ExecCGI FollowSymLinks
</Location>
<Location /eg/web>
No revision
No revision
1.1.2.3 +4 -4 embperl/test/html/Attic/execviamod.pm
Index: execviamod.pm
===================================================================
RCS file: /home/cvs/embperl/test/html/Attic/execviamod.pm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- execviamod.pm 28 May 2002 06:56:05 -0000 1.1.2.2
+++ execviamod.pm 28 May 2002 18:58:02 -0000 1.1.2.3
@@ -5,11 +5,11 @@
{
print OUT "begin execviamod\n" ;
- Embperl::Execute ({inputfile => 'plain.htm', input_escmode => 7}) ;
+ Embperl::Execute ({inputfile => 'plain.htm', input_escmode => 7, escmode => 7})
;
print OUT "middle execviamod\n" ;
- Embperl::Req::ExecuteComponent ({inputfile => 'plain.htm', input_escmode => 7})
;
+ Embperl::Req::ExecuteComponent ({inputfile => 'plain.htm', input_escmode => 7,
escmode => 7}) ;
print OUT "end execviamod\n" ;
}
@@ -18,9 +18,9 @@
sub execviamod2
{
- Embperl::Execute ({inputfile => 'inc.htm', input_escmode => 7}) ;
+ Embperl::Execute ({inputfile => 'div.htm', input_escmode => 7, escmode => 7}) ;
- Embperl::Req::ExecuteComponent ({inputfile => 'inc.htm', input_escmode => 7}) ;
+ Embperl::Req::ExecuteComponent ({inputfile => 'div.htm', input_escmode => 7,
escmode => 7}) ;
}
1 ;
1.4.6.10 +1 -1 embperl/test/html/table.htm
Index: table.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/table.htm,v
retrieving revision 1.4.6.9
retrieving revision 1.4.6.10
diff -u -r1.4.6.9 -r1.4.6.10
--- table.htm 30 Oct 2001 09:05:54 -0000 1.4.6.9
+++ table.htm 28 May 2002 18:58:02 -0000 1.4.6.10
@@ -217,7 +217,7 @@
[- print LOG "1row= $row regs=$regs[0]{Id}\n"
; $cmp = $regs[0]->{Id} ; print LOG "2row= $row regs=$regs[0]{Id}\n" ; 1 ; -]
[- while (($k, $v) = each (%{$regs[0]})) { print LOG "$v=$k;\n"
; } -]
[$if ($cmp || '') ne '' $]
- <a href="inhalt.htm?Region=[+print LOG "row= $row
regs=$regs[0]{Id}\n" ; $regs[$row]{Id}+]">[+$regs[$row]{Id}+]</a></td>
+ <a href="inhalt.htm?Region=[+ do { print LOG "row= $row
regs=$regs[0]{Id}\n" ; $regs[$row]{Id} } +]">[+$regs[$row]{Id}+]</a></td>
[$endif$]
</tr>
</table>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
