You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2002/02/20 09:28:18 UTC
cvs commit: embperl/Embperl/Recipe Embperl.pm
richter 02/02/20 00:28:18
Modified: . Tag: Embperl2c epcache.c epmain.c
Embperl/Recipe Tag: Embperl2c Embperl.pm
Log:
provider
Revision Changes Path
No revision
No revision
1.1.2.22 +3 -3 embperl/Attic/epcache.c
Index: epcache.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcache.c,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- epcache.c 16 Feb 2002 23:31:32 -0000 1.1.2.21
+++ epcache.c 20 Feb 2002 08:28:17 -0000 1.1.2.22
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epcache.c,v 1.1.2.21 2002/02/16 23:31:32 richter Exp $
+# $Id: epcache.c,v 1.1.2.22 2002/02/20 08:28:17 richter Exp $
#
###################################################################################*/
@@ -275,7 +275,7 @@
return rcUnknownProvider ;
}
- nParamNdx++ ;
+ nParamNdx-- ;
}
else if (SvTYPE(pParam) == SVt_PVHV)
{
@@ -439,7 +439,7 @@
return rcUnknownProvider ;
}
- nParamIndex++ ;
+ nParamIndex-- ;
}
else if (SvTYPE(pParam) == SVt_PVHV)
{
1.75.4.100 +6 -3 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.99
retrieving revision 1.75.4.100
diff -u -r1.75.4.99 -r1.75.4.100
--- epmain.c 16 Feb 2002 23:31:32 -0000 1.75.4.99
+++ epmain.c 20 Feb 2002 08:28:17 -0000 1.75.4.100
@@ -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.99 2002/02/16 23:31:32 richter Exp $
+# $Id: epmain.c,v 1.75.4.100 2002/02/20 08:28:17 richter Exp $
#
###################################################################################*/
@@ -1242,7 +1242,8 @@
if (num == 1)
pParamRV = POPs ;
PUTBACK;
- if (num != 1 || !SvROK (pParamRV) || !(pParam = (HV *)SvRV(pParamRV)) || SvTYPE((SV *)pParam) != SVt_PVHV)
+ if (num != 1 || !SvROK (pParamRV) || !(pParam = (HV *)SvRV(pParamRV)) ||
+ (SvTYPE((SV *)pParam) != SVt_PVHV && SvTYPE((SV *)pParam) != SVt_PVAV))
{
strncpy (r -> errdat1, SvPV(pRecipe, l), sizeof (r -> errdat1) - 1) ;
return rcUnknownRecipe ;
@@ -1250,13 +1251,15 @@
}
+ /*
if (SvTYPE(pParam) != SVt_PVHV)
{
strncpy (r -> errdat2, "provider", sizeof(r -> errdat2) - 1) ;
return rcNotHashRef ;
}
+ */
- if ((rc = Cache_New (r, pParam, 0, 1, &r -> Component.pOutputCache)) != ok)
+ if ((rc = Cache_New (r, pParam, -1, 1, &r -> Component.pOutputCache)) != ok)
return rc ;
No revision
No revision
1.1.2.16 +9 -63 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.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- Embperl.pm 16 Feb 2002 23:31:34 -0000 1.1.2.15
+++ Embperl.pm 20 Feb 2002 08:28:18 -0000 1.1.2.16
@@ -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.15 2002/02/16 23:31:34 richter Exp $
+# $Id: Embperl.pm,v 1.1.2.16 2002/02/20 08:28:18 richter Exp $
#
###################################################################################
@@ -37,76 +37,22 @@
my $self ;
my $param = $r -> component -> param ;
- my $config = $r -> component -> config ;
- my $file = $param -> inputfile ;
-
- die "no filename" if (!$file) ;
+ my @recipe ;
if (!$src)
{
- if (ref $param -> input)
- {
- $src =
- {
- 'type' => 'memory',
- #'name' => $param -> inputfile,
- #'source' => $param -> input,
- #'mtime' => $param -> mtime,
- } ;
- }
- else
- {
- $src =
- {
- 'type' => 'file',
- #'filename' => $file,
- 'cache' => 0,
- } ;
- }
- }
-
- my $import =
- {
- 'type' => 'epcompile',
- ($config -> package?('package' => $config -> package):()),
- 'source' =>
- {
- 'cache', => 0,
- 'type' => 'epparse',
- $syntax?('syntax' => $syntax):(),
- 'source' =>
- {
- 'cache' => 0,
- %$src,
- }
- }
- } ;
-
- if ($param -> import < 0)
- {
- my $run =
- {
- 'type' => 'eprun',
- 'source' => $import
- } ;
-
-
-
- #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 ;
-
- $run -> {'cache'} = 0 ;
- $self = $run ;
+ push @recipe, {'type' => ref ($param -> input)?'memory':'file' } ;
}
else
{
- $self = $import ;
+ push @recipe, ref $src eq 'ARRAY'?@$src:$src ;
}
- return $self ;
+ push @recipe, {'type' => 'epparse' } ;
+ push @recipe, {'type' => 'epcompile' } ;
+ push @recipe, {'type' => 'eprun' } if ($param -> import < 0) ;
+
+ return \@recipe ;
}
1;
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org