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 2002/02/06 10:21:08 UTC
cvs commit: embperl/xsbuilder/maps ep_structure.map
richter 02/02/06 01:21:08
Modified: . Tag: Embperl2c Embperl.pm Makefile.PL embperl.h
epapinit.c epdat2.h epinit.c epmain.c eputil.c
test.pl
test/cmp Tag: Embperl2c Execute.htm reqrec.htm tied.htm
test/html/registry Tag: Embperl2c Execute.htm errpage.htm
reggetsess.htm tied.htm
xsbuilder/maps Tag: Embperl2c ep_structure.map
Log:
eo
Revision Changes Path
No revision
No revision
1.118.4.85 +17 -1 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.84
retrieving revision 1.118.4.85
diff -u -r1.118.4.84 -r1.118.4.85
--- Embperl.pm 28 Jan 2002 20:28:34 -0000 1.118.4.84
+++ Embperl.pm 6 Feb 2002 09:21:06 -0000 1.118.4.85
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.118.4.84 2002/01/28 20:28:34 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.85 2002/02/06 09:21:06 richter Exp $
#
###################################################################################
@@ -36,6 +36,7 @@
@ISA
$VERSION
$cwd
+ $req_rec
) ;
@@ -92,6 +93,7 @@
my $r = shift ;
local $SIG{__WARN__} = \&Warn ;
+ $req_rec = $r ;
Embperl::Req::ExecuteRequest ($r) ;
}
@@ -137,6 +139,20 @@
if (!ref $param)
{
$Embperl::req -> execute_component ({ inputfile => $param, param => [@_]}) ;
+ }
+ elsif ($param -> {object})
+ {
+ my $c = $Embperl::req -> setup_component ($param) ;
+ my $rc = $c -> run ;
+ my $package = $c -> curr_package ;
+ $c -> cleanup ;
+ if (!$rc)
+ {
+ my $object = {} ;
+ bless $object, $package ;
+ return $object ;
+ }
+ return undef ;
}
else
{
1.31.4.47 +2 -1 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.31.4.46
retrieving revision 1.31.4.47
diff -u -r1.31.4.46 -r1.31.4.47
--- Makefile.PL 28 Jan 2002 20:28:34 -0000 1.31.4.46
+++ Makefile.PL 6 Feb 2002 09:21:07 -0000 1.31.4.47
@@ -3,7 +3,7 @@
#
# (C) 1997-2001 G.Richter (richter@dev.ecos.de) / ECOS
#
-# $Id: Makefile.PL,v 1.31.4.46 2002/01/28 20:28:34 richter Exp $
+# $Id: Makefile.PL,v 1.31.4.47 2002/02/06 09:21:07 richter Exp $
#
@@ -142,6 +142,7 @@
} ;
+ $txt =~ s/\@cd/\n#\t\@cd/ ; # remove tests for subdirs
$txt =~ s/\r\n/\n/g ; # make doesn't like \r\n!
1.19.4.19 +8 -1 embperl/embperl.h
Index: embperl.h
===================================================================
RCS file: /home/cvs/embperl/embperl.h,v
retrieving revision 1.19.4.18
retrieving revision 1.19.4.19
diff -u -r1.19.4.18 -r1.19.4.19
--- embperl.h 5 Feb 2002 09:04:03 -0000 1.19.4.18
+++ embperl.h 6 Feb 2002 09:21:07 -0000 1.19.4.19
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: embperl.h,v 1.19.4.18 2002/02/05 09:04:03 richter Exp $
+# $Id: embperl.h,v 1.19.4.19 2002/02/06 09:21:07 richter Exp $
#
###################################################################################*/
@@ -237,3 +237,10 @@
extern pid_t nPid ;
+#ifdef WIN32
+#define PATH_SEPARATOR_CHAR '\\'
+#define PATH_SEPARATOR_STR "\\"
+#else
+#define PATH_SEPARATOR_CHAR '/'
+#define PATH_SEPARATOR_STR "/"
+#endif
\ No newline at end of file
1.1.2.14 +18 -1 embperl/epapinit.c
Index: epapinit.c
===================================================================
RCS file: /home/cvs/embperl/epapinit.c,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- epapinit.c 29 Jan 2002 16:02:51 -0000 1.1.2.13
+++ epapinit.c 6 Feb 2002 09:21:07 -0000 1.1.2.14
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epapinit.c,v 1.1.2.13 2002/01/29 16:02:51 richter Exp $
+# $Id: epapinit.c,v 1.1.2.14 2002/02/06 09:21:07 richter Exp $
#
###################################################################################*/
@@ -30,10 +30,12 @@
#define EPCFG_INT EPCFG
#define EPCFG_BOOL EPCFG
#define EPCFG_CV EPCFG
+#define EPCFG_REGEX EPCFG
#define EPCFG_CHAR EPCFG
#define EPCFG_APP
#define EPCFG_REQ
#define EPCFG_COMPONENT
+#define EPCFG_AV(STRUCT,TYPE,NAME,CFGNAME,SEPARATOR) EPCFG(STRUCT,TYPE,NAME,CFGNAME)
#define EPCFG(STRUCT,TYPE,NAME,CFGNAME) int set_##STRUCT##NAME:1 ;
@@ -335,6 +337,21 @@
return NULL; \
*/ return "unimplemented" ; \
}
+
+#undef EPCFG_AV
+#define EPCFG_AV(STRUCT,TYPE,NAME,CFGNAME,SEPARATOR) \
+char * embperl_Apache_Config_##STRUCT##NAME (cmd_parms *cmd, tApacheDirConfig * pDirCfg, char * arg) \
+ { \
+ return "unimplemented" ; \
+ }
+
+#undef EPCFG_REGEX
+#define EPCFG_REGEX(STRUCT,TYPE,NAME,CFGNAME) \
+char * embperl_Apache_Config_##STRUCT##NAME (cmd_parms *cmd, tApacheDirConfig * pDirCfg, char * arg) \
+ { \
+ return "unimplemented" ; \
+ }
+
#include "epcfg.h"
1.1.2.22 +7 -2 embperl/Attic/epdat2.h
Index: epdat2.h
===================================================================
RCS file: /home/cvs/embperl/Attic/epdat2.h,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- epdat2.h 5 Feb 2002 09:04:03 -0000 1.1.2.21
+++ epdat2.h 6 Feb 2002 09:21:07 -0000 1.1.2.22
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epdat2.h,v 1.1.2.21 2002/02/05 09:04:03 richter Exp $
+# $Id: epdat2.h,v 1.1.2.22 2002/02/06 09:21:07 richter Exp $
#
###################################################################################*/
@@ -147,11 +147,15 @@
SV * pOutput ;
char * sSub ; /* subroutine to call */
int nImport ;
+ char * sObject ; /**< create an object */
+ char * sISA ; /**< make this a base class */
+ AV * pErrArray ; /**< return error messages in this hash */
int nFirstLine ;
int nMtime ; /**< last modification time of pInput */
AV * pParam ; /**< parameters passed via Execute */
HV * pFormHash; /**< fdat for this component */
AV * pFormArray ; /**< ffld for this component */
+
} tComponentParam ;
@@ -297,7 +301,8 @@
char op_mask_buf[MAXO + 100]; /* save buffer for opcode mask - maxo shouldn't differ from MAXO but leave room anyway (see BOOT:) */
- HV * pImportStash ; /* stash for package, where new macros should be imported */
+ char * sImportPackage ; /**< name of caller macro that should be used to import new subs */
+ HV * pImportStash ; /* stash for package, where new subs should be imported */
HV * pExportHash ;
1.1.2.25 +58 -13 embperl/Attic/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epinit.c,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- epinit.c 5 Feb 2002 09:04:03 -0000 1.1.2.24
+++ epinit.c 6 Feb 2002 09:21:07 -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: epinit.c,v 1.1.2.24 2002/02/05 09:04:03 richter Exp $
+# $Id: epinit.c,v 1.1.2.25 2002/02/06 09:21:07 richter Exp $
#
###################################################################################*/
@@ -1038,6 +1038,27 @@
tReq * r = c -> pReq ;
epTHX_
+ if (c -> Param.sISA)
+ {
+ STRLEN l ;
+ SV * pName = newSVpvf ("%s::ISA", c -> sImportPackage) ;
+ AV * pCallerISA = perl_get_av (SvPV(pName, l), TRUE) ;
+ int i ;
+ int n = av_len(pCallerISA) + 1;
+ SV ** ppSV ;
+
+ SvREFCNT_dec (pName) ;
+
+ for (i = 0; i < n; i++)
+ {
+ if ((ppSV = av_fetch(pCallerISA, i, 0)) && *ppSV && strcmp (SvPV(*ppSV, l), c -> sCurrPackage) == 0)
+ break ;
+ }
+
+ if (n == i)
+ av_push(pCallerISA, newSVpv (c -> sCurrPackage, 0)) ;
+ }
+
embperl_CleanupOutput (r, c) ;
SvREFCNT_dec (c -> Config._perlsv) ;
@@ -1116,7 +1137,7 @@
hv_clear (r -> pThread -> pFormSplitHash) ;
av_clear (r -> pDomTreeAV) ;
SvREFCNT_dec (r -> pDomTreeAV) ;
- for (i = 0 ; i < AvFILL (r -> pCleanupAV); i++)
+ for (i = 0 ; i <= av_len (r -> pCleanupAV); i++)
{
sv_setsv (SvRV(*av_fetch (r -> pCleanupAV, i, 0)), &sv_undef) ;
}
@@ -1216,7 +1237,7 @@
tComponentOutput * pOutput ;
tMemPool * pPool ;
- if (!c -> Param.pOutput && !c -> Param.sOutputfile && c -> pPrev)
+ if (!c -> Param.pOutput && !c -> Param.sOutputfile && c -> pPrev && !r -> Component.pImportStash)
{ /* this component uses the main output object */
c -> pOutput = c -> pPrev -> pOutput ;
return ok ;
@@ -1334,28 +1355,37 @@
NewEscMode (r, NULL) ;
c -> bEscModeSet = 0 ;
+ if (c -> Param.nImport < 0 && (c -> Param.sObject || c -> Param.sISA))
+ c -> Param.nImport = 0 ;
+
if (c -> Param.nImport >= 0)
{
char code[40] ;
SV * pSVImport ;
- char * sImport ;
STRLEN l ;
- sprintf (code, "caller(%d)", c -> Param.nImport>0?c -> Param.nImport:0) ;
+ sprintf (code, "caller(%d)", c -> Param.nImport>0?c -> Param.nImport:1) ;
/* there is no c api to the caller function, eval it... */
pSVImport = perl_eval_pv(code, 0) ;
- sImport = SvPV (pSVImport, l) ;
+ c -> sImportPackage = ep_pstrdup(r -> pPool, SvPV (pSVImport, l)) ;
- if ((c -> pImportStash = gv_stashpv (sImport, 0)) == NULL)
+ if ((c -> pImportStash = gv_stashpv (c -> sImportPackage, 0)) == NULL)
{
- strncpy (r -> errdat1, sImport, sizeof (r -> errdat1) - 1);
+ strncpy (r -> errdat1, c -> sImportPackage, sizeof (r -> errdat1) - 1);
LogError (r, rcImportStashErr) ;
}
}
- c -> nSourceline = c -> Param.nFirstLine ;
+ c -> nSourceline = pParam -> nFirstLine ;
if (!pParam -> sInputfile)
- pParam -> sInputfile = r -> Param.sFilename ;
+ {
+ if (pParam -> sISA)
+ pParam -> sInputfile = pParam -> sISA ;
+ else if (pParam -> sObject)
+ pParam -> sInputfile = pParam -> sObject ;
+ else
+ pParam -> sInputfile = r -> Param.sFilename ;
+ }
else if (p = strchr(pParam -> sInputfile, '#'))
{
pParam -> sSub = p + 1 ;
@@ -1366,7 +1396,22 @@
}
if (!*pParam -> sInputfile || strcmp(pParam -> sInputfile, "*") == 0)
pParam -> sInputfile = r -> Param.sFilename ;
-
+ else if (strcmp(pParam -> sInputfile, "../*") == 0)
+ {
+#ifdef WIN32
+ char * p = strrchr(r -> Param.sFilename, '\\') ;
+ if (!p)
+ p = strrchr(r -> Param.sFilename, '/') ;
+#else
+ char * p = strrchr(r -> Param.sFilename, '/') ;
+#endif
+ if (!p)
+ p = r -> Param.sFilename ;
+ else
+ p++ ;
+
+ pParam -> sInputfile = ep_pstrcat(r -> pPool, "../", p, NULL) ;
+ }
*ppComponent = c ;
@@ -1530,8 +1575,8 @@
args[0] = newSVpv (r -> Param.sUri, 0) ;
else if (r -> Param.sFilename && *r -> Param.sFilename)
args[0] = newSVpv (r -> Param.sFilename, 0) ;
- else if (pPerlParam)
- args[0] = GetHashValueSVinc (r, pPerlParam, "inputfile", &sv_undef) ;
+ else if (pPerlParam && SvROK(pPerlParam))
+ args[0] = (SV *)GetHashValueSVinc (r, (HV *)SvRV(pPerlParam), "inputfile", &sv_undef) ;
else
{
LogError (r, rcCannotCheckUri) ;
1.75.4.96 +18 -2 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.95
retrieving revision 1.75.4.96
diff -u -r1.75.4.95 -r1.75.4.96
--- epmain.c 5 Feb 2002 09:04:03 -0000 1.75.4.95
+++ epmain.c 6 Feb 2002 09:21:07 -0000 1.75.4.96
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epmain.c,v 1.75.4.95 2002/02/05 09:04:03 richter Exp $
+# $Id: epmain.c,v 1.75.4.96 2002/02/06 09:21:07 richter Exp $
#
###################################################################################*/
@@ -1295,7 +1295,9 @@
{
int rc = ok ;
- char * sInputfile = r -> Component.sSourcefile ;
+ tComponent * c = &r -> Component ;
+ char * sInputfile = c -> sSourcefile ;
+
dTHR ;
epTHX ;
@@ -1311,6 +1313,13 @@
/* SetupSafeNamespace (r) ; */
+
+ if (c -> Param.pErrArray)
+ {
+ SvREFCNT_inc(c -> Param.pErrArray) ;
+ SvREFCNT_dec(r -> pErrArray) ;
+ r -> pErrArray = c -> Param.pErrArray ;
+ }
/* --- open output and send http header if EarlyHttpHeaders --- */
if (rc == ok)
@@ -1421,6 +1430,13 @@
if ((c -> Config.bOptions & optReturnError) )
save_int(&r -> bError) ;
+
+ if (c -> Param.pErrArray)
+ {
+ save_int(&r -> bError) ;
+ save_aptr(&r -> pErrArray) ;
+ r -> pErrArray = c -> Param.pErrArray ;
+ }
if ((c -> Config.bOptions & optEarlyHttpHeader) == 0)
oBegin (r) ;
1.15.4.39 +21 -18 embperl/eputil.c
Index: eputil.c
===================================================================
RCS file: /home/cvs/embperl/eputil.c,v
retrieving revision 1.15.4.38
retrieving revision 1.15.4.39
diff -u -r1.15.4.38 -r1.15.4.39
--- eputil.c 5 Feb 2002 09:04:04 -0000 1.15.4.38
+++ eputil.c 6 Feb 2002 09:21:07 -0000 1.15.4.39
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: eputil.c,v 1.15.4.38 2002/02/05 09:04:04 richter Exp $
+# $Id: eputil.c,v 1.15.4.39 2002/02/06 09:21:07 richter Exp $
#
###################################################################################*/
@@ -1479,11 +1479,7 @@
sAbsname = pPool?ep_palloc(pPool, l):malloc (l) ;
strcpy (sAbsname, r -> Component.sCWD) ;
-#ifdef WIN32
- strcat (sAbsname, "\\") ;
-#else
- strcat (sAbsname, "/") ;
-#endif
+ strcat (sAbsname, PATH_SEPARATOR_STR) ;
strcat (sAbsname, sFilename) ;
}
else
@@ -1518,14 +1514,18 @@
sAbsFilename = embperl_File2Abs(r, r -> pPool, sFilename) ;
-#ifdef WIN32
- p = strrchr(sAbsFilename, '\\') ;
-#else
- p = strrchr(sAbsFilename, '/') ;
-#endif
+ p = strrchr(sAbsFilename, PATH_SEPARATOR_CHAR) ;
+
+ while (p && p > sAbsFilename + 2 && p[-1] == '.' && p[-2] == '.' && p[-3] == PATH_SEPARATOR_CHAR)
+ {
+ p[-3] = '\0' ;
+ p = strrchr(sAbsFilename, PATH_SEPARATOR_CHAR) ;
+ }
+
r -> Component.sCWD = sAbsFilename ;
- *p = '\0' ;
+ if (p)
+ *p = '\0' ;
}
/* ---------------------------------------------------------------------------- */
@@ -1541,6 +1541,7 @@
{
epTHX_
AV *pPathAV = r -> Config.pPathAV ;
+ int skip = 0 ;
int i ;
struct stat st ;
char * fn ;
@@ -1549,13 +1550,15 @@
if (isAbsPath(sFilename) || !pPathAV || AvFILL (pPathAV) < r -> Component.nPathNdx)
return embperl_File2Abs (r, pPool, sFilename) ;
- for (i = 0 ; i <= AvFILL (pPathAV); i++)
+ while (sFilename[0] == '.' && sFilename[1] == '.' && (sFilename[2] == '/' || sFilename[2] == '\\'))
+ {
+ skip++ ;
+ sFilename += 3 ;
+ }
+
+ for (i = skip ; i <= AvFILL (pPathAV); i++)
{
-#ifdef WIN32
- fn = ep_pstrcat(r -> pPool, SvPV(*av_fetch (pPathAV, i, 0), l), "\\", sFilename, NULL) ;
-#else
- fn = ep_pstrcat(r -> pPool, SvPV(*av_fetch (pPathAV, i, 0), l), "/", sFilename, NULL) ;
-#endif
+ fn = ep_pstrcat(r -> pPool, SvPV(*av_fetch (pPathAV, i, 0), l), PATH_SEPARATOR_STR, sFilename, NULL) ;
if (stat (fn, &st) == 0)
{
r -> Component.nPathNdx = i ;
1.70.4.112 +5 -4 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.111
retrieving revision 1.70.4.112
diff -u -r1.70.4.111 -r1.70.4.112
--- test.pl 5 Feb 2002 09:04:04 -0000 1.70.4.111
+++ test.pl 6 Feb 2002 09:21:07 -0000 1.70.4.112
@@ -11,7 +11,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: test.pl,v 1.70.4.111 2002/02/05 09:04:04 richter Exp $
+# $Id: test.pl,v 1.70.4.112 2002/02/06 09:21:07 richter Exp $
#
###################################################################################
@@ -1540,7 +1540,7 @@
{ $opt_cache = $opt_modperl = $opt_cgi = $opt_offline = $opt_execute = 1 }
else
{ $opt_cache = $opt_offline = $opt_execute = 1 }
- $opt_ep1 = 1 ;
+ #$opt_ep1 = 1 ;
}
@@ -1782,6 +1782,7 @@
#############
$ENV{EMBPERL_EP1COMPAT} = 0 ;
+ delete $ENV{EMBPERL_ALLOW} ;
if ($err == 0)
{
@@ -1962,9 +1963,9 @@
$err = CheckError ($EP2?5:8) if ($err == 0) ;
- if (@errors != ($EP2?5:12))
+ if (@errors != ($EP2?4:12))
{
- print "\n\n\@errors does not return correct number of errors (is " . scalar(@errors) . ", should 5)\n" ;
+ print "\n\n\@errors does not return correct number of errors (is " . scalar(@errors) . ", should 4)\n" ;
$err = 1 ;
}
No revision
No revision
1.3.6.2 +1 -1 embperl/test/cmp/Execute.htm
Index: Execute.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Execute.htm,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- Execute.htm 26 Oct 2000 07:32:59 -0000 1.3.6.1
+++ Execute.htm 6 Feb 2002 09:21:08 -0000 1.3.6.2
@@ -1,4 +1,4 @@
-<HTML><TITLE>Test for HTML::Embperl::Execute</TITLE><BODY>
+<HTML><TITLE>Test for Embperl::Execute</TITLE><BODY>
<H1> 1.) Include from memory</H1>
<P>Here is some text</P>
<H1> 2.) Include from memory with some Embperl code</H1>
1.5.4.1 +1 -1 embperl/test/cmp/reqrec.htm
Index: reqrec.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/reqrec.htm,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -r1.5 -r1.5.4.1
--- reqrec.htm 16 Jul 2000 17:45:54 -0000 1.5
+++ reqrec.htm 6 Feb 2002 09:21:08 -0000 1.5.4.1
@@ -5,7 +5,7 @@
</head>
$conf = <br>
-^\$_\[0\] = HTML::Embperl::Req=HASH\(0x.*?\) <br>
+^\$_\[0\] = Embperl::Req=HASH\(0x.*?\) <br>
$_[1] = <br>
^\$rec_rec = Apache=SCALAR\(0x.*?\)<br>
1.2.6.1 +6 -6 embperl/test/cmp/tied.htm
Index: tied.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/tied.htm,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -r1.2 -r1.2.6.1
--- tied.htm 5 Oct 1999 06:02:21 -0000 1.2
+++ tied.htm 6 Feb 2002 09:21:08 -0000 1.2.6.1
@@ -1,22 +1,22 @@
-<HTML><TITLE>Test for HTML::Embperl::Execute</TITLE><BODY>
+<HTML><TITLE>Test for Embperl::Execute</TITLE><BODY>
<H1> 1.) Include from memory: ref to string</H1>
<P>Here is some text</P>
rc = 0
-<HTML><TITLE>Test for HTML::Embperl::Execute</TITLE><BODY>
+<HTML><TITLE>Test for Embperl::Execute</TITLE><BODY>
<H1> 2.) Include from memory: numeric</H1>
rc = 500
-<HTML><TITLE>Test for HTML::Embperl::Execute</TITLE><BODY>
+<HTML><TITLE>Test for Embperl::Execute</TITLE><BODY>
<H1> 3.) Include from memory: string</H1>
rc = 500
-<HTML><TITLE>Test for HTML::Embperl::Execute</TITLE><BODY>
+<HTML><TITLE>Test for Embperl::Execute</TITLE><BODY>
<H1> 4.) Include from memory: array</H1>
rc = 0
-<HTML><TITLE>Test for HTML::Embperl::Execute</TITLE><BODY>
+<HTML><TITLE>Test for Embperl::Execute</TITLE><BODY>
<H1> 5.) Include from memory: tied string ref</H1>
<P>Here is some text</P>
rc = 0
-<HTML><TITLE>Test for HTML::Embperl::Execute</TITLE><BODY>
+<HTML><TITLE>Test for Embperl::Execute</TITLE><BODY>
<H1> 6.) Include from memory: tied string</H1>
rc = 500
<H1> 6.) Done :-)</H1>
No revision
No revision
1.1.2.1.6.5 +13 -13 embperl/test/html/registry/Execute.htm
Index: Execute.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/registry/Execute.htm,v
retrieving revision 1.1.2.1.6.4
retrieving revision 1.1.2.1.6.5
diff -u -r1.1.2.1.6.4 -r1.1.2.1.6.5
--- Execute.htm 8 Nov 2001 13:14:03 -0000 1.1.2.1.6.4
+++ Execute.htm 6 Feb 2002 09:21:08 -0000 1.1.2.1.6.5
@@ -1,11 +1,11 @@
#
-# Example for using HTML::Embperl::Execute
+# Example for using Embperl::Execute
#
# run this under mod_perl / Apache::Registry
#
-use HTML::Embperl ;
+use Embperl ;
my($r) = @_;
@@ -17,7 +17,7 @@
chdir(dirname ($fn)) ;
-$HTML::Embperl::DebugDefault = 0xffffdffd ;
+$Embperl::DebugDefault = 0xffffdffd ;
$tst1 = '<P>Here is some text</P>' ;
@@ -25,10 +25,10 @@
$r -> status (200) ;
$r -> send_http_header () ;
-print "<HTML><TITLE>Test for HTML::Embperl::Execute</TITLE><BODY>\n" ;
+print "<HTML><TITLE>Test for Embperl::Execute</TITLE><BODY>\n" ;
print "<H1> 1.) Include from memory</H1>\n" ;
-HTML::Embperl::Execute ({input => \$tst1,
+Embperl::Execute ({input => \$tst1,
mtime => 1,
inputfile => 'Some text',
req_rec => $r}) ;
@@ -36,7 +36,7 @@
print "<H1> 2.) Include from memory with some Embperl code</H1>\n" ;
-HTML::Embperl::Execute ({input => \'[- @ar = (a1, b2, c3) -]<table><tr><td>[+$ar[$col]+]</td> </tr> </table> </P>',
+Embperl::Execute ({input => \'[- @ar = (a1, b2, c3) -]<table><tr><td>[+$ar[$col]+]</td> </tr> </table> </P>',
mtime => 1,
inputfile => 'table',
req_rec => $r}) ;
@@ -46,7 +46,7 @@
$MyPackage::Interface::Var = 'Some Var' ;
-HTML::Embperl::Execute ({input => \'<P>Transfer some vars [+ $Var +] !</P>',
+Embperl::Execute ({input => \'<P>Transfer some vars [+ $Var +] !</P>',
inputfile => 'Var',
mtime => 1,
'package' => 'MyPackage::Interface',
@@ -60,7 +60,7 @@
# Note you get problems is you change the code, but did not restart the server or
# change the value in mtime. So make sure if you change something also change mtime!
-HTML::Embperl::Execute ({input => \'<P>Transfer some vars [+ $Var +] !</P>',
+Embperl::Execute ({input => \'<P>Transfer some vars [+ $Var +] !</P>',
inputfile => 'Var2',
mtime => 1,
'package' => 'MyPackage::Interface',
@@ -70,7 +70,7 @@
print "<H1> 5.) Use \@param to pass parameters</H1>\n" ;
-HTML::Embperl::Execute ({input => \'<P>Use @param to transfer some data ([+ "@param" +]) !</P>',
+Embperl::Execute ({input => \'<P>Use @param to transfer some data ([+ "@param" +]) !</P>',
inputfile => 'Param',
debug => 0xffffdffd,
req_rec => $r,
@@ -85,7 +85,7 @@
print "<H3> \$p[0] is $p[0] and \$p[1] is $p[1]<H3>" ;
-HTML::Embperl::Execute ({input => \'<P>Got data in @param ([+ "@param" +]) !</P>[- $param[0] = "newA" ; $param[1] = "newB" ; -]<P>Change data in @param to ([+ "@param" +]) !</P>',
+Embperl::Execute ({input => \'<P>Got data in @param ([+ "@param" +]) !</P>[- $param[0] = "newA" ; $param[1] = "newB" ; -]<P>Change data in @param to ([+ "@param" +]) !</P>',
inputfile => 'Param & Return',
req_rec => $r,
param => \@p }
@@ -100,7 +100,7 @@
my @myffld = sort keys %myfdat ;
-HTML::Embperl::Execute ({input => \'<P><table><tr><td>[+ $ffld[$row] +]</td><td>[+ do { local $^W = 0 ; $fdat{$ffld[$row]} } +]</td></tr></table></P>',
+Embperl::Execute ({input => \'<P><table><tr><td>[+ $ffld[$row] +]</td><td>[+ do { local $^W = 0 ; $fdat{$ffld[$row]} } +]</td></tr></table></P>',
inputfile => 'fdat & ffld',
req_rec => $r,
fdat => \%myfdat,
@@ -111,7 +111,7 @@
print "<H1> 8.) Inculde a file</H1>\n" ;
-HTML::Embperl::Execute ({inputfile => '../inc.htm',
+Embperl::Execute ({inputfile => '../inc.htm',
req_rec => $r}) ;
@@ -119,7 +119,7 @@
my $out ;
-HTML::Embperl::Execute ({inputfile => '../inc.htm',
+Embperl::Execute ({inputfile => '../inc.htm',
output => \$out,
req_rec => $r}) ;
1.1.2.1.6.2 +7 -7 embperl/test/html/registry/errpage.htm
Index: errpage.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/registry/errpage.htm,v
retrieving revision 1.1.2.1.6.1
retrieving revision 1.1.2.1.6.2
diff -u -r1.1.2.1.6.1 -r1.1.2.1.6.2
--- errpage.htm 29 May 2001 06:14:51 -0000 1.1.2.1.6.1
+++ errpage.htm 6 Feb 2002 09:21:08 -0000 1.1.2.1.6.2
@@ -1,11 +1,11 @@
#
-# Example for using HTML::Embperl::Execute
+# Example for using Embperl::Execute
#
# run this under mod_perl / Apache::Registry
#
-use HTML::Embperl ;
+use Embperl ;
my($r) = @_;
@@ -16,21 +16,21 @@
my $fn = $r -> filename ;
chdir(dirname ($fn)) ;
-$HTML::Embperl::DebugDefault = 811005 ;
+$Embperl::DebugDefault = 811005 ;
$r -> status (200) ;
$r -> send_http_header () ;
-print "<HTML><TITLE>Test for HTML::Embperl::Execute and errors</TITLE><BODY>\n" ;
+print "<HTML><TITLE>Test for Embperl::Execute and errors</TITLE><BODY>\n" ;
my $out ;
print "<H1> 1.) The next one produces an error page</H1>\n" ;
-HTML::Embperl::Execute ({inputfile => '../error.htm',
+Embperl::Execute ({inputfile => '../error.htm',
output => \$out,
req_rec => $r}) ;
@@ -42,9 +42,9 @@
print "<H1> 2.) The next one produces an errors, but error page is disabled</H1>\n" ;
-HTML::Embperl::Execute ({inputfile => '../error.htm',
+Embperl::Execute ({inputfile => '../error.htm',
output => \$out,
- options => HTML::Embperl::optDisableEmbperlErrorPage,
+ options => Embperl::optDisableEmbperlErrorPage,
req_rec => $r}) ;
1.2.4.2 +6 -6 embperl/test/html/registry/reggetsess.htm
Index: reggetsess.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/registry/reggetsess.htm,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -r1.2.4.1 -r1.2.4.2
--- reggetsess.htm 26 Oct 2000 07:33:07 -0000 1.2.4.1
+++ reggetsess.htm 6 Feb 2002 09:21:08 -0000 1.2.4.2
@@ -3,22 +3,22 @@
#
-use HTML::Embperl ;
+use Embperl ;
my($r) = @_;
-$HTML::Embperl::DebugDefault = 811005 ;
+$Embperl::DebugDefault = 811005 ;
$r -> status (200) ;
$r -> send_http_header () ;
-print "<HTML><TITLE>Test for HTML::Embperl::Req::SetupSession</TITLE><BODY>\n" ;
+print "<HTML><TITLE>Test for Embperl::Req::SetupSession</TITLE><BODY>\n" ;
-my $session = HTML::Embperl::Req::SetupSession ($r) ;
+my $session = Embperl::Req::SetupSession ($r) ;
-$off = 0 ; $off-- if ($HTML::Embperl::SessionMgnt == 2 && !defined (tied (%$session) -> getid)) ;
+$off = 0 ; $off-- if ($Embperl::SessionMgnt == 2 && !defined (tied (%$session) -> getid)) ;
@ks = grep (!/^_/, sort (keys %$session)) ; $num = keys (%$session) - $#ks - 1 + $off ;
foreach (@ks)
@@ -29,7 +29,7 @@
$tst1 = '<P>Here is some text inside of Execute</P>' ;
-HTML::Embperl::Execute ({input => \$tst1,
+Embperl::Execute ({input => \$tst1,
mtime => 1,
inputfile => 'Some text session test',
}) ;
1.2.6.3 +18 -18 embperl/test/html/registry/tied.htm
Index: tied.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/registry/tied.htm,v
retrieving revision 1.2.6.2
retrieving revision 1.2.6.3
diff -u -r1.2.6.2 -r1.2.6.3
--- tied.htm 15 May 2001 14:21:34 -0000 1.2.6.2
+++ tied.htm 6 Feb 2002 09:21:08 -0000 1.2.6.3
@@ -1,11 +1,11 @@
-#
-# Test for magic and numeric vaiables within HTML::Embperl::Execute
+#
+# Test for magic and numeric vaiables within Embperl::Execute
#
# run this under mod_perl / Apache::Registry
#
{
- package HTML::Embperl::Test::Tie ;
+ package Embperl::Test::Tie ;
sub TIESCALAR
{
@@ -25,11 +25,11 @@
-use HTML::Embperl ;
+use Embperl ;
my($r) = @_;
-$HTML::Embperl::DebugDefault = 811005 ;
+$Embperl::DebugDefault = 811005 ;
$tst1 = '<P>Here is some text</P>' ;
@@ -37,50 +37,50 @@
$r -> status (200) ;
$r -> send_http_header () ;
-print "<HTML><TITLE>Test for HTML::Embperl::Execute</TITLE><BODY>\n" ;
+print "<HTML><TITLE>Test for Embperl::Execute</TITLE><BODY>\n" ;
print "<H1> 1.) Include from memory: ref to string</H1>\n" ;
-$rc = HTML::Embperl::Execute ({inputfile => 'test_ref_string',
+$rc = Embperl::Execute ({inputfile => 'test_ref_string',
input => \$tst1,
mtime => 1}) ;
print "rc = $rc\n" ;
-print "<HTML><TITLE>Test for HTML::Embperl::Execute</TITLE><BODY>\n" ;
+print "<HTML><TITLE>Test for Embperl::Execute</TITLE><BODY>\n" ;
print "<H1> 2.) Include from memory: numeric</H1>\n" ;
-$rc = HTML::Embperl::Execute ({inputfile => 'test_numeric',
+$rc = Embperl::Execute ({inputfile => 'test_numeric',
input => 5,
mtime => 1}) ;
print "rc = $rc\n" ;
-print "<HTML><TITLE>Test for HTML::Embperl::Execute</TITLE><BODY>\n" ;
+print "<HTML><TITLE>Test for Embperl::Execute</TITLE><BODY>\n" ;
print "<H1> 3.) Include from memory: string</H1>\n" ;
-$rc = HTML::Embperl::Execute ({inputfile => 'test_string',
+$rc = Embperl::Execute ({inputfile => 'test_string',
input => 'Hi',
mtime => 1}) ;
print "rc = $rc\n" ;
-print "<HTML><TITLE>Test for HTML::Embperl::Execute</TITLE><BODY>\n" ;
+print "<HTML><TITLE>Test for Embperl::Execute</TITLE><BODY>\n" ;
print "<H1> 4.) Include from memory: array</H1>\n" ;
-$rc = HTML::Embperl::Execute ({inputfile => 'test_array',
+$rc = Embperl::Execute ({inputfile => 'test_array',
input => ['a', 'b', 'c'],
mtime => 1}) ;
print "rc = $rc\n" ;
-tie $tiedvar1, 'HTML::Embperl::Test::Tie', $tst1 ;
+tie $tiedvar1, 'Embperl::Test::Tie', $tst1 ;
-print "<HTML><TITLE>Test for HTML::Embperl::Execute</TITLE><BODY>\n" ;
+print "<HTML><TITLE>Test for Embperl::Execute</TITLE><BODY>\n" ;
print "<H1> 5.) Include from memory: tied string ref</H1>\n" ;
-$rc = HTML::Embperl::Execute ({inputfile => 'test_tied_string_ref',
+$rc = Embperl::Execute ({inputfile => 'test_tied_string_ref',
input => \$tiedvar1,
mtime => 1}) ;
@@ -89,10 +89,10 @@
-print "<HTML><TITLE>Test for HTML::Embperl::Execute</TITLE><BODY>\n" ;
+print "<HTML><TITLE>Test for Embperl::Execute</TITLE><BODY>\n" ;
print "<H1> 6.) Include from memory: tied string</H1>\n" ;
-$rc = HTML::Embperl::Execute ({inputfile => 'test_tied_string',
+$rc = Embperl::Execute ({inputfile => 'test_tied_string',
input => $tiedvar1,
mtime => 1}) ;
No revision
No revision
1.1.2.13 +3 -0 embperl/xsbuilder/maps/Attic/ep_structure.map
Index: ep_structure.map
===================================================================
RCS file: /home/cvs/embperl/xsbuilder/maps/Attic/ep_structure.map,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- ep_structure.map 5 Feb 2002 09:04:06 -0000 1.1.2.12
+++ ep_structure.map 6 Feb 2002 09:21:08 -0000 1.1.2.13
@@ -175,6 +175,9 @@
pParam | param
pFormHash | fdat
pFormArray | ffld
+ sObject | object
+ sISA | isa
+ pErrArray | errors
new
! private
</tComponentParam>
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org