richter 01/09/20 06:27:32
Modified: . Tag: Embperl2c Embperl.pm epmain.c test.pl
Embperl/Syntax Tag: Embperl2c POD.pm
test/cmp Tag: Embperl2c pod.asc.htm
test/conf Tag: Embperl2c httpd.conf.src
Added: test/cmp Tag: Embperl2c incxmlLibXSLT.htm
incxmlXalanXSLT.htm
test/html Tag: Embperl2c incxmlLibXSLT.htm
incxmlXalanXSLT.htm
test/html/xml Tag: Embperl2c kfd.xsl kfdres.xml
Log:
XSLT
Revision Changes Path
No revision
No revision
1.118.4.53 +2 -2 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.52
retrieving revision 1.118.4.53
diff -u -r1.118.4.52 -r1.118.4.53
--- Embperl.pm 2001/09/19 10:45:21 1.118.4.52
+++ Embperl.pm 2001/09/20 13:27:30 1.118.4.53
@@ -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.52 2001/09/19 10:45:21 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.53 2001/09/20 13:27:30 richter Exp $
#
###################################################################################
@@ -68,7 +68,7 @@
##ep2##
-$VERSION = '2.0b4_dev-4' ;
+$VERSION = '2.0b4_dev-5' ;
##/ep2##
##ep1##$VERSION = '1.3.4_dev';
1.75.4.45 +19 -2 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.44
retrieving revision 1.75.4.45
diff -u -r1.75.4.44 -r1.75.4.45
--- epmain.c 2001/09/20 08:23:55 1.75.4.44
+++ epmain.c 2001/09/20 13:27:30 1.75.4.45
@@ -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.44 2001/09/20 08:23:55 richter Exp $
+# $Id: epmain.c,v 1.75.4.45 2001/09/20 13:27:30 richter Exp $
#
###################################################################################*/
@@ -3044,6 +3044,11 @@
oCommitToMem (r, NULL, pData) ;
oRollbackOutput (r, NULL) ;
SvCUR_set (pOut, l - 1) ;
+
+ if (r -> bAppendToMainReq)
+ oBegin (r) ;
+
+
if (strstr (r -> pConf -> sRecipe, "LibXSLT"))
{
#ifdef LIBXSLT
@@ -3119,7 +3124,19 @@
if (!bError && !r -> pImportStash)
{
tDomTree * pDomTree = DomTree_self (r -> xCurrDomTree) ;
- l -> xCurrNode = Node_insertAfter (pDomTree, pDomTree ->
xDocument, DomTree_self (l -> xCurrDomTree), l -> xCurrNode) ;
+ if (bXSLT)
+ {
+ int len = GetContentLength (r) + 1 ;
+ char * pData = _malloc (r, len) ;
+ oCommitToMem (r, NULL, pData) ;
+ oRollbackOutput (r, NULL) ;
+ l -> xCurrNode = Node_appendChild (DomTree_self (l ->
xCurrDomTree),
+ ntypCDATA,
+ 0,
+ pData, len - 1,
l -> xCurrNode, 0, 0, "XSLT Result") ;
+ }
+ else
+ l -> xCurrNode = Node_insertAfter (pDomTree, pDomTree
-> xDocument, DomTree_self (l -> xCurrDomTree), l -> xCurrNode) ;
}
}
#endif
1.70.4.77 +57 -7 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.76
retrieving revision 1.70.4.77
diff -u -r1.70.4.76 -r1.70.4.77
--- test.pl 2001/09/20 08:23:55 1.70.4.76
+++ test.pl 2001/09/20 13:27:31 1.70.4.77
@@ -11,7 +11,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: test.pl,v 1.70.4.76 2001/09/20 08:23:55 richter Exp $
+# $Id: test.pl,v 1.70.4.77 2001/09/20 13:27:31 richter Exp $
#
###################################################################################
@@ -38,6 +38,7 @@
# recipe =>
# xsltstylesheet =>
# syntax =>
+# msg =>
@testdata = (
'ascii' => { },
@@ -708,32 +709,81 @@
},
'xml/pod.xml' => {
'version' => 2,
- 'recipe' => 'LibXSLT',
+ 'recipe' => 'EmbperlLibXSLT',
'xsltstylesheet' => 'pod.xsl',
+ 'offline' => 1,
'condition' => '$LIBXSLTVERSION',
+ 'msg' => ' libxslt',
},
'xml/pod.xml' => {
'version' => 2,
- 'recipe' => 'XALAN-XSLT',
+ 'recipe' => 'EmbperlXalanXSLT',
'xsltstylesheet' => 'pod.xsl',
+ 'offline' => 1,
'condition' => '$XALANPATH',
+ 'cmpext' => '.xalan',
+ 'msg' => ' xalan',
},
'pod/pod.asc' => {
'version' => 2,
'syntax' => 'POD',
- 'recipe' => 'LibXSLT',
+ 'recipe' => 'EmbperlLibXSLT',
'xsltstylesheet' => '../xml/pod.xsl',
'cmpext' => '.htm',
'offline' => 1,
+ 'msg' => ' libxslt',
+ 'condition' => '$LIBXSLTVERSION',
},
- 'ascxml/pod.asc' => {
+ 'pod/pod.asc' => {
'version' => 2,
'syntax' => 'POD',
- 'recipe' => 'LibXSLT',
+ 'recipe' => 'EmbperlXalanXSLT',
'xsltstylesheet' => '../xml/pod.xsl',
+ 'cmpext' => '.xalan.htm',
+ 'offline' => 1,
+ 'msg' => ' xalan',
+ 'condition' => '$XALANPATH',
+ },
+ 'libxslt/pod.xml' => {
+ 'version' => 2,
+ 'modperl' => 1,
+ 'aliasdir' => 1,
+ 'msg' => ' libxslt',
+ 'condition' => '$LIBXSLTVERSION',
+ },
+ 'xalan/pod.xml' => {
+ 'version' => 2,
+ 'cmpext' => '.xalan',
+ 'modperl' => 1,
+ 'aliasdir' => 1,
+ 'msg' => ' xalan',
+ 'condition' => '$XALANPATH',
+ },
+ 'asclibxslt/pod.asc' => {
+ 'version' => 2,
'cmpext' => '.htm',
'modperl' => 1,
'aliasdir' => 1,
+ 'msg' => ' libxslt',
+ 'condition' => '$LIBXSLTVERSION',
+ },
+ 'ascxalan/pod.asc' => {
+ 'version' => 2,
+ 'cmpext' => '.xalan.htm',
+ 'modperl' => 1,
+ 'aliasdir' => 1,
+ 'msg' => ' xalan',
+ 'condition' => '$XALANPATH',
+ },
+ 'incxmlLibXSLT.htm' => {
+ 'version' => 2,
+ 'condition' => '$LIBXSLTVERSION',
+ 'msg' => ' libxslt',
+ },
+ 'incxmlXalanXSLT.htm' => {
+ 'version' => 2,
+ 'condition' => '$XALANPATH',
+ 'msg' => ' xalan',
},
) ;
@@ -1593,7 +1643,7 @@
$page, $test -> {query_info} || '') ;
unshift (@testargs, 'dbgbreak') if ($opt_dbgbreak) ;
- $txt = "#$testnum ". $file . ($debug != $defaultdebug ?"-d $debug
":"") . '...' ;
+ $txt = "#$testnum ". $file . ($debug != $defaultdebug ?"-d $debug
":"") . ($test->{msg} || '') . '...' ;
$txt .= ' ' x (30 - length ($txt)) ;
print $txt ;
No revision
No revision
1.1.2.4 +6 -6 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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- POD.pm 2001/09/18 18:01:46 1.1.2.3
+++ POD.pm 2001/09/20 13:27:31 1.1.2.4
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: POD.pm,v 1.1.2.3 2001/09/18 18:01:46 richter Exp $
+# $Id: POD.pm,v 1.1.2.4 2001/09/20 13:27:31 richter Exp $
#
###################################################################################
@@ -225,11 +225,11 @@
'nodename' => 'BR/',
'nodetype' => ntypTag,
},
- 'POD Emptyline' => {
- 'text' => "\r\n\r\n",
- 'nodename' => 'BR/',
- 'nodetype' => ntypTag,
- },
+# 'POD Emptyline' => {
+# 'text' => "\r\n\r\n",
+# 'nodename' => 'BR/',
+# 'nodetype' => ntypTag,
+# },
'POD Code' => {
'text' => "\n ",
'end' => "\n",
No revision
No revision
1.1.2.2 +7 -25 embperl/test/cmp/Attic/pod.asc.htm
Index: pod.asc.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/pod.asc.htm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- pod.asc.htm 2001/09/19 12:24:00 1.1.2.1
+++ pod.asc.htm 2001/09/20 13:27:31 1.1.2.2
@@ -5,33 +5,15 @@
</head>
<body>
<h1>HEAD1</h1>
-some text under HEAD1
+some text under HEAD1<br/><br/><h2><img src="sq.gif" width="16" height="16"
alt="-"/>HEAD2</h2><p/>
+some text under HEAD2<br/><br/>HEAD3
+some text under HEAD3<br/><br/>format bold <code>code</code> italic underline
-<h2><img src="sq.gif" width="16" height="16" alt="-"/>HEAD2</h2><p/>
-some text under HEAD2
-
-HEAD3
-some text under HEAD3
-
-format bold <code>code</code> italic underline
-
<ul>
<li><b>first item</b></li><br/>
-text 1
-
-<li><b>second item</b></li><br/>
-text 2
-
-</ul>
-
-<ul>
+text 1<br/><br/><li><b>second item</b></li><br/>
+text 2<br/><br/></ul><br/><br/><ul>
first item
-text 1
-
-second item
-text 2
-
-</ul>
-
-</body>
+text 1<br/><br/>second item
+text 2<br/><br/></ul><br/><br/></body>
</html>
No revision
No revision
1.1.2.1 +57 -0 embperl/test/cmp/Attic/incxmlLibXSLT.htm
1.1.2.1 +64 -0 embperl/test/cmp/Attic/incxmlXalanXSLT.htm
No revision
No revision
1.24.4.22 +23 -15 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.21
retrieving revision 1.24.4.22
diff -u -r1.24.4.21 -r1.24.4.22
--- httpd.conf.src 2001/09/19 12:24:00 1.24.4.21
+++ httpd.conf.src 2001/09/20 13:27:31 1.24.4.22
@@ -131,10 +131,12 @@
AddType text/html .htm
AddType text/html .xhtm
+Alias /embperl/asclibxslt \"$EPPATH/test/html/pod\"
+Alias /embperl/ascxalan \"$EPPATH/test/html/pod\"
+Alias /embperl/libxslt \"$EPPATH/test/html/xml\"
+Alias /embperl/xalan \"$EPPATH/test/html/xml\"
Alias /embperl/uidurl/ \"$EPPATH/test/html/sidurl/\"
-
Alias /embperl/suidurl/ \"$EPPATH/test/html/sidurl/\"
-
Alias /embperl/sub/ \"$EPPATH/test/html/\"
Alias /embperl/ \"$EPPATH/test/html/\"
Alias /embperl2/ \"$EPPATH/test/html2/\"
@@ -170,24 +172,32 @@
PerlSetEnv EMBPERL_OPTIONS 4
</Location>
-<Location /embperl/xml>
-SetHandler perl-script
-PerlHandler HTML::Embperl
-Options ExecCGI
-PerlSetEnv EMBPERL_RECIPE LibXSLT
+
+
+<Location /embperl/libxslt>
+PerlSetEnv EMBPERL_RECIPE EmbperlLibXSLT
PerlSetEnv EMBPERL_XSLTSTYLESHEET pod.xsl
</Location>
-Alias /embperl/ascxml \"$EPPATH/test/html/pod\"
+<Location /embperl/asclibxslt>
+PerlSetEnv EMBPERL_RECIPE EmbperlLibXSLT
+PerlSetEnv EMBPERL_XSLTSTYLESHEET ../xml/pod.xsl
+PerlSetEnv EMBPERL_SYNTAX POD
+</Location>
-<Location /embperl/ascxml>
-SetHandler perl-script
-PerlHandler HTML::Embperl
-Options ExecCGI
-PerlSetEnv EMBPERL_RECIPE LibXSLT
+<Location /embperl/xalan>
+PerlSetEnv EMBPERL_RECIPE EmbperlXalanXSLT
+PerlSetEnv EMBPERL_XSLTSTYLESHEET pod.xsl
+</Location>
+
+<Location /embperl/ascxalan>
+PerlSetEnv EMBPERL_RECIPE EmbperlXalanXSLT
PerlSetEnv EMBPERL_XSLTSTYLESHEET ../xml/pod.xsl
+PerlSetEnv EMBPERL_SYNTAX POD
</Location>
+
+
<Location /embperl/opmask>
SetHandler perl-script
PerlHandler HTML::Embperl
@@ -335,9 +345,7 @@
Alias /cgi-bin/uidurl/ \"$EPPATH/test/html/sidurl/\"
-
Alias /cgi-bin/suidurl/ \"$EPPATH/test/html/sidurl/\"
-
Alias /cgi-bin/ \"$EPPATH/test/html/\"
Alias /cgi-bin2/ \"$EPPATH/test/html2/\"
Alias /cgi-bin-32/ \"$EPPATH/test/html/\"
No revision
No revision
1.1.2.1 +21 -0 embperl/test/html/Attic/incxmlLibXSLT.htm
1.1.2.1 +21 -0 embperl/test/html/Attic/incxmlXalanXSLT.htm
No revision
No revision
1.1.2.1 +162 -0 embperl/test/html/xml/Attic/kfd.xsl
1.1.2.1 +1 -0 embperl/test/html/xml/Attic/kfdres.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
