richter 01/12/17 01:04:03
Modified: . Tag: Embperl2c Embperl.pm Embperl.xs
EmbperlObject.pm epmain.c
Embperl Tag: Embperl2c Recipe.pm
Embperl/Recipe Tag: Embperl2c Embperl.pm EmbperlXSLT.pm
XSLT.pm
Log:
app object
Revision Changes Path
No revision
No revision
1.118.4.70 +13 -5 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.69
retrieving revision 1.118.4.70
diff -u -r1.118.4.69 -r1.118.4.70
--- Embperl.pm 2001/12/14 20:55:53 1.118.4.69
+++ Embperl.pm 2001/12/17 09:04:02 1.118.4.70
@@ -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.69 2001/12/14 20:55:53 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.70 2001/12/17 09:04:02 richter Exp $
#
###################################################################################
@@ -754,7 +754,7 @@
{
my $rc ;
my $req = shift ;
-
+
if (!ref ($req))
{
my @parameter = @_ ;
@@ -767,10 +767,12 @@
if ($lastreq)
{ # inherent parameter of outer request
my $lastparam = $lastreq -> ReqParameter ;
+ warn "last fn ", $lastreq -> ReqFilename ;
if ($lastparam)
{
foreach (keys %$lastparam)
{
+ next if ($_ eq 'import' || $_ eq 'object' || $_ eq 'isa' || $_ eq
'provider' || $_ eq 'param') ;
$req -> {$_} = $lastparam -> {$_} if (!exists ($req -> {$_})) ;
}
}
@@ -787,6 +789,8 @@
return SendLogFile ($DefaultLog, $ENV{QUERY_STRING}, $$req{'req_rec'}) ;
}
+ $req -> {'import'} = 0 if (!exists ($req -> {'import'}) && ($$req{'isa'} ||
$$req{'object'})) ;
+
my $ns ;
my $opcodemask ;
@@ -813,7 +817,7 @@
my $mtime ;
my $OutData ;
my $InData ;
- my $import = exists ($req -> {'import'})?$req -> {'import'}:($$req{'isa'}
|| $$req{'object'})?0:undef ;
+ my $import = $req -> {'import'} ;
if (exists $$req{'input_func'})
{
@@ -905,6 +909,10 @@
$mtime = 0 ;
}
+ $req -> {'inputfile'} = $Inputfile ;
+ my $recipe = HTML::Embperl::Recipe::GetRecipe (undef, $req, $req -> {'recipe'})
;
+ $req -> {'provider'} = $recipe -> {'provider'} ;
+
#ep2#
my $syntax = HTML::Embperl::Syntax::GetSyntax ($req -> {syntax} ||
$lastSyntaxName || 'Embperl') ;
#ep2#
@@ -916,7 +924,7 @@
&epIOMod_Perl, $In, $Out, $Sub,
defined ($import)?scalar(caller ($import > 0?$import -
1:0)):'',
$SessionMgnt, $syntax) ;
-
+
eval
{
if (exists ($$req{'bless'}))
@@ -1011,9 +1019,9 @@
@cleanupfuncs = () ;
}
+ my $app ;
if ($req -> {application} && !($r -> SubReq))
{
- my $app ;
$r -> application ($app = $req -> {application}) ;
$app -> init ($r) ;
}
1.29.4.29 +5 -0 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.29.4.28
retrieving revision 1.29.4.29
diff -u -r1.29.4.28 -r1.29.4.29
--- Embperl.xs 2001/12/14 20:55:53 1.29.4.28
+++ Embperl.xs 2001/12/17 09:04:02 1.29.4.29
@@ -608,7 +608,12 @@
CODE:
RETVAL = r -> pApplication ;
if (items > 1)
+ {
r -> pApplication = app ;
+ SvREFCNT_inc (app) ;
+ if (RETVAL)
+ SvREFCNT_dec (RETVAL) ;
+ }
OUTPUT:
RETVAL
1.36.4.10 +2 -1 embperl/EmbperlObject.pm
Index: EmbperlObject.pm
===================================================================
RCS file: /home/cvs/embperl/EmbperlObject.pm,v
retrieving revision 1.36.4.9
retrieving revision 1.36.4.10
diff -u -r1.36.4.9 -r1.36.4.10
--- EmbperlObject.pm 2001/12/14 20:55:53 1.36.4.9
+++ EmbperlObject.pm 2001/12/17 09:04:02 1.36.4.10
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: EmbperlObject.pm,v 1.36.4.9 2001/12/14 20:55:53 richter Exp $
+# $Id: EmbperlObject.pm,v 1.36.4.10 2001/12/17 09:04:02 richter Exp $
#
###################################################################################
@@ -320,6 +320,7 @@
'path' => $searchpath,
'param' => [$req],
'debug' => $req -> {debug},
+ 'reqfilename'=> $filename,
}) ;
return 500 if (!$app) ;
1.75.4.76 +20 -11 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.75
retrieving revision 1.75.4.76
diff -u -r1.75.4.75 -r1.75.4.76
--- epmain.c 2001/12/13 15:13:54 1.75.4.75
+++ epmain.c 2001/12/17 09:04:02 1.75.4.76
@@ -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.75 2001/12/13 15:13:54 richter Exp $
+# $Id: epmain.c,v 1.75.4.76 2001/12/17 09:04:02 richter Exp $
#
###################################################################################*/
@@ -2437,6 +2437,9 @@
r -> bOptions = pConf -> bOptions ;
/*r -> nIOType = InitialReq.nIOType ;*/
+ if (r -> pApplication)
+ SvREFCNT_inc (r -> pApplication) ;
+
r -> sSubName = sSubName ;
r -> nSessionMgnt = nSessionMgnt ;
r -> pConf = pConf ;
@@ -2600,6 +2603,9 @@
if (!r -> bAppendToMainReq && r -> ofd)
CloseOutput (r) ; /* just to be sure */
+ if (r -> pApplication)
+ SvREFCNT_dec (r -> pApplication) ;
+
if (r -> bSubReq)
{
tReq * l = r -> pLastReq ;
@@ -3280,16 +3286,19 @@
else
#endif
{
- if (r -> pOutputSV)
- {
- STRLEN len ;
- char * p = SvPV (r -> pOutputSV, len) ;
- l -> xCurrNode = Node_insertAfter_CDATA (p, len, 0,
DomTree_self (l -> xCurrDomTree), l -> xCurrNode, l -> nCurrRepeatLevel) ;
- }
- else
- {
- l -> xCurrNode = Node_insertAfter (pDomTree,
pDomTree -> xDocument, 0, DomTree_self (l -> xCurrDomTree), l -> xCurrNode, l ->
nCurrRepeatLevel) ;
- }
+ if (l -> xCurrNode)
+ {
+ if (r -> pOutputSV)
+ {
+ STRLEN len ;
+ char * p = SvPV (r -> pOutputSV, len) ;
+ l -> xCurrNode = Node_insertAfter_CDATA (p, len,
0, DomTree_self (l -> xCurrDomTree), l -> xCurrNode, l -> nCurrRepeatLevel) ;
+ }
+ else if (pDomTree -> xDocument)
+ {
+ l -> xCurrNode = Node_insertAfter (pDomTree,
pDomTree -> xDocument, 0, DomTree_self (l -> xCurrDomTree), l -> xCurrNode, l ->
nCurrRepeatLevel) ;
+ }
+ }
}
}
}
No revision
No revision
1.1.2.9 +2 -2 embperl/Embperl/Attic/Recipe.pm
Index: Recipe.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Recipe.pm,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- Recipe.pm 2001/11/27 08:37:56 1.1.2.8
+++ Recipe.pm 2001/12/17 09:04:03 1.1.2.9
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Recipe.pm,v 1.1.2.8 2001/11/27 08:37:56 richter Exp $
+# $Id: Recipe.pm,v 1.1.2.9 2001/12/17 09:04:03 richter Exp $
#
###################################################################################
@@ -34,8 +34,8 @@
{
my ($r, $param, $name) = @_ ;
+ $name ||= 'Embperl' ;
my @names = split (/\s/, $name) ;
- @names = ('Embperl') if (!@names) ;
foreach my $recipe (@names)
{
No revision
No revision
1.1.2.9 +7 -3 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.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- Embperl.pm 2001/11/27 08:37:56 1.1.2.8
+++ Embperl.pm 2001/12/17 09:04:03 1.1.2.9
@@ -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.1.2.8 2001/11/27 08:37:56 richter Exp $
+# $Id: Embperl.pm,v 1.1.2.9 2001/12/17 09:04:03 richter Exp $
#
###################################################################################
@@ -37,7 +37,10 @@
my $self ;
my $src ;
- my $file ;
+ my $file = $param -> {inputfile} ;
+
+ die "no filename" if (!$file) ;
+=pod
if (!$param -> {inputfile} && $param->{sub})
{
($file) = $r -> Sourcefile =~ /.*(?:\/|\\)(.*?)$/ ;
@@ -46,6 +49,7 @@
{
$file = $r -> Sourcefile ;
}
+=cut
if (ref $param -> {input})
{
@@ -90,7 +94,7 @@
}
} ;
- if (!$r -> IsImport)
+ if (!exists ($param -> {import})) #!$r -> IsImport)
{
my $run =
{
1.1.2.6 +3 -2 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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- EmbperlXSLT.pm 2001/12/11 09:03:51 1.1.2.5
+++ EmbperlXSLT.pm 2001/12/17 09:04:03 1.1.2.6
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: EmbperlXSLT.pm,v 1.1.2.5 2001/12/11 09:03:51 richter Exp $
+# $Id: EmbperlXSLT.pm,v 1.1.2.6 2001/12/17 09:04:03 richter Exp $
#
###################################################################################
@@ -38,7 +38,8 @@
my ($class, $r, $recipe, $param) = @_ ;
my $ep = HTML::Embperl::Recipe::Embperl -> new ($r, $recipe, $param) ;
- return $ep if ($r -> IsImport) ;
+ #return $ep if ($r -> IsImport) ;
+ return $ep if (exists ($param -> {'import'})) ;
my $xsltproc = $param -> {xsltproc} ;
my $xsltparam= $param -> {xsltparam} || \%HTML::Embperl::fdat ;
1.1.2.6 +6 -4 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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- XSLT.pm 2001/12/11 09:03:51 1.1.2.5
+++ XSLT.pm 2001/12/17 09:04:03 1.1.2.6
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: XSLT.pm,v 1.1.2.5 2001/12/11 09:03:51 richter Exp $
+# $Id: XSLT.pm,v 1.1.2.6 2001/12/17 09:04:03 richter Exp $
#
###################################################################################
@@ -39,10 +39,11 @@
my $self ;
my $src ;
- my $file ;
+ my $file = $param -> {inputfile} ;
my $xsltproc = $param -> {xsltproc} ;
my $xsltparam= $param -> {xsltparam} || \%HTML::Embperl::fdat ;
+=pod
if (!$param -> {inputfile} && $param->{sub})
{
($file) = $r -> Sourcefile =~ /.*(?:\/|\\)(.*?)$/ ;
@@ -51,7 +52,7 @@
{
$file = $r -> Sourcefile ;
}
-
+=cut
if (ref $param -> {input})
{
$src =
@@ -72,7 +73,8 @@
} ;
}
- return $src if ($r -> IsImport) ;
+ return $src if (exists ($param -> {'import'})) ;
+ #return $src if ($r -> IsImport) ;
$self =
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
