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/25 15:57:47 UTC
cvs commit: embperl/driver epxalan.MAKEPL epxalan.cpp
richter 02/02/25 06:57:47
Modified: Embperl Tag: Embperl2c Object.pm
driver Tag: Embperl2c epxalan.MAKEPL epxalan.cpp
Log:
-
Revision Changes Path
No revision
No revision
1.1.2.9 +16 -16 embperl/Embperl/Attic/Object.pm
Index: Object.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Object.pm,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- Object.pm 25 Feb 2002 11:20:28 -0000 1.1.2.8
+++ Object.pm 25 Feb 2002 14:57:47 -0000 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: Object.pm,v 1.1.2.8 2002/02/25 11:20:28 richter Exp $
+# $Id: Object.pm,v 1.1.2.9 2002/02/25 14:57:47 richter Exp $
#
###################################################################################
@@ -118,29 +118,29 @@
sub handler
{
my $r = shift ;
- my $filename = $r -> filename ;
- my $mod ;
- if ($filename =~ /^(.*)__(.*?)$/)
- {
- $filename = $1 ;
- $mod = $2 ;
- $mod =~ s/[^a-zA-Z0-9]/_/g ;
- }
- else
- {
- $mod = '' ;
- }
-
+ #my $filename = $r -> filename ;
+ #my $mod ;
+ #if ($filename =~ /^(.*)__(.*?)$/)
+ # {
+ # $filename = $1 ;
+ # $mod = $2 ;
+ # $mod =~ s/[^a-zA-Z0-9]/_/g ;
+ # }
+ #else
+ # {
+ # $mod = '' ;
+ # }
+ #
my %req ;
#ScanEnvironment (\%req, $r) ;
#$req{'inputfile'} = $filename ;
- $req{'object_base_modifier'} = $mod ;
+ #$req{'object_base_modifier'} = $mod ;
#$req{'uri'} = $r -> Apache::uri ;
#$req{'cleanup'} = -1 if (($req{'options'} & Embperl::Constant::optDisableVarCleanup)) ;
- $req{'options'} |= Embperl::Constant::optSendHttpHeader ;
+ #$req{'options'} |= Embperl::Constant::optSendHttpHeader ;
$req{'req_rec'} = $r ;
Execute (\%req) ;
No revision
No revision
1.1.2.13 +2 -2 embperl/driver/Attic/epxalan.MAKEPL
Index: epxalan.MAKEPL
===================================================================
RCS file: /home/cvs/embperl/driver/Attic/epxalan.MAKEPL,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- epxalan.MAKEPL 12 Feb 2002 09:11:44 -0000 1.1.2.12
+++ epxalan.MAKEPL 25 Feb 2002 14:57:47 -0000 1.1.2.13
@@ -95,12 +95,12 @@
my ($l1, $l2) = "$xalanlib $xerceslib" =~ /^lib(.*?)\.so lib(.*?)\.so$/ ;
- ($l1, $l2) = "$xalanlib $xerceslib" =~ /^(Xalan.*?\.lib) (xerces.*?\.lib)$/ ;
+ ($l1, $l2) = "$xalanlib $xerceslib" =~ /^(xalan.*?\.lib) (xerces.*?\.lib)$/i if ($win32) ;
return { cflags => "-I\"$pathsrc\" -I\"$xercesinc\" -D_REENTRANT " ,
cpp => $cpp,
cppflags => $cppflags,
- libs => "-L\"$xalanlibpath\" -L\"$xerceslibpath\" -l\"$l1\" -l\"$l2\" $extralibs",
+ libs => "-L\"$xalanlibpath\" -L\"$xerceslibpath\" -l$l1 -l$l2 $extralibs",
defines => '-DXALAN' . ($platform?" -D$platform":'') ,
objects => 'driver/epxalan$(OBJ_EXT)',
save => { '$XALANPATH' => $path }} ;
1.1.2.17 +74 -39 embperl/driver/Attic/epxalan.cpp
Index: epxalan.cpp
===================================================================
RCS file: /home/cvs/embperl/driver/Attic/epxalan.cpp,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- epxalan.cpp 7 Feb 2002 06:56:21 -0000 1.1.2.16
+++ epxalan.cpp 25 Feb 2002 14:57:47 -0000 1.1.2.17
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epxalan.cpp,v 1.1.2.16 2002/02/07 06:56:21 richter Exp $
+# $Id: epxalan.cpp,v 1.1.2.17 2002/02/25 14:57:47 richter Exp $
#
###################################################################################*/
@@ -74,9 +74,11 @@
* @param r Embperl request record
* @param pItem CacheItem which holds the output of the provider
* @param pProviderClass Provider class record
-* @param pParam Parameter Hash
+* @param pProviderParam Parameter Hash of this Providers
* stylesheet filename or provider for the
* stylesheet
+* @param pParam All Parameters
+* @param nParamIndex If pParam is an AV, this parameter gives the index into the Array
* @return error code
* \endif
*
@@ -88,9 +90,11 @@
* @param pItem CacheItem welches die Ausgabe des Providers
* speichert
* @param pProviderClass Provider class record
-* @param pParam Parameter Hash
+* @param pProviderParam Parameter Hash dieses Providers
* stylesheet dateiname oder provider f�r das
* stylesheet
+* @param pParam Parameter insgesamt
+* @param nParamIndex Wenn pParam ein AV ist, gibt dieser Parameter den Index an
* @return Fehlercode
* \endif
*
@@ -99,13 +103,15 @@
static int ProviderXalanXSL_New (/*in*/ req * r,
/*in*/ tCacheItem * pItem,
/*in*/ tProviderClass * pProviderClass,
- /*in*/ HV * pParam)
+ /*in*/ HV * pProviderParam,
+ /*in*/ SV * pParam,
+ /*in*/ IV nParamIndex)
{
int rc ;
- if ((rc = Provider_NewDependOne (r, sizeof(tProviderXalanXSL), "stylesheet", pItem, pProviderClass, pParam)) != ok)
+ if ((rc = Provider_NewDependOne (r, sizeof(tProviderXalanXSL), "stylesheet", pItem, pProviderClass, pProviderParam, pParam, nParamIndex)) != ok)
return rc ;
return ok ;
@@ -122,8 +128,11 @@
*
* @param r Embperl request record
* @param pProviderClass Provider class record
-* @param pParam Parameter Hash
-* filename name of file
+* @param pProviderParam Parameter Hash of this Providers
+* stylesheet filename or provider for the
+* stylesheet
+* @param pParam All Parameters
+* @param nParamIndex If pParam is an AV, this parameter gives the index into the Array
* @param pKey Key to which string should be appended
* @return error code
* \endif
@@ -135,8 +144,11 @@
*
* @param r Embperl request record
* @param pProviderClass Provider class record
-* @param pParam Parameter Hash
-* filename Dateiname
+* @param pProviderParam Parameter Hash dieses Providers
+* stylesheet dateiname oder provider f�r das
+* stylesheet
+* @param pParam Parameter insgesamt
+* @param nParamIndex Wenn pParam ein AV ist, gibt dieser Parameter den Index an
* @param pKey Schl�ssel zu welchem hinzugef�gt wird
* @return Fehlercode
* \endif
@@ -145,12 +157,14 @@
static int ProviderXalanXSL_AppendKey (/*in*/ req * r,
/*in*/ tProviderClass * pProviderClass,
- /*in*/ HV * pParam,
+ /*in*/ HV * pProviderParam,
+ /*in*/ SV * pParam,
+ /*in*/ IV nParamIndex,
/*i/o*/ SV * pKey)
{
int rc ;
- if ((rc = Cache_AppendKey (r, pParam, "stylesheet", pKey)) != ok)
+ if ((rc = Cache_AppendKey (r, pProviderParam, "stylesheet", pParam, nParamIndex, pKey)) != ok)
return rc;
sv_catpv (pKey, "*xalan-compile-xsl") ;
@@ -307,9 +321,9 @@
* @param r Embperl request record
* @param pItem CacheItem which holds the output of the provider
* @param pProviderClass Provider class record
-* @param pParam Parameter Hash
-* stylesheet filename or provider for the
-* stylesheet
+* @param pProviderParam Parameter Hash of this Providers
+* @param pParam All Parameters
+* @param nParamIndex If pParam is an AV, this parameter gives the index into the Array
* @return error code
* \endif
*
@@ -321,9 +335,9 @@
* @param pItem CacheItem welches die Ausgabe des Providers
* speichert
* @param pProviderClass Provider class record
-* @param pParam Parameter Hash
-* stylesheet dateiname oder provider f�r das
-* stylesheet
+* @param pProviderParam Parameter Hash dieses Providers
+* @param pParam Parameter insgesamt
+* @param nParamIndex Wenn pParam ein AV ist, gibt dieser Parameter den Index an
* @return Fehlercode
* \endif
*
@@ -332,13 +346,15 @@
static int ProviderXalanXML_New (/*in*/ req * r,
/*in*/ tCacheItem * pItem,
/*in*/ tProviderClass * pProviderClass,
- /*in*/ HV * pParam)
+ /*in*/ HV * pProviderParam,
+ /*in*/ SV * pParam,
+ /*in*/ IV nParamIndex)
{
int rc ;
- if ((rc = Provider_NewDependOne (r, sizeof(tProviderXalanXML), "source", pItem, pProviderClass, pParam)) != ok)
+ if ((rc = Provider_NewDependOne (r, sizeof(tProviderXalanXML), "source", pItem, pProviderClass, pProviderParam, pParam, nParamIndex)) != ok)
return rc ;
return ok ;
@@ -355,8 +371,9 @@
*
* @param r Embperl request record
* @param pProviderClass Provider class record
-* @param pParam Parameter Hash
-* filename name of file
+* @param pProviderParam Parameter Hash of this Providers
+* @param pParam All Parameters
+* @param nParamIndex If pParam is an AV, this parameter gives the index into the Array
* @param pKey Key to which string should be appended
* @return error code
* \endif
@@ -368,8 +385,9 @@
*
* @param r Embperl request record
* @param pProviderClass Provider class record
-* @param pParam Parameter Hash
-* filename Dateiname
+* @param pProviderParam Parameter Hash dieses Providers
+* @param pParam Parameter insgesamt
+* @param nParamIndex Wenn pParam ein AV ist, gibt dieser Parameter den Index an
* @param pKey Schl�ssel zu welchem hinzugef�gt wird
* @return Fehlercode
* \endif
@@ -378,12 +396,14 @@
static int ProviderXalanXML_AppendKey (/*in*/ req * r,
/*in*/ tProviderClass * pProviderClass,
- /*in*/ HV * pParam,
+ /*in*/ HV * pProviderParam,
+ /*in*/ SV * pParam,
+ /*in*/ IV nParamIndex,
/*i/o*/ SV * pKey)
{
int rc ;
- if ((rc = Cache_AppendKey (r, pParam, "source", pKey)) != ok)
+ if ((rc = Cache_AppendKey (r, pProviderParam, "source", pParam, nParamIndex, pKey)) != ok)
return rc;
sv_catpv (pKey, "*xalan-parse-xml") ;
@@ -649,8 +669,9 @@
}
tCacheItem * pXSLCache ;
- if ((rc = Cache_New (r, (HV *)SvRV(pStylesheetParam), &pXSLCache)) != ok)
- return rc ;
+ // does not work !!!!!!!!!!!!!!!!!!!!
+ //if ((rc = Cache_New (r, (HV *)SvRV(pStylesheetParam), &pXSLCache)) != ok)
+ // return rc ;
XalanCompiledStylesheet * pCompiledXSL ;
@@ -708,9 +729,11 @@
* @param r Embperl request record
* @param pItem CacheItem which holds the output of the provider
* @param pProviderClass Provider class record
-* @param pParam Parameter Hash
+* @param pProviderParam Parameter Hash of this Providers
* stylesheet filename or provider for the
* stylesheet
+* @param pParam All Parameters
+* @param nParamIndex If pParam is an AV, this parameter gives the index into the Array
* @return error code
* \endif
*
@@ -722,9 +745,11 @@
* @param pItem CacheItem welches die Ausgabe des Providers
* speichert
* @param pProviderClass Provider class record
-* @param pParam Parameter Hash
+* @param pProviderParam Parameter Hash dieses Providers
* stylesheet dateiname oder provider f�r das
* stylesheet
+* @param pParam Parameter insgesamt
+* @param nParamIndex Wenn pParam ein AV ist, gibt dieser Parameter den Index an
* @return Fehlercode
* \endif
*
@@ -733,16 +758,18 @@
int ProviderXalan_New (/*in*/ req * r,
/*in*/ tCacheItem * pItem,
/*in*/ tProviderClass * pProviderClass,
- /*in*/ HV * pParam)
+ /*in*/ HV * pProviderParam,
+ /*in*/ SV * pParam,
+ /*in*/ IV nParamIndex)
{
int rc ;
- if ((rc = Provider_NewDependOne (r, sizeof(tProviderXalan), "source", pItem, pProviderClass, pParam)) != ok)
+ if ((rc = Provider_NewDependOne (r, sizeof(tProviderXalan), "source", pItem, pProviderClass, pProviderParam, pParam, nParamIndex)) != ok)
return rc ;
- if ((rc = Provider_AddDependOne (r, pItem -> pProvider, "stylesheet", pItem, pProviderClass, pParam)) != ok)
+ if ((rc = Provider_AddDependOne (r, pItem -> pProvider, "stylesheet", pItem, pProviderClass, pProviderParam, NULL, 0)) != ok)
return rc ;
return ok ;
@@ -759,8 +786,11 @@
*
* @param r Embperl request record
* @param pProviderClass Provider class record
-* @param pParam Parameter Hash
-* filename name of file
+* @param pProviderParam Parameter Hash of this Providers
+* stylesheet filename or provider for the
+* stylesheet
+* @param pParam All Parameters
+* @param nParamIndex If pParam is an AV, this parameter gives the index into the Array
* @param pKey Key to which string should be appended
* @return error code
* \endif
@@ -772,8 +802,11 @@
*
* @param r Embperl request record
* @param pProviderClass Provider class record
-* @param pParam Parameter Hash
-* filename Dateiname
+* @param pProviderParam Parameter Hash dieses Providers
+* stylesheet dateiname oder provider f�r das
+* stylesheet
+* @param pParam Parameter insgesamt
+* @param nParamIndex Wenn pParam ein AV ist, gibt dieser Parameter den Index an
* @param pKey Schl�ssel zu welchem hinzugef�gt wird
* @return Fehlercode
* \endif
@@ -782,15 +815,17 @@
static int ProviderXalan_AppendKey (/*in*/ req * r,
/*in*/ tProviderClass * pProviderClass,
- /*in*/ HV * pParam,
+ /*in*/ HV * pProviderParam,
+ /*in*/ SV * pParam,
+ /*in*/ IV nParamIndex,
/*i/o*/ SV * pKey)
{
int rc ;
- if ((rc = Cache_AppendKey (r, pParam, "source", pKey)) != ok)
+ if ((rc = Cache_AppendKey (r, pProviderParam, "source", pParam, nParamIndex, pKey)) != ok)
return rc;
- if ((rc = Cache_AppendKey (r, pParam, "stylesheet", pKey)) != ok)
+ if ((rc = Cache_AppendKey (r, pProviderParam, "stylesheet", NULL, 0, pKey)) != ok)
return rc;
sv_catpv (pKey, "*xalan") ;
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org