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/01/22 10:29:57 UTC
cvs commit: embperl/test/html subimp.pm
richter 02/01/22 01:29:57
Modified: . Tag: Embperl2c Embperl.pm Embperl.xs Makefile.PL
embperl.h epapinit.c epcgiinit.c epdat2.h epinit.c
epmain.c eppriv.h epprovider.c eppublic.h test.pl
Embperl Tag: Embperl2c Mail.pm Module.pm Recipe.pm
Syntax.pm
Embperl/Recipe Tag: Embperl2c Embperl.pm EmbperlLibXSLT.pm
EmbperlXSLT.pm EmbperlXalanXSLT.pm LibXSLT.pm
XSLT.pm XalanXSLT.pm
Embperl/Syntax Tag: Embperl2c ASP.pm Embperl.pm
EmbperlBlocks.pm EmbperlHTML.pm HTML.pm Mail.pm
POD.pm Perl.pm RTF.pm SSI.pm Test.pm Text.pm
test/html Tag: Embperl2c subimp.pm
Added: Embperl Tag: Embperl2c Log.pm Object.pm Out.pm Run.pm
Util.pm
Log:
data structure rewrite
Revision Changes Path
No revision
No revision
1.118.4.78 +5 -11 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.77
retrieving revision 1.118.4.78
diff -u -r1.118.4.77 -r1.118.4.78
--- Embperl.pm 19 Jan 2002 13:45:39 -0000 1.118.4.77
+++ Embperl.pm 22 Jan 2002 09:29:54 -0000 1.118.4.78
@@ -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.77 2002/01/19 13:45:39 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.78 2002/01/22 09:29:54 richter Exp $
#
###################################################################################
@@ -26,15 +26,6 @@
use Embperl::Syntax ;
use Embperl::Recipe ;
-use Embperl::Thread ;
-use Embperl::App ;
-use Embperl::App::Config ;
-use Embperl::Req ;
-use Embperl::Req::Config ;
-use Embperl::Req::Param ;
-use Embperl::Component ;
-use Embperl::Component::Config ;
-use Embperl::Component::Param ;
use strict ;
@@ -59,14 +50,17 @@
bootstrap Embperl $VERSION;
+Boot ($VERSION) ;
Init (undef, {}) ;
+1 ;
+
sub Execute
{
my $rc ;
my $param = shift ;
- my $r = Embperl::Req::InitRequest (undef, $param) ;
+ my $r = Embperl::Req::RunRequest (undef, $param) ;
}
1.29.4.38 +91 -1 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.29.4.37
retrieving revision 1.29.4.38
diff -u -r1.29.4.37 -r1.29.4.38
--- Embperl.xs 19 Jan 2002 14:13:41 -0000 1.29.4.37
+++ Embperl.xs 22 Jan 2002 09:29:54 -0000 1.29.4.38
@@ -22,7 +22,10 @@
embperl_Init(pApacheSrvSV, pPerlParam)
SV * pApacheSrvSV
SV * pPerlParam
-
+CODE:
+ RETVAL = embperl_Init (aTHX_ pApacheSrvSV, pPerlParam) ;
+OUTPUT:
+ RETVAL
MODULE = Embperl::Req PACKAGE = Embperl::Req PREFIX = embperl_
@@ -39,4 +42,91 @@
PUSHs(epxs_IV_2obj(RETVAL)) ;
PUSHs(epxs_Embperl__Req_2obj(ppReq)) ;
+int
+embperl_InitRequestComponent(pApacheReqSV, pPerlParam)
+ SV * pApacheReqSV
+ SV * pPerlParam
+PREINIT:
+ Embperl__Req ppReq;
+PPCODE:
+ RETVAL = embperl_InitRequestComponent(aTHX_ pApacheReqSV, pPerlParam, &ppReq);
+ EXTEND(SP, 2) ;
+ PUSHs(epxs_IV_2obj(RETVAL)) ;
+ PUSHs(epxs_Embperl__Req_2obj(ppReq)) ;
+
+
+int
+embperl_RunRequest(pApacheSrvSV, pPerlParam)
+ SV * pApacheSrvSV
+ SV * pPerlParam
+CODE:
+ RETVAL = embperl_RunRequest (aTHX_ pApacheSrvSV, pPerlParam) ;
+OUTPUT:
+ RETVAL
+
+
+
+
MODULE = Embperl PACKAGE = Embperl PREFIX = embperl_
+
+void
+embperl_Boot(version)
+ SV * version
+CODE:
+ PUSHMARK(sp);
+ XPUSHs(sv_2mortal(newSVpv("Embperl::Thread", 0))) ;
+ XPUSHs(version) ;
+ PUTBACK;
+ boot_Embperl__Thread (aTHX) ;
+
+ PUSHMARK(sp);
+ XPUSHs(sv_2mortal(newSVpv("Embperl::App", 0))) ;
+ XPUSHs(version) ;
+ PUTBACK;
+ boot_Embperl__App (aTHX) ;
+
+ PUSHMARK(sp);
+ XPUSHs(sv_2mortal(newSVpv("Embperl::App::Config", 0))) ;
+ XPUSHs(version) ;
+ PUTBACK;
+ boot_Embperl__App__Config (aTHX) ;
+
+ PUSHMARK(sp);
+ XPUSHs(sv_2mortal(newSVpv("Embperl::Req", 0))) ;
+ XPUSHs(version) ;
+ PUTBACK;
+ boot_Embperl__Req (aTHX) ;
+
+ PUSHMARK(sp);
+ XPUSHs(sv_2mortal(newSVpv("Embperl::Req::Config", 0))) ;
+ XPUSHs(version) ;
+ PUTBACK;
+ boot_Embperl__Req__Config (aTHX) ;
+
+ PUSHMARK(sp);
+ XPUSHs(sv_2mortal(newSVpv("Embperl::Req::Param", 0))) ;
+ XPUSHs(version) ;
+ PUTBACK;
+ boot_Embperl__Req__Param (aTHX) ;
+
+ PUSHMARK(sp);
+ XPUSHs(sv_2mortal(newSVpv("Embperl::Component", 0))) ;
+ XPUSHs(version) ;
+ PUTBACK;
+ boot_Embperl__Component (aTHX) ;
+
+ PUSHMARK(sp);
+ XPUSHs(sv_2mortal(newSVpv("Embperl::Component::Config", 0))) ;
+ XPUSHs(version) ;
+ PUTBACK;
+ boot_Embperl__Component__Config (aTHX) ;
+
+ PUSHMARK(sp);
+ XPUSHs(sv_2mortal(newSVpv("Embperl::Component::Param", 0))) ;
+ XPUSHs(version) ;
+ PUTBACK;
+ boot_Embperl__Component__Param (aTHX) ;
+
+
+
+
1.31.4.42 +19 -3 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.31.4.41
retrieving revision 1.31.4.42
diff -u -r1.31.4.41 -r1.31.4.42
--- Makefile.PL 19 Jan 2002 13:45:40 -0000 1.31.4.41
+++ Makefile.PL 22 Jan 2002 09:29:54 -0000 1.31.4.42
@@ -3,7 +3,7 @@
#
# (C) 1997-2001 G.Richter (richter@dev.ecos.de) / ECOS
#
-# $Id: Makefile.PL,v 1.31.4.41 2002/01/19 13:45:40 richter Exp $
+# $Id: Makefile.PL,v 1.31.4.42 2002/01/22 09:29:54 richter Exp $
#
@@ -442,6 +442,7 @@
$apache = 0 ;
$b = 0 ;
+$optdebug = '' ;
$ccdebug = '' ;
$lddebug = '' ;
$libs = '' ;
@@ -450,6 +451,7 @@
if ($ARGV[0] eq 'debug')
{
shift @ARGV;
+ $optdebug = '-g -O0' ;
if ($win32)
{
$ccdebug = '-Zi -W3' ;
@@ -457,7 +459,7 @@
}
else
{
- $ccdebug = '-ggdb' ;
+ $ccdebug = '-ggdb -O0' ;
$lddebug = '-g' ;
}
}
@@ -1146,6 +1148,9 @@
'LIBS' => [$libs || ''],
'DEFINE' => "$d \$(DEFS)",
'INC' => "-I $EPPATH $i",
+ 'VERSION' => undef,
+ 'VERSION_FROM' => "$EPPATH/Embperl.pm",
+ $optdebug?('OPTIMIZE' => $ccdebug):(),
) ;
@@ -1155,7 +1160,18 @@
close FH ;
-
+$o .= ' ' .
+join (' ', qw{
+xs\Embperl\App\App.obj
+xs\Embperl\App\Config\Config.obj
+xs\Embperl\Component\Component.obj
+xs\Embperl\Component\Config\Config.obj
+xs\Embperl\Component\Param\Param.obj
+xs\Embperl\Req\Req.obj
+xs\Embperl\Req\Config\Config.obj
+xs\Embperl\Req\Param\Param.obj
+xs\Embperl\Thread\Thread.obj
+}) ;
WriteMakefile(
'NAME' => 'Embperl',
1.19.4.17 +3 -2 embperl/embperl.h
Index: embperl.h
===================================================================
RCS file: /home/cvs/embperl/embperl.h,v
retrieving revision 1.19.4.16
retrieving revision 1.19.4.17
diff -u -r1.19.4.16 -r1.19.4.17
--- embperl.h 13 Dec 2001 15:13:54 -0000 1.19.4.16
+++ embperl.h 22 Jan 2002 09:29:54 -0000 1.19.4.17
@@ -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.16 2001/12/13 15:13:54 richter Exp $
+# $Id: embperl.h,v 1.19.4.17 2002/01/22 09:29:54 richter Exp $
#
###################################################################################*/
@@ -85,7 +85,8 @@
rcNotCodeRef,
rcUnknownRecipe,
rcTypeMismatch,
- rcChdirError
+ rcChdirError,
+ rcUnknownSyntax
} ;
1.1.2.11 +2 -2 embperl/epapinit.c
Index: epapinit.c
===================================================================
RCS file: /home/cvs/embperl/epapinit.c,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- epapinit.c 18 Jan 2002 16:22:36 -0000 1.1.2.10
+++ epapinit.c 22 Jan 2002 09:29:54 -0000 1.1.2.11
@@ -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.10 2002/01/18 16:22:36 richter Exp $
+# $Id: epapinit.c,v 1.1.2.11 2002/01/22 09:29:54 richter Exp $
#
###################################################################################*/
@@ -44,7 +44,7 @@
#undef EPCFG
#define EPCFG(STRUCT,TYPE,NAME,CFGNAME) \
- { #CFGNAME, embperl_Apache_Config_##NAME, NULL, RSRC_CONF, TAKE1, "" },
+ { "EMBPERL_"#CFGNAME, embperl_Apache_Config_##NAME, NULL, RSRC_CONF, TAKE1, "" },
static const command_rec embperl_cmds[] =
1.1.2.4 +6 -6 embperl/Attic/epcgiinit.c
Index: epcgiinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcgiinit.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- epcgiinit.c 19 Jan 2002 14:13:41 -0000 1.1.2.3
+++ epcgiinit.c 22 Jan 2002 09:29:54 -0000 1.1.2.4
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epcgiinit.c,v 1.1.2.3 2002/01/19 14:13:41 richter Exp $
+# $Id: epcgiinit.c,v 1.1.2.4 2002/01/22 09:29:54 richter Exp $
#
###################################################################################*/
@@ -20,21 +20,21 @@
#undef EPCFG
#define EPCFG_INT(STRUCT,TYPE,NAME,CFGNAME) \
- pConfig -> NAME = GetHashValueInt (aTHX_ pThread -> pEnvHash, #CFGNAME, pConfig -> NAME) ;
+ pConfig -> NAME = GetHashValueInt (aTHX_ pThread -> pEnvHash, "EMBPERL_"#CFGNAME, pConfig -> NAME) ;
#undef EPCFG_BOOL
#define EPCFG_BOOL(STRUCT,TYPE,NAME,CFGNAME) \
- pConfig -> NAME = GetHashValueInt (aTHX_ pThread -> pEnvHash, #CFGNAME, pConfig -> NAME) ;
+ pConfig -> NAME = GetHashValueInt (aTHX_ pThread -> pEnvHash, "EMBPERL_"#CFGNAME, pConfig -> NAME) ;
#undef EPCFG_STR
#define EPCFG_STR(STRUCT,TYPE,NAME,CFGNAME) \
- pConfig -> NAME = GetHashValueStrDup (aTHX_ pPool, pThread -> pEnvHash, #CFGNAME, pConfig -> NAME) ;
+ pConfig -> NAME = GetHashValueStrDup (aTHX_ pPool, pThread -> pEnvHash, "EMBPERL_"#CFGNAME, pConfig -> NAME) ;
#undef EPCFG_CHAR
#define EPCFG_CHAR(STRUCT,TYPE,NAME,CFGNAME) \
{ \
char buf[2] = { pConfig -> NAME, '\0' } ; \
- char *p = GetHashValueStrDup (aTHX_ pPool, pThread -> pEnvHash, #CFGNAME, buf) ; \
+ char *p = GetHashValueStrDup (aTHX_ pPool, pThread -> pEnvHash, "EMBPERL_"#CFGNAME, buf) ; \
pConfig -> NAME = *p ; \
}
@@ -42,7 +42,7 @@
#define EPCFG_CV(STRUCT,TYPE,NAME,CFGNAME) \
{ \
int rc ;\
- char * arg = GetHashValueStr (aTHX_ pThread -> pEnvHash, #CFGNAME, NULL) ; \
+ char * arg = GetHashValueStr (aTHX_ pThread -> pEnvHash, "EMBPERL_"#CFGNAME, NULL) ; \
if (arg) \
if ((rc = EvalConfig (pApp, sv_2mortal(newSVpv(arg, 0)), 0, NULL, &pConfig -> NAME)) != ok) \
return rc ; \
1.1.2.12 +2 -1 embperl/Attic/epdat2.h
Index: epdat2.h
===================================================================
RCS file: /home/cvs/embperl/Attic/epdat2.h,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- epdat2.h 18 Jan 2002 16:22:36 -0000 1.1.2.11
+++ epdat2.h 22 Jan 2002 09:29:54 -0000 1.1.2.12
@@ -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.11 2002/01/18 16:22:36 richter Exp $
+# $Id: epdat2.h,v 1.1.2.12 2002/01/22 09:29:54 richter Exp $
#
###################################################################################*/
@@ -279,6 +279,7 @@
request_rec * pApacheReq ; /* apache request record */
SV * pApacheReqSV ;
+ tApacheDirConfig * pApacheConfig ;
tReqConfig Config ; /**< request configuration data */
tReqParam Param ; /**< request parameter data */
1.1.2.12 +79 -50 embperl/Attic/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epinit.c,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- epinit.c 19 Jan 2002 14:13:41 -0000 1.1.2.11
+++ epinit.c 22 Jan 2002 09:29:54 -0000 1.1.2.12
@@ -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.11 2002/01/19 14:13:41 richter Exp $
+# $Id: epinit.c,v 1.1.2.12 2002/01/22 09:29:54 richter Exp $
#
###################################################################################*/
@@ -25,15 +25,13 @@
#ifndef PERL_IMPLICIT_CONTEXT
-tThreadData embperl_ThreadData ;
+SV * embperl_ThreadDataRV ;
#define SINGLETHREAD
#endif
-#define EMBPERL_PACKAGE Embperl
-#define EMBPERL_PACKAGE_STR "Embperl"
#define OPTPREFIX EMBPERL_PACKAGE_STR
@@ -92,23 +90,14 @@
SV * * ppSV ;
#ifdef SINGLETHREAD
- pThread = &embperl_ThreadData ;
+ ppSV = &embperl_ThreadDataRV ;
#else
- ppSV = hv_fetch (PL_modglobal, "HTML::Embperl::Thread", 21, 1) ;
- if (*ppSV == NULL)
- {
- *ppSV = newSV(sizeof (*pThread)) ;
- pThread = (tThreadData * )SvPVX (*ppSV) ;
- memset (pThread, 0, sizeof (*pThread)) ;
- }
- else
- {
- pThread = (tThreadData * )SvPVX (*ppSV) ;
- }
- pThread -> pPerlTHX = aTHX ;
+ ppSV = hv_fetch (PL_modglobal, "Embperl::Thread", 15, 1) ;
#endif
+ if (!ppSV)
+ return rcHashError ;
- if (!pThread -> nPid)
+ if (!*ppSV || !SvOK(*ppSV))
{
SV * pThreadRV ;
SV * pThreadSV ;
@@ -128,6 +117,11 @@
pThread -> pHeaderHash = perl_get_hv (EMBPERL_HDR_NAME, TRUE) ;
pThread -> pInputHash = perl_get_hv (EMBPERL_IDAT_NAME, TRUE) ;
pThread -> pEnvHash = perl_get_hv (EMBPERL_ENV_NAME, TRUE) ;
+ *ppSV = pThreadRV ;
+ }
+ else
+ {
+ pThread = epxs_sv2_Embperl__Thread(*ppSV) ;
}
*ppThread = pThread ;
@@ -188,11 +182,13 @@
void embperl_DefaultAppConfig (/*in*/ tAppConfig *pCfg)
{
- memset (pCfg, 0, sizeof (*pCfg)) ;
-
pCfg -> sAppName = "Embperl" ;
pCfg -> sCookieName = "EMBPERL_UID" ;
+#ifdef WIN32
+ pCfg -> sLog = "\\embperl.log" ;
+#else
pCfg -> sLog = "/tmp/embperl.log" ;
+#endif
pCfg -> bDebug = dbgStd ;
}
@@ -246,11 +242,15 @@
int rc ;
SV * pAppSV ;
SV * pAppRV ;
+ SV * pSV ;
+ SV * pRV ;
+ tAppConfig * pCfg ;
tMemPool * pPool = ep_make_sub_pool (pThread -> pPool) ;
epxs_Embperl__App_create_obj(pApp,pAppSV,pAppRV,ep_palloc(pPool,sizeof(*pApp))) ;
+ epxs_Embperl__App__Config_create_obj(pCfg,pSV,pRV,&pApp -> Config) ;
#ifdef PERL_IMPLICIT_CONTEXT
pApp -> pPerlTHX = aTHX ;
#endif
@@ -261,8 +261,9 @@
embperl_GetApacheAppConfig (pThread, pPool, ap_r, ap_s, &pApp -> Config) ;
else
#endif
- embperl_GetCGIAppConfig (pThread, pPool, & pApp -> Config) ;
+ embperl_GetCGIAppConfig (pThread, pPool, &pApp -> Config) ;
+ SetHashValueInt (NULL, pThread -> pApplications, sAppName, (IV)pApp) ;
pApp -> pThread = pThread ;
@@ -271,7 +272,8 @@
{
if ((rc = OpenLog (pApp)) != ok)
{
- LogError (NULL, rc) ;
+ pApp -> Config.bDebug = 0 ; /* Turn debbuging off, only errors will go to stderr */
+ LogErrorParam (pApp, rc, pApp -> Config.sLog, Strerror(errno)) ;
}
}
@@ -293,7 +295,8 @@
}
*/
- Embperl__App_new_init(pApp, pPerlParam) ;
+ if (pPerlParam && SvROK(pPerlParam))
+ Embperl__App_new_init(aTHX_ pApp, SvRV(pPerlParam), 0) ;
}
*ppApp = pApp ;
@@ -487,13 +490,6 @@
}
#endif
- if ((rc = OpenLog (pApp)) != ok)
- {
- pApp -> Config.bDebug = 0 ; /* Turn debbuging off, only errors will go to stderr */
- LogError (NULL, rc) ;
- }
-
-
ADDINTMG (EscMode)
ADDINTMG (CurrNode)
@@ -586,8 +582,6 @@
void embperl_DefaultReqConfig (/*in*/ tReqConfig *pCfg)
{
- memset (pCfg, 0, sizeof (*pCfg)) ;
-
pCfg -> cMultFieldSep = '\t' ;
}
@@ -868,6 +862,10 @@
tThreadData * pThread ;
SV * pReqSV ;
SV * pReqRV ;
+ SV * pSV ;
+ SV * pRV ;
+ tReqConfig * pConfig ;
+ tReqParam * pParam ;
#ifdef APACHE
request_rec * pApacheReq ;
@@ -875,6 +873,8 @@
tMemPool * pPool = ep_make_sub_pool (pApp -> pPool) ;
epxs_Embperl__Req_create_obj(r,pReqSV,pReqRV,ep_palloc(pPool,sizeof(*r))) ;
+ epxs_Embperl__Req__Config_create_obj(pConfig,pSV,pRV,&r->Config) ;
+ epxs_Embperl__Req__Param_create_obj(pParam,pSV,pRV,&r->Param) ;
#ifdef PERL_IMPLICIT_CONTEXT
r -> pPerlTHX = aTHX ;
#endif
@@ -914,6 +914,12 @@
embperl_GetCGIReqParam (pApp, pPool, &r -> Param) ;
}
+ if (pPerlParam && SvROK(pPerlParam))
+ {
+ Embperl__Req__Config_new_init(aTHX_ &r -> Config, SvRV(pPerlParam), 0) ;
+ Embperl__Req__Param_new_init(aTHX_ &r -> Param, SvRV(pPerlParam), 0) ;
+ }
+
r -> pApp = pApp ;
pThread = r -> pThread = pApp -> pThread ;
@@ -935,8 +941,6 @@
r -> nLogFileStartPos = GetLogFilePos (pApp) ;
- Embperl__Req_new_init (r, pPerlParam) ;
-
hv_clear (pThread -> pHeaderHash) ;
embperl_SetupFormData (r) ;
@@ -966,9 +970,6 @@
void embperl_DefaultComponentConfig (/*in*/ tComponentConfig *pCfg)
{
- memset (pCfg, 0, sizeof (*pCfg)) ;
-
-
pCfg -> sPackage ;
pCfg -> bDebug = dbgStd ;
pCfg -> bOptions = optRawInput | optAllFormData ;
@@ -1006,32 +1007,42 @@
int embperl_SetupComponent (/*in*/ tReq * r,
- /*in*/ tApacheDirConfig * pApacheCfg,
/*in*/ SV * pPerlParam,
/*out*/tComponent * * ppComponent)
{
- int rc ;
SV * pComponentSV ;
SV * pComponentRV ;
+ SV * pSV ;
+ SV * pRV ;
tComponent * c ;
+ tComponentParam * pParam ;
+ tComponentConfig * pConfig ;
epTHX ;
+#if 0
epxs_Embperl__Component_create_obj(c,pComponentSV, pComponentRV,ep_palloc(r->pPool,sizeof(*c))) ;
/* for performance reason we copy the actual component directly into the request object */
c -> pPrev = r -> Component.pOrg ;
- memcpy (c -> pPrev, &r -> Component, sizeof (*c -> pPrev)) ;
+ if (c -> pPrev)
+ memcpy (c -> pPrev, &r -> Component, sizeof (*c -> pPrev)) ;
c -> pOrg = c ;
memcpy (&r -> Component, c, sizeof (r -> Component)) ;
-
+#endif
+
+ epxs_Embperl__Component_create_obj(c,pComponentSV, pComponentRV,&r->Component) ;
+ epxs_Embperl__Component__Param_create_obj(pParam,pSV, pRV,&r->Component.Param) ;
+ epxs_Embperl__Component__Config_create_obj(pConfig,pSV, pRV,&r->Component.Config) ;
+
+ c -> Param.nImport = -1 ;
#ifdef APACHE
if (r -> pApacheReq)
{
- embperl_GetApacheComponentConfig (r, r -> pPool, pApacheCfg, &c -> Config) ;
+ embperl_GetApacheComponentConfig (r, r -> pPool, r -> pApacheConfig, &c -> Config) ;
}
else
#endif
@@ -1039,19 +1050,20 @@
embperl_GetCGIComponentConfig (r, r -> pPool, &c -> Config) ;
}
-
+ if (pPerlParam && SvROK(pPerlParam))
+ {
+ Embperl__Component__Config_new_init (aTHX_ &c -> Config, SvRV(pPerlParam), 0) ;
+ Embperl__Component__Param_new_init (aTHX_ &c -> Param, SvRV(pPerlParam), 0) ;
+ }
+
getcwd (c->sCWD, sizeof (c->sCWD)-1) ;
#ifdef WIN32
c -> nCWDDrive = _getdrive () ;
#endif
- if ((rc = embperl_GetSyntax (c -> Config.sSyntax, r -> Component.pTokenTable)) != ok)
- return rc ;
-
NewEscMode (r, NULL) ;
c -> bEscModeSet = 0 ;
-
if (c -> Param.nImport >= 0)
{
char code[40] ;
@@ -1071,8 +1083,8 @@
}
c -> nSourceline = c -> Param.nFirstLine ;
-
- Embperl__Component_new_init (c, pPerlParam) ;
+ if (!pParam -> sInputfile)
+ pParam -> sInputfile = r -> Param.sFilename ;
*ppComponent = c ;
@@ -1196,8 +1208,9 @@
request_rec * ap_r = (request_rec *)SvIV((SV*)SvRV(pApacheReqSV));
embperl_GetApacheConfig (pThread, ap_r, ap_r -> server, &pApacheCfg) ;
+
+ r -> pApacheConfig = pApacheCfg ;
}
- else
#endif
/* get the application object */
@@ -1218,3 +1231,19 @@
}
+
+
+int embperl_InitRequestComponent (/*in*/ pTHX_
+ /*in*/ SV * pApacheReqSV,
+ /*in*/ SV * pPerlParam,
+ /*out*/tReq * * ppReq)
+
+ {
+ int rc ;
+ tComponent * pComponent ;
+
+ if ((rc = embperl_InitRequest (aTHX_ pApacheReqSV, pPerlParam, ppReq)) != ok)
+ return rc ;
+
+ return embperl_SetupComponent (*ppReq, pPerlParam, &pComponent) ;
+ }
\ No newline at end of file
1.75.4.84 +214 -136 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.83
retrieving revision 1.75.4.84
diff -u -r1.75.4.83 -r1.75.4.84
--- epmain.c 19 Jan 2002 14:13:41 -0000 1.75.4.83
+++ epmain.c 22 Jan 2002 09:29:54 -0000 1.75.4.84
@@ -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.83 2002/01/19 14:13:41 richter Exp $
+# $Id: epmain.c,v 1.75.4.84 2002/01/22 09:29:54 richter Exp $
#
###################################################################################*/
@@ -68,8 +68,11 @@
/* print error */
/* */
-char * LogError (/*i/o*/ register req * r,
- /*in*/ int rc)
+static char * DoLogError (/*i/o*/ struct tReq * r,
+ /*i/o*/ struct tApp * a,
+ /*in*/ int rc,
+ /*in*/ char * errdat1,
+ /*in*/ char * errdat2)
{
const char * msg ;
@@ -77,18 +80,45 @@
SV * pSV ;
SV * pSVLine = NULL ;
STRLEN l ;
+ pid_t nPid ;
- epTHX ;
-
- EPENTRY (LogError) ;
-
- r -> errdat1 [sizeof (r -> errdat1) - 1] = '\0' ;
- r -> errdat2 [sizeof (r -> errdat2) - 1] = '\0' ;
+ #ifdef PERL_IMPLICIT_CONTEXT
+ pTHX ;
+ if (r)
+ aTHX = r -> pPerlTHX ;
+ else if (a)
+ aTHX = a -> pPerlTHX ;
+ else
+ aTHX = PERL_GET_THX ;
+#endif
+
+ if (r)
+ {
+ r -> errdat1 [sizeof (r -> errdat1) - 1] = '\0' ;
+ r -> errdat2 [sizeof (r -> errdat2) - 1] = '\0' ;
+
+ GetLineNo (r) ;
+
+ errdat1 = r -> errdat1 ;
+ errdat2 = r -> errdat2 ;
+
+ if (rc != rcPerlWarn)
+ r -> bError = 1 ;
+ nPid = r -> pThread -> nPid ;
+ a = r -> pApp ;
+ }
+ else if (a)
+ {
+ nPid = a -> pThread -> nPid ;
+ }
+ else
+ nPid = getpid() ;
- GetLineNo (r) ;
- if (rc != rcPerlWarn)
- r -> bError = 1 ;
+ if (!errdat1)
+ errdat1 = "" ;
+ if (!errdat2)
+ errdat2 = "" ;
switch (rc)
{
@@ -155,11 +185,12 @@
case rcUnknownRecipe: msg ="[%d]ERR: %d: %s Unknown recipe '%s'" ; break ;
case rcTypeMismatch: msg ="[%d]ERR: %d: %s Unsupported Outputformat %s of %s" ; break ;
case rcChdirError: msg ="[%d]ERR: %d: %s Cannot change to directory %s %s" ; break ;
+ case rcUnknownSyntax: msg ="[%d]ERR: %d: %s Unknown syntax '%s'" ; break ;
default: msg ="[%d]ERR: %d: %s Error %s%s" ; break ;
}
- if ((rc != rcPerlWarn && rc != rcEvalErr) || r -> errdat1[0] == '\0')
+ if (r && ((rc != rcPerlWarn && rc != rcEvalErr) || r -> errdat1[0] == '\0'))
{
char * p = NULL ;
char buf[20] = "" ;
@@ -185,10 +216,10 @@
- pSV = newSVpvf (msg, r -> pThread -> nPid , rc, pSVLine?SvPV(pSVLine, l):"", r -> errdat1, r -> errdat2) ;
+ pSV = newSVpvf (msg, nPid , rc, pSVLine?SvPV(pSVLine, l):"", errdat1, errdat2) ;
newSVpvf2(pSV) ;
- if (r -> Component.Config.bOptions & optShowBacktrace)
+ if (r && r -> Component.Config.bOptions & optShowBacktrace)
{
tComponent * c = &r -> Component ;
while (c)
@@ -204,10 +235,11 @@
sText = SvPV (pSV, l) ;
- lprintf (r -> pApp, "%s\n", sText) ;
+ if (a)
+ lprintf (a, "%s\n", sText) ;
#ifdef APACHE
- if (r -> pApacheReq)
+ if (r && r -> pApacheReq)
#ifdef APLOG_ERR
if (rc != rcPerlWarn)
aplog_error (APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, r -> pApacheReq -> server, "%s", sText) ;
@@ -223,22 +255,95 @@
fflush (stderr) ;
}
- if (rc == rcPerlWarn)
- strncpy (r -> lastwarn, r -> errdat1, sizeof (r -> lastwarn) - 1) ;
+ if (r)
+ {
+ if (rc == rcPerlWarn)
+ strncpy (r -> lastwarn, r -> errdat1, sizeof (r -> lastwarn) - 1) ;
- if (r -> pErrArray)
- {
- av_push (r -> pErrArray, pSV) ;
+ if (r -> pErrArray)
+ {
+ av_push (r -> pErrArray, pSV) ;
+ }
+ else
+ SvREFCNT_dec (pSV) ;
+
+ r -> errdat1[0] = '\0' ;
+ r -> errdat2[0] = '\0' ;
}
else
- SvREFCNT_dec (pSV) ;
-
- r -> errdat1[0] = '\0' ;
- r -> errdat2[0] = '\0' ;
+ SvREFCNT_dec (pSV) ;
return sText ;
}
+/*---------------------------------------------------------------------------
+* LogErrorParam
+*/
+/*!
+*
+* \_en
+* Logs the occurence of an error to the embperl logfile and the httpd error log
+*
+* @param a the application object
+* @param rc the error code
+* @param errdat1 addtional informations
+* @param errdat2 addtional informations
+* \endif
+*
+* \_de
+* logged das auftreten eines Fehler in das Embperl Logfile und den httpd
+* error log
+*
+* @param a das Applikationobjekt
+* @param rc Fehlercode
+* @param errdat1 Zus�tzliche Informationen
+* @param errdat2 Zus�tzliche Informationen
+* \endif
+*
+* ------------------------------------------------------------------------ */
+
+
+char * LogErrorParam (/*i/o*/ struct tApp * a,
+ /*in*/ int rc,
+ /*in*/ char * errdat1,
+ /*in*/ char * errdat2)
+ {
+ return DoLogError (NULL, a, rc, errdat1, errdat2) ;
+ }
+
+
+/*---------------------------------------------------------------------------
+* LogErrorParam
+*/
+/*!
+*
+* \_en
+* Logs the occurence of an error to the embperl logfile and the httpd error log
+* Addtional informations, like stack backtrace, is taken from the request object
+*
+* @param r the request object
+* @param rc the error code
+* \endif
+*
+* \_de
+* Logged das auftreten eines Fehler in das Embperl Logfile und den httpd
+* error log. Zus�tzlich Informationen, wie z.B. ein Stackbacktrace, werden
+* dem Requestobjket entnommen
+*
+* @param a das Requestobjekt
+* @param rc Fehlercode
+* \endif
+*
+* ------------------------------------------------------------------------ */
+
+char * LogError (/*i/o*/ register req * r,
+ /*in*/ int rc)
+
+
+ {
+ return DoLogError (r, NULL, rc, NULL, NULL) ;
+ }
+
#if defined (_DEBUG) && defined (WIN32)
@@ -1052,7 +1157,7 @@
{
int rc ;
SV * pOutData = r -> Component.Param.pOutput ;
- int bOutToMem = SvROK (pOutData) ;
+ int bOutToMem = pOutData && SvROK (pOutData) ;
epTHX ;
if (r -> Component.pImportStash)
@@ -1083,7 +1188,7 @@
if (bOutToMem)
r -> Component.Config.bOptions &= ~optEarlyHttpHeader ;
- if (!r -> Component.pPrev || r -> Component.pImportStash)
+ if (r -> Component.pPrev || r -> Component.pImportStash)
r -> Component.Config.bOptions &= ~optSendHttpHeader ;
@@ -1736,100 +1841,77 @@
r -> Component.pEndPos = r -> Component.pBuf + nFileSize ;
*/
- if (!r -> Component.Config.bEP1Compat)
- {
- HV * pParam ;
- SV * pParamRV ;
- /*SV * pImportParam ;
- tCacheItem * pCache ;
- HV * pRP = r -> pConf -> pReqParameter ;
- int i ;
- char * s ;
- SV * c ;*/
- SV * pRecipe ;
- STRLEN l ;
- int num ;
+ HV * pParam ;
+ SV * pParamRV ;
+ /*SV * pImportParam ;
+ tCacheItem * pCache ;
+ HV * pRP = r -> pConf -> pReqParameter ;
+ int i ;
+ char * s ;
+ SV * c ;*/
+ SV * pRecipe ;
+ STRLEN l ;
+ int num ;
- dSP ;
+ dSP ;
- /*
- if (GetHashValueSV (pRP, "provider"))
- pParam = r -> pConf -> pReqParameter ;
- else
- {
- if (!(pRecipe = GetHashValueSV (pRP, "recipe")))
- pRecipe = sv_2mortal(newSVpv ("Embperl", 7)) ;
- */
- {
- pRecipe = sv_2mortal(newSVpv (r -> Component.Config.sRecipe, 7)) ;
+ /*
+ if (GetHashValueSV (pRP, "provider"))
+ pParam = r -> pConf -> pReqParameter ;
+ else
+ {
+ if (!(pRecipe = GetHashValueSV (pRP, "recipe")))
+ pRecipe = sv_2mortal(newSVpv ("Embperl", 7)) ;
+ */
+ {
+ pRecipe = sv_2mortal(newSVpv (r -> Component.Config.sRecipe, 0)) ;
- PUSHMARK(sp);
- XPUSHs(r -> _perlsv);
- XPUSHs(&sv_undef) ; /*sv_2mortal(newRV_inc((SV *)pRP))); */
- XPUSHs(pRecipe);
- PUTBACK;
- num = perl_call_pv ("HTML::Embperl::Recipe::GetRecipe", G_SCALAR /*| G_EVAL*/) ;
- tainted = 0 ;
- SPAGAIN;
- if (num == 1)
- pParamRV = POPs ;
- PUTBACK;
- if (num != 1 || !SvROK (pParamRV) || !(pParam = (HV *)SvRV(pParamRV)) || SvTYPE((SV *)pParam) != SVt_PVHV)
- {
- strncpy (r -> errdat1, SvPV(pRecipe, l), sizeof (r -> errdat1) - 1) ;
- return rcUnknownRecipe ;
- }
+ PUSHMARK(sp);
+ XPUSHs(r -> _perlsv);
+ XPUSHs(&sv_undef) ; /*sv_2mortal(newRV_inc((SV *)pRP))); */
+ XPUSHs(pRecipe);
+ PUTBACK;
+ num = perl_call_pv ("Embperl::Recipe::GetRecipe", G_SCALAR /*| G_EVAL*/) ;
+ tainted = 0 ;
+ SPAGAIN;
+ if (num == 1)
+ pParamRV = POPs ;
+ PUTBACK;
+ if (num != 1 || !SvROK (pParamRV) || !(pParam = (HV *)SvRV(pParamRV)) || SvTYPE((SV *)pParam) != SVt_PVHV)
+ {
+ strncpy (r -> errdat1, SvPV(pRecipe, l), sizeof (r -> errdat1) - 1) ;
+ return rcUnknownRecipe ;
}
+ }
- if (SvTYPE(pParam) != SVt_PVHV)
- {
- strncpy (r -> errdat2, "provider", sizeof(r -> errdat2) - 1) ;
- return rcNotHashRef ;
- }
-
- if ((rc = Cache_New (r, pParam, &r -> Component.pOutputCache)) != ok)
- return rc ;
+ if (SvTYPE(pParam) != SVt_PVHV)
+ {
+ strncpy (r -> errdat2, "provider", sizeof(r -> errdat2) - 1) ;
+ return rcNotHashRef ;
+ }
-
- if (strncmp (r -> Component.pOutputCache -> pProvider -> sOutputType, "text/", 5) == 0)
- {
- if ((rc = Cache_GetContentSV (r, r -> Component.pOutputCache, &r -> Component.pOutputSV)) != ok)
- return rc ;
- }
- else if (strcmp (r -> Component.pOutputCache -> pProvider -> sOutputType, "X-Embperl/DomTree") == 0)
- {
- if ((rc = Cache_GetContentIndex (r, r -> Component.pOutputCache, &r -> Component.xCurrDomTree)) != ok)
- return rc ;
- }
- else
- {
- sprintf (r -> errdat1, "'%s' (accpetable are 'text/*', 'X-Embperl/DomTree')", r -> Component.pOutputCache -> pProvider -> sOutputType) ;
- strncpy (r -> errdat2, r -> Component.pOutputCache -> sKey, sizeof (r -> errdat2) - 1) ;
- return rcTypeMismatch ;
- }
+ if ((rc = Cache_New (r, pParam, &r -> Component.pOutputCache)) != ok)
+ return rc ;
+ if (strncmp (r -> Component.pOutputCache -> pProvider -> sOutputType, "text/", 5) == 0)
+ {
+ if ((rc = Cache_GetContentSV (r, r -> Component.pOutputCache, &r -> Component.pOutputSV)) != ok)
+ return rc ;
+ }
+ else if (strcmp (r -> Component.pOutputCache -> pProvider -> sOutputType, "X-Embperl/DomTree") == 0)
+ {
+ if ((rc = Cache_GetContentIndex (r, r -> Component.pOutputCache, &r -> Component.xCurrDomTree)) != ok)
+ return rc ;
}
-#if 0
else
- {
- clock_t cl1 = clock () ;
- clock_t cl2 ;
+ {
+ sprintf (r -> errdat1, "'%s' (accpetable are 'text/*', 'X-Embperl/DomTree')", r -> Component.pOutputCache -> pProvider -> sOutputType) ;
+ strncpy (r -> errdat2, r -> Component.pOutputCache -> sKey, sizeof (r -> errdat2) - 1) ;
+ return rcTypeMismatch ;
+ }
- rc = EvalMain (r) ;
-
- cl2 = clock () ;
-#ifdef CLOCKS_PER_SEC
- if (r -> Component.Config.bDebug)
- {
- lprintf (r -> pApp, "[%d]PERF: Run Start Time: %d ms \n", r -> pThread -> nPid, ((cl1 - r -> startclock) * 1000 / CLOCKS_PER_SEC)) ;
- lprintf (r -> pApp, "[%d]PERF: Run End Time: %d ms \n", r -> pThread -> nPid, ((cl2 - r -> startclock) * 1000 / CLOCKS_PER_SEC)) ;
- lprintf (r -> pApp, "[%d]PERF: Run Time: %d ms \n", r -> pThread -> nPid, ((cl2 - cl1) * 1000 / CLOCKS_PER_SEC)) ;
- }
-#endif
- }
-#endif
return rc ;
}
@@ -2107,8 +2189,7 @@
-int ExecuteReq (/*i/o*/ register req * r,
- /*in*/ SV * pReqSV)
+int embperl_ExecuteRequest (/*i/o*/ register req * r)
{
int rc = ok ;
@@ -2120,42 +2201,19 @@
EPENTRY (ExecuteReq) ;
- /* r -> pReqSV = pReqSV ; ep2?? */
-
if (!r -> Component.pExportHash)
r -> Component.pExportHash = newHV () ;
ENTER;
SAVETMPS ;
- SetupSafeNamespace (r) ;
+ /* SetupSafeNamespace (r) ; */
-#if 0
- /* --- read form data from browser if not already read by perl part --- */
- if (rc == ok && !(r -> Component.Config.bOptions & optDisableFormData) &&
- av_len (r -> pThread -> pFormArray) == -1 && r -> Component.pPrev &&
- r -> Component.pImportStash == NULL)
- rc = GetInputData_CGIScript (r) ;
-#endif
/* --- open output and send http header if EarlyHttpHeaders --- */
if (rc == ok)
rc = StartOutput (r) ;
- /* --- read input file or get input file from memory --- */
-#if 0
-#ifdef EP2
- if (rc == ok && r -> Component.Config.bEP1Compat)
-#else
- if (rc == ok)
-#endif
- {
- rc = ReadInputFile (r) ;
-
- if (rc == ok && r -> Component.pBuf == NULL && r -> Buf.pFile -> nFilesize == 0)
- rc = rcMissingInput ;
- }
-#endif
/* --- ok so far? if not exit ---- */
#ifdef APACHE
@@ -2283,3 +2341,23 @@
return ok ;
}
+
+
+
+int embperl_RunRequest (/*in*/ pTHX_
+ /*in*/ SV * pApacheReqSV,
+ /*in*/ SV * pPerlParam)
+
+
+ {
+ int rc ;
+ tReq * r ;
+
+ rc = embperl_InitRequestComponent (aTHX_ pApacheReqSV, pPerlParam, &r) ;
+
+ if (rc == ok)
+ embperl_ExecuteRequest (r) ;
+
+ return rc ;
+ }
+
1.1.2.7 +18 -1 embperl/Attic/eppriv.h
Index: eppriv.h
===================================================================
RCS file: /home/cvs/embperl/Attic/eppriv.h,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- eppriv.h 19 Jan 2002 14:13:41 -0000 1.1.2.6
+++ eppriv.h 22 Jan 2002 09:29:54 -0000 1.1.2.7
@@ -10,11 +10,13 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: eppriv.h,v 1.1.2.6 2002/01/19 14:13:41 richter Exp $
+# $Id: eppriv.h,v 1.1.2.7 2002/01/22 09:29:54 richter Exp $
#
###################################################################################*/
+#define EMBPERL_PACKAGE Embperl
+#define EMBPERL_PACKAGE_STR "Embperl"
#ifdef PERL_IMPLICIT_CONTEXT
@@ -34,6 +36,17 @@
#endif
+void boot_Embperl__Thread (pTHX) ;
+void boot_Embperl__App (pTHX) ;
+void boot_Embperl__App__Config (pTHX) ;
+void boot_Embperl__Req (pTHX) ;
+void boot_Embperl__Req__Config (pTHX) ;
+void boot_Embperl__Req__Param (pTHX) ;
+void boot_Embperl__Component (pTHX) ;
+void boot_Embperl__Component__Config (pTHX) ;
+void boot_Embperl__Component__Param (pTHX) ;
+
+
struct tCacheItem ;
/*-----------------------------------------------------------------*/
@@ -210,6 +223,10 @@
void Embperl__App_new_init(pApp, pPerlParam) ;
void Embperl__Req_new_init (r, pPerlParam) ;
+void Embperl__Req__Config_new_init (r, pPerlParam) ;
+void Embperl__Req__Param_new_init (r, pPerlParam) ;
void Embperl__Component_new_init (c, pPerlParam) ;
+void Embperl__Component__Config_new_init (c, pPerlParam) ;
+void Embperl__Component__Param_new_init (c, pPerlParam) ;
1.1.2.20 +73 -4 embperl/Attic/epprovider.c
Index: epprovider.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epprovider.c,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- epprovider.c 19 Jan 2002 14:13:41 -0000 1.1.2.19
+++ epprovider.c 22 Jan 2002 09:29:54 -0000 1.1.2.20
@@ -9,13 +9,15 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epprovider.c,v 1.1.2.19 2002/01/19 14:13:41 richter Exp $
+# $Id: epprovider.c,v 1.1.2.20 2002/01/22 09:29:54 richter Exp $
#
###################################################################################*/
#include "ep.h"
#include "epmacro.h"
+#include "ep_xs_typedefs.h"
+#include "ep_xs_sv_convert.h"
@@ -428,9 +430,19 @@
{
epTHX_
size_t nSize = pProvider -> pCache -> FileStat.st_size ;
- int rc = ReadHTML(r, (char *)((tProviderFile *)pProvider) -> sFilename, &nSize, pData) ;
+ int rc ;
+
+ r -> Component.sSourcefile = (char *)((tProviderFile *)pProvider) -> sFilename ;
+
+ rc = ReadHTML(r, (char *)((tProviderFile *)pProvider) -> sFilename, &nSize, pData) ;
if (rc == ok)
+ {
SvREFCNT_inc (*pData) ;
+ r -> Component.pBuf = SvPVX (*pData) ;
+ r -> Component.pEndPos = r -> Component.pBuf + nSize ;
+ r -> Component.pCurrPos = r -> Component.pBuf ;
+ }
+
return rc ;
}
@@ -769,6 +781,7 @@
typedef struct tProviderEpParse
{
tProvider Provider ;
+ tTokenTable * pTokenTable ;
} tProviderEpParse ;
@@ -811,11 +824,38 @@
{
+ epTHX_
+ dSP ;
int rc ;
-
+ int num ;
+ SV * pSyntaxSV ;
+ SV * pSyntaxRV ;
+ SV * pSyntaxPV ;
+ const char * sSyntax = GetHashValueStr (aTHX_ pParam, "syntax", r -> Component.Config.sSyntax) ;
+
if ((rc = Provider_NewDependOne (r, sizeof(tProviderEpParse), "source", pItem, pProviderClass, pParam)) != ok)
return rc ;
+ pSyntaxPV = sv_2mortal(newSVpv (sSyntax, 0)) ;
+
+
+ PUSHMARK(sp);
+ XPUSHs(pSyntaxPV);
+ PUTBACK;
+ num = perl_call_pv ("Embperl::Syntax::GetSyntax", G_SCALAR /*| G_EVAL*/) ;
+ tainted = 0 ;
+ SPAGAIN;
+ if (num == 1)
+ pSyntaxRV = POPs ;
+ PUTBACK;
+ if (num != 1 || !SvROK (pSyntaxRV) || !(pSyntaxSV = SvRV(pSyntaxRV)) || SvTYPE((SV *)pSyntaxSV) != SVt_PVHV)
+ {
+ strncpy (r -> errdat1, sSyntax, sizeof (r -> errdat1) - 1) ;
+ return rcUnknownSyntax ;
+ }
+
+ ((tProviderEpParse *)pItem -> pProvider) -> pTokenTable = epxs_sv2_Embperl__Syntax(pSyntaxSV) ;
+
pItem -> bCache = FALSE ; /* do not cache, because it's cached by the compiler */
return ok ;
@@ -835,6 +875,7 @@
* @param pProviderClass Provider class record
* @param pParam Parameter Hash
* source Sourcetext
+* syntax Syntax
* @param pKey Key to which string should be appended
* @return error code
* \endif
@@ -848,6 +889,7 @@
* @param pProviderClass Provider class record
* @param pParam Parameter Hash
* source Quellentext
+* syntax Syntax
* @param pKey Schl�ssel zu welchem hinzugef�gt wird
* @return Fehlercode
* \endif
@@ -861,7 +903,7 @@
{
epTHX_
int rc ;
- const char * sSyntax = GetHashValueStr (aTHX_ pParam, "syntax", "") ;
+ const char * sSyntax = GetHashValueStr (aTHX_ pParam, "syntax", r -> Component.Config.sSyntax) ;
if ((rc = Cache_AppendKey (r, pParam, "source", pKey)) != ok)
return rc;
@@ -914,6 +956,7 @@
if ((rc = Cache_GetContentSV (r, pFileCache, &pSource)) != ok)
return rc ;
+ r -> Component.pTokenTable = ((tProviderEpParse *)pProvider) -> pTokenTable ;
p = SvPV (pSource, len) ;
if ((rc = embperl_Parse (r, p, len, pData)) != ok)
return rc ;
@@ -987,6 +1030,7 @@
{
tProvider Provider ;
SV * pSVData ;
+ char * sPackage ;
} tProviderEpCompile ;
@@ -1029,11 +1073,23 @@
{
+ epTHX_
int rc ;
+ char * sPackage ;
if ((rc = Provider_NewDependOne (r, sizeof(tProviderEpCompile), "source", pItem, pProviderClass, pParam)) != ok)
return rc ;
+ if (sPackage = GetHashValueStrDupA (aTHX_ pParam, "package", NULL))
+ {
+ ((tProviderEpCompile *)(pItem -> pProvider)) -> sPackage = sPackage ;
+ }
+ else
+ {
+ sPackage = ((tProviderEpCompile *)(pItem -> pProvider)) -> sPackage = malloc (sizeof (EMBPERL_PACKAGE_STR) + 32) ;
+ sprintf (sPackage, EMBPERL_PACKAGE_STR"::__%d", r -> nRequestCount) ;
+ }
+
return ok ;
}
@@ -1051,6 +1107,7 @@
* @param pProviderClass Provider class record
* @param pParam Parameter Hash
* source Sourcetext
+* package Packagename
* @param pKey Key to which string should be appended
* @return error code
* \endif
@@ -1064,6 +1121,7 @@
* @param pProviderClass Provider class record
* @param pParam Parameter Hash
* source Quellentext
+* package Packagename
* @param pKey Schl�ssel zu welchem hinzugef�gt wird
* @return Fehlercode
* \endif
@@ -1132,6 +1190,10 @@
if ((rc = Cache_GetContentIndex (r, pSrcCache, &xSrcDomTree)) != ok)
return rc ;
+ r -> Component.sCurrPackage = ((tProviderEpCompile *)(pProvider)) -> sPackage ;
+ r -> Component.sEvalPackage = ((tProviderEpCompile *)(pProvider)) -> sPackage ;
+ r -> Component.nEvalPackage = strlen (((tProviderEpCompile *)(pProvider)) -> sPackage) ;
+
if ((rc = embperl_Compile (r, xSrcDomTree, pData, &pProg )) != ok)
{
((tProviderEpCompile *)pProvider) -> pSVData = NULL ;
@@ -1217,8 +1279,15 @@
/*in*/ tCacheItem * pItem)
{
+ epTHX_
+
if (pItem -> xData)
return DomTree_delete (r -> pApp, DomTree_self(pItem -> xData)) ;
+
+ if (((tProviderEpCompile *)(pItem -> pProvider)) -> sPackage)
+ free (((tProviderEpCompile *)(pItem -> pProvider)) -> sPackage) ;
+
+
return ok ;
}
1.1.2.4 +9 -1 embperl/Attic/eppublic.h
Index: eppublic.h
===================================================================
RCS file: /home/cvs/embperl/Attic/eppublic.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- eppublic.h 19 Jan 2002 13:45:40 -0000 1.1.2.3
+++ eppublic.h 22 Jan 2002 09:29:54 -0000 1.1.2.4
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: eppublic.h,v 1.1.2.3 2002/01/19 13:45:40 richter Exp $
+# $Id: eppublic.h,v 1.1.2.4 2002/01/22 09:29:54 richter Exp $
#
###################################################################################*/
@@ -24,6 +24,14 @@
SV * pPerlParam,
tReq * * ppReq) ;
+int embperl_InitRequestComponent ( pTHX_
+ SV * pApacheReqSV,
+ SV * pPerlParam,
+ tReq * * ppReq) ;
+
+int embperl_RunRequest (pTHX_
+ SV * pApacheReqSV,
+ SV * pPerlParam) ;
#define ERRDATLEN 1024
1.70.4.106 +26 -24 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.105
retrieving revision 1.70.4.106
diff -u -r1.70.4.105 -r1.70.4.106
--- test.pl 18 Jan 2002 16:22:37 -0000 1.70.4.105
+++ test.pl 22 Jan 2002 09:29:54 -0000 1.70.4.106
@@ -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.105 2002/01/18 16:22:37 richter Exp $
+# $Id: test.pl,v 1.70.4.106 2002/01/22 09:29:54 richter Exp $
#
###################################################################################
@@ -1519,8 +1519,10 @@
use Embperl;
-use EmbperlObject ;
-require Embperl::Module ;
+use Embperl::Object ;
+use Embperl::Util ;
+use Embperl::Run ;
+#require Embperl::Module ;
print "ok\n";
@@ -1620,7 +1622,7 @@
$testshare = "Shared Data" ;
-$cp = Embperl::AddCompartment ('TEST') ;
+$cp = Embperl::Util::AddCompartment ('TEST') ;
$cp -> deny (':base_loop') ;
$cp -> share ('$testshare') ;
@@ -1732,9 +1734,9 @@
unlink ($outfile) ;
$n_offline++ ;
- $t1 = Embperl::Clock () ;
- $err = Embperl::run (@testargs) ;
- $t_offline += Embperl::Clock () - $t1 ;
+ $t1 = 0 ; # Embperl::Clock () ;
+ $err = Embperl::Run::run (@testargs) ;
+ $t_offline += 0 ; # Embperl::Clock () - $t1 ;
if ($opt_memcheck)
{
@@ -1806,14 +1808,14 @@
print $txt2 ;
unlink ($outfile) ;
- $t1 = Embperl::Clock () ;
+ $t1 = 0 ; # Embperl::Clock () ;
$err = Embperl::Execute ({'inputfile' => $src,
'mtime' => 1,
'outputfile' => $outfile,
'debug' => $defaultdebug,
}) ;
- $t_exec += Embperl::Clock () - $t1 ;
+ $t_exec += 0 ; # Embperl::Clock () - $t1 ;
$err = CheckError ($errcnt) if ($err == 0) ;
$err = CmpFiles ($outfile, $org) if ($err == 0) ;
@@ -1826,14 +1828,14 @@
print $txt2 ;
unlink ($outfile) ;
- $t1 = Embperl::Clock () ;
+ $t1 = 0 ; # Embperl::Clock () ;
$err = Embperl::Execute ({'input' => \$indata,
'inputfile' => 'i1',
'mtime' => 1,
'outputfile' => $outfile,
'debug' => $defaultdebug,
}) ;
- $t_exec += Embperl::Clock () - $t1 ;
+ $t_exec += 0 ; # Embperl::Clock () - $t1 ;
$err = CheckError ($errcnt) if ($err == 0) ;
$err = CmpFiles ($outfile, $org) if ($err == 0) ;
@@ -1849,13 +1851,13 @@
my $outdata ;
my @errors ;
unlink ($outfile) ;
- $t1 = Embperl::Clock () ;
+ $t1 = 0 ; # Embperl::Clock () ;
$err = Embperl::Execute ({'inputfile' => $src,
'mtime' => 1,
'output' => \$outdata,
'debug' => $defaultdebug,
}) ;
- $t_exec += Embperl::Clock () - $t1 ;
+ $t_exec += 0 ; # Embperl::Clock () - $t1 ;
$err = CheckError ($errcnt) if ($err == 0) ;
@@ -1877,12 +1879,12 @@
unlink ($outfile) ;
$Embperl::Test::STDOUT::output = '' ;
tie *STDOUT, 'Embperl::Test::STDOUT' ;
- $t1 = Embperl::Clock () ;
+ $t1 = 0 ; # Embperl::Clock () ;
$err = Embperl::Execute ({'inputfile' => $src,
'mtime' => 1,
'debug' => $defaultdebug,
}) ;
- $t_exec += Embperl::Clock () - $t1 ;
+ $t_exec += 0 ; # Embperl::Clock () - $t1 ;
untie *STDOUT ;
$err = CheckError ($errcnt) if ($err == 0) ;
@@ -1902,7 +1904,7 @@
my $outdata ;
unlink ($outfile) ;
- $t1 = Embperl::Clock () ;
+ $t1 = 0 ; # Embperl::Clock () ;
$err = Embperl::Execute ({'input' => \$indata,
'inputfile' => $src,
'mtime' => 1,
@@ -1910,7 +1912,7 @@
'errors' => \@errors,
'debug' => $defaultdebug,
}) ;
- $t_exec += Embperl::Clock () - $t1 ;
+ $t_exec += 0 ; # Embperl::Clock () - $t1 ;
$err = CheckError ($errcnt) if ($err == 0) ;
@@ -1947,14 +1949,14 @@
my $outdata ;
my @errors ;
unlink ($outfile) ;
- $t1 = Embperl::Clock () ;
+ $t1 = 0 ; # Embperl::Clock () ;
$err = Embperl::Execute ({'inputfile' => $src,
'mtime' => 1,
'output' => \$outdata,
'debug' => $defaultdebug,
'errors' => \@errors,
}) ;
- $t_exec += Embperl::Clock () - $t1 ;
+ $t_exec += 0 ; # Embperl::Clock () - $t1 ;
$err = CheckError ($EP2?6:8) if ($err == 0) ;
@@ -1990,14 +1992,14 @@
my $outdata ;
my @errors ;
unlink ($outfile) ;
- $t1 = Embperl::Clock () ;
- $err = EmbperlObject::Execute ({'inputfile' => "$EPPATH/$inpath/$src",
+ $t1 = 0 ; # Embperl::Clock () ;
+ $err = Embperl::Object::Execute ({'inputfile' => "$EPPATH/$inpath/$src",
'object_base' => 'epobase.htm',
'debug' => $defaultdebug,
'outputfile' => $outfile,
'errors' => \@errors,
}) ;
- $t_exec += Embperl::Clock () - $t1 ;
+ $t_exec += 0 ; # Embperl::Clock () - $t1 ;
$err = CheckError (0) if ($err == 0) ;
@@ -2437,7 +2439,7 @@
}
$n_req++ ;
- $t1 = Embperl::Clock () ;
+ $t1 = 0 ; # Embperl::Clock () ;
$file .= '-1' if ($opt_ep1 && -e "$page-1") ;
if (defined ($opt_ab))
{
@@ -2458,7 +2460,7 @@
{
$m = REQ ("$loc$locver", $file, $test -> {query_info}, $outfile, $content, $upload, $test -> {cookie}, $test -> {respheader}) ;
}
- $t_req += Embperl::Clock () - $t1 ;
+ $t_req += 0 ; # Embperl::Clock () - $t1 ;
if ($opt_memcheck)
{
No revision
No revision
1.29.4.4 +15 -15 embperl/Embperl/Mail.pm
Index: Mail.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Mail.pm,v
retrieving revision 1.29.4.3
retrieving revision 1.29.4.4
diff -u -r1.29.4.3 -r1.29.4.4
--- Mail.pm 13 Sep 2001 07:29:44 -0000 1.29.4.3
+++ Mail.pm 22 Jan 2002 09:29:55 -0000 1.29.4.4
@@ -9,15 +9,15 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Mail.pm,v 1.29.4.3 2001/09/13 07:29:44 richter Exp $
+# $Id: Mail.pm,v 1.29.4.4 2002/01/22 09:29:55 richter Exp $
#
###################################################################################
-package HTML::Embperl::Mail ;
+package Embperl::Mail ;
-require HTML::Embperl ;
+require Embperl ;
use Apache::Constants qw(&OPT_EXECCGI &DECLINED &OK &FORBIDDEN &NOT_FOUND) ;
@@ -29,7 +29,7 @@
) ;
-@ISA = qw(HTML::Embperl);
+@ISA = qw(Embperl);
$VERSION = '1.3.4';
@@ -44,14 +44,14 @@
my $data ;
my @errors ;
- $req -> {options} ||= &HTML::Embperl::optDisableHtmlScan | &HTML::Embperl::optRawInput |
- &HTML::Embperl::optKeepSpaces | &HTML::Embperl::optReturnError;
+ $req -> {options} ||= &Embperl::optDisableHtmlScan | &Embperl::optRawInput |
+ &Embperl::optKeepSpaces | &Embperl::optReturnError;
$req -> {escmode} ||= 0 ;
$req -> {output} = \$data ;
$req -> {errors} ||= \@errors ;
- HTML::Embperl::Execute ($req) ;
+ Embperl::Execute ($req) ;
die "@errors" if (@errors) ;
@@ -142,29 +142,29 @@
=head1 NAME
-HTML::Embperl::Mail - Sends results from Embperl via E-Mail
+Embperl::Mail - Sends results from Embperl via E-Mail
=head1 SYNOPSIS
- use HTML::Embperl::Mail ;
+ use Embperl::Mail ;
- HTML::Embperl::Mail::Execute ({inputfile => 'template.epl',
- subject => 'Test HTML::Embperl::Mail::Execute',
+ Embperl::Mail::Execute ({inputfile => 'template.epl',
+ subject => 'Test Embperl::Mail::Execute',
to => 'email@foo.org'}) ;
=head1 DESCRIPTION
-I<HTML::Embperl::Mail> uses I<HTML::Embperl> to process a page template and send
+I<Embperl::Mail> uses I<Embperl> to process a page template and send
the result out via EMail. Currently only plain text mails are supported. A later
version may add support for HTML mails. Because of that fact, normal I<Embperl>
HTML processing is disabled per Default (see L<options> below).
=head2 Execute
-The C<Execute> function can handle all the parameter that C<HTML::Embperl::Execute>
+The C<Execute> function can handle all the parameter that C<Embperl::Execute>
does. Addtionaly the following parameters are recognized:
=over 4
@@ -229,7 +229,7 @@
=item errors
-As in C<HTML::Embperl::Execute> you can specify an array ref, which returns
+As in C<Embperl::Execute> you can specify an array ref, which returns
all the error messages from template processing. If you don't specify
this parameter C<Execute> will die when an error occurs.
@@ -267,4 +267,4 @@
=head1 See Also
-perl(1), HTML::Embperl, Net::SMTP
+perl(1), Embperl, Net::SMTP
1.28.6.2 +6 -6 embperl/Embperl/Module.pm
Index: Module.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Module.pm,v
retrieving revision 1.28.6.1
retrieving revision 1.28.6.2
diff -u -r1.28.6.1 -r1.28.6.2
--- Module.pm 27 Mar 2001 11:52:30 -0000 1.28.6.1
+++ Module.pm 22 Jan 2002 09:29:55 -0000 1.28.6.2
@@ -9,15 +9,15 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Module.pm,v 1.28.6.1 2001/03/27 11:52:30 richter Exp $
+# $Id: Module.pm,v 1.28.6.2 2002/01/22 09:29:55 richter Exp $
#
###################################################################################
-package HTML::Embperl::Module ;
+package Embperl::Module ;
-use HTML::Embperl ;
+use Embperl ;
$VERSION = '0.01_dev-1';
@@ -33,11 +33,11 @@
# compile page
- HTML::Embperl::Execute ({'inputfile' => __FILE__,
+ Embperl::Execute ({'inputfile' => __FILE__,
'input' => \$data,
'mtime' => -M __FILE__ ,
'import' => 0,
- 'options' => HTML::Embperl::optKeepSrcInMemory,
+ 'options' => Embperl::optKeepSrcInMemory,
'package' => __PACKAGE__}) ;
@@ -48,7 +48,7 @@
sub import
{
- HTML::Embperl::Execute ({'inputfile' => __FILE__,
+ Embperl::Execute ({'inputfile' => __FILE__,
'import' => 2,
'package' => __PACKAGE__}) ;
1.1.2.10 +6 -6 embperl/Embperl/Attic/Recipe.pm
Index: Recipe.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Recipe.pm,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- Recipe.pm 17 Dec 2001 09:04:03 -0000 1.1.2.9
+++ Recipe.pm 22 Jan 2002 09:29:55 -0000 1.1.2.10
@@ -10,13 +10,13 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Recipe.pm,v 1.1.2.9 2001/12/17 09:04:03 richter Exp $
+# $Id: Recipe.pm,v 1.1.2.10 2002/01/22 09:29:55 richter Exp $
#
###################################################################################
-package HTML::Embperl::Recipe ;
+package Embperl::Recipe ;
use strict ;
use vars qw{@ISA @EXPORT_OK %EXPORT_TAGS %Recipes} ;
@@ -44,7 +44,7 @@
$recipe = $1 ;
if (!($mod = $Recipes{$recipe}))
{
- $mod = ($name =~ /::/)?$recipe:'HTML::Embperl::Recipe::'. $recipe ;
+ $mod = ($name =~ /::/)?$recipe:'Embperl::Recipe::'. $recipe ;
if (!defined (&{$mod . '::new'}))
{
eval "require $mod" ;
@@ -77,7 +77,7 @@
{
my ($self) = @_ ;
- return HTML::Embperl::Execute ({recipe => $self}) ;
+ return Embperl::Execute ({recipe => $self}) ;
}
@@ -99,7 +99,7 @@
=head1 DESCRIPTION
-HTML::Embperl::Recipe provides basic features that are necessary for createing
+Embperl::Recipe provides basic features that are necessary for createing
your own recipes.
To do so you have to create a class that provides a C<new> method which returns
a hash that contains the description what to do.
@@ -114,7 +114,7 @@
=item $r
-The Embperl request record object (HTML::Embperl::Req), maybe a derived
+The Embperl request record object (Embperl::Req), maybe a derived
object when running under EmbperlObject.
=item $recipe
1.1.4.50 +20 -20 embperl/Embperl/Attic/Syntax.pm
Index: Syntax.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Syntax.pm,v
retrieving revision 1.1.4.49
retrieving revision 1.1.4.50
diff -u -r1.1.4.49 -r1.1.4.50
--- Syntax.pm 29 Nov 2001 09:07:43 -0000 1.1.4.49
+++ Syntax.pm 22 Jan 2002 09:29:55 -0000 1.1.4.50
@@ -10,13 +10,13 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Syntax.pm,v 1.1.4.49 2001/11/29 09:07:43 richter Exp $
+# $Id: Syntax.pm,v 1.1.4.50 2002/01/22 09:29:55 richter Exp $
#
###################################################################################
-package HTML::Embperl::Syntax ;
+package Embperl::Syntax ;
use strict ;
use vars qw{@ISA @EXPORT_OK %EXPORT_TAGS %DocumentRoot %Syntax} ;
@@ -200,7 +200,7 @@
my @split = split (/\s/, $name) ;
if ($op eq '-')
{
- my @mnames = map { /::/?$_:'HTML::Embperl::Syntax::'. $_ } @split ;
+ my @mnames = map { /::/?$_:'Embperl::Syntax::'. $_ } @split ;
foreach (@mnames)
{
$names{$_} = 1 ;
@@ -208,7 +208,7 @@
@split = split (/\s/, $oldname) ;
}
- my @xnames = map { /::/?$_:'HTML::Embperl::Syntax::'. $_ } @split ;
+ my @xnames = map { /::/?$_:'Embperl::Syntax::'. $_ } @split ;
my @names ;
foreach (@xnames)
{
@@ -218,7 +218,7 @@
$name = join (' ', @names) ;
- print HTML::Embperl::LOG "[$$]SYNTAX: switch to $name\n" ;
+ print Embperl::LOG "[$$]SYNTAX: switch to $name\n" ;
return undef if (!$name) ;
return $Syntax{$name} if (exists ($Syntax{$name})) ;
@@ -335,8 +335,8 @@
*_ep_rpurl=\\&XML::Embperl::DOM::Node::iReplaceChildWithUrlDATA;
*_ep_cp=\\&XML::Embperl::DOM::Tree::iCheckpoint;
*_ep_dcp=\\&XML::Embperl::DOM::Tree::iDiscardAfterCheckpoint;
-*_ep_opt=\\&HTML::Embperl::Cmd::Option;
-*_ep_hid=\\&HTML::Embperl::Cmd::Hidden;
+*_ep_opt=\\&Embperl::Cmd::Option;
+*_ep_hid=\\&Embperl::Cmd::Hidden;
*_ep_ac=\\&XML::Embperl::DOM::Node::iAppendChild;
*_ep_sa=\\&XML::Embperl::DOM::Element::iSetAttribut;
},
@@ -365,8 +365,8 @@
*_ep_rpurl=\\&XML::Embperl::DOM::Node::iReplaceChildWithUrlDATA;
*_ep_cp=\\&XML::Embperl::DOM::Tree::iCheckpoint;
*_ep_dcp=\\&XML::Embperl::DOM::Tree::iDiscardAfterCheckpoint;
-*_ep_opt=\\&HTML::Embperl::Cmd::Option;
-*_ep_hid=\\&HTML::Embperl::Cmd::Hidden;
+*_ep_opt=\\&Embperl::Cmd::Option;
+*_ep_hid=\\&Embperl::Cmd::Hidden;
*_ep_ac=\\&XML::Embperl::DOM::Node::iAppendChild;
*_ep_sa=\\&XML::Embperl::DOM::Element::iSetAttribut;
},
@@ -396,7 +396,7 @@
=head1 DESCRIPTION
-HTML::Embperl::Syntax provides a base class from which all custom syntaxes
+Embperl::Syntax provides a base class from which all custom syntaxes
should be derived. Currently Embperl comes with the following derived syntaxes:
=over 4
@@ -416,11 +416,11 @@
=item ASP
-<% %> and <%= %>, see perldoc HTML::Embperl::Syntax::ASP
+<% %> and <%= %>, see perldoc Embperl::Syntax::ASP
=item SSI
-Server Side Includes, see perldoc HTML::Embperl::Syntax::SSI
+Server Side Includes, see perldoc Embperl::Syntax::SSI
=item Perl
@@ -480,17 +480,17 @@
best thing is to take a look at the syntax classes that comes with Embperl.
(inside the directory Embperl/Syntax/).
-For example if you want to add new html tags, derive from I<HTML::Embperl::Syntax::HTML>,
-if you want to add new metacommands derive from I<HTML::Embperl::Syntax::EmbperlBlocks>.
+For example if you want to add new html tags, derive from I<Embperl::Syntax::HTML>,
+if you want to add new metacommands derive from I<Embperl::Syntax::EmbperlBlocks>.
Some of the classes define addtionaly methods to easily add new tags. See the
respective pod file, which methods are available for a certain class.
-I<HTML::Embperl::Syntax> defines the basic methods to create a syntax:
+I<Embperl::Syntax> defines the basic methods to create a syntax:
=head1 Methods
-=head2 HTML::Embperl::Syntax -> new / $self -> new
+=head2 Embperl::Syntax -> new / $self -> new
Create a new syntax class. This method should only be called inside a constructor
of a derived class.
@@ -499,14 +499,14 @@
=head2 $self -> AddToRoot ($elements)
This adds a new element to the root of the parser tree. C<$elements> must be a
-hashref. See I<HTML::Embperl::Syntax::ASP> for an example.
+hashref. See I<Embperl::Syntax::ASP> for an example.
=head2 $self -> AddInitCode ($compiletimecode, $initcode, $termcode, $procinfo)
This gives you the possibility to add some Perl code, that is always executed
at the beginning of a document (C<$initcode>), at the end of the document
(C<$termcode>) or at compile time (C<$compiletimecode>). The three strings must
-be valid Perl code. See I<HTML::Embperl::Syntax::SSI> for an example. C<$procinfo>
+be valid Perl code. See I<Embperl::Syntax::SSI> for an example. C<$procinfo>
is a hashref that can consits of addtional processor infos (see below) for the
document.
@@ -514,12 +514,12 @@
Returns the root of the parser tree.
-=head2 HTML::Embperl::Syntax::GetSyntax ($name, $oldname)
+=head2 Embperl::Syntax::GetSyntax ($name, $oldname)
Returns a syntax object which is build form the syntaxes named
in C<$name>. If C<$oldname> is given, C<$name> can start with a C<+> or C<->
to add or subtract a syntax. This is normaly only needed by Embperl itself
-or to implement a syntax switch statement (see I<HTML::Embperl::Syntax::SSI>
+or to implement a syntax switch statement (see I<Embperl::Syntax::SSI>
for an example.)
No revision
No revision
1.1.2.1 +48 -0 embperl/Embperl/Attic/Log.pm
1.1.2.1 +697 -0 embperl/Embperl/Attic/Object.pm
1.1.2.1 +48 -0 embperl/Embperl/Attic/Out.pm
1.1.2.1 +69 -0 embperl/Embperl/Attic/Run.pm
1.1.2.1 +41 -0 embperl/Embperl/Attic/Util.pm
No revision
No revision
1.1.2.10 +24 -17 embperl/Embperl/Recipe/Attic/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Recipe/Attic/Embperl.pm,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- Embperl.pm 17 Dec 2001 09:04:03 -0000 1.1.2.9
+++ Embperl.pm 22 Jan 2002 09:29:56 -0000 1.1.2.10
@@ -10,18 +10,18 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.1.2.9 2001/12/17 09:04:03 richter Exp $
+# $Id: Embperl.pm,v 1.1.2.10 2002/01/22 09:29:56 richter Exp $
#
###################################################################################
-package HTML::Embperl::Recipe::Embperl ;
+package Embperl::Recipe::Embperl ;
use strict ;
use vars qw{@ISA} ;
-@ISA = ('HTML::Embperl::Recipe') ;
+@ISA = ('Embperl::Recipe') ;
# ---------------------------------------------------------------------------------
#
@@ -33,11 +33,15 @@
sub new
{
- my ($class, $r, $recipe, $param) = @_ ;
+ my ($class, $r, $recipe) = @_ ;
my $self ;
my $src ;
- my $file = $param -> {inputfile} ;
+ my $param = $r -> component -> param ;
+ my $config = $r -> component -> config ;
+ my $file = $param -> inputfile ;
+ use Data::Dumper ;
+ print STDERR Dumper ($config, $param, $file) ;
die "no filename" if (!$file) ;
=pod
@@ -51,14 +55,14 @@
}
=cut
- if (ref $param -> {input})
+ if (ref $param -> input)
{
$src =
{
'type' => 'memory',
- 'name' => $param -> {inputfile},
- 'source' => $param -> {input},
- 'mtime' => $param -> {mtime},
+ 'name' => $param -> inputfile,
+ 'source' => $param -> input,
+ 'mtime' => $param -> mtime,
} ;
}
else
@@ -71,19 +75,20 @@
} ;
}
+ print STDERR Dumper ($config) ;
my $import =
{
'provider' =>
{
'type' => 'epcompile',
- ($param -> {'package'}?('package' => $param -> {'package'}):()),
+ ($config -> package?('package' => $config -> package):()),
'source' =>
{
'cache', => 0,
'provider' =>
{
'type' => 'epparse',
- 'syntax' => $param -> {'syntax'} || 'Embperl',
+ 'syntax' => $config -> syntax || 'Embperl',
'source' =>
{
'cache' => 0,
@@ -94,7 +99,7 @@
}
} ;
- if (!exists ($param -> {import})) #!$r -> IsImport)
+ if ($param -> import >= 0)
{
my $run =
{
@@ -106,11 +111,13 @@
} ;
- foreach (qw{expires_in expires_func expires_filename cache_key cache_key_options cache_key_func})
- {
- $run -> {$_} = $param -> {$_} if (exists $param -> {$_}) ;
- }
- $run -> {'cache'} = $run -> {expires_in} || $run -> {expires_func} || exists ($run -> {expires_filename})?1:0 ;
+
+ #foreach (qw{expires_in expires_func expires_filename cache_key cache_key_options cache_key_func})
+ # {
+ # $run -> {$_} = $param -> {$_} if (exists $param -> {$_}) ;
+ # }
+ #$run -> {'cache'} = $run -> {expires_in} || $run -> {expires_func} || exists ($run -> {expires_filename})?1:0 ;
+
$self = $run ;
}
else
1.1.2.4 +5 -5 embperl/Embperl/Recipe/Attic/EmbperlLibXSLT.pm
Index: EmbperlLibXSLT.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Recipe/Attic/EmbperlLibXSLT.pm,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- EmbperlLibXSLT.pm 27 Nov 2001 08:37:56 -0000 1.1.2.3
+++ EmbperlLibXSLT.pm 22 Jan 2002 09:29:56 -0000 1.1.2.4
@@ -10,20 +10,20 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: EmbperlLibXSLT.pm,v 1.1.2.3 2001/11/27 08:37:56 richter Exp $
+# $Id: EmbperlLibXSLT.pm,v 1.1.2.4 2002/01/22 09:29:56 richter Exp $
#
###################################################################################
-package HTML::Embperl::Recipe::EmbperlLibXSLT ;
+package Embperl::Recipe::EmbperlLibXSLT ;
use strict ;
use vars qw{@ISA} ;
-use HTML::Embperl::Recipe::EmbperlXSLT ;
+use Embperl::Recipe::EmbperlXSLT ;
-@ISA = ('HTML::Embperl::Recipe::EmbperlXSLT') ;
+@ISA = ('Embperl::Recipe::EmbperlXSLT') ;
# ---------------------------------------------------------------------------------
#
@@ -38,7 +38,7 @@
my ($class, $r, $recipe, $param) = @_ ;
$param -> {xsltproc} = 'libxslt' ;
- return HTML::Embperl::Recipe::EmbperlXSLT -> new ($r, $recipe, $param) ;
+ return Embperl::Recipe::EmbperlXSLT -> new ($r, $recipe, $param) ;
}
1.1.2.7 +7 -7 embperl/Embperl/Recipe/Attic/EmbperlXSLT.pm
Index: EmbperlXSLT.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Recipe/Attic/EmbperlXSLT.pm,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- EmbperlXSLT.pm 17 Dec 2001 09:04:03 -0000 1.1.2.6
+++ EmbperlXSLT.pm 22 Jan 2002 09:29:56 -0000 1.1.2.7
@@ -10,20 +10,20 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: EmbperlXSLT.pm,v 1.1.2.6 2001/12/17 09:04:03 richter Exp $
+# $Id: EmbperlXSLT.pm,v 1.1.2.7 2002/01/22 09:29:56 richter Exp $
#
###################################################################################
-package HTML::Embperl::Recipe::EmbperlXSLT ;
+package Embperl::Recipe::EmbperlXSLT ;
use strict ;
use vars qw{@ISA} ;
-use HTML::Embperl::Recipe::Embperl ;
+use Embperl::Recipe::Embperl ;
-@ISA = ('HTML::Embperl::Recipe::Embperl') ;
+@ISA = ('Embperl::Recipe::Embperl') ;
# ---------------------------------------------------------------------------------
#
@@ -37,15 +37,15 @@
{
my ($class, $r, $recipe, $param) = @_ ;
- my $ep = HTML::Embperl::Recipe::Embperl -> new ($r, $recipe, $param) ;
+ my $ep = Embperl::Recipe::Embperl -> new ($r, $recipe, $param) ;
#return $ep if ($r -> IsImport) ;
return $ep if (exists ($param -> {'import'})) ;
my $xsltproc = $param -> {xsltproc} ;
- my $xsltparam= $param -> {xsltparam} || \%HTML::Embperl::fdat ;
+ my $xsltparam= $param -> {xsltparam} || \%Embperl::fdat ;
use Data::Dumper ;
- print HTML::Embperl::LOG 'xsltparam = ', Dumper ($xsltparam) ;
+ print Embperl::LOG 'xsltparam = ', Dumper ($xsltparam) ;
my $self =
1.1.2.4 +5 -5 embperl/Embperl/Recipe/Attic/EmbperlXalanXSLT.pm
Index: EmbperlXalanXSLT.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Recipe/Attic/EmbperlXalanXSLT.pm,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- EmbperlXalanXSLT.pm 27 Nov 2001 08:37:56 -0000 1.1.2.3
+++ EmbperlXalanXSLT.pm 22 Jan 2002 09:29:56 -0000 1.1.2.4
@@ -10,20 +10,20 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: EmbperlXalanXSLT.pm,v 1.1.2.3 2001/11/27 08:37:56 richter Exp $
+# $Id: EmbperlXalanXSLT.pm,v 1.1.2.4 2002/01/22 09:29:56 richter Exp $
#
###################################################################################
-package HTML::Embperl::Recipe::EmbperlXalanXSLT ;
+package Embperl::Recipe::EmbperlXalanXSLT ;
use strict ;
use vars qw{@ISA} ;
-use HTML::Embperl::Recipe::EmbperlXSLT ;
+use Embperl::Recipe::EmbperlXSLT ;
-@ISA = ('HTML::Embperl::Recipe::EmbperlXSLT') ;
+@ISA = ('Embperl::Recipe::EmbperlXSLT') ;
# ---------------------------------------------------------------------------------
#
@@ -38,7 +38,7 @@
my ($class, $r, $recipe, $param) = @_ ;
$param -> {xsltproc} = 'xalan' ;
- return HTML::Embperl::Recipe::EmbperlXSLT -> new ($r, $recipe, $param) ;
+ return Embperl::Recipe::EmbperlXSLT -> new ($r, $recipe, $param) ;
}
1.1.2.3 +5 -5 embperl/Embperl/Recipe/Attic/LibXSLT.pm
Index: LibXSLT.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Recipe/Attic/LibXSLT.pm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LibXSLT.pm 27 Nov 2001 08:37:56 -0000 1.1.2.2
+++ LibXSLT.pm 22 Jan 2002 09:29:56 -0000 1.1.2.3
@@ -10,20 +10,20 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: LibXSLT.pm,v 1.1.2.2 2001/11/27 08:37:56 richter Exp $
+# $Id: LibXSLT.pm,v 1.1.2.3 2002/01/22 09:29:56 richter Exp $
#
###################################################################################
-package HTML::Embperl::Recipe::LibXSLT ;
+package Embperl::Recipe::LibXSLT ;
use strict ;
use vars qw{@ISA} ;
-use HTML::Embperl::Recipe::XSLT ;
+use Embperl::Recipe::XSLT ;
-@ISA = ('HTML::Embperl::Recipe::XSLT') ;
+@ISA = ('Embperl::Recipe::XSLT') ;
# ---------------------------------------------------------------------------------
#
@@ -38,7 +38,7 @@
my ($class, $r, $recipe, $param) = @_ ;
$param -> {xsltproc} = 'libxslt' ;
- return HTML::Embperl::Recipe::XSLT -> new ($r, $recipe, $param) ;
+ return Embperl::Recipe::XSLT -> new ($r, $recipe, $param) ;
}
1.1.2.7 +5 -5 embperl/Embperl/Recipe/Attic/XSLT.pm
Index: XSLT.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Recipe/Attic/XSLT.pm,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- XSLT.pm 17 Dec 2001 09:04:03 -0000 1.1.2.6
+++ XSLT.pm 22 Jan 2002 09:29:56 -0000 1.1.2.7
@@ -10,20 +10,20 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: XSLT.pm,v 1.1.2.6 2001/12/17 09:04:03 richter Exp $
+# $Id: XSLT.pm,v 1.1.2.7 2002/01/22 09:29:56 richter Exp $
#
###################################################################################
-package HTML::Embperl::Recipe::XSLT ;
+package Embperl::Recipe::XSLT ;
use strict ;
use vars qw{@ISA} ;
-use HTML::Embperl::Recipe ;
+use Embperl::Recipe ;
-@ISA = ('HTML::Embperl::Recipe') ;
+@ISA = ('Embperl::Recipe') ;
# ---------------------------------------------------------------------------------
#
@@ -41,7 +41,7 @@
my $src ;
my $file = $param -> {inputfile} ;
my $xsltproc = $param -> {xsltproc} ;
- my $xsltparam= $param -> {xsltparam} || \%HTML::Embperl::fdat ;
+ my $xsltparam= $param -> {xsltparam} || \%Embperl::fdat ;
=pod
if (!$param -> {inputfile} && $param->{sub})
1.1.2.3 +5 -5 embperl/Embperl/Recipe/Attic/XalanXSLT.pm
Index: XalanXSLT.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Recipe/Attic/XalanXSLT.pm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- XalanXSLT.pm 27 Nov 2001 08:37:56 -0000 1.1.2.2
+++ XalanXSLT.pm 22 Jan 2002 09:29:56 -0000 1.1.2.3
@@ -10,20 +10,20 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: XalanXSLT.pm,v 1.1.2.2 2001/11/27 08:37:56 richter Exp $
+# $Id: XalanXSLT.pm,v 1.1.2.3 2002/01/22 09:29:56 richter Exp $
#
###################################################################################
-package HTML::Embperl::Recipe::XalanXSLT ;
+package Embperl::Recipe::XalanXSLT ;
use strict ;
use vars qw{@ISA} ;
-use HTML::Embperl::Recipe::XSLT ;
+use Embperl::Recipe::XSLT ;
-@ISA = ('HTML::Embperl::Recipe::XSLT') ;
+@ISA = ('Embperl::Recipe::XSLT') ;
# ---------------------------------------------------------------------------------
#
@@ -38,7 +38,7 @@
my ($class, $r, $recipe, $param) = @_ ;
$param -> {xsltproc} = 'xalan' ;
- return HTML::Embperl::Recipe::XSLT -> new ($r, $recipe, $param) ;
+ return Embperl::Recipe::XSLT -> new ($r, $recipe, $param) ;
}
No revision
No revision
1.1.2.4 +10 -10 embperl/Embperl/Syntax/Attic/ASP.pm
Index: ASP.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/ASP.pm,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ASP.pm 10 Sep 2001 13:44:26 -0000 1.1.2.3
+++ ASP.pm 22 Jan 2002 09:29:56 -0000 1.1.2.4
@@ -10,19 +10,19 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: ASP.pm,v 1.1.2.3 2001/09/10 13:44:26 richter Exp $
+# $Id: ASP.pm,v 1.1.2.4 2002/01/22 09:29:56 richter Exp $
#
###################################################################################
-package HTML::Embperl::Syntax::ASP ;
+package Embperl::Syntax::ASP ;
-use HTML::Embperl::Syntax qw{:types} ;
-use HTML::Embperl::Syntax::HTML ;
+use Embperl::Syntax qw{:types} ;
+use Embperl::Syntax::HTML ;
use strict ;
use vars qw{@ISA %Cmds %CmdsOutput %CmdsOutputLink} ;
-@ISA = qw(HTML::Embperl::Syntax::HTML) ;
+@ISA = qw(Embperl::Syntax::HTML) ;
###################################################################################
@@ -43,7 +43,7 @@
{
my $class = shift ;
- my $self = HTML::Embperl::Syntax::HTML::new ($class) ;
+ my $self = Embperl::Syntax::HTML::new ($class) ;
if (!$self -> {-aspInit})
{
@@ -79,8 +79,8 @@
'end' => '?%>',
'procinfo' => {
embperl => {
- compiletimeperlcode => '$_[0] -> Syntax (HTML::Embperl::Syntax::GetSyntax(%#\'0%, $_[0] -> SyntaxName));',
- parsetimeperlcode => '$_[0] -> Syntax (HTML::Embperl::Syntax::GetSyntax(\'%%\', $_[0] -> SyntaxName)) ;',
+ compiletimeperlcode => '$_[0] -> Syntax (Embperl::Syntax::GetSyntax(%#\'0%, $_[0] -> SyntaxName));',
+ parsetimeperlcode => '$_[0] -> Syntax (Embperl::Syntax::GetSyntax(\'%%\', $_[0] -> SyntaxName)) ;',
removenode => 3,
}
}
@@ -103,7 +103,7 @@
{
my $self = shift ;
- my $tag = $self -> HTML::Embperl::Syntax::HTML::AddTag (@_) ;
+ my $tag = $self -> Embperl::Syntax::HTML::AddTag (@_) ;
#### add the ASP cmd inside the new HTML Tag ####
@@ -295,5 +295,5 @@
=head1 See Also
-HTML::Embperl::Syntax
+Embperl::Syntax
1.1.2.5 +9 -9 embperl/Embperl/Syntax/Attic/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/Embperl.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- Embperl.pm 28 Mar 2001 19:15:32 -0000 1.1.2.4
+++ Embperl.pm 22 Jan 2002 09:29:56 -0000 1.1.2.5
@@ -10,19 +10,19 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.1.2.4 2001/03/28 19:15:32 richter Exp $
+# $Id: Embperl.pm,v 1.1.2.5 2002/01/22 09:29:56 richter Exp $
#
###################################################################################
-package HTML::Embperl::Syntax::Embperl ;
+package Embperl::Syntax::Embperl ;
-use HTML::Embperl::Syntax qw{:types} ;
-use HTML::Embperl::Syntax::EmbperlHTML ;
-use HTML::Embperl::Syntax::EmbperlBlocks ;
+use Embperl::Syntax qw{:types} ;
+use Embperl::Syntax::EmbperlHTML ;
+use Embperl::Syntax::EmbperlBlocks ;
-@ISA = qw(HTML::Embperl::Syntax::EmbperlBlocks HTML::Embperl::Syntax::EmbperlHTML) ;
+@ISA = qw(Embperl::Syntax::EmbperlBlocks Embperl::Syntax::EmbperlHTML) ;
###################################################################################
@@ -42,8 +42,8 @@
{
my $class = shift ;
- my $self = HTML::Embperl::Syntax::EmbperlBlocks::new ($class) ;
- HTML::Embperl::Syntax::EmbperlHTML::new ($self) ;
+ my $self = Embperl::Syntax::EmbperlBlocks::new ($class) ;
+ Embperl::Syntax::EmbperlHTML::new ($self) ;
return $self ;
}
@@ -73,5 +73,5 @@
=head1 See Also
-HTML::Embperl::Syntax, HTML::Embperl::Syntax::EmbperlHTML, HTML::Embperl::Syntax::EmbperlBlocks
+Embperl::Syntax, Embperl::Syntax::EmbperlHTML, Embperl::Syntax::EmbperlBlocks
1.1.2.19 +19 -19 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.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- EmbperlBlocks.pm 30 Oct 2001 14:40:16 -0000 1.1.2.18
+++ EmbperlBlocks.pm 22 Jan 2002 09:29:56 -0000 1.1.2.19
@@ -10,22 +10,22 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: EmbperlBlocks.pm,v 1.1.2.18 2001/10/30 14:40:16 richter Exp $
+# $Id: EmbperlBlocks.pm,v 1.1.2.19 2002/01/22 09:29:56 richter Exp $
#
###################################################################################
-package HTML::Embperl::Syntax::EmbperlBlocks ;
+package Embperl::Syntax::EmbperlBlocks ;
-use HTML::Embperl::Syntax (':types') ;
+use Embperl::Syntax (':types') ;
use strict ;
use vars qw{@ISA %Blocks %BlocksOutput %BlocksOutputLink} ;
-@ISA = qw(HTML::Embperl::Syntax) ;
+@ISA = qw(Embperl::Syntax) ;
###################################################################################
@@ -45,7 +45,7 @@
{
my $self = shift ;
- $self = HTML::Embperl::Syntax::new ($self) ;
+ $self = Embperl::Syntax::new ($self) ;
if (!$self -> {-epbBlocks})
{
@@ -195,7 +195,7 @@
{
my $self = shift ;
- my $tag = $self -> HTML::Embperl::Syntax::HTML::AddTag (@_) ;
+ my $tag = $self -> Embperl::Syntax::HTML::AddTag (@_) ;
#### add the Embperl Block inside the new HTML Tag ####
@@ -356,17 +356,17 @@
}) ;
$self -> AddMetaCmd ('syntax',
{
- compiletimeperlcode => '$_[0] -> Syntax (HTML::Embperl::Syntax::GetSyntax(%&\'<noname>%, $_[0] -> SyntaxName));',
+ compiletimeperlcode => '$_[0] -> Syntax (Embperl::Syntax::GetSyntax(%&\'<noname>%, $_[0] -> SyntaxName));',
removenode => 3,
},
{
- parsetimeperlcode => '$_[0] -> Syntax (HTML::Embperl::Syntax::GetSyntax(\'%%\', $_[0] -> SyntaxName)) ;',
+ parsetimeperlcode => '$_[0] -> Syntax (Embperl::Syntax::GetSyntax(\'%%\', $_[0] -> SyntaxName)) ;',
},
) ;
$self -> AddMetaStartEnd ('sub', 'endsub',
{
perlcode => 'sub _ep_sub_%&<noname>% { ',
- perlcodeend => '}; sub %^subname% { my @_ep_save ; HTML::Embperl::Cmd::SubStart($_ep_DomTree,%$q%,\\@_ep_save); my $_ep_ret = _ep_sub_%^subname% (@_); HTML::Embperl::Cmd::SubEnd($_ep_DomTree,\\@_ep_save); return $_ep_ret } ; $_[0] -> ExportHash -> {%^"subname%} = \&%^subname% ; ',
+ perlcodeend => '}; sub %^subname% { my @_ep_save ; Embperl::Cmd::SubStart($_ep_DomTree,%$q%,\\@_ep_save); my $_ep_ret = _ep_sub_%^subname% (@_); Embperl::Cmd::SubEnd($_ep_DomTree,\\@_ep_save); return $_ep_ret } ; $_[0] -> ExportHash -> {%^"subname%} = \&%^subname% ; ',
removenode => 10,
mayjump => 1,
stackname2 => 'subname',
@@ -375,7 +375,7 @@
callreturn => 1,
},
{
- perlcode => '}; sub %^subname% { my @_ep_save ; HTML::Embperl::Cmd::SubStart($_ep_DomTree,%$q%,\\@_ep_save); my $_ep_ret = _ep_sub_%^subname% (@_); HTML::Embperl::Cmd::SubEnd($_ep_DomTree,\\@_ep_save); return $_ep_ret } ; $_[0] -> ExportHash -> {%^"subname%} = \&%^subname% ; ',
+ perlcode => '}; sub %^subname% { my @_ep_save ; Embperl::Cmd::SubStart($_ep_DomTree,%$q%,\\@_ep_save); my $_ep_ret = _ep_sub_%^subname% (@_); Embperl::Cmd::SubEnd($_ep_DomTree,\\@_ep_save); return $_ep_ret } ; $_[0] -> ExportHash -> {%^"subname%} = \&%^subname% ; ',
removenode => 10,
mayjump => 0,
pop2 => 'subname',
@@ -394,7 +394,7 @@
callreturn => 1,
},
{
- perlcode => '}; sub %^subname% { my @_ep_save ; HTML::Embperl::Cmd::SubStart($_ep_DomTree,%$q%,\\@_ep_save); my $_ep_ret = _ep_sub_%^subname% (@_); HTML::Embperl::Cmd::SubEnd($_ep_DomTree,\\@_ep_save); return $_ep_ret } ; $_[0] -> ExportHash -> {%^"subname%} = \&%^subname% ; ',
+ perlcode => '}; sub %^subname% { my @_ep_save ; Embperl::Cmd::SubStart($_ep_DomTree,%$q%,\\@_ep_save); my $_ep_ret = _ep_sub_%^subname% (@_); Embperl::Cmd::SubEnd($_ep_DomTree,\\@_ep_save); return $_ep_ret } ; $_[0] -> ExportHash -> {%^"subname%} = \&%^subname% ; ',
removenode => 10,
mayjump => 0,
pop2 => 'subname',
@@ -541,21 +541,21 @@
=head1 NAME
-HTML::Embperl::Syntax::EmbperlBlocks
+Embperl::Syntax::EmbperlBlocks
=head1 SYNOPSIS
=head1 DESCRIPTION
-Class derived from HTML::Embperl::Syntax to define the syntax for
+Class derived from Embperl::Syntax to define the syntax for
Embperl Blocks and metacommands.
=head1 Methods
-I<HTML::Embperl::Syntax::EmbperlBlocks> defines the following methods:
+I<Embperl::Syntax::EmbperlBlocks> defines the following methods:
-=head2 HTML::Embperl::Syntax::EmbperlBlocks -> new / $self -> new
+=head2 Embperl::Syntax::EmbperlBlocks -> new / $self -> new
Create a new syntax class. This method should only be called inside a constructor
of a derived class.
@@ -564,21 +564,21 @@
=head2 AddMetaCmd ($cmdname, $procinfo)
Add a new metacommand with name C<$cmdname> and use processor info from
-C<$procinfo>. See I<HTML::Embperl::Syntax> for a definition of procinfo.
+C<$procinfo>. See I<Embperl::Syntax> for a definition of procinfo.
=head2 AddMetaCmdWithEnd ($cmdname, $endname, $procinfo)
Add a new metacommand with name C<$cmdname> and use processor info from
C<$procinfo>. Addtionaly specify that a matching C<$endname> metacommand
must be found to end the block, that is started by this metacommand.
-See I<HTML::Embperl::Syntax> for a definition of procinfo.
+See I<Embperl::Syntax> for a definition of procinfo.
=head2 AddMetaCmdBlock ($cmdname, $endname, $procinfostart, $procinfoend)
Add a new metacommand with name C<$cmdname> and and a second metacommand
C<$endname> which ends the block that is started by C<$cmdname>.
Use processor info from C<$procinfo>.
-See I<HTML::Embperl::Syntax> for a definition of procinfo.
+See I<Embperl::Syntax> for a definition of procinfo.
@@ -588,6 +588,6 @@
=head1 See Also
-HTML::Embperl::Syntax
+Embperl::Syntax
1.1.2.10 +12 -12 embperl/Embperl/Syntax/Attic/EmbperlHTML.pm
Index: EmbperlHTML.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/EmbperlHTML.pm,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- EmbperlHTML.pm 13 Dec 2001 15:13:55 -0000 1.1.2.9
+++ EmbperlHTML.pm 22 Jan 2002 09:29:56 -0000 1.1.2.10
@@ -10,21 +10,21 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: EmbperlHTML.pm,v 1.1.2.9 2001/12/13 15:13:55 richter Exp $
+# $Id: EmbperlHTML.pm,v 1.1.2.10 2002/01/22 09:29:56 richter Exp $
#
###################################################################################
-package HTML::Embperl::Syntax::EmbperlHTML ;
+package Embperl::Syntax::EmbperlHTML ;
-use HTML::Embperl::Syntax qw{:types} ;
-use HTML::Embperl::Syntax::HTML ;
+use Embperl::Syntax qw{:types} ;
+use Embperl::Syntax::HTML ;
use strict ;
use vars qw{@ISA} ;
-@ISA = qw(HTML::Embperl::Syntax::HTML) ;
+@ISA = qw(Embperl::Syntax::HTML) ;
###################################################################################
@@ -44,7 +44,7 @@
{
my $class = shift ;
- my $self = HTML::Embperl::Syntax::HTML::new ($class) ;
+ my $self = Embperl::Syntax::HTML::new ($class) ;
Init ($self) ;
@@ -68,7 +68,7 @@
{
perlcode =>
[
- 'HTML::Embperl::Cmd::InputCheck (%$n%, %&*\'name%, %&*\'value%, %&\'checked%) ; %&=-type:radio|checkbox% ',
+ 'Embperl::Cmd::InputCheck (%$n%, %&*\'name%, %&*\'value%, %&\'checked%) ; %&=-type:radio|checkbox% ',
'$idat{%&*\'name%}=$fdat{%&*\'name%} ; _ep_sa(%$n%, \'value\', $fdat{%&*\'name%} || \'\') ; %&!-value%',
'$idat{%&*\'name%}=%&*\'value% ; ',
]
@@ -77,7 +77,7 @@
{
perlcode =>
[
- '$idat{%&*\'name%}=$fdat{%&*\'name%};_ep_ac(%$n%, HTML::Embperl::Syntax::ntypText, $fdat{%&*\'name%}) ; %#!-0%',
+ '$idat{%&*\'name%}=$fdat{%&*\'name%};_ep_ac(%$n%, Embperl::Syntax::ntypText, $fdat{%&*\'name%}) ; %#!-0%',
'$idat{%&*\'name%}=\'%#*0%\' ; ',
]
}) ;
@@ -158,19 +158,19 @@
=head1 NAME
-HTML::Embperl::Syntax::EmbperlHTML
+Embperl::Syntax::EmbperlHTML
=head1 SYNOPSIS
=head1 DESCRIPTION
-Class derived from HTML::Embperl::Syntax::HTML to define the syntax for
+Class derived from Embperl::Syntax::HTML to define the syntax for
HTML tags that Embperl processes.
=head1 Methods
-I<HTML::Embperl::Syntax::EmbperlHTML> does not defines any methods.
+I<Embperl::Syntax::EmbperlHTML> does not defines any methods.
=head1 Author
@@ -178,6 +178,6 @@
=head1 See Also
-HTML::Embperl::Syntax, HTML::Embperl::Syntax::HTML
+Embperl::Syntax, Embperl::Syntax::HTML
1.1.2.16 +13 -13 embperl/Embperl/Syntax/Attic/HTML.pm
Index: HTML.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/HTML.pm,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- HTML.pm 13 Dec 2001 15:13:55 -0000 1.1.2.15
+++ HTML.pm 22 Jan 2002 09:29:56 -0000 1.1.2.16
@@ -10,21 +10,21 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: HTML.pm,v 1.1.2.15 2001/12/13 15:13:55 richter Exp $
+# $Id: HTML.pm,v 1.1.2.16 2002/01/22 09:29:56 richter Exp $
#
###################################################################################
-package HTML::Embperl::Syntax::HTML ;
+package Embperl::Syntax::HTML ;
-use HTML::Embperl::Syntax (':types') ;
+use Embperl::Syntax (':types') ;
use strict ;
use vars qw{@ISA %Attr %AssignAttr %AssignAttrLink %Quotes} ;
-@ISA = qw(HTML::Embperl::Syntax) ;
+@ISA = qw(Embperl::Syntax) ;
###################################################################################
@@ -44,7 +44,7 @@
{
my $self = shift ;
- $self = HTML::Embperl::Syntax::new ($self) ;
+ $self = Embperl::Syntax::new ($self) ;
if (!$self -> {-htmlAssignAttr})
{
@@ -103,7 +103,7 @@
$addinside++ ;
}
$tag -> {'procinfo'}{$self->{-procinfotype}}{perlcode} .=
- q[HTML::Embperl::Cmd::AddSessionIdToLink (%$n%, ] . $addsess . q[,'] . join ("','", @$attrsurl) . "') ;"
+ q[Embperl::Cmd::AddSessionIdToLink (%$n%, ] . $addsess . q[,'] . join ("','", @$attrsurl) . "') ;"
if ($addsess) ;
}
if ($attrsnoval)
@@ -403,23 +403,23 @@
=head1 NAME
-HTML::Embperl::Syntax::HTML
+Embperl::Syntax::HTML
=head1 SYNOPSIS
=head1 DESCRIPTION
-Class derived from HTML::Embperl::Syntax to define the syntax for HTML.
+Class derived from Embperl::Syntax to define the syntax for HTML.
This class does not add functionalty of it own, it just provides
methods add definitions for derived classes to implement their own
tags.
=head1 Methods
-I<HTML::Embperl::Syntax::HTML> defines the following methods:
+I<Embperl::Syntax::HTML> defines the following methods:
-=head2 HTML::Embperl::Syntax::HTML -> new / $self -> new
+=head2 Embperl::Syntax::HTML -> new / $self -> new
Create a new syntax class. This method should only be called inside a constructor
of a derived class.
@@ -449,11 +449,11 @@
=item $procinfo
-Processor info. See I<HTML::Embperl::Syntax> for a definition of procinfo.
+Processor info. See I<Embperl::Syntax> for a definition of procinfo.
=item $taginfo
-Addtional tag definitions. See I<HTML::Embperl::Syntax> for more infos.
+Addtional tag definitions. See I<Embperl::Syntax> for more infos.
=item $addsess
@@ -490,7 +490,7 @@
=head1 See Also
-HTML::Embperl::Syntax
+Embperl::Syntax
1.1.2.5 +11 -11 embperl/Embperl/Syntax/Attic/Mail.pm
Index: Mail.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/Mail.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- Mail.pm 10 Sep 2001 13:44:26 -0000 1.1.2.4
+++ Mail.pm 22 Jan 2002 09:29:56 -0000 1.1.2.5
@@ -10,19 +10,19 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Mail.pm,v 1.1.2.4 2001/09/10 13:44:26 richter Exp $
+# $Id: Mail.pm,v 1.1.2.5 2002/01/22 09:29:56 richter Exp $
#
###################################################################################
-package HTML::Embperl::Syntax::Mail ;
+package Embperl::Syntax::Mail ;
-use HTML::Embperl::Syntax qw{:types} ;
-use HTML::Embperl::Syntax::HTML ;
+use Embperl::Syntax qw{:types} ;
+use Embperl::Syntax::HTML ;
use strict ;
use vars qw{@ISA} ;
-@ISA = qw(HTML::Embperl::Syntax::HTML) ;
+@ISA = qw(Embperl::Syntax::HTML) ;
###################################################################################
@@ -43,7 +43,7 @@
{
my $class = shift ;
- my $self = HTML::Embperl::Syntax::HTML::new ($class) ;
+ my $self = Embperl::Syntax::HTML::new ($class) ;
if (!$self -> {-mailInit})
{
@@ -74,10 +74,10 @@
perlcode => {},
perlcodeend => q{
{
- use HTML::Embperl::Mail ;
+ use Embperl::Mail ;
my $txt = XML::Embperl::DOM::Node::iChildsText (%$n%) ;
- $? = HTML::Embperl::Mail::Execute (
+ $? = Embperl::Mail::Execute (
{
'input' => \$txt,
'inputfile' => 'mail',
@@ -139,9 +139,9 @@
=head1 DESCRIPTION
The is module provides a mail:send tag, for sending text via email. It uses the
-HTML::Embperl::Mail module for actualy sending the mail. The following attributes
+Embperl::Mail module for actualy sending the mail. The following attributes
are recognized. The mail body is enclosed between the mail:send tags.
-See L<HTML::Embperl::Mail> for an description of the attribues:
+See L<Embperl::Mail> for an description of the attribues:
=over 4
@@ -175,5 +175,5 @@
=head1 See Also
-HTML::Embperl::Syntax, HTML::Embperl::Syntax::HTML
+Embperl::Syntax, Embperl::Syntax::HTML
1.1.2.8 +13 -13 embperl/Embperl/Syntax/Attic/POD.pm
Index: POD.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/POD.pm,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- POD.pm 11 Dec 2001 09:03:52 -0000 1.1.2.7
+++ POD.pm 22 Jan 2002 09:29:56 -0000 1.1.2.8
@@ -10,23 +10,23 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: POD.pm,v 1.1.2.7 2001/12/11 09:03:52 richter Exp $
+# $Id: POD.pm,v 1.1.2.8 2002/01/22 09:29:56 richter Exp $
#
###################################################################################
-package HTML::Embperl::Syntax::POD ;
+package Embperl::Syntax::POD ;
-use HTML::Embperl::Syntax (':types') ;
-use HTML::Embperl::Syntax::EmbperlBlocks ;
+use Embperl::Syntax (':types') ;
+use Embperl::Syntax::EmbperlBlocks ;
use strict ;
use vars qw{@ISA %Tags %Format %Escape %Para %ParaItem %ParaTitle %List %Search %ListStart %CDATA} ;
-@ISA = qw(HTML::Embperl::Syntax::EmbperlBlocks) ;
+@ISA = qw(Embperl::Syntax::EmbperlBlocks) ;
###################################################################################
@@ -46,8 +46,8 @@
{
my $self = shift ;
- #$self = HTML::Embperl::Syntax::EmbperlBlocks::new ($self, 1) ;
- $self = HTML::Embperl::Syntax::new ($self, 1) ;
+ #$self = Embperl::Syntax::EmbperlBlocks::new ($self, 1) ;
+ $self = Embperl::Syntax::new ($self, 1) ;
if (!$self -> {-PODTags})
{
@@ -533,7 +533,7 @@
=head1 NAME
-HTML::Embperl::Syntax::POD
+Embperl::Syntax::POD
=head1 SYNOPSIS
@@ -545,9 +545,9 @@
=head1 Methods
-I<HTML::Embperl::Syntax::POD> defines the following methods:
+I<Embperl::Syntax::POD> defines the following methods:
-=head2 HTML::Embperl::Syntax::POD -> new / $self -> new
+=head2 Embperl::Syntax::POD -> new / $self -> new
Create a new syntax class. This method should only be called inside a constructor
of a derived class.
@@ -556,14 +556,14 @@
=head2 AddPODCmd ($cmdname, $procinfo)
Add a new POD command with name C<$cmdname> and use processor info from
-C<$procinfo>. See I<HTML::Embperl::Syntax> for a definition of procinfo.
+C<$procinfo>. See I<Embperl::Syntax> for a definition of procinfo.
=head2 AddPODCmdStartEnd ($cmdname, $endname, $procinfo)
Add a new POD command with name C<$cmdname> and use processor info from
C<$procinfo>. Addtionaly specify that a matching C<$endname> POD command
must be found to end the block, that is started by this POD command.
-See I<HTML::Embperl::Syntax> for a definition of procinfo.
+See I<Embperl::Syntax> for a definition of procinfo.
@@ -573,4 +573,4 @@
=head1 See Also
-HTML::Embperl::Syntax
+Embperl::Syntax
1.1.2.6 +6 -6 embperl/Embperl/Syntax/Attic/Perl.pm
Index: Perl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/Perl.pm,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Perl.pm 31 Oct 2001 12:04:26 -0000 1.1.2.5
+++ Perl.pm 22 Jan 2002 09:29:56 -0000 1.1.2.6
@@ -10,19 +10,19 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Perl.pm,v 1.1.2.5 2001/10/31 12:04:26 richter Exp $
+# $Id: Perl.pm,v 1.1.2.6 2002/01/22 09:29:56 richter Exp $
#
###################################################################################
-package HTML::Embperl::Syntax::Perl ;
+package Embperl::Syntax::Perl ;
-use HTML::Embperl::Syntax qw{:types} ;
-use HTML::Embperl::Syntax ;
+use Embperl::Syntax qw{:types} ;
+use Embperl::Syntax ;
use strict ;
use vars qw{@ISA} ;
-@ISA = qw(HTML::Embperl::Syntax) ;
+@ISA = qw(Embperl::Syntax) ;
###################################################################################
@@ -43,7 +43,7 @@
{
my $class = shift ;
- my $self = HTML::Embperl::Syntax::new ($class) ;
+ my $self = Embperl::Syntax::new ($class) ;
if (!$self -> {-perlInit})
{
1.1.2.23 +20 -20 embperl/Embperl/Syntax/Attic/RTF.pm
Index: RTF.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/RTF.pm,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- RTF.pm 22 Nov 2001 11:00:54 -0000 1.1.2.22
+++ RTF.pm 22 Jan 2002 09:29:56 -0000 1.1.2.23
@@ -10,23 +10,23 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: RTF.pm,v 1.1.2.22 2001/11/22 11:00:54 richter Exp $
+# $Id: RTF.pm,v 1.1.2.23 2002/01/22 09:29:56 richter Exp $
#
###################################################################################
-package HTML::Embperl::Syntax::RTF ;
+package Embperl::Syntax::RTF ;
-use HTML::Embperl::Syntax (':types') ;
-use HTML::Embperl::Syntax::EmbperlBlocks ;
+use Embperl::Syntax (':types') ;
+use Embperl::Syntax::EmbperlBlocks ;
use strict ;
use vars qw{@ISA %RTF %Para %ParaBlockInside %Block %BlockInside %FieldStart %CmdStart %Var %Spaces %Inside} ;
require Text::ParseWords ;
-@ISA = qw(HTML::Embperl::Syntax::EmbperlBlocks) ;
+@ISA = qw(Embperl::Syntax::EmbperlBlocks) ;
###################################################################################
@@ -46,7 +46,7 @@
{
my $self = shift ;
- $self = HTML::Embperl::Syntax::EmbperlBlocks::new ($self, 1) ;
+ $self = Embperl::Syntax::EmbperlBlocks::new ($self, 1) ;
if (!$self -> {-rtfBlocks})
{
@@ -355,11 +355,11 @@
}) ;
$self -> AddRTFCmd ('syntax',
{
- compiletimeperlcode => '$_[0] -> Syntax (HTML::Embperl::Syntax::GetSyntax(%&\'<noname>%, $_[0] -> SyntaxName));',
+ compiletimeperlcode => '$_[0] -> Syntax (Embperl::Syntax::GetSyntax(%&\'<noname>%, $_[0] -> SyntaxName));',
removenode => 3,
},
{
- parsetimeperlcode => '$_[0] -> Syntax (HTML::Embperl::Syntax::GetSyntax(\'%%\', $_[0] -> SyntaxName)) ;',
+ parsetimeperlcode => '$_[0] -> Syntax (Embperl::Syntax::GetSyntax(\'%%\', $_[0] -> SyntaxName)) ;',
},
) ;
$self -> AddRTFCmdBlock ('sub', 'endsub',
@@ -372,7 +372,7 @@
switchcodetype => 2,
},
{
- perlcode => '}; sub %^subname% { my @_ep_save ; HTML::Embperl::Cmd::SubStart(\\$_ep_DomTree,%$q%,\\@_ep_save); my $_ep_ret = _ep_sub_%^subname% (@_); HTML::Embperl::Cmd::SubEnd(\\@_ep_save); return $_ep_ret } ; $_[0] -> ExportHash ->
+ perlcode => '}; sub %^subname% { my @_ep_save ; Embperl::Cmd::SubStart(\\$_ep_DomTree,%$q%,\\@_ep_save); my $_ep_ret = _ep_sub_%^subname% (@_); Embperl::Cmd::SubEnd(\\@_ep_save); return $_ep_ret } ; $_[0] -> ExportHash ->
@@ -419,7 +419,7 @@
'nodename' => ':{:}:full_var',
'procinfo' => {
'embperl' => {
- compiletimeperlcode => q[$_[0] -> Code (HTML::Embperl::Syntax::RTF::Var2Code (%#'0%)) ;],
+ compiletimeperlcode => q[$_[0] -> Code (Embperl::Syntax::RTF::Var2Code (%#'0%)) ;],
},
},
@@ -768,14 +768,14 @@
=head1 NAME
-HTML::Embperl::Syntax::RTF
+Embperl::Syntax::RTF
=head1 SYNOPSIS
=head1 DESCRIPTION
-Class derived from HTML::Embperl::Syntax to define the syntax for
+Class derived from Embperl::Syntax to define the syntax for
RTF files. RTF files can be read and written by various word processing
programms. This allows you to create dynamic wordprocessing documents or
let process serial letters thru Embperl.
@@ -795,13 +795,13 @@
use DBIx::Recordset ;
- use HTML::Embperl ;
+ use Embperl ;
*set = DBIx::Recordset -> Search({'!DataSource' => $db, '!Table' => 'address', '!WriteMode' => 0}) ;
die DBIx::Recordset -> LastError if (DBIx::Recordset -> LastError) ;
- HTML::Embperl::Execute ({'inputfile' => 'address.rtf', param => \@set, syntax => 'RTF'}) ;
+ Embperl::Execute ({'inputfile' => 'address.rtf', param => \@set, syntax => 'RTF'}) ;
# if your database table contains fields 'name' and 'street' you can now simply insert a
@@ -811,9 +811,9 @@
=head1 Methods
-I<HTML::Embperl::Syntax::RTF> defines the following methods:
+I<Embperl::Syntax::RTF> defines the following methods:
-=head2 HTML::Embperl::Syntax::RTF -> new / $self -> new
+=head2 Embperl::Syntax::RTF -> new / $self -> new
Create a new syntax class. This method should only be called inside a constructor
of a derived class.
@@ -822,21 +822,21 @@
=head2 AddRTFCmd ($cmdname, $procinfo)
Add a new RTF command with name C<$cmdname> and use processor info from
-C<$procinfo>. See I<HTML::Embperl::Syntax> for a definition of procinfo.
+C<$procinfo>. See I<Embperl::Syntax> for a definition of procinfo.
=head2 AddRTFCmdWithEnd ($cmdname, $endname, $procinfo)
Add a new RTF command with name C<$cmdname> and use processor info from
C<$procinfo>. Addtionaly specify that a matching C<$endname> RTF command
must be found to end the block, that is started by this RTF command.
-See I<HTML::Embperl::Syntax> for a definition of procinfo.
+See I<Embperl::Syntax> for a definition of procinfo.
=head2 AddRTFCmdBlock ($cmdname, $endname, $procinfostart, $procinfoend)
Add a new RTF command with name C<$cmdname> and and a second RTF command
C<$endname> which ends the block that is started by C<$cmdname>.
Use processor info from C<$procinfo>.
-See I<HTML::Embperl::Syntax> for a definition of procinfo.
+See I<Embperl::Syntax> for a definition of procinfo.
@@ -846,4 +846,4 @@
=head1 See Also
-HTML::Embperl::Syntax
+Embperl::Syntax
1.1.2.13 +19 -19 embperl/Embperl/Syntax/Attic/SSI.pm
Index: SSI.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/SSI.pm,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- SSI.pm 20 Nov 2001 15:15:42 -0000 1.1.2.12
+++ SSI.pm 22 Jan 2002 09:29:56 -0000 1.1.2.13
@@ -10,14 +10,14 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: SSI.pm,v 1.1.2.12 2001/11/20 15:15:42 richter Exp $
+# $Id: SSI.pm,v 1.1.2.13 2002/01/22 09:29:56 richter Exp $
#
###################################################################################
-package HTML::Embperl::Syntax::SSI ;
+package Embperl::Syntax::SSI ;
-use HTML::Embperl::Syntax qw{:types} ;
-use HTML::Embperl::Syntax::HTML ;
+use Embperl::Syntax qw{:types} ;
+use Embperl::Syntax::HTML ;
use File::Basename;
BEGIN {
@@ -30,7 +30,7 @@
use strict ;
use vars qw{@ISA $apreq $epreq} ;
-@ISA = qw(HTML::Embperl::Syntax::HTML) ;
+@ISA = qw(Embperl::Syntax::HTML) ;
###################################################################################
@@ -51,7 +51,7 @@
{
my $class = shift ;
- my $self = HTML::Embperl::Syntax::HTML::new ($class) ;
+ my $self = Embperl::Syntax::HTML::new ($class) ;
if (!$self -> {-ssiInit})
{
@@ -75,7 +75,7 @@
{
my ($self) = @_ ;
- $self -> AddInitCode (undef, 'HTML::Embperl::Syntax::SSI::InitSSI($_[0], $req_rec);', undef) ;
+ $self -> AddInitCode (undef, 'Embperl::Syntax::SSI::InitSSI($_[0], $req_rec);', undef) ;
$self -> AddComment ('#echo', ['var', 'encoding'], undef, undef, { perlcode => '_ep_rp(%$x%, $ENV{%&*\'var%}) ;' } ) ;
$self -> AddComment ('#printenv', undef, undef, undef, { perlcode => '_ep_rp(%$x%, join ("\\\\<br\\\\>\n", map { "$_ = $ENV{$_}" } keys %ENV)) ;' } ) ;
@@ -90,30 +90,30 @@
$self -> AddComment ('#exec', ['cgi', 'cmd'], undef, undef,
{ perlcode => [
- '_ep_rp(%$x%, HTML::Embperl::Syntax::SSI::exec (%&\'cmd%, %&\'cgi%)) ;',
+ '_ep_rp(%$x%, Embperl::Syntax::SSI::exec (%&\'cmd%, %&\'cgi%)) ;',
] } ) ;
$self -> AddComment ('#fsize', ['file', 'virtual'], undef, undef,
{ perlcode => [
- '_ep_rp(%$x%, HTML::Embperl::Syntax::SSI::fsize ($_ep_ssi_sizefmt, %&\'file%, %&\'virtual%)) ;',
+ '_ep_rp(%$x%, Embperl::Syntax::SSI::fsize ($_ep_ssi_sizefmt, %&\'file%, %&\'virtual%)) ;',
] } ) ;
$self -> AddComment ('#flastmod', ['file', 'virtual'], undef, undef,
{ perlcode => [
- '_ep_rp(%$x%, HTML::Embperl::Syntax::SSI::flastmod ($_ep_ssi_timefmt, %&\'file%, %&\'virtual%)) ;',
+ '_ep_rp(%$x%, Embperl::Syntax::SSI::flastmod ($_ep_ssi_timefmt, %&\'file%, %&\'virtual%)) ;',
] } ) ;
$self -> AddComment ('#include', ['file', 'virtual'], undef, undef,
{ perlcode => [
- '_ep_rp(%$x%, HTML::Embperl::Syntax::SSI::include (%&\'file%, %&\'virtual%)) ;',
+ '_ep_rp(%$x%, Embperl::Syntax::SSI::include (%&\'file%, %&\'virtual%)) ;',
] } ) ;
$self -> AddComment ('#set', ['var', 'value'], undef, undef,
{ perlcode => '%&value%',
- compiletimeperlcode => '$_[0] -> Code (q{$ENV{%&*\'var%} = "} . HTML::Embperl::Syntax::SSI::InterpretVars (%&\'value%) . \'";\') ;',
+ compiletimeperlcode => '$_[0] -> Code (q{$ENV{%&*\'var%} = "} . Embperl::Syntax::SSI::InterpretVars (%&\'value%) . \'";\') ;',
removenode => 1
} ) ;
$self -> AddComment ('#if', ['expr'], undef, undef,
{ perlcode => '%&\'expr%',
- compiletimeperlcode => '$_[0] -> Code (q{if (} . HTML::Embperl::Syntax::SSI::InterpretVars (%&\'expr%) . \') {\') ;',
+ compiletimeperlcode => '$_[0] -> Code (q{if (} . Embperl::Syntax::SSI::InterpretVars (%&\'expr%) . \') {\') ;',
removenode => 10,
mayjump => 1,
stackname => 'ssicmd',
@@ -121,7 +121,7 @@
} ) ;
$self -> AddComment ('#elif', ['expr'], undef, undef,
{ perlcode => '%&\'expr%',
- compiletimeperlcode => '$_[0] -> Code (\'} elsif (\' . HTML::Embperl::Syntax::SSI::InterpretVars (%&\'expr%) . \') {\') ;',
+ compiletimeperlcode => '$_[0] -> Code (\'} elsif (\' . Embperl::Syntax::SSI::InterpretVars (%&\'expr%) . \') {\') ;',
removenode => 10,
mayjump => 1,
stackname => 'ssicmd',
@@ -145,11 +145,11 @@
} ) ;
my $tag = $self -> AddComment ('#syntax', ['type'], undef, undef,
{
- compiletimeperlcode => '$_[0] -> Syntax (HTML::Embperl::Syntax::GetSyntax(%&\'type%, $_[0] -> SyntaxName));',
+ compiletimeperlcode => '$_[0] -> Syntax (Embperl::Syntax::GetSyntax(%&\'type%, $_[0] -> SyntaxName));',
removenode => 3,
},
) ;
- my $ptcode = '$_[0] -> Syntax (HTML::Embperl::Syntax::GetSyntax(\'%%\', $_[0] -> SyntaxName)) ;' ;
+ my $ptcode = '$_[0] -> Syntax (Embperl::Syntax::GetSyntax(\'%%\', $_[0] -> SyntaxName)) ;' ;
if (!$self -> {-ssiAssignAttrType})
{
@@ -355,9 +355,9 @@
}
my $output = "";
- HTML::Embperl::Execute({inputfile=>$filename, output=>\$output, syntax=>$type});
+ Embperl::Execute({inputfile=>$filename, output=>\$output, syntax=>$type});
- local $HTML::Embperl::escmode = 0 ;
+ local $Embperl::escmode = 0 ;
return $output;
}
@@ -475,7 +475,7 @@
=head1 See Also
-HTML::Embperl::Syntax, HTML::Embperl::Syntax::HTML
+Embperl::Syntax, Embperl::Syntax::HTML
=cut
1.1.2.2 +6 -5 embperl/Embperl/Syntax/Attic/Test.pm
Index: Test.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/Test.pm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Test.pm 20 Nov 2001 15:15:42 -0000 1.1.2.1
+++ Test.pm 22 Jan 2002 09:29:56 -0000 1.1.2.2
@@ -1,15 +1,16 @@
-package HTML::Embperl::Syntax::Test;
+
+package Embperl::Syntax::Test;
use strict;
-use HTML::Embperl::Syntax qw{:types} ;
-use HTML::Embperl::Syntax::HTML ;
-use base qw(HTML::Embperl::Syntax::HTML);
+use Embperl::Syntax qw{:types} ;
+use Embperl::Syntax::HTML ;
+use base qw(Embperl::Syntax::HTML);
sub new
{
my $class = shift;
- my $self = HTML::Embperl::Syntax::HTML::new($class);
+ my $self = Embperl::Syntax::HTML::new($class);
if (!$self->{-testInit})
{
1.1.2.3 +7 -7 embperl/Embperl/Syntax/Attic/Text.pm
Index: Text.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/Text.pm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Text.pm 28 Mar 2001 19:15:33 -0000 1.1.2.2
+++ Text.pm 22 Jan 2002 09:29:56 -0000 1.1.2.3
@@ -10,19 +10,19 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Text.pm,v 1.1.2.2 2001/03/28 19:15:33 richter Exp $
+# $Id: Text.pm,v 1.1.2.3 2002/01/22 09:29:56 richter Exp $
#
###################################################################################
-package HTML::Embperl::Syntax::Text ;
+package Embperl::Syntax::Text ;
-use HTML::Embperl::Syntax qw{:types} ;
-use HTML::Embperl::Syntax ;
+use Embperl::Syntax qw{:types} ;
+use Embperl::Syntax ;
use strict ;
use vars qw{@ISA} ;
-@ISA = qw(HTML::Embperl::Syntax) ;
+@ISA = qw(Embperl::Syntax) ;
###################################################################################
@@ -43,7 +43,7 @@
{
my $class = shift ;
- my $self = HTML::Embperl::Syntax::new ($class) ;
+ my $self = Embperl::Syntax::new ($class) ;
return $self ;
}
@@ -76,7 +76,7 @@
=head1 See Also
-HTML::Embperl::Syntax
+Embperl::Syntax
=cut
No revision
No revision
1.4.6.4 +6 -6 embperl/test/html/subimp.pm
Index: subimp.pm
===================================================================
RCS file: /home/cvs/embperl/test/html/subimp.pm,v
retrieving revision 1.4.6.3
retrieving revision 1.4.6.4
diff -u -r1.4.6.3 -r1.4.6.4
--- subimp.pm 30 Oct 2001 14:40:16 -0000 1.4.6.3
+++ subimp.pm 22 Jan 2002 09:29:57 -0000 1.4.6.4
@@ -1,9 +1,9 @@
package subimp ;
-#require HTML::Embperl::Module ;
-#@ISA = qw{HTML::Embperl::Module} ;
-#HTML::Embperl::Module::init (\*DATA) ;
+#require Embperl::Module ;
+#@ISA = qw{Embperl::Module} ;
+#Embperl::Module::init (\*DATA) ;
#1 ;
@@ -14,11 +14,11 @@
# compile page
my $pn = __PACKAGE__ ;
-HTML::Embperl::Execute ({inputfile => __FILE__,
+Embperl::Execute ({inputfile => __FILE__,
input => \$data,
mtime => -M __FILE__ ,
import => 0,
- options => HTML::Embperl::optKeepSrcInMemory,
+ options => Embperl::optKeepSrcInMemory,
package => $pn . $ENV{EMBPERL_EP1COMPAT}}) ;
@@ -30,7 +30,7 @@
{
my $pn = __PACKAGE__ ;
- HTML::Embperl::Execute ({inputfile => __FILE__,
+ Embperl::Execute ({inputfile => __FILE__,
import => 2,
package => $pn . $ENV{EMBPERL_EP1COMPAT}}) ;
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org