richter 02/02/12 01:11:45
Modified: . Tag: Embperl2c DOM.xs Makefile.PL ep.h epapinit.c
epprovider.c eppublic.h eputil.c
driver Tag: Embperl2c eplibxslt.MAKEPL eplibxslt.c
epxalan.MAKEPL
eg/web Tag: Embperl2c base.epl config.pl content.epl
epwebapp.pl header.epl messages.pl
eg/web/db Tag: Embperl2c content.epl epwebapp.pl
eg/web/pod/doc Tag: Embperl2c index.htm
test/conf Tag: Embperl2c httpd.conf.src
Added: eg/web/db Tag: Embperl2c show.epl
Log:
embperl web
Revision Changes Path
No revision
No revision
1.1.2.25 +2 -2 embperl/DOM.xs
Index: DOM.xs
===================================================================
RCS file: /home/cvs/embperl/DOM.xs,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- DOM.xs 10 Feb 2002 21:26:14 -0000 1.1.2.24
+++ DOM.xs 12 Feb 2002 09:11:44 -0000 1.1.2.25
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: DOM.xs,v 1.1.2.24 2002/02/10 21:26:14 richter Exp $
+# $Id: DOM.xs,v 1.1.2.25 2002/02/12 09:11:44 richter Exp $
#
###################################################################################
@@ -120,7 +120,7 @@
char * sId
PREINIT:
STRLEN l ;
- char * s ;
+ const char * s ;
tReq * r = CurrReq ;
PPCODE:
s = embperl_GetText (r, sId) ;
1.31.4.48 +7 -4 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.31.4.47
retrieving revision 1.31.4.48
diff -u -r1.31.4.47 -r1.31.4.48
--- Makefile.PL 6 Feb 2002 09:21:07 -0000 1.31.4.47
+++ Makefile.PL 12 Feb 2002 09:11:44 -0000 1.31.4.48
@@ -3,7 +3,7 @@
#
# (C) 1997-2001 G.Richter ([EMAIL PROTECTED]) / ECOS
#
-# $Id: Makefile.PL,v 1.31.4.47 2002/02/06 09:21:07 richter Exp $
+# $Id: Makefile.PL,v 1.31.4.48 2002/02/12 09:11:44 richter Exp $
#
@@ -142,7 +142,9 @@
} ;
- $txt =~ s/\@cd/\n#\t\@cd/ ; # remove tests for subdirs
+ $txt =~ s/\tPERL_DL_NONLAZY=0 /\tSET PATH=\$\(PATH\)\;$EPENVPATH\n\t/g if
($win32) ;
+
+ $txt =~ s/\@cd/\n#\t\@cd/ ; # remove tests for subdirs
$txt =~ s/\r\n/\n/g ; # make doesn't like \r\n!
@@ -285,8 +287,9 @@
my ($prompt, $default) = @_ ;
printf ("%s [%s]", $prompt, $default) ;
- chop ($_ = <STDIN>) ;
- if (!/^\s*$/)
+ chomp ($_ = <STDIN>) ;
+ s/\s+$//;
+ if (!/^\s*$/)
{return $_ ;}
else
{
1.27.4.43 +4 -4 embperl/ep.h
Index: ep.h
===================================================================
RCS file: /home/cvs/embperl/ep.h,v
retrieving revision 1.27.4.42
retrieving revision 1.27.4.43
diff -u -r1.27.4.42 -r1.27.4.43
--- ep.h 11 Feb 2002 17:01:05 -0000 1.27.4.42
+++ ep.h 12 Feb 2002 09:11:44 -0000 1.27.4.43
@@ -581,15 +581,15 @@
/*in*/ char * sInputfile) ;
void embperl_SetCWDToFile (/*i/o*/ register req * r,
- /*in*/ char * sFilename) ;
+ /*in*/ const char * sFilename) ;
char * embperl_File2Abs (/*i/o*/ register req * r,
/*in*/ tMemPool * pPool,
- /*in*/ char * sFilename) ;
+ /*in*/ const char * sFilename) ;
char * embperl_PathSearch (/*i/o*/ register req * r,
/*in*/ tMemPool * pPool,
- /*in*/ char * sFilename) ;
+ /*in*/ const char * sFilename) ;
char * embperl_PathStr (/*i/o*/ register req * r,
- /*in*/ char * sFilename) ;
+ /*in*/ const char * sFilename) ;
AV * embperl_String2AV (/*in*/ tApp * pApp,
/*in*/ const char * sData,
/*in*/ const char * sSeparator) ;
1.1.2.17 +1 -5 embperl/epapinit.c
Index: epapinit.c
===================================================================
RCS file: /home/cvs/embperl/epapinit.c,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- epapinit.c 11 Feb 2002 17:01:05 -0000 1.1.2.16
+++ epapinit.c 12 Feb 2002 09:11:44 -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: epapinit.c,v 1.1.2.16 2002/02/11 17:01:05 richter Exp $
+# $Id: epapinit.c,v 1.1.2.17 2002/02/12 09:11:44 richter Exp $
#
###################################################################################*/
@@ -114,12 +114,8 @@
{
if (!ap_find_linked_module(__FILE__ /*'epapinit.c'*/))
{
- fprintf(stderr, "add module") ;
ap_add_module (&embperl_module) ;
}
- else
- fprintf(stderr, "found module") ;
-
}
static void embperl_ApacheInit (server_rec *s, pool *p)
1.1.2.30 +9 -7 embperl/Attic/epprovider.c
Index: epprovider.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epprovider.c,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -u -r1.1.2.29 -r1.1.2.30
--- epprovider.c 11 Feb 2002 17:01:06 -0000 1.1.2.29
+++ epprovider.c 12 Feb 2002 09:11:44 -0000 1.1.2.30
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epprovider.c,v 1.1.2.29 2002/02/11 17:01:06 richter Exp $
+# $Id: epprovider.c,v 1.1.2.30 2002/02/12 09:11:44 richter Exp $
#
###################################################################################*/
@@ -629,7 +629,7 @@
pSrc = GetHashValueSV (r, pParam, "source") ;
if (!pSrc)
- ((tProviderMem *)pProvider) -> pSource = NULL ;
+ ((tProviderMem *)pProvider) -> pSource = SvROK(r ->
Component.Param.pInput)?SvREFCNT_inc (SvRV(r -> Component.Param.pInput)):NULL ;
else if (SvROK(pSrc))
((tProviderMem *)pProvider) -> pSource = SvREFCNT_inc (SvRV(pSrc)) ;
else
@@ -681,11 +681,13 @@
if (!bUseCache)
{
((tProviderMem *)pProvider) -> nLastModifiedWhileGet = ((tProviderMem
*)pProvider) -> nLastModified ;
- *pData = SvREFCNT_inc(((tProviderMem *)pProvider) -> pSource) ;
- SvREFCNT_inc (*pData) ;
- r -> Component.pBuf = SvPVX (*pData) ;
- r -> Component.pEndPos = r -> Component.pBuf + SvCUR(*pData) ;
- r -> Component.pCurrPos = r -> Component.pBuf ;
+ if ((*pData = SvREFCNT_inc(((tProviderMem *)pProvider) -> pSource)))
+ {
+ SvREFCNT_inc (*pData) ;
+ r -> Component.pBuf = SvPVX (*pData) ;
+ r -> Component.pEndPos = r -> Component.pBuf + SvCUR(*pData) ;
+ r -> Component.pCurrPos = r -> Component.pBuf ;
+ }
}
return ok ;
}
1.1.2.9 +2 -2 embperl/Attic/eppublic.h
Index: eppublic.h
===================================================================
RCS file: /home/cvs/embperl/Attic/eppublic.h,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- eppublic.h 10 Feb 2002 21:26:15 -0000 1.1.2.8
+++ eppublic.h 12 Feb 2002 09:11:44 -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: eppublic.h,v 1.1.2.8 2002/02/10 21:26:15 richter Exp $
+# $Id: eppublic.h,v 1.1.2.9 2002/02/12 09:11:44 richter Exp $
#
###################################################################################*/
@@ -46,7 +46,7 @@
SV * pPerlParam) ;
-char * embperl_GetText (tReq * r,
+const char * embperl_GetText (tReq * r,
const char * sMsgId) ;
1.15.4.43 +16 -15 embperl/eputil.c
Index: eputil.c
===================================================================
RCS file: /home/cvs/embperl/eputil.c,v
retrieving revision 1.15.4.42
retrieving revision 1.15.4.43
diff -u -r1.15.4.42 -r1.15.4.43
--- eputil.c 11 Feb 2002 17:01:06 -0000 1.15.4.42
+++ eputil.c 12 Feb 2002 09:11:44 -0000 1.15.4.43
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: eputil.c,v 1.15.4.42 2002/02/11 17:01:06 richter Exp $
+# $Id: eputil.c,v 1.15.4.43 2002/02/12 09:11:44 richter Exp $
#
###################################################################################*/
@@ -1453,7 +1453,7 @@
char * embperl_File2Abs (/*i/o*/ register req * r,
/*in*/ tMemPool * pPool,
- /*in*/ char * sFilename)
+ /*in*/ const char * sFilename)
{
epTHX_
char * c ;
@@ -1462,15 +1462,6 @@
if (sFilename == NULL)
return NULL ;
-#ifdef WIN32
- c = sFilename ;
- while (*c)
- { /* convert / to \ */
- if (*c == '/')
- *c = '\\' ;
- c++ ;
- }
-#endif
/* is it a relative filename? -> append path */
if (!isAbsPath(sFilename))
@@ -1485,6 +1476,16 @@
else
sAbsname = pPool?ep_pstrdup (pPool, sFilename):strdup (sFilename) ;
+#ifdef WIN32
+ c = sAbsname ;
+ while (*c)
+ { /* convert / to \ */
+ if (*c == '/')
+ *c = '\\' ;
+ c++ ;
+ }
+#endif
+
return sAbsname ;
}
@@ -1496,7 +1497,7 @@
/* ---------------------------------------------------------------------------- */
void embperl_SetCWDToFile (/*i/o*/ register req * r,
- /*in*/ char * sFilename)
+ /*in*/ const char * sFilename)
{
epTHX_
@@ -1536,7 +1537,7 @@
char * embperl_PathSearch (/*i/o*/ register req * r,
/*in*/ tMemPool * pPool,
- /*in*/ char * sFilename)
+ /*in*/ const char * sFilename)
{
epTHX_
@@ -1576,7 +1577,7 @@
/* ---------------------------------------------------------------------------- */
char * embperl_PathStr (/*i/o*/ register req * r,
- /*in*/ char * sFilename)
+ /*in*/ const char * sFilename)
{
epTHX_
@@ -1673,7 +1674,7 @@
}
-char * embperl_GetText (/*in*/ tReq * r,
+const char * embperl_GetText (/*in*/ tReq * r,
/*in*/ const char * sMsgId)
{
No revision
No revision
1.1.2.6 +112 -0 embperl/driver/Attic/eplibxslt.MAKEPL
Index: eplibxslt.MAKEPL
===================================================================
RCS file: /home/cvs/embperl/driver/Attic/eplibxslt.MAKEPL,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- eplibxslt.MAKEPL 23 Nov 2001 14:50:06 -0000 1.1.2.5
+++ eplibxslt.MAKEPL 12 Feb 2002 09:11:44 -0000 1.1.2.6
@@ -1,4 +1,7 @@
+use File::Spec ;
+use File::Find ;
+use Cwd ;
$win32 = ($^O eq 'MSWin32') ;
@@ -56,6 +59,115 @@
objects => 'driver/eplibxslt$(OBJ_EXT)',
save => { '$LIBXSLTVERSION' => $version2 }} ;
}
+
+
+$path = $ENV{LIBXSLTPATH} || GetString ("Enter path of the directory where you have
extracted libxml2 and libxslt or single dot for not using libxml", $LIBXSLTPATH) ;
+
+return undef if (!$path || $path eq '.') ;
+
+my $currdir = Cwd::fastcwd ;
+
+eval { find (\&libxslt, $path) ; } ;
+$@ = '' ;
+chdir ($currdir);
+if (!$libxslt)
+ {
+ print "libxslt.lib library not found under $path\n" ;
+ return undef ;
+ }
+
+eval { find (\&libxml2, $path) ; } ;
+$@ = '' ;
+chdir ($currdir);
+if (!$libxml2)
+ {
+ print "libxml2.lib library not found under $path\n" ;
+ return undef ;
+ }
+
+eval { find (\&iconv, $path) ; } ;
+$@ = '' ;
+chdir ($currdir);
+if (!$iconv)
+ {
+ print "iconv.lib library not found under $path\n" ;
+ return undef ;
+ }
+
+$path = File::Spec -> canonpath ($path) ;
+$inc1 = File::Spec -> canonpath ("$libxsltpath/../include") ;
+$inc2 = File::Spec -> canonpath ("$libxml2path/../include") ;
+$inc3 = File::Spec -> canonpath ("$iconvpath/../include") ;
+
+print "libxslt and libxml2 found under $libxsltpath and $libxml2path\n" ;
+
+return {
+ libs => "-L\"$libxsltpath\" -L\"$libxml2path\" -L\"$iconvpath\"
-l$libxslt -l$libxml2 -l$iconv",
+ cflags => "-I\"$inc1\" -I\"$inc2\" -I\"$inc3\"",
+ defines => '-DLIBXSLT',
+ objects => 'driver/eplibxslt$(OBJ_EXT)',
+ save => {
+ '$LIBXSLTVERSION' => '2x',
+ '$LIBXSLTPATH' => $path,
+ }} ;
+
+
+
+sub libxslt
+
+ {
+ if ($File::Find::dir ne $path && (($File::Find::dir =~ m#/\.#) ||
($File::Find::dir !~ /libxslt/)))
+ {
+ $File::Find::prune = 1 ;
+ return ;
+ }
+
+ if (/^libxslt\.lib/i)
+ {
+ $libxsltpath = $File::Find::dir ;
+ die $libxslt = $_ ;
+ }
+ }
+
+
+sub libxml2
+
+ {
+ if ($File::Find::dir ne $path && (($File::Find::dir =~ m#/\.#) ||
($File::Find::dir !~ /libxml2/)))
+ {
+ $File::Find::prune = 1 ;
+ return ;
+ }
+
+ if (/^libxml2\.lib/i)
+ {
+ $libxml2path = $File::Find::dir ;
+ die $libxml2 = $_ ;
+ }
+ }
+
+
+
+sub iconv
+
+ {
+ if ($File::Find::dir ne $path && (($File::Find::dir =~ m#/\.#) ||
($File::Find::dir !~ /iconv/)))
+ {
+ $File::Find::prune = 1 ;
+ return ;
+ }
+
+ if (/^iconv\.lib/i)
+ {
+ $iconvpath = $File::Find::dir ;
+ die $iconv = $_ ;
+ }
+ }
+
+
+
+
+
print "libxml2/libxslt is currently not supported on Win32\n" ;
return undef ;
1.1.2.15 +34 -9 embperl/driver/Attic/eplibxslt.c
Index: eplibxslt.c
===================================================================
RCS file: /home/cvs/embperl/driver/Attic/eplibxslt.c,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- eplibxslt.c 7 Feb 2002 06:56:21 -0000 1.1.2.14
+++ eplibxslt.c 12 Feb 2002 09:11:44 -0000 1.1.2.15
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: eplibxslt.c,v 1.1.2.14 2002/02/07 06:56:21 richter Exp $
+# $Id: eplibxslt.c,v 1.1.2.15 2002/02/12 09:11:44 richter Exp $
#
###################################################################################*/
@@ -31,8 +31,11 @@
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
+#ifdef WIN32
+extern __declspec( dllimport ) int xmlLoadExtDtdDefaultValue;
+#else
extern int xmlLoadExtDtdDefaultValue;
-
+#endif
/* ------------------------------------------------------------------------ */
/* */
@@ -72,6 +75,7 @@
/*in*/ SV * pSource)
{
+ epTHX_
xsltStylesheetPtr cur = NULL;
xmlDocPtr doc ;
xmlDocPtr res;
@@ -88,7 +92,7 @@
char * p ;
xmlOutputBufferPtr obuf ;
- sStylesheet = GetHashValueStr (pReqParameter, "xsltstylesheet", r ->
Component.Config.sXsltstylesheet) ;
+ sStylesheet = GetHashValueStr (aTHX_ pReqParameter, "xsltstylesheet", r ->
Component.Config.sXsltstylesheet) ;
if (!sStylesheet)
{
strncpy (r -> errdat1, "XSLT", sizeof (r -> errdat1)) ;
@@ -102,7 +106,7 @@
if (!SvROK (*ppSV) || SvTYPE ((SV *)(pParam = (HV *)SvRV (*ppSV))) != SVt_PVHV)
{
strncpy (r -> errdat1, "XSLT", sizeof (r -> errdat1)) ;
- sprintf (r -> errdat2, "%s", pKey) ;
+ sprintf (r -> errdat2, "%s", "xsltparameter") ;
return rcNotHashRef ;
}
@@ -253,6 +257,7 @@
/*in*/ HV * pParam,
/*i/o*/ SV * pKey)
{
+ epTHX_
int rc ;
if ((rc = Cache_AppendKey (r, pParam, "stylesheet", pKey)) != ok)
@@ -301,6 +306,7 @@
/*in*/ bool bUseCache)
{
+ epTHX_
int rc ;
char * p ;
STRLEN len ;
@@ -494,6 +500,7 @@
/*in*/ HV * pParam,
/*i/o*/ SV * pKey)
{
+ epTHX_
int rc ;
if ((rc = Cache_AppendKey (r, pParam, "source", pKey)) != ok)
@@ -541,6 +548,7 @@
/*in*/ bool bUseCache)
{
+ epTHX_
int rc ;
char * p ;
STRLEN len ;
@@ -645,12 +653,21 @@
/* */
/* ------------------------------------------------------------------------ */
+struct iowrite
+ {
+ tProviderLibXSLT * pProvider ;
+ tReq * pReq ;
+ } ;
+
static int ProviderLibXSLT_iowrite (void *context,
const char *buffer,
int len)
{
- sv_catpvn (((tProviderLibXSLT *)context) -> pOutputSV, (char *)buffer, len) ;
+ tReq * r = ((struct iowrite *)context) -> pReq ;
+ epTHX_
+
+ sv_catpvn (((struct iowrite *)context) -> pProvider -> pOutputSV, (char
*)buffer, len) ;
return len ;
}
@@ -744,6 +761,7 @@
/*in*/ HV * pParam,
/*i/o*/ SV * pKey)
{
+ epTHX_
int rc ;
if ((rc = Cache_AppendKey (r, pParam, "source", pKey)) != ok)
@@ -790,8 +808,8 @@
/*in*/ tProvider * pProvider,
/*in*/ HV * pParam)
{
+ epTHX_
int rc ;
- SV * pSrc ;
HV * pParamHV ;
HE * pEntry ;
char * pKey ;
@@ -810,7 +828,7 @@
if (((tProviderLibXSLT *)pProvider) -> pParamArray)
{
- free (((tProviderLibXSLT *)pProvider) -> pParamArray) ;
+ free ((void *)(((tProviderLibXSLT *)pProvider) -> pParamArray)) ;
((tProviderLibXSLT *)pProvider) -> pParamArray = NULL ;
}
@@ -881,12 +899,13 @@
/*in*/ bool bUseCache)
{
+ epTHX_
int rc ;
xsltStylesheetPtr cur ;
xmlDocPtr doc ;
xmlDocPtr res;
xmlOutputBufferPtr obuf ;
-
+ struct iowrite iowrite ;
tCacheItem * pSrcCache = Cache_GetDependency(r, pProvider -> pCache, 0) ;
tCacheItem * pXSLCache = Cache_GetDependency(r, pProvider -> pCache, 1) ;
@@ -911,7 +930,10 @@
return rcLibXSLTError ;
}
- obuf = xmlOutputBufferCreateIO (ProviderLibXSLT_iowrite, NULL, pProvider,
NULL) ;
+ iowrite.pProvider = (tProviderLibXSLT *)pProvider ;
+ iowrite.pReq = r ;
+
+ obuf = xmlOutputBufferCreateIO (ProviderLibXSLT_iowrite, NULL, &iowrite,
NULL) ;
xsltSaveResultTo(obuf, res, cur);
@@ -954,6 +976,7 @@
/*in*/ tCacheItem * pItem)
{
+ epTHX_
tProviderLibXSLT * pProvider = ((tProviderLibXSLT *)pItem -> pProvider) ;
if (pProvider -> pOutputSV)
@@ -996,6 +1019,8 @@
Cache_AddProviderClass ("libxslt-compile-xsl", &ProviderClassLibXSLTXSL) ;
Cache_AddProviderClass ("libxslt-parse-xml", &ProviderClassLibXSLTXML) ;
Cache_AddProviderClass ("libxslt", &ProviderClassLibXSLT) ;
+
+ return ok ;
}
1.1.2.12 +14 -11 embperl/driver/Attic/epxalan.MAKEPL
Index: epxalan.MAKEPL
===================================================================
RCS file: /home/cvs/embperl/driver/Attic/epxalan.MAKEPL,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- epxalan.MAKEPL 12 Feb 2002 07:20:35 -0000 1.1.2.11
+++ epxalan.MAKEPL 12 Feb 2002 09:11:44 -0000 1.1.2.12
@@ -1,12 +1,12 @@
-use File::Spec ;
+use File::Spec ;
use File::Find ;
use Cwd ;
$win32 = ($^O eq 'MSWin32') ;
-if (1) # !$win32)
+if (!$win32)
{
$path = $ENV{XALANPATH} || GetString ("Enter path of XALAN base directory or
single dot for not using XALAN", $XALANPATH) ;
@@ -36,7 +36,7 @@
}
}
- $path = File::Spec -> canonpath ($path) ;
+ $path = File::Spec -> canonpath ($path) ;
my $currdir = Cwd::fastcwd ;
eval { find (\&xalanlib, $win32?"$path/Build":"$path/lib") ; } ;
@@ -58,9 +58,9 @@
return undef ;
}
-
- $xalanlibpath = File::Spec -> canonpath ($xalanlibpath) ;
- $xerceslibpath = File::Spec -> canonpath ($xerceslibpath) ;
+
+ $xalanlibpath = File::Spec -> canonpath ($xalanlibpath) ;
+ $xerceslibpath = File::Spec -> canonpath ($xerceslibpath) ;
print "Found Xalan library $xalanlib at $xalanlibpath\n" ;
print "Found Xerces library $xerceslib at $xerceslibpath\n" ;
@@ -89,15 +89,18 @@
}
- my $pathsrc = File::Spec -> canonpath ("$path/src") ;
- my $xercesinc = File::Spec -> canonpath ("$xerceslibpath/../include") ;
-
- "$xalanlib $xerceslib" =~ /^lib(.*?)\.so lib(.*?)\.so$/ ;
+ my $pathsrc = File::Spec -> canonpath ("$path/src") ;
+ my $xercesinc = File::Spec -> canonpath ("$xerceslibpath/../include") ;
+
+
+
+ my ($l1, $l2) = "$xalanlib $xerceslib" =~ /^lib(.*?)\.so lib(.*?)\.so$/ ;
+ ($l1, $l2) = "$xalanlib $xerceslib" =~ /^(Xalan.*?\.lib) (xerces.*?\.lib)$/ ;
return { cflags => "-I\"$pathsrc\" -I\"$xercesinc\" -D_REENTRANT " ,
cpp => $cpp,
cppflags => $cppflags,
- libs => "-L\"$xalanlibpath\" -L\"$xerceslibpath\" -l\"$1\" -l\"$2\"
$extralibs",
+ libs => "-L\"$xalanlibpath\" -L\"$xerceslibpath\" -l\"$l1\" -l\"$l2\"
$extralibs",
defines => '-DXALAN' . ($platform?" -D$platform":'') ,
objects => 'driver/epxalan$(OBJ_EXT)',
save => { '$XALANPATH' => $path }} ;
No revision
No revision
1.1.2.2 +3 -3 embperl/eg/web/Attic/base.epl
Index: base.epl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/base.epl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- base.epl 12 Feb 2002 07:20:35 -0000 1.1.2.1
+++ base.epl 12 Feb 2002 09:11:44 -0000 1.1.2.2
@@ -7,14 +7,14 @@
<title>Embperl</title>
</head>
<body bgcolor="#ffffff">
- [- Execute ('header.htm') -]
+ [- Execute ('header.epl') -]
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
- <td valign="top">[- Execute ('menuleft.htm') -]</td>
+ <td valign="top">[- Execute ('menuleft.epl') -]</td>
<td valign="top" width="2"> </td>
<td valign="top" height="100%"><img src="/eg/images/frame.jpg"
width="1" height="100%"></td>
<td valign="top" width="10"> </td>
- <td valign="top" width="90%">[- Execute ('content.htm') -]</td>
+ <td valign="top" width="90%">[- Execute ('content.epl') -]</td>
<td valign="top" width="2"> </td>
<td valign="top" height="100%"><img src="/eg/images/frame.jpg"
width="1" height="100%"></td>
<td valign="top" width="10"> </td>
1.1.2.2 +3 -2 embperl/eg/web/Attic/config.pl
Index: config.pl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/config.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- config.pl 12 Feb 2002 07:20:35 -0000 1.1.2.1
+++ config.pl 12 Feb 2002 09:11:44 -0000 1.1.2.2
@@ -58,6 +58,7 @@
{ menu => 'Sites using Embperl', uri => 'pod/Sites.htm',
file => 'Sites.pod' },
{ menu => 'Hinzuf�gen', uri => 'db/addsel.epl' },
{ menu => 'Hinzuf�gen', uri => 'db/add.epl' },
+ { menu => 'Hinzuf�gen', uri => 'db/show.epl' },
{ menu => 'Hinzuf�gen', uri => 'db/data.epd' },
{ menu => 'News', uri => 'db/news/news.htm',
file => 'eg/web/db/data.epd', fdat => { 'category_id' => 5 } },
{ menu => 'Sites using Embperl', uri => 'db/sites/sites.htm',
file => 'eg/web/db/data.epd', fdat => { 'category_id' => 6 } },
@@ -74,8 +75,8 @@
$r -> {imageuri} = '/eg/images/' ;
$r -> {baseuri} = '/eg/web/' ;
- $r -> {root} = '/usr/msrc/ep2a/' ;
- $r -> {dbdsn} = 'dbi:mysql:embperl' ;
+ $r -> {root} = $^O eq 'MSWin32'?'/perl/msrc/ep2a/':'/usr/msrc/ep2a/' ;
+ $r -> {dbdsn} = $^O eq 'MSWin32'?'dbi:ODBC:embperl':'dbi:mysql:embperl' ;
$r -> {dbuser} = 'www' ;
}
1.1.2.2 +10 -2 embperl/eg/web/Attic/content.epl
Index: content.epl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/content.epl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- content.epl 12 Feb 2002 07:20:35 -0000 1.1.2.1
+++ content.epl 12 Feb 2002 09:11:44 -0000 1.1.2.2
@@ -1,11 +1,19 @@
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
- <td valign="top"><img
src="/eg/images/aim/h_leer.gif/Annotate?text=ABOUT&gravity=NorthWest&pointsize=16&antialias=true&y=-6&x=3&font=/usr/msrc/fonts/ocraext.ttf"
width="152" height="19"><br><br>
+ <td valign="top">
+ [# <img
src="/eg/images/aim/h_leer.gif/Annotate?text=ABOUT&gravity=NorthWest&pointsize=16&antialias=true&y=-6&x=3&font=/usr/msrc/fonts/ocraext.ttf"
width="152" height="19"> #]
+ <img src="/eg/images/h_content.gif" width="152" height="19">
+
+ <br><br>
<font size="2" face="Verdana, Arial, Helvetica, sans-serif">[- Execute
({inputfile => '*', syntax => 'Text'}) -]</td>
<td valign="top" width="10"> </td>
<td valign="top" height="100%"><img src="/eg/images/frame.jpg" width="1"
height="100%"></td>
<td valign="top" width="2"> </td>
- <td valign="top" align="left" width="152"><font size="2" face="Verdana,
Arial, Helvetica, sans-serif">[- Execute ({inputfile => 'news/NEWS.xml',
xsltstylesheet => 'xml/NEWS.xsl', recipe => 'XSLT', xsltproc => 'xalan'}) -]</td>
+ <td valign="top" align="left" width="152"><font size="2" face="Verdana,
Arial, Helvetica, sans-serif">
+ [#
+ [- Execute ({inputfile => 'news/NEWS.xml', xsltstylesheet =>
'xml/NEWS.xsl', recipe => 'XSLT', xsltproc => 'xalan'}) -]
+ #]
+ </td>
</tr>
</table>
1.1.2.2 +5 -3 embperl/eg/web/Attic/epwebapp.pl
Index: epwebapp.pl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/epwebapp.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- epwebapp.pl 12 Feb 2002 07:20:35 -0000 1.1.2.1
+++ epwebapp.pl 12 Feb 2002 09:11:44 -0000 1.1.2.2
@@ -12,6 +12,7 @@
if (!$m -> {file})
{
$m -> {path} = $root . $m -> {url} ;
+ $m -> {path} .= 'index.htm' if ($m -> {path} =~ m#/$#) ;
}
elsif (ref $m -> {file})
{
@@ -62,13 +63,11 @@
my $path = $m -> {path} ;
if (ref $path)
{
- use Data::Dumper ;
- print STDERR "xxxx", Dumper ($r -> param -> language,$path,$path -> {$r
-> param -> language}, $path -> {'en'}) ;
return $path -> {$r -> param -> language} || $path -> {'en'} ;
}
if ($m -> {fdat})
{
- while (my ($v, $k) = each %{$m -> {fdat}})
+ while (my ($k, $v) = each %{$m -> {fdat}})
{
$fdat{$k} = $v ;
}
@@ -94,6 +93,9 @@
fill_menu ($config, $r -> {menu}, $r -> {baseuri}, $r -> {root}) ;
$pf = map_file ($r) ;
$r -> param -> filename ($pf) ;
+
+ use Data::Dumper ;
+ print STDERR Dumper ($r -> {menu}, $r -> param -> uri, $pf) ;
Execute ({inputfile => 'messages.pl', syntax => 'Perl'}) ;
1.1.2.2 +3 -2 embperl/eg/web/Attic/header.epl
Index: header.epl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/header.epl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- header.epl 12 Feb 2002 07:20:35 -0000 1.1.2.1
+++ header.epl 12 Feb 2002 09:11:44 -0000 1.1.2.2
@@ -14,9 +14,10 @@
<td colspan=2 valign="top">
<table width="100%" cellspacing="0" cellpadding="0"
border="0">
<tr><td align="left" valign="middle"><font size=2><b>
- [- $i = 0 -]
+ <a href="[+ $r -> {baseuri} +]">Home</a>
+ [- $i = 0 -]
[$foreach $level (@{$r -> {menuitems}}) $]
- [+ $i++?' :: ':'' +]<a href="[+ $level
-> {url} +]">[+ $level -> {menu} +]</a>
+ : <a href="[+ $level -> {url} +]">[+
$level -> {menu} +]</a>
[$endforeach$]
</td>
<td align="right" valign="middle"
height="99%">Suchen: <input type="text" name="search">
1.1.2.2 +0 -2 embperl/eg/web/Attic/messages.pl
Index: messages.pl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/messages.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- messages.pl 12 Feb 2002 07:20:35 -0000 1.1.2.1
+++ messages.pl 12 Feb 2002 09:11:44 -0000 1.1.2.2
@@ -37,5 +37,3 @@
push @{$r -> default_messages}, $messages{'en'} if ($lang ne 'en') ;
-use Data::Dumper ; print STDERR Dumper ($lang,
-$r -> messages, $r -> default_messages, $messages{'de'}, $messages{'en'}) ;
\ No newline at end of file
No revision
No revision
1.1.2.2 +2 -0 embperl/eg/web/db/Attic/content.epl
Index: content.epl
===================================================================
RCS file: /home/cvs/embperl/eg/web/db/Attic/content.epl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- content.epl 12 Feb 2002 07:20:36 -0000 1.1.2.1
+++ content.epl 12 Feb 2002 09:11:45 -0000 1.1.2.2
@@ -1,3 +1,5 @@
[#<img src="/eg/images/aim/h_leer.gif/Annotate?text=Database
maintaince&gravity=NorthWest&pointsize=16&antialias=true&y=-6&x=3&font=/usr/msrc/fonts/ocraext.ttf"
width="152" height="19"><br><br>#]
+
+<hr>
<font size="2" face="Verdana, Arial, Helvetica, sans-serif">[- Execute ({inputfile
=> '*'}) -]
1.1.2.2 +9 -1 embperl/eg/web/db/Attic/epwebapp.pl
Index: epwebapp.pl
===================================================================
RCS file: /home/cvs/embperl/eg/web/db/Attic/epwebapp.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- epwebapp.pl 12 Feb 2002 07:20:36 -0000 1.1.2.1
+++ epwebapp.pl 12 Feb 2002 09:11:45 -0000 1.1.2.2
@@ -17,9 +17,11 @@
my $db = DBIx::Database -> new ({'!DataSource' => $r -> {dbdsn},
'!Username' => $r -> {dbuser},
'!Password' => $r -> {dbpassword},
- '!DBIAttr' => { RaiseError => 1 },
+ '!DBIAttr' => { RaiseError => 1, PrintError
=> 1 },
+
}) ;
+ $db -> TableAttr ('*', '!SeqClass', "DBIx::Recordset::FileSeq,$r->{root}/db")
if ($^O eq 'MSWin32') ;
$r -> {db} = $db ;
$r -> {language_set} = DBIx::Recordset -> Search ({'!DataSource' => $db,
'!Table' => 'language'}) ;
@@ -50,6 +52,7 @@
}
+# ----------------------------------------------------------------------------
sub add_category
{
@@ -75,6 +78,9 @@
}
}
+
+# ----------------------------------------------------------------------------
+
sub add_item
{
my $self = shift ;
@@ -100,5 +106,7 @@
url => $fdat{"url_$rec->{id}"} || $fdat{url},
heading => $fdat{"heading_$rec->{id}"}}) if
($fdat{"heading_$rec->{id}"}) ;
}
+
+ $fdat{link_id} = $id ;
}
No revision
No revision
1.1.2.1 +45 -0 embperl/eg/web/db/Attic/show.epl
No revision
No revision
1.1.2.2 +3 -1 embperl/eg/web/pod/doc/Attic/index.htm
Index: index.htm
===================================================================
RCS file: /home/cvs/embperl/eg/web/pod/doc/Attic/index.htm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- index.htm 12 Feb 2002 07:20:36 -0000 1.1.2.1
+++ index.htm 12 Feb 2002 09:11:45 -0000 1.1.2.2
@@ -1 +1,3 @@
-Here you find several Introductions to Embperl
\ No newline at end of file
+<br>
+Here you find the whole documention of Embperl
+
No revision
No revision
1.24.4.36 +9 -5 embperl/test/conf/httpd.conf.src
Index: httpd.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.conf.src,v
retrieving revision 1.24.4.35
retrieving revision 1.24.4.36
diff -u -r1.24.4.35 -r1.24.4.36
--- httpd.conf.src 10 Feb 2002 21:26:16 -0000 1.24.4.35
+++ httpd.conf.src 12 Feb 2002 09:11:45 -0000 1.24.4.36
@@ -123,9 +123,12 @@
print OFH <<EOD ;
SetEnv EMBPERL_ALLOW (asc|\\.xml\$|\\.htm\$)
-
-PerlRequire \"$EPPATH/test/conf/$EPSTARTUP\"
-#PerlModule Embperl
+
+
+PerlRequire \"$EPPATH/test/conf/$EPSTARTUP\"
+
+#PerlModule Embperl
+
Embperl_UseEnv on
@@ -528,10 +531,11 @@
<Location /eg/web>
-EMBPERL_RECIPE EmbperlWeb
+EMBPERL_RECIPE EmbperlWeb
+
SetEnv EMBPERL_ALLOW .
-PerlSetEnv EMBPERL_OBJECT_BASE base.htm
+PerlSetEnv EMBPERL_OBJECT_BASE base.epl
PerlSetEnv EMBPERL_OBJECT_APP epwebapp.pl
PerlSetEnv EMBPERL_OBJECT_STOPDIR \"$EPPATH/eg/web\"
PerlSetEnv EMBPERL_URIMATCH \"\\.htm.?\$|\\.epl\$|\\.xml\$|\\.pod\$\"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
