richter 2002/06/15 16:06:02
Modified: . Tag: Embperl2c Changes.pod INSTALL.pod MANIFEST
test.pl
Embperl Tag: Embperl2c Object.pm
Embperl/Syntax Tag: Embperl2c POD.pm
driver Tag: Embperl2c eplibxslt.c
eg/web Tag: Embperl2c base.epl epwebapp.pl pod.xsl
eg/web/pod Tag: Embperl2c content.epl
test/conf Tag: Embperl2c httpd.conf.src
Added: test/conf Tag: Embperl2c httpd.stop.conf.src
Log:
web site
Revision Changes Path
No revision
No revision
1.129.4.76 +4 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.129.4.75
retrieving revision 1.129.4.76
diff -u -r1.129.4.75 -r1.129.4.76
--- Changes.pod 1 Jun 2002 23:44:24 -0000 1.129.4.75
+++ Changes.pod 15 Jun 2002 23:06:00 -0000 1.129.4.76
@@ -41,6 +41,10 @@
- removed do { } around expressions of [+ +] blocks inside urls, because
this cost performance and now all [+ +] behaves the same. Reported by
Michael Smith.
+ - make stop now works also on windows.
+ - make start, which can be used to view/test the Embperl website localy,
+ now displays the URL how to request the site.
+ - libxslt does correct error reporting now.
=head1 2.0b7 (BETA) 21. Mar. 2002
1.12.4.11 +68 -36 embperl/INSTALL.pod
Index: INSTALL.pod
===================================================================
RCS file: /home/cvs/embperl/INSTALL.pod,v
retrieving revision 1.12.4.10
retrieving revision 1.12.4.11
diff -u -r1.12.4.10 -r1.12.4.11
--- INSTALL.pod 13 Mar 2002 11:44:28 -0000 1.12.4.10
+++ INSTALL.pod 15 Jun 2002 23:06:01 -0000 1.12.4.11
@@ -4,9 +4,13 @@
=head2 UNIX
-- B<Unpack the archive>
+To install on unix perform the following steps:
-- B<perl Makefile.PL>
+=over
+
+=item B<Unpack the archive>
+
+=item B<perl Makefile.PL>
You will be asked if you want to compile in support for Apache mod_perl. If
you say yes, the source of Apache is searched (for headerfiles). If
@@ -15,11 +19,14 @@
higher, Makefile.PL automatically suggests the same source path as was
used to build mod_perl.
-- B<make>
+=item B<make>
-- B<make test>
+=item B<make test>
+
+=item B<make install>
+
+=back
-- B<make install>
B<NOTE 1:> For using session handling you need
Apache::Session 1.53 and Apache::SessionX 2.00b3 or higher.
@@ -138,19 +145,33 @@
If you have an UNIX with preinstalled Apache and mod_perl (e.g. a Linux
distribution), you need to locate the following files on your disk:
- - httpd.h
- - httpd
- - mod_env.so
+=over
+
+=item httpd.h
+
+=item httpd
+
+=item mod_env.so
+
+=back
For example in SuSE Linux 7.1 they could be found at
- - /usr/include/apache/httpd.h
- - /usr/sbin/httpd
- - /usr/lib/apache/mod_env.so
+=over
+
+=item /usr/include/apache/httpd.h
+
+=item /usr/sbin/httpd
+
+=item /usr/lib/apache/mod_env.so
+
+=back
Now go to the Embperl directory and start
- perl Makefile.PL
+=over
+
+=item perl Makefile.PL
When get asked for the Apache sources, enter the directory where you
found C<httpd.h> (e.g. C</usr/include/apache>). For the Apache executable
@@ -158,9 +179,12 @@
the you will get ask for C<mod_env.so>, enter it's directory. Now you can
continue as normal with
- make test
- make install
-
+=item make test
+
+=item make install
+
+=back
+
=head2 WIN 32 (non ActiveState Perl)
@@ -170,10 +194,13 @@
On Windows 95/NT you have to do the following:
-B<perl Makefile.PL>
+=over
+
+=item B<perl Makefile.PL>
-B<nmake> (you must have the c compiler in your path)
+=item B<nmake>
+(you must have the c compiler in your path)
if you get an error about compiling Embperl.c. Edit Embperl.c and change
-#line "Embperl.xs"
@@ -184,11 +211,14 @@
now re-run nmake and it should compile.
-B<nmake test>
+=item B<nmake test>
B<NOTE:> nmake test needs libwin32, libwww and HTML::Parser installed to work
-B<nmake install>
+=item B<nmake install>
+
+=back
+
B<NOTE 1:> For using session handling you need
Apache::Session 1.53 and Apache::SessionX 2.00b3 or higher.
@@ -372,23 +402,25 @@
There must be one typecast inserted in the following three files:
- "c/src/XSLT/ExtensionFunctionHandler.cpp", line 156
- 156c156
- < return m_functions.find(function) != m_functions.end();
- ---
- > return StringSetType::const_iterator(m_functions.find(function)) !=
m_functions.end();
-
- "c/src/XSLT/ExtensionNSHandler.cpp", line 200
- 200c200
- < return (m_elements.find(element) != m_elements.end());
- ---
- > return (ExtensionSetType::const_iterator(m_elements.find(element)) !=
m_elements.end());
-
- "c/src/XSLT/NamespacesHandler.cpp", line 366
- 366c366
- < || m_extensionNamespaceURIs.find(theURI) !=
m_extensionNamespaceURIs.end()
- ---
- > ||
ExtensionNamespaceURISetType::const_iterator(m_extensionNamespaceURIs.find(theURI)) !=
m_extensionNamespaceURIs.end()
+ "c/src/XSLT/ExtensionFunctionHandler.cpp", line 156
+ 156c156
+ < return m_functions.find(function) != m_functions.end();
+ ---
+ > return StringSetType::const_iterator(m_functions.find(function)) !=
m_functions.end();
+
+ "c/src/XSLT/ExtensionNSHandler.cpp", line 200
+ 200c200
+ < return (m_elements.find(element) != m_elements.end());
+ ---
+ > return (ExtensionSetType::const_iterator(m_elements.find(element)) !=
m_elements.end());
+
+ "c/src/XSLT/NamespacesHandler.cpp", line 366
+ 366c366
+ < || m_extensionNamespaceURIs.find(theURI) != m_extensionNamespaceURIs.end()
+ ---
+ > ||
ExtensionNamespaceURISetType::const_iterator(m_extensionNamespaceURIs.find(theURI))
+ > != m_extensionNamespaceURIs.end()
+
=item * Compile XALAN
1.50.4.50 +2 -0 embperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/embperl/MANIFEST,v
retrieving revision 1.50.4.49
retrieving revision 1.50.4.50
diff -u -r1.50.4.49 -r1.50.4.50
--- MANIFEST 1 Jun 2002 23:44:24 -0000 1.50.4.49
+++ MANIFEST 15 Jun 2002 23:06:01 -0000 1.50.4.50
@@ -116,6 +116,7 @@
eg/web/pod.xsl
eg/web/pod/content.epl
eg/web/pod/doc/index.htm
+eg/web/pod/doc/doc13.htm
eg/web/pod/intro/index.htm
eg/webutil/db.schema
eg/webutil/setupdb.pl
@@ -351,6 +352,7 @@
test/cmp2/varerr.htm56
test/conf/config.pl
test/conf/httpd.conf.src
+test/conf/httpd.stop.conf.src
test/conf/null
test/conf/ssldisable.conf
test/conf/startup.pl
1.70.4.137 +95 -50 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.136
retrieving revision 1.70.4.137
diff -u -r1.70.4.136 -r1.70.4.137
--- test.pl 28 May 2002 06:56:04 -0000 1.70.4.136
+++ test.pl 15 Jun 2002 23:06:01 -0000 1.70.4.137
@@ -1107,8 +1107,8 @@
#### setup files ####
-$httpdconfsrc = "$confpath/httpd.conf.src" ;
$httpdconf = "$confpath/httpd.conf" ;
+$httpdstopconf = "$confpath/httpd.stop.conf" ;
$httpderr = "$tmppath/httpd.err.log" ;
$offlineerr = "$tmppath/test.err.log" ;
$outfile = "$tmppath/out.htm" ;
@@ -2398,38 +2398,38 @@
chop($httpdpid) ;
close FH ;
- unlink "$tmppath/httpd.pid" ;
-
print "Try to kill Apache pid = $httpdpid\n" ;
if ($EPWIN32)
{
- my $exitcode = 0 ;
- Win32::Process::KillProcess($httpdpid, $exitcode)
+ system ("\"$EPHTTPD\" -k stop -f \"$EPPATH/$httpdstopconf\" ") ;
}
else
{
kill 15, $httpdpid ;
}
+ unlink "$tmppath/httpd.pid" ;
}
}
#### Configure httpd conf file
$EPDEBUG = $defaultdebug ;
- my $cf ;
- my $rs = $/ ;
- undef $/ ;
-
- $ENV{EMBPERL_LOG} = $logfile ;
- open IFH, $httpdconfsrc or die "***Cannot open $httpconfsrc" ;
- $cf = <IFH> ;
- close IFH ;
- open OFH, ">$httpdconf" or die "***Cannot open $httpconf" ;
- eval $cf ;
- die "***Cannot eval $httpconf ($@)" if ($@) ;
- close OFH ;
- $/ = $rs ;
-
+ $ENV{EMBPERL_LOG} = $logfile ;
+ foreach my $src (<$confpath/*.src>)
+ {
+ local $^W = 0 ;
+ my $cf ;
+ local $/ = undef ;
+ my ($dest) = ($src =~ /^(.*)\.src$/) ;
+ open IFH, $src or die "***Cannot open $src" ;
+ $cf = <IFH> ;
+ close IFH ;
+ open OFH, ">$dest" or die "***Cannot open $dest" ;
+ eval $cf ;
+ die "***Cannot eval $src to $dest ($@)" if ($@) ;
+ close OFH ;
+ }
+
#### Start httpd
print "\n\nStarting httpd... " ;
unlink "$tmppath/httpd.pid" ;
@@ -2486,45 +2486,35 @@
last ;
}
if ($herr || open (HERR, $httpderr))
-
{
-
seek HERR, 0, 1 ;
-
print "\n" if (!$herr) ;
-
$herr = 1 ;
-
while (<HERR>)
-
{
-
print ;
-
}
-
}
-
-
sleep (1) ;
}
close HERR if ($herr) ;
die "Cannot open $tmppath/httpd.pid" if (!$httpdpid) ;
-
- if ($EPWIN32)
- {
- #$httpdpid = $HttpdObj -> GetProcessID ;
- }
-
print "pid = $httpdpid ok\n" ;
close ERR ;
- open (ERR, "$httpderr") ;
- <ERR> ; # skip first line
+ if (!open (ERR, "$httpderr"))
+ {
+ sleep (1) ;
+ if (!open (ERR, "$httpderr"))
+ {
+ print "Cannot open Apache error log ($httpderr: $1)\n" ;
+ }
+ }
+ eval { <ERR> ; } ; # skip first line and ignore errors
$httpduid = getpwnam ($EPUSER) if (!$EPWIN32) ;
}
@@ -2750,24 +2740,79 @@
}
else
{
- print "\nAll test have been passed successfully!\n\n" ;
+ if ($opt_modperl || $opt_cgi || $opt_offline || $opt_execute || $opt_cache ||
$opt_ep1)
+ {
+ print "\nAll test have been passed successfully!\n\n" ;
+ }
+ elsif ($opt_start)
+ {
+ my $make = $EPWIN32?'nmake':'make' ;
+
+ print qq{
+
+-----------------------------------------------------------------------
+
+ Test server has been started.
+
+ To view the Embperl web site direct your browser to
+
+ http://localhost:$EPPORT/eg/web/
+
+ View $EPPATH/eg/web/README for more details about localy
+ setting up the Embperl website.
+
+ To stop the test server again run
+
+ $make stop
+
+-----------------------------------------------------------------------
+ } ;
+ }
+ elsif ($opt_kill)
+ {
+ my $make = $EPWIN32?'nmake':'make' ;
+
+ print qq{
+
+-----------------------------------------------------------------------
+
+ Test server will be stoped now.
+
+-----------------------------------------------------------------------
+ } ;
+ }
+
}
-if (defined ($line = <ERR>) && !defined ($opt_ab))
- {
- print "\nFound unexpected output in httpd errorlog:\n" ;
- print $line ;
- while (defined ($line = <ERR>))
- { print $line ; }
- }
-close ERR ;
-
+ {
+ local $^W = 0 ;
+ if (defined ($line = <ERR>) && !defined ($opt_ab))
+ {
+ print "\nFound unexpected output in httpd errorlog:\n" ;
+ print $line ;
+ while (defined ($line = <ERR>))
+ { print $line ; }
+ }
+ close ERR ;
+ } ;
+
$fatal = 0 ;
if ($EPWIN32)
{
- $HttpdObj->Kill(-1) if ($HttpdObj && !$opt_nokill) ;
+ if (!$opt_nokill)
+ {
+ if ($HttpdObj)
+ {
+ $HttpdObj->Kill(-1) ;
+ unlink "$tmppath/httpd.pid" ;
+ }
+ elsif (-f "$EPPATH/$httpdstopconf" && -f "$tmppath/httpd.pid")
+ {
+ system ("\"$EPHTTPD\" -k stop -f $EPPATH/$httpdstopconf ") ;
+ }
+ }
}
else
{
No revision
No revision
1.1.2.23 +9 -3 embperl/Embperl/Attic/Object.pm
Index: Object.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Object.pm,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- Object.pm 20 May 2002 12:59:09 -0000 1.1.2.22
+++ Object.pm 15 Jun 2002 23:06:01 -0000 1.1.2.23
@@ -128,7 +128,13 @@
my $req = shift ;
my ($rc, $r) = Embperl::Req::InitRequest ($req -> {req_rec}, $req) ;
- return $rc if ($rc) ;
+ my $debug = $r && ($r -> config -> debug &
Embperl::Constant::dbgObjectSearch) ;
+
+ if ($rc)
+ {
+ print Embperl::LOG "[$$]Embperl::Object InitRequest returns $rc\n" if
($debug);
+ return $rc ;
+ }
my $app = $r -> app ;
my $appcfg = $app -> config;
@@ -144,7 +150,6 @@
my $directory ;
my $rootdir = $apr?norm_path ($apr -> document_root, $cwd):"$volume/" ;
my $stopdir = norm_path ($appcfg -> object_stopdir, $cwd) ;
- my $debug = $r -> config -> debug & Embperl::Constant::dbgObjectSearch ;
if (-d $filename)
{
@@ -279,6 +284,7 @@
elsif ($status)
{
$r -> cleanup ;
+ print Embperl::LOG "[$$]Embperl::Object Application -> init had
returned $status\n" if ($debug);
return $status ;
}
$filename = norm_path ($r -> param -> filename, $cwd) ;
No revision
No revision
1.1.2.17 +15 -2 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.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- POD.pm 10 Apr 2002 06:00:46 -0000 1.1.2.16
+++ POD.pm 15 Jun 2002 23:06:01 -0000 1.1.2.17
@@ -54,7 +54,7 @@
$self -> {-PODTags} = $self -> CloneHash (\%Search) ;
$self -> AddToRoot ($self -> {-PODTags}) ;
- $self -> AddInitCode (undef, '$escmode = 15;', undef) ;
+ $self -> AddInitCode (undef, '$escmode=15; ', undef) ;
#$self -> AddToRoot ({'-defnodetype' => ntypText,}) ;
@@ -225,6 +225,7 @@
'nodename' => 'uri',
'nodetype' => ntypAttr,
'cdatatype' => ntypAttrValue,
+ 'addflags' => aflgSingleQuote,
},
'Quote \'\'' =>
{
@@ -233,6 +234,7 @@
'nodename' => 'uri',
'nodetype' => ntypAttr,
'cdatatype' => ntypAttrValue,
+ 'addflags' => aflgSingleQuote,
},
'all' =>
{
@@ -241,6 +243,7 @@
'nodetype' => ntypAttr,
'cdatatype' => ntypAttrValue,
'donteat' => 2,
+ 'addflags' => aflgSingleQuote,
},
},
},
@@ -266,6 +269,7 @@
'nodetype' => ntypAttr,
'cdatatype' => ntypAttrValue,
'donteat' => 2,
+ 'addflags' => aflgSingleQuote,
},
},
@@ -325,6 +329,15 @@
'nodename' => 'list',
'removespaces' => 72,
'exitinside' => 1,
+ },
+ 'item*' => {
+ 'text' => '=item *',
+ 'end' => '=item *',
+ 'donteat' => 2,
+ 'nodetype' => ntypStartEndTag,
+ 'nodename' => 'item',
+ 'removespaces' => 2,
+ 'inside' => \%ParaItem,
},
'item' => {
'text' => '=item',
No revision
No revision
1.1.2.19 +61 -1 embperl/driver/Attic/eplibxslt.c
Index: eplibxslt.c
===================================================================
RCS file: /home/cvs/embperl/driver/Attic/eplibxslt.c,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- eplibxslt.c 13 Jun 2002 17:40:38 -0000 1.1.2.18
+++ eplibxslt.c 15 Jun 2002 23:06:02 -0000 1.1.2.19
@@ -228,6 +228,54 @@
/* ------------------------------------------------------------------------ */
/* */
+/* ProviderLibXSLTXSL_ErrorFunc */
+/* */
+/*!
+* \_en
+* Callback which is called when an error occurs
+* \endif
+*
+* \_de
+* Callback das im Fehlerfall aufgerufen wird
+* \endif
+*/
+
+void ProviderLibXSLT_ErrorFunc (void *ctx, const char *msg, ...)
+
+ {
+ tReq * r ;
+ SV * pSV ;
+ STRLEN l ;
+ va_list args ;
+ dTHX ;
+
+ r = CurrReq ; /* we cannot use ctx to pass the request, because it's not thread
safe */
+
+ pSV = newSV (256) ;
+
+ va_start(args, msg) ;
+ sv_vsetpvfn(pSV, msg, strlen(msg), &args, Null(SV**), 0, Null(bool*)) ;
+ va_end(args) ;
+
+ if (!r)
+ fputs (SvPV(pSV, l), stderr) ;
+ else
+ {
+ char * p = SvPV(pSV, l) ;
+ if (l && p[l-1] == '\n')
+ p[l-1] = '\0' ;
+
+ strncpy (r -> errdat1, p, sizeof (r -> errdat1) - 1) ;
+ LogError (r, rcLibXSLTError) ;
+ }
+
+ SvREFCNT_dec(pSV) ;
+ }
+
+
+
+/* ------------------------------------------------------------------------ */
+/* */
/* ProviderLibXSLTXSL_AppendKey */
/* */
/*!
@@ -342,6 +390,10 @@
return rcMissingInput ;
}
+ xmlSubstituteEntitiesDefault(1);
+ xmlLoadExtDtdDefaultValue = 1;
+ xmlSetGenericErrorFunc (NULL, &ProviderLibXSLT_ErrorFunc) ;
+
if ((doc = xmlParseMemory(p, len)) == NULL)
{
Cache_ReleaseContent (r, pFileCache) ;
@@ -589,6 +641,10 @@
return rcMissingInput ;
}
+ xmlSubstituteEntitiesDefault(1);
+ xmlLoadExtDtdDefaultValue = 1;
+ xmlSetGenericErrorFunc (NULL, &ProviderLibXSLT_ErrorFunc) ;
+
if ((doc = xmlParseMemory(p, len)) == NULL)
{
Cache_ReleaseContent (r, pFileCache) ;
@@ -954,6 +1010,10 @@
SvREFCNT_dec (((tProviderLibXSLT *)pProvider) -> pOutputSV) ;
((tProviderLibXSLT *)pProvider) -> pOutputSV = newSVpv("", 0) ;
+
+ xmlSubstituteEntitiesDefault(1);
+ xmlLoadExtDtdDefaultValue = 1;
+ xmlSetGenericErrorFunc (NULL, &ProviderLibXSLT_ErrorFunc) ;
res = xsltApplyStylesheet(cur, doc, ((tProviderLibXSLT *)pProvider) ->
pParamArray);
if(res == NULL)
No revision
No revision
1.1.2.5 +30 -6 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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- base.epl 16 Feb 2002 18:00:48 -0000 1.1.2.4
+++ base.epl 15 Jun 2002 23:06:02 -0000 1.1.2.5
@@ -6,16 +6,40 @@
<head>
<title>Embperl</title>
<style type="text/css">
+ [-
+ $font = 'font-family: Geneva,Arial,Helvetica;' ;
+ $base = $font ;
+ $base10 = $base . ' font-size: 10px;' ;
+ $base12 = $base . ' font-size: 12px;' ;
+ $base14 = $base . ' font-size: 14px;' ;
+ $base18 = $base . ' font-size: 18px;' ;
+ -]
+
.cInput {background: #DDDDDD; }
.cText {background: #AFBDCA; }
.cSectionInput {background: #ddaaaa; }
.cSectionText {background: #ddaaaa; }
- .cTabsOn {background: #ddaaaa; font-size: 14px; }
- .cTabsOff {background: #DDDDDD; font-size: 14px; }
- .cMenu {font-family: Geneva,Arial,Helvetica; font-size:
10px; }
- .cNews {font-family: Geneva,Arial,Helvetica; font-size:
10px; }
- body {font-family: Geneva,Arial,Helvetica; font-size:
12px; }
- table {font-family: Geneva,Arial,Helvetica; font-size:
12px; }
+ .cTabsOn {[+ $base14 +] background: #ddaaaa; }
+ .cTabsOff {[+ $base14 +] background: #DDDDDD; }
+ .cMenu {[+ $base10 +]}
+ .cNews {[+ $base10 +]}
+
+ .cPodHeaderNavLink {[+ $base12 +]}
+ .cPodH1ContentLink {[+ $base12 +] font-weight: bold;}
+ .cPodH2ContentLink {[+ $base10 +]}
+
+ .cPodH1 {[+ $base18 +] padding-left: 15px; padding-right:
15px; background: #fefcad; color: #000000; font-weight: bold; }
+ .cPodH2 {[+ $base14 +] padding-left: 15px; padding-right:
15px; background: #D2E9F5; color: #000000; font-weight: bold; }
+ .cTopLink {[+ $base10 +] }
+
+ .cItemText {[+ $base14 +] font-weight: bold; }
+ .cPodVerbatim {font-family: monospace; font-size: 12px;
background: #eeeeee;
+ border-left: solid 1px black; border-right: solid
1px black;
+ padding-top: 3px}
+
+ body {[+ $base12 +]}
+ table {[+ $base12 +]}
+ a:hover { color: red ;}
</style>
</head>
<body bgcolor="#ffffff">
1.1.2.7 +2 -1 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.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- epwebapp.pl 14 Jun 2002 23:38:57 -0000 1.1.2.6
+++ epwebapp.pl 15 Jun 2002 23:06:02 -0000 1.1.2.7
@@ -169,7 +169,8 @@
$r -> {menu} = $config -> get_menu ($r) ;
fill_menu ($config, $r -> {menu}, $r -> {baseuri}, $r -> {root}) ;
$pf = map_file ($r) ;
- $r -> param -> filename ($pf) ;
+ $r -> param -> filename ($pf) ; # tell Embperl the filename
+ $r -> apache_req -> filename ($pf) ; # tell Apache the filename
print STDERR Dumper ($r -> {menu}, $r -> param -> uri, $pf, \%fdat) ;
1.1.2.5 +39 -49 embperl/eg/web/Attic/pod.xsl
Index: pod.xsl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/pod.xsl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- pod.xsl 2 Mar 2002 19:55:47 -0000 1.1.2.4
+++ pod.xsl 15 Jun 2002 23:06:02 -0000 1.1.2.5
@@ -1,25 +1,22 @@
<?xml version='1.0'?>
-<!--
-<!DOCTYPE xxx [
-<!ENTITY % nbsp "<![CDATA[ ]]>" >
-]>
--->
+
+<!-- the following seems not to work with libxml -->
<!DOCTYPE stylesheet [
-<!-- <!ENTITY nbsp "<xsl:text
disable-output-escaping="yes">&nbsp;</xsl:text>"> -->
+<!ENTITY nbsp "<xsl:text disable-output-escaping='yes'>&nbsp;</xsl:text>">
<!ENTITY space "<xsl:text> </xsl:text>">
<!ENTITY cr "<xsl:text>
</xsl:text>">
]>
-
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:pod="http://axkit.org/ns/2000/pod2xml";
xmlns="http://www.w3.org/TR/xhtml1/strict";>
+
<xsl:output method="html" indent="yes" encoding="iso-8859-1"/>
<xsl:variable name="imagepath">/eg/images</xsl:variable>
@@ -37,10 +34,7 @@
<xsl:param name="txt"></xsl:param>
<table width="100%" border="0" cellspacing="0" cellpadding="6">
<tr>
- <td bgcolor="#fefcad" xxx="#faf208" xx="#93c4de"><font size="4"
face="Verdana, Arial, Helvetica, sans-serif"><b>
- <font color="0" xx="#FFFFFF"><xsl:text
disable-output-escaping="yes">&nbsp;</xsl:text>
- <xsl:value-of select="$txt"/>
- </font></b></font></td>
+ <td class="cPodH1"><xsl:value-of select="$txt"/></td>
</tr>
</table>
</xsl:template>
@@ -70,17 +64,13 @@
<xsl:if test="$prevpage > 0">
<xsl:choose>
<xsl:when test="$pageinname != 0">
- <a href="{$basename}.{$prevpage}{$extension}">
- <font size="2" face="Verdana, Arial, Helvetica,
sans-serif">
- << Prev: <xsl:value-of
select="preceding-sibling::sect1[para|verbatim|sect2][position()=1]/title"/>
- </font>
+ <a href="{$basename}.{$prevpage}{$extension}"
class="cPodHeaderNavLink">
+ << Prev: <xsl:value-of
select="preceding-sibling::sect1[para|verbatim|sect2][position()=1]/title"/>
</a>
</xsl:when>
<xsl:otherwise>
- <a href="{$basename}{$extension}?page={$prevpage}">
- <font size="2" face="Verdana, Arial, Helvetica,
sans-serif">
- << Prev: <xsl:value-of
select="preceding-sibling::sect1[para|verbatim|sect2][position()=1]/title"/>
- </font>
+ <a href="{$basename}{$extension}?page={$prevpage}"
class="cPodHeaderNavLink">
+ << Prev: <xsl:value-of
select="preceding-sibling::sect1[para|verbatim|sect2][position()=1]/title"/>
</a>
</xsl:otherwise>
</xsl:choose>
@@ -94,9 +84,8 @@
<xsl:if test="$pageinname = 0">
<xsl:attribute name="href"><xsl:value-of
select="$basename"/><xsl:value-of select="$extension"/>?page=0</xsl:attribute>
</xsl:if>
- <font size="2" face="Verdana, Arial, Helvetica, sans-serif">
+ <xsl:attribute
name="class">cPodHeaderNavLink</xsl:attribute>
[Content]
- </font>
</xsl:element>
</td>
<td align="right" valign="top" width="35%">
@@ -108,9 +97,8 @@
<xsl:if test="$pageinname = 0">
<xsl:attribute name="href"><xsl:value-of
select="concat($basename,$extension)"/>?page=<xsl:value-of
select="$nextpage"/></xsl:attribute>
</xsl:if>
- <font size="2" face="Verdana, Arial, Helvetica,
sans-serif">
+ <xsl:attribute
name="class">cPodHeaderNavLink</xsl:attribute>
Next: <xsl:value-of
select="following-sibling::sect1[para|verbatim|sect2]/title"/> >>
- </font>
</xsl:element>
</xsl:if>
</td>
@@ -128,9 +116,8 @@
<xsl:if test="$pageinname = 0">
<xsl:attribute name="href"><xsl:value-of select="concat
($basename, $extension)"/>?page=<xsl:value-of select="$nextpage"/></xsl:attribute>
</xsl:if>
- <font size="2" face="Verdana, Arial, Helvetica, sans-serif">
+ <xsl:attribute
name="class">cPodHeaderNavLink</xsl:attribute>
Next: <xsl:value-of
select="/pod/sect1[para|verbatim|sect2]/title"/> >>
- </font>
</xsl:element>
</td>
</tr></table>
@@ -183,7 +170,8 @@
<xsl:if test="$pageinname = 0">
<xsl:attribute name="href"><xsl:value-of
select="concat($basename,$extension)"/>?page=<xsl:number/></xsl:attribute>
</xsl:if>
- <font size="2" face="Verdana, Arial, Helvetica,
sans-serif"><xsl:value-of select="title"/></font>
+ <xsl:attribute name="class">cPodH1ContentLink</xsl:attribute>
+ <xsl:value-of select="title"/>
</xsl:element>
</b></li>
</xsl:if>
@@ -201,7 +189,7 @@
</xsl:variable>
- <li><b><a href="{$pagehref}"><font size="2" face="Verdana, Arial,
Helvetica, sans-serif"><xsl:value-of select="title"/></font></a></b></li>
+ <li><a href="{$pagehref}" class="cPodH1ContentLink"><xsl:value-of
select="title"/></a></li>
<xsl:if test="sect2">
<ul>
<xsl:apply-templates select="sect2" mode="toc1">
@@ -217,7 +205,8 @@
<li>
<xsl:element name="a">
<xsl:attribute name="href"><xsl:value-of
select="$pagehref"/>#sect_<xsl:number level="any"/></xsl:attribute>
- <font size="1" face="Verdana, Arial, Helvetica,
sans-serif"><xsl:value-of select="title"/></font>
+ <xsl:attribute name="class">cPodH2ContentLink</xsl:attribute>
+ <xsl:value-of select="title"/>
</xsl:element>
</li>
</xsl:template>
@@ -252,12 +241,9 @@
<xsl:element name="a">
<xsl:attribute name="name">sect_<xsl:number
level="any"/></xsl:attribute>
<table width="100%" border="0" cellspacing="0" cellpadding="6">
- <tr bgcolor="#D2E9F5">
- <td><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><b>
- <font color="0"><xsl:text
disable-output-escaping="yes">&nbsp;</xsl:text>
- <xsl:value-of select="title"/>
- </font></b></font></td>
- <td align="right"><a href="#top"><font size="1">top</font></a></td>
+ <tr class="cPodH2">
+ <td><xsl:value-of select="title"/></td>
+ <td align="right"><a href="#top" class="cTopLink">top</a></td>
</tr>
</table>
</xsl:element>
@@ -276,14 +262,15 @@
<xsl:template match="item" mode="item">
- <tr>
- <td>
- <img src="{$imagepath}/but.gif"/>
+ <tr class="cItemText">
+ <td valign="top">
+ <img src="{$imagepath}/but.gif"/><xsl:text
disable-output-escaping="yes">&nbsp;</xsl:text>
</td>
<td>
<xsl:apply-templates select="itemtext"/>
</td>
</tr>
+ <xsl:if test="*[name()!='itemtext']">
<tr>
<td>
<xsl:text disable-output-escaping="yes">&nbsp;</xsl:text>
@@ -297,6 +284,7 @@
<img src="{$imagepath}/transp.gif" height="4"/>
</td>
</tr>
+ </xsl:if>
</xsl:template>
@@ -314,7 +302,7 @@
</xsl:template>
<xsl:template match="itemtext">
- <p><font size="2" face="Verdana, Arial, Helvetica,
sans-serif"><b><xsl:apply-templates/></b></font></p>
+ <p><xsl:apply-templates/></p>
</xsl:template>
@@ -323,16 +311,18 @@
<!--
<xsl:template match="verbatim">
<xsl:if test="not(preceding-sibling::node()[position() =
2][name()='verbatim'])">
- <table width="100%" cellpadding="10"><tr>
- <td width="10%"><xsl:text
disable-output-escaping="yes">&nbsp;</xsl:text></td>
- <td bgcolor="#eeeeee">
- <pre><xsl:value-of select="."/>
+ <table width="100%" cellpadding="10">
+ <tr>
+ <td width="5%"><xsl:text
disable-output-escaping="yes">&nbsp;</xsl:text></td>
+ <td class="cPodVerbatim" width="90%">
+ <pre class="cPodVerbatim"><xsl:value-of select="."/>
<xsl:apply-templates select="following-sibling::node()[position() <
3][name()='verbatim']" mode="verbatim"/>
</pre>
</td>
- <td width="10%"><xsl:text
disable-output-escaping="yes">&nbsp;</xsl:text></td>
- </tr></table>
+ <td width="5%"><xsl:text
disable-output-escaping="yes">&nbsp;</xsl:text></td>
+ </tr>
+ </table>
</xsl:if>
</xsl:template>
@@ -343,14 +333,14 @@
-->
<xsl:template match="verbatim">
- <table width="100%" cellpadding="3" cellspacing="0"><tr>
- <td width="10%"><xsl:text
disable-output-escaping="yes">&nbsp;</xsl:text></td>
- <td bgcolor="#eeeeee" width="80%">
+ <table width="100%" cellspacing="0"><tr>
+ <td width="5%"><xsl:text
disable-output-escaping="yes">&nbsp;</xsl:text></td>
+ <td class="cPodVerbatim" width="90%">
<br/><pre>
<xsl:apply-templates/>
</pre>
</td>
- <td width="10%"><xsl:text
disable-output-escaping="yes">&nbsp;</xsl:text></td>
+ <td width="5%"><xsl:text
disable-output-escaping="yes">&nbsp;</xsl:text></td>
</tr></table>
</xsl:template>
@@ -432,7 +422,7 @@
</xsl:template>
<xsl:template match="para">
- <p><font size="2" face="Verdana, Arial, Helvetica,
sans-serif"><xsl:apply-templates/></font></p>
+ <p class="body"><xsl:apply-templates/></p>
</xsl:template>
<!-- - - - - text - - - - -->
No revision
No revision
1.1.2.2 +10 -4 embperl/eg/web/pod/Attic/content.epl
Index: content.epl
===================================================================
RCS file: /home/cvs/embperl/eg/web/pod/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 15 Jun 2002 23:06:02 -0000 1.1.2.2
@@ -1,5 +1,11 @@
[- $r = shift -]
-[$if $r -> param -> uri !~ /html?$/ $]<pre>[$endif$]
-[- Execute ({inputfile => '*'}) -]
-[$if $r -> param -> uri !~ /html?$/ $]</pre>[$endif$]
-
+[$if $r -> param -> uri !~ /html?$|\/$/ $]<pre>[$endif$]
+[- Execute ({inputfile => '*', options => Embperl::Constant::optReturnError, errors
=> \@err}) -]
+[$if $r -> param -> uri !~ /html?$|\/$/ $]</pre>[$endif$]
+[$if @err$]
+<pre>
+[$foreach $e (@err)$]
+[+ $e +]
+[$endforeach$]
+</pre>
+[$endif$]
No revision
No revision
1.24.4.66 +65 -27 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.65
retrieving revision 1.24.4.66
diff -u -r1.24.4.65 -r1.24.4.66
--- httpd.conf.src 13 Jun 2002 17:40:38 -0000 1.24.4.65
+++ httpd.conf.src 15 Jun 2002 23:06:02 -0000 1.24.4.66
@@ -1,7 +1,12 @@
+
+# $Id$
+
print OFH <<EOD ;
#
# Testconfig for Embperl make test
#
+# This file is automaticly generated each time you run make test/make start/make
stop
+#
ServerRoot \"$EPPATH/test\"
ServerName localhost
@@ -31,12 +36,18 @@
print OFH "Listen ", $EPPORT + 4, "\n" ;
print OFH "Listen ", $EPPORT + 5, "\n" ;
-print OFH "$EPMODPERL\n" ;
-print OFH "LoadModule embperl_module
\"$EPPATH/blib/arch/auto/Embperl/Embperl.so\"\n" if ($MP2) ;
-##print OFH "LoadModule info_module
\"/usr/src/packages/apache_1.3.24_mp561_so/src/modules/standard/mod_info.so\"\n" ;
-
-#print OFH "PerlPassEnv PATH\n" if ($MP2) ;
-#print OFH "PerlPassEnv PERL5LIB\n" if ($MP2) ;
+print OFH "$EPMODPERL\n" ;
+
+print OFH "LoadModule embperl_module
\"$EPPATH/blib/arch/auto/Embperl/Embperl.so\"\n" if ($MP2) ;
+
+##print OFH "LoadModule info_module
\"/usr/src/packages/apache_1.3.24_mp561_so/src/modules/standard/mod_info.so\"\n" ;
+
+
+
+#print OFH "PerlPassEnv PATH\n" if ($MP2) ;
+
+#print OFH "PerlPassEnv PERL5LIB\n" if ($MP2) ;
+
print OFH <<EOD ;
@@ -68,18 +79,28 @@
ErrorLog tmp/httpd.err.log
PidFile tmp/httpd.pid
-EOD
-
-
-if (!$MP2)
- {
-print OFH <<EOD ;
+EOD
+
+
+
+
+
+if (!$MP2)
+
+ {
+
+print OFH <<EOD ;
+
AccessConfig conf/null
ResourceConfig conf/null
-EOD
- }
-
-print OFH <<EOD ;
+EOD
+
+ }
+
+
+
+print OFH <<EOD ;
+
TypesConfig conf/null
LockFile tmp/httpd.lock
@@ -137,7 +158,6 @@
Alias /embperl/ \"$EPPATH/test/html/\"
Alias /embperl2/ \"$EPPATH/test/html2/\"
Alias /embperlmail/ \"$EPPATH/test/html/\"
-Alias /eg/ \"$EPPATH/eg/\"
<Location /embperl>
SetHandler perl-script
@@ -271,12 +291,17 @@
<Location /embperl/registry>
SetHandler perl-script
-EOD
-
+EOD
+
+
+
print OFH "PerlHandler ", $MP2?'ModPerl':'Apache', "::Registry\n" ;
-
-
-print OFH <<EOD ;
+
+
+
+
+print OFH <<EOD ;
+
Options ExecCGI
</Location>
@@ -491,6 +516,7 @@
<Location /perl-status>
SetHandler perl-script
PerlHandler Apache::Status
+PerlSetVar StatusOptionsAll On
</Location>
<Location /server-status>
@@ -502,6 +528,14 @@
</Location>
+# redirect all languages of the web to the same directory
+#AliasMatch \"/eg/web/../(.*)/\$\" \"$EPPATH/eg/web/\$1/index.htm\"
+#AliasMatch \"/eg/web/../(.*)/\$\" \"c:/perl/msrc/ep2a/eg/web/\$1/index.htm\"
+AliasMatch \"/eg/web/../(.*)\$\" \"$EPPATH/eg/web/\$1\"
+
+# path for examples
+Alias /eg/ \"$EPPATH/eg/\"
+
@@ -517,10 +551,14 @@
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI FollowSymLinks
-EMBPERL_INPUT_ESCMODE 7
-EMBPERL_SYNTAX "Embperl III::RandomTag"
-EMBPERL_OPTIONS 262288
-
+EMBPERL_INPUT_ESCMODE 7
+
+EMBPERL_SYNTAX "Embperl III::RandomTag"
+
+EMBPERL_OPTIONS 262288
+
+
+
</Location>
<Location /eg/web>
@@ -530,7 +568,7 @@
EMBPERL_OBJECT_BASE base.epl
EMBPERL_OBJECT_APP epwebapp.pl
EMBPERL_OBJECT_STOPDIR \"$EPPATH/eg/web\"
-EMBPERL_URIMATCH \"\\.htm.?\$|\\.epl\$|\\.xml\$|\\.pod\$\"
+EMBPERL_URIMATCH \"\\.htm.?\$|\\.epl\$|\\.xml\$|\\.pod\$|/$\"
SetHandler perl-script
PerlHandler Embperl::Object
Options ExecCGI
No revision
No revision
1.1.2.1 +67 -0 embperl/test/conf/Attic/httpd.stop.conf.src
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
