richter 00/09/14 05:02:32
Modified: . Tag: Embperl2c epcomp.c epdat.h epdom.c epmain.c
test.pl
Embperl Tag: Embperl2c Syntax.pm
test/cmp Tag: Embperl2c include.htm includeerr2.htm
test/cmp2 Tag: Embperl2c error.htm
test/html Tag: Embperl2c callsub.htm include.htm
test/html/rawinput Tag: Embperl2c include.htm
Log:
Embperl 1 & 2 Source Integration
Revision Changes Path
No revision
No revision
1.4.2.3 +16 -1 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- epcomp.c 2000/09/13 18:13:38 1.4.2.2
+++ epcomp.c 2000/09/14 12:02:19 1.4.2.3
@@ -1258,6 +1258,8 @@
}
else if (*ppSV == NULL || !SvIOKp (*ppSV) )
{
+ r -> nPhase = phParse ;
+
if (*ppSV)
SvREFCNT_dec (*ppSV) ;
@@ -1277,6 +1279,8 @@
cl2 = clock () ;
+ r -> nPhase = phCompile ;
+
pDomTree = DomTree_self (r -> xCurrDomTree) ;
*ppSV = pDomTree -> pDomTreeSV ;
/* SvREFCNT_inc (*ppSV) ;*/
@@ -1314,6 +1318,8 @@
cl3 = clock () ;
+ r -> nPhase = phRunAfterCompile ;
+
l = ArrayGetSize (pProgDef) ;
if (pCurrReq -> bDebug & dbgParse)
lprintf (r, "[%d]EPCOMP: AfterCompileTimeCode: %*.*s\n", r -> nPid, l,
l, pProgDef) ;
@@ -1323,6 +1329,8 @@
LogError (r, rc) ;
SvREFCNT_dec(pSV);
+ r -> nPhase = phPerlCompile ;
+
if ((rc = EvalStore (r, pProgRun, 0, &pSV)) != ok)
return rc ;
@@ -1343,6 +1351,8 @@
}
else
{
+ r -> nPhase = phPerlCompile ;
+
pDomTree = DomTree_self (SvIVX (*ppSV)) ;
r -> xDocument = pDomTree -> xDocument ;
if ((rc = EvalStore (r, pProgRun, 0, &pSV)) != ok)
@@ -1355,6 +1365,8 @@
rc = ok ;
cl1 = clock () ;
+ r -> nPhase = phRun ;
+
if (!(r -> xCurrDomTree = DomTree_clone (pDomTree, &pCurrDomTree)))
return 1 ;
@@ -1393,6 +1405,9 @@
return rc ;
}
-
+
+ r -> nPhase = phTerm ;
+
+
return ok ;
}
1.20.4.3 +20 -0 embperl/epdat.h
Index: epdat.h
===================================================================
RCS file: /home/cvs/embperl/epdat.h,v
retrieving revision 1.20.4.2
retrieving revision 1.20.4.3
diff -u -r1.20.4.2 -r1.20.4.3
--- epdat.h 2000/09/14 05:08:27 1.20.4.2
+++ epdat.h 2000/09/14 12:02:19 1.20.4.3
@@ -27,6 +27,25 @@
int (* pCompiler)(tReq *, tDomTree *, tNode) ;
} tProcessor ;
+/*-----------------------------------------------------------------*/
+/* */
+/* RequestPhases */
+/* */
+/*-----------------------------------------------------------------*/
+
+typedef enum
+ {
+ phInit,
+ phParse,
+ phCompile,
+ phRunAfterCompile,
+ phPerlCompile,
+ phRun,
+ phTerm
+ } tPhase ;
+
+
+
#endif
@@ -286,6 +305,7 @@
int bExit ; /* We should exit the page */
#ifdef EP2
bool bEP1Compat ; /* run in Embperl 1.x compatible mode */
+ tPhase nPhase ; /* which phase of the request we are in */
/* --- DomTree ---*/
1.4.2.1 +17 -11 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- epdom.c 2000/09/12 18:17:29 1.4
+++ epdom.c 2000/09/14 12:02:19 1.4.2.1
@@ -751,12 +751,15 @@
{
- tDomTree * pDomTree = DomTree_self (xDomTree) ;
- int n = ArrayAdd (&pDomTree -> pOrder, 1) ;
- (pDomTree -> pOrder)[n].xFromNode = xChild ;
- (pDomTree -> pOrder)[n].xToNode = 0 ;
- if (pCurrReq -> bDebug & dbgParse)
- lprintf (pCurrReq, "[%d]Checkpoint: Node=%d OrderIndex %d SVs=%d\n", pCurrReq
-> nPid, xChild, n, sv_count) ;
+ if (pCurrReq -> nPhase == phRun)
+ {
+ tDomTree * pDomTree = DomTree_self (xDomTree) ;
+ int n = ArrayAdd (&pDomTree -> pOrder, 1) ;
+ (pDomTree -> pOrder)[n].xFromNode = xChild ;
+ (pDomTree -> pOrder)[n].xToNode = 0 ;
+ if (pCurrReq -> bDebug & dbgParse)
+ lprintf (pCurrReq, "[%d]Checkpoint: Node=%d OrderIndex %d SVs=%d\n",
pCurrReq -> nPid, xChild, n, sv_count) ;
+ }
}
@@ -772,11 +775,14 @@
{
- int n = ArrayAdd (&pDomTree -> pOrder, 1) ;
- (pDomTree -> pOrder)[n].xFromNode = xFromNode ;
- (pDomTree -> pOrder)[n].xToNode = xToNode ;
- if (pCurrReq -> bDebug & dbgParse)
- lprintf (pCurrReq, "[%d]Checkpoint: Node=%d -> %d OrderIndex %d SVs=%d\n",
pCurrReq -> nPid, xFromNode, xToNode, n, sv_count) ;
+ if (pCurrReq -> nPhase == phRun)
+ {
+ int n = ArrayAdd (&pDomTree -> pOrder, 1) ;
+ (pDomTree -> pOrder)[n].xFromNode = xFromNode ;
+ (pDomTree -> pOrder)[n].xToNode = xToNode ;
+ if (pCurrReq -> bDebug & dbgParse)
+ lprintf (pCurrReq, "[%d]Checkpoint: Node=%d -> %d OrderIndex %d SVs=%d\n",
pCurrReq -> nPid, xFromNode, xToNode, n, sv_count) ;
+ }
}
1.75.4.3 +30 -7 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.2
retrieving revision 1.75.4.3
diff -u -r1.75.4.2 -r1.75.4.3
--- epmain.c 2000/09/14 05:08:27 1.75.4.2
+++ epmain.c 2000/09/14 12:02:20 1.75.4.3
@@ -1781,7 +1781,7 @@
if ( pConf->sPackage )
cache_key_len += strlen( pConf->sPackage );
- cache_key = _malloc( r, cache_key_len + 1 );
+ cache_key = _malloc( r, cache_key_len + 3 );
strcpy( cache_key, sSourcefile );
if ( pConf->sPackage )
strcat( cache_key, pConf->sPackage );
@@ -1881,10 +1881,19 @@
if ( sPackage && *sPackage)
cache_key_len += strlen( sPackage );
- cache_key = malloc(cache_key_len + 1 );
+ cache_key = malloc(cache_key_len + 3 );
strcpy( cache_key, sSourcefile );
if ( sPackage && *sPackage)
strcat( cache_key, sPackage );
+
+#ifdef EP2xxx
+ if ( pConf->bEP1Compat )
+ {
+ strcat( cache_key, "-1" ); /* make sure Embperl 1.x compatible files get
another namespace */
+ cache_key_len += 2 ;
+ }
+#endif
+
ppSV = hv_fetch(pCacheHash, cache_key, cache_key_len, 0);
if (ppSV && *ppSV)
@@ -2019,6 +2028,9 @@
memcpy (r, pCurrReq, sizeof (*r)) ;
}
+#ifdef EP2
+ r -> nPhase = phInit ;
+#endif
r -> bSubReq = !(pCurrReq == &InitialReq) ;
r -> pLastReq = pCurrReq ;
@@ -2191,8 +2203,12 @@
}
lprintf (r, "[%d]REQ: %s %s ", r -> nPid, (r -> bOptions &
optSafeNamespace)?"SafeNamespace":"No Safe Eval", (r -> bOptions &
optOpcodeMask)?"OpcodeMask":"All Opcode allowed") ;
+#ifdef EP2
+ lprintf (r, " mode = %s (%d) %s\n", sMode, r -> nIOType, r -> bEP1Compat?"EP
1.x":"EP 2.x") ;
+#else
lprintf (r, " mode = %s (%d)\n", sMode, r -> nIOType) ;
- lprintf (r, "[%d]REQ: Package = %s\n", r -> nPid, r -> Buf.pFile ->
sCurrPackage) ;
+#endif
+ lprintf (r, "[%d]REQ: Package = %s\n", r -> nPid, r -> Buf.pFile ->
sCurrPackage) ;
}
return r ;
@@ -2418,6 +2434,8 @@
int bError = 0 ;
STRLEN ldummy ;
+ r -> bEscModeSet = 0 ;
+
if (rc != ok || r -> bError)
{ /* --- generate error page if necessary --- */
dSP; /* initialize stack pointer */
@@ -2457,8 +2475,8 @@
r -> pApacheReq -> status = 500 ;
#endif
}
+ bError = 1 ;
}
- bError = 1 ;
if (!r -> bAppendToMainReq)
r -> bError = 0 ; /* error already handled */
}
@@ -2652,8 +2670,10 @@
#endif
{
#ifndef EP2
- oputs (r, "\r\n") ;
+ if (r -> bEP1Compat)
#endif
+ oputs (r, "\r\n") ;
+
if (bOutToMem)
{
char * pData ;
@@ -2662,7 +2682,8 @@
if (!bError && !r -> bEP1Compat)
Node_toString (DomTree_self (r -> xCurrDomTree), r, r -> xDocument) ;
- oputs (r, "\r\n") ;
+ if (!r -> bEP1Compat)
+ oputs (r, "\r\n") ;
#endif
l = GetContentLength (r) + 1 ;
@@ -2697,6 +2718,7 @@
#endif
}
else
+ {
oCommit (r, NULL) ;
#ifdef EP2
if (!bError && !r -> bEP1Compat)
@@ -2705,7 +2727,8 @@
oputs (r, "\r\n") ;
}
#endif
- }
+ }
+ }
}
else
{
1.70.4.8 +9 -8 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.7
retrieving revision 1.70.4.8
diff -u -r1.70.4.7 -r1.70.4.8
--- test.pl 2000/09/14 06:10:04 1.70.4.7
+++ test.pl 2000/09/14 12:02:20 1.70.4.8
@@ -127,7 +127,7 @@
'object.htm' => {
'version' => 2,
},
- 'discard.htm' => {
+ 'discard.htm' => { ###
'errors' => '12',
'version' => 1,
},
@@ -172,7 +172,7 @@
'registry/Execute.htm' => {
'modperl' => 1,
},
- 'registry/errpage.htm' => {
+ 'registry/errpage.htm' => { ###
'modperl' => 1,
'errors' => '16',
'version' => 1,
@@ -186,10 +186,7 @@
'errors' => '3',
},
'callsub.htm' => {
- 'version' => 1,
- },
- 'callsub.htm' => {
- 'version' => 1,
+ 'repeat' => 2,
},
'importsub.htm' => {
'version' => 1,
@@ -1176,6 +1173,7 @@
elsif ($ARGV[0] =~ /^\d/)
{
@savetests = @tests ;
+ $startnumber = $ARGV[0] ;
@tests = () ;
while (defined ($t = shift @ARGV))
{
@@ -1248,9 +1246,9 @@
$n = 0 ;
$t_offline = 0 ;
$n_offline = 0 ;
- $testnum = -1 + $startnumber ;
foreach $ep1compat (($version == 2 && $opt_ep1)?(0, 1):(0))
{
+ $testnum = -1 + $startnumber ;
#next if (($ep1compat && !($opt_ep1)) || (!$ep1compat &&
!($opt_offline)));
$ENV{EMBPERL_EP1COMPAT} = $ep1compat ;
@@ -1467,7 +1465,10 @@
$txt = 'error.htm' ;
$org = "$cmppath/$txt" ;
+ $org = "$cmppath$version/$txt" if (-e "$cmppath$version/$txt") ;
$src = "$inpath/$txt" ;
+ $src = "$inpath$version/$txt" if (-e "$inpath$version/$txt") ;
+ $page = $src ;
$notseen = $seen{"o:$src"}?0:1 ;
$seen{"o:$src"} = 1 ;
@@ -1508,7 +1509,7 @@
foreach $src ('EmbperlObject/epopage1.htm',
'EmbperlObject/sub/epopage2.htm', 'EmbperlObject/obj/epoobj3.htm')
{
- if ($err == 0)
+ if ($err == 0 && $version == 1)
{
$src =~ m#^.*/(.*?)$# ;
$org = "$cmppath/$1" ;
No revision
No revision
1.1.4.2 +7 -3 embperl/Embperl/Attic/Syntax.pm
Index: Syntax.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Syntax.pm,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- Syntax.pm 2000/09/13 08:40:06 1.1.4.1
+++ Syntax.pm 2000/09/14 12:02:24 1.1.4.2
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Syntax.pm,v 1.1.4.1 2000/09/13 08:40:06 richter Exp $
+# $Id: Syntax.pm,v 1.1.4.2 2000/09/14 12:02:24 richter Exp $
#
###################################################################################
@@ -775,7 +775,9 @@
'procinfo' => {
embperl => {
perlcode => q{
-my $_ep_DomTree = $_[1];
+#my
+use vars ('$_ep_DomTree') ;
+$_ep_DomTree = $_[1];
},
compiletimeperlcode => q{
*_ep_rp=\\&XML::Embperl::DOM::Node::replaceChildWithCDATA;
@@ -1028,8 +1030,10 @@
=item mayjump => 0/1
-If set, tells the compiler that this code may jump to another programm location.
+If set, tells the compiler that this code may jump to another programm location.
(e.g. if, while, goto etc.).
+Could also be a condition as described under perlcode.
+
=item compilechilds => 0/1
No revision
No revision
1.7.6.2 +52 -3 embperl/test/cmp/include.htm
Index: include.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/include.htm,v
retrieving revision 1.7.6.1
retrieving revision 1.7.6.2
diff -u -r1.7.6.1 -r1.7.6.2
--- include.htm 2000/09/13 19:17:24 1.7.6.1
+++ include.htm 2000/09/14 12:02:26 1.7.6.2
@@ -83,9 +83,58 @@
<P>Ok.<P>
-<H1> 9.) Inculde a file and return output in a scalar</H1>
+<H1> 8b.) Include again the same file </H1>
+
+Here it starts with some HTML Text<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) äöü <BR>
+$c = 57 <BR>
+$d = 1 <BR>
+$e = 2 <BR>
+
+
+First of all assign a value:
+<BR>
+
+Now we have some 'Umlaute':
+
+
+Now lets look what we are getting from this:<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)
äöü<P>
+
+Here we have some HTML tags within the perl code, Embperl will delete them!<BR>
+
+57
+SELECT * 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) äöü <BR>
+$c = 57 <BR>
+$d = 1 <BR>
+$e = 2 <BR>
+
+<P>Ok.<P>
+
+
+<H1> 9.) Include a file and return output in a scalar</H1>
+
+
<H3>
Here it starts with some HTML Text<P>
@@ -238,7 +287,7 @@
</table>
-<H1> 11.) Inculde a file with parameters</H1>
+<H1> 11.) Include a file with parameters</H1>
Here is param[0] -> 0<br>
Here is param[1] -> B<br>
@@ -248,7 +297,7 @@
-<H1> 12.) Inculde a file and write outputfile</H1>
+<H1> 12.) Include a file and write outputfile</H1>
<H1> 12.) Done :-)</H1>
1.3.6.3 +5 -5 embperl/test/cmp/includeerr2.htm
Index: includeerr2.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/includeerr2.htm,v
retrieving revision 1.3.6.2
retrieving revision 1.3.6.3
diff -u -r1.3.6.2 -r1.3.6.3
--- includeerr2.htm 2000/09/14 06:10:06 1.3.6.2
+++ includeerr2.htm 2000/09/14 12:02:26 1.3.6.3
@@ -7,11 +7,11 @@
^\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
^\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
^\[.*?\]ERR\: 24\: Line \d+\: Error in Perl code: Can't locate object method
"is" via package "here" at .*?incerr.htm line 6
-^\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
-^\[.*?\]ERR\: 24\: Line \d+\: Error in Perl code: Can't locate object method
"is" via package "here" at .*?incerr.htm line 6
-^\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
-^\[.*?\]ERR\: 24\: Line \d+\: Error in Perl code: Can't locate object method
"is" via package "here" at .*?incerr.htm line 6
-^\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
+^-\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
+^-\[.*?\]ERR\: 24\: Line \d+\: Error in Perl code: Can't locate object method
"is" via package "here" at .*?incerr.htm line 6
+^-\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
+^-\[.*?\]ERR\: 24\: Line \d+\: Error in Perl code: Can't locate object method
"is" via package "here" at .*?incerr.htm line 6
+^-\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
^ HTML\:\:Embperl.*?<P>
</BODY></HTML>
No revision
No revision
1.1.2.2 +1 -1 embperl/test/cmp2/Attic/error.htm
Index: error.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp2/Attic/error.htm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- error.htm 2000/09/13 08:38:19 1.1.2.1
+++ error.htm 2000/09/14 12:02:28 1.1.2.2
@@ -3,7 +3,7 @@
The server encountered an internal error or misconfiguration and was unable to
complete your request.<P>
^Please contact the server administrator\,.*?and inform them of the time the error
occurred\, and anything you might have done that may have caused the error
^^\[.*?\]ERR: 32: Line \d+: Warning in Perl code: Unquoted string
"qqqqqqqqqqqqqq" may clash with future reserved word at .*?error.htm line
-^^\[.*?\]ERR: 32: Line \d+: Warning in Perl code: Use of uninitialized value at
.*?error.htm line \d+.<p>
+^-\[.*?\]ERR: 32: Line \d+: Warning in Perl code: Use of uninitialized value at
.*?error.htm line \d+.<p>
^^\[.*?\]ERR: 32: Line \d+: Warning in Perl code: Bareword found where operator
expected at .*?error.htm line \d+, near "\$error is"<p>
^^\[.*?\]ERR: 32: Line \d+: Warning in Perl code: \(Missing operator before
is\?\)<p>
^\[.*?\]ERR: 24: Line \d+: Error in Perl code: syntax error at .*?error.htm line
\d+, at EOF
No revision
No revision
1.3.6.1 +23 -13 embperl/test/html/callsub.htm
Index: callsub.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/callsub.htm,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- callsub.htm 1999/10/05 06:03:36 1.3
+++ callsub.htm 2000/09/14 12:02:29 1.3.6.1
@@ -8,22 +8,22 @@
[###### first sub #####]
[$sub txt$]
-
-<h2>Here goes some normal html text <h2>
-
+*txt*
+*txt* <h2>Here goes some normal html text <h2>
+*txt*
[$endsub$]
[###### second sub #####]
[$sub perl_code $]
-
-Here comes some perl:
-
-[- $foo = 'Hello world' -]
-
-foo = [+ $foo +]<br>
-testdata = [+ $testdata +]<br>
-
+*perl_code*
+*perl_code* Here comes some perl:
+*perl_code*
+*perl_code* [- $foo = 'Hello world' -]
+*perl_code*
+*perl_code* foo = [+ $foo +]<br>
+*perl_code* testdata = [+ $testdata +]<br>
+*perl_code*
[$endsub$]
[###### main page #####]
@@ -35,12 +35,12 @@
Now we call the first sub via Execute:
-[- Execute ('#txt') -]
+[# [- Execute ('#txt') -]
And now the second via Execute:
[- Execute ('#perl_code') -]
-
+#]
Now we call the first sub via Perl:
[- txt -]
@@ -48,6 +48,16 @@
And now the second via Perl:
[- perl_code -]
+
+Second time, other oder:
+
+And now the second via Perl:
+
+[- perl_code -]
+
+Now we call the first sub via Perl:
+
+[- txt -]
And done!
1.6.6.4 +7 -3 embperl/test/html/include.htm
Index: include.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/include.htm,v
retrieving revision 1.6.6.3
retrieving revision 1.6.6.4
diff -u -r1.6.6.3 -r1.6.6.4
--- include.htm 2000/09/14 05:53:58 1.6.6.3
+++ include.htm 2000/09/14 12:02:29 1.6.6.4
@@ -103,10 +103,14 @@
[- Execute ('inc.htm') -]
-<H1> 9.) Inculde a file and return output in a scalar</H1>
+<H1> 8b.) Include again the same file </H1>
+[- Execute ('inc.htm') -]
+<H1> 9.) Include a file and return output in a scalar</H1>
+
+
[- Execute ({inputfile => 'inc.htm',
output => \$out,
req_rec => $req_rec}) ;
@@ -128,11 +132,11 @@
</table>
-<H1> 11.) Inculde a file with parameters</H1>
+<H1> 11.) Include a file with parameters</H1>
[- Execute ('incparam.htm', 0, 'B', 'three', 'dddd', '555') -]
-<H1> 12.) Inculde a file and write outputfile</H1>
+<H1> 12.) Include a file and write outputfile</H1>
[# - Execute ({inputfile => 'inc.htm',
outputfile => "../tmp/incout.htm",
No revision
No revision
1.1.4.2 +3 -2 embperl/test/html/rawinput/Attic/include.htm
Index: include.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/rawinput/Attic/include.htm,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- include.htm 2000/09/14 05:10:45 1.1.4.1
+++ include.htm 2000/09/14 12:02:31 1.1.4.2
@@ -100,11 +100,11 @@
<H1> 8a.) Include a file</H1>
-[- Execute ('../inc.htm') -]
+[- Execute ({inputfile => '../inc.htm', options => 0, }) -]
<H1> 8b.) Include again the same file </H1>
-[- Execute ('../inc.htm') -]
+[- Execute ({inputfile => '../inc.htm', options => 0, }) -]
<H1> 9.) Include a file and return output in a scalar</H1>
@@ -112,6 +112,7 @@
[- Execute ({inputfile => '../inc.htm',
output => \$out,
+ options => 0,
req_rec => $req_rec}) ;
-]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
