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/12 22:02:43 UTC
cvs commit: embperl/eg/web/db data.epd epwebapp.pl
richter 02/02/12 13:02:43
Modified: . Tag: Embperl2c epdom.c epdom.h
eg/web Tag: Embperl2c content.epl header.epl
eg/web/db Tag: Embperl2c data.epd epwebapp.pl
Log:
xml escaping
Revision Changes Path
No revision
No revision
1.4.2.81 +10 -3 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.4.2.80
retrieving revision 1.4.2.81
diff -u -r1.4.2.80 -r1.4.2.81
--- epdom.c 18 Jan 2002 16:22:36 -0000 1.4.2.80
+++ epdom.c 12 Feb 2002 21:02:42 -0000 1.4.2.81
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epdom.c,v 1.4.2.80 2002/01/18 16:22:36 richter Exp $
+# $Id: epdom.c,v 1.4.2.81 2002/02/12 21:02:42 richter Exp $
#
###################################################################################*/
@@ -2824,7 +2824,7 @@
if (nEscMode != -1)
{
- pNew -> nType = (nEscMode & 3)?ntypText:ntypCDATA ;
+ pNew -> nType = (nEscMode & 8)?ntypText:((nEscMode & 3)?ntypTextHTML:ntypCDATA) ;
pNew -> bFlags &= ~(nflgEscXML + nflgEscUrl + nflgEscChar) ;
pNew -> bFlags |= (nEscMode ^ nflgEscChar) & (nflgEscXML + nflgEscUrl + nflgEscChar) ;
}
@@ -2888,7 +2888,7 @@
if (nEscMode != -1)
{
- pOldChild -> nType = (nEscMode & 3)?ntypText:ntypCDATA ;
+ pOldChild -> nType = (nEscMode & 8)?ntypText:((nEscMode & 3)?ntypTextHTML:ntypCDATA) ;
pOldChild -> bFlags &= ~(nflgEscXML + nflgEscUrl + nflgEscChar) ;
pOldChild -> bFlags |= (nEscMode ^ nflgEscChar) & (nflgEscXML + nflgEscUrl + nflgEscChar) ;
}
@@ -3323,6 +3323,13 @@
}
}
else if (pNode -> nType == ntypText)
+ {
+ char * s ;
+ int l ;
+ Ndx2StringLen (pNode -> nText,s,l) ;
+ OutputEscape (r, s, l, Char2XML, (pNode -> bFlags & nflgEscChar)?'\\':0) ;
+ }
+ else if (pNode -> nType == ntypTextHTML)
{
char * s ;
int l ;
1.4.2.48 +2 -1 embperl/Attic/epdom.h
Index: epdom.h
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.h,v
retrieving revision 1.4.2.47
retrieving revision 1.4.2.48
diff -u -r1.4.2.47 -r1.4.2.48
--- epdom.h 17 Jan 2002 23:16:17 -0000 1.4.2.47
+++ epdom.h 12 Feb 2002 21:02:42 -0000 1.4.2.48
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epdom.h,v 1.4.2.47 2002/01/17 23:16:17 richter Exp $
+# $Id: epdom.h,v 1.4.2.48 2002/02/12 21:02:42 richter Exp $
#
###################################################################################*/
@@ -121,6 +121,7 @@
ntypAttr = 2,
ntypAttrValue = 2 + 0x20,
ntypText = 3,
+ ntypTextHTML = 3 + 0x20, /* same as text, but with html encoding */
ntypCDATA = 4,
ntypEntityRef = 5,
ntypEntity = 6,
No revision
No revision
1.1.2.3 +1 -4 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- content.epl 12 Feb 2002 09:11:44 -0000 1.1.2.2
+++ content.epl 12 Feb 2002 21:02:42 -0000 1.1.2.3
@@ -2,7 +2,6 @@
<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"> #]
- <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>
@@ -10,9 +9,7 @@
<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'}) -]
- #]
+ [# [- Execute ({inputfile => 'db/data.epd', xsltstylesheet => 'db/news/news.xsl', fdat => {'categorie_id' => 1 }}) -] #]
</td>
</tr>
</table>
1.1.2.3 +28 -26 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- header.epl 12 Feb 2002 09:11:44 -0000 1.1.2.2
+++ header.epl 12 Feb 2002 21:02:42 -0000 1.1.2.3
@@ -1,29 +1,31 @@
[- $r = shift -]
<table width="100%" cellspacing="0" cellpadding="0" border="0">
- <tr>
- <td valign="top" rowspan=2><img src="/eg/images/kopf-links.gif" width="206" height="97" usemap="#Map" border="0">
- <map name="Map">
- <area shape="rect" coords="90,56,151,69" href="../index-d.htm" target="_top">
- <area shape="rect" coords="90,70,151,82" href="index-e.htm" target="_top">
- </map>
- </td>
- <td valign="top" width="50%"><img src="/eg/images/kopf-mitte.jpg" width="100%" height="46" vspace=0></td>
- <td valign="top"><img src="/eg/images/kopf-rechts-engl.jpg" width="568" height="46" vspace=0></td>
- </tr>
- <tr>
- <td colspan=2 valign="top">
- <table width="100%" cellspacing="0" cellpadding="0" border="0">
- <tr><td align="left" valign="middle"><font size=2><b>
- <a href="[+ $r -> {baseuri} +]">Home</a>
- [- $i = 0 -]
- [$foreach $level (@{$r -> {menuitems}}) $]
- : <a href="[+ $level -> {url} +]">[+ $level -> {menu} +]</a>
- [$endforeach$]
- </td>
- <td align="right" valign="middle" height="99%">Suchen: <input type="text" name="search">
- </td>
- </tr>
- </table>
- </td>
- </tr>
+ <tr>
+ <td valign="top" rowspan=2><img src="/eg/images/kopf-links.gif" width="206" height="97" usemap="#Map" border="0">
+ <map name="Map">
+ <area shape="rect" coords="90,56,151,69" href="../index-d.htm" target="_top">
+ <area shape="rect" coords="90,70,151,82" href="index-e.htm" target="_top">
+ </map>
+ </td>
+ <td valign="top" width="50%"><img src="/eg/images/kopf-mitte.jpg" width="100%" height="46" vspace=0></td>
+ <td valign="top"><img src="/eg/images/kopf-rechts-engl.jpg" width="568" height="46" vspace=0></td>
+ </tr>
+ <tr>
+ <td colspan=2 valign="top" align=left>
+ <table width="100%" cellspacing="0" cellpadding="0" border="0">
+ <tr>
+ <td align="left" valign="middle"><font size=2><b>
+ [$if @{$r -> {menuitems}} > 1 || $r -> {menuitems}[0]{menu} ne 'Home' $]
+ <a href="[+ $r -> {baseuri} +]">Home</a>
+ [- $i = 0 -]
+ [$foreach $level (@{$r -> {menuitems}}) $]
+ : <a href="[+ $level -> {url} +]">[+ $r -> gettext($level -> {menu}) +]</a>
+ [$endforeach$]
+ [$endif$]
+ </td>
+ <td align="right" valign="middle" height="99%">Suchen: <input type="text" name="search"></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
</table>
No revision
No revision
1.1.2.3 +32 -28 embperl/eg/web/db/Attic/data.epd
Index: data.epd
===================================================================
RCS file: /home/cvs/embperl/eg/web/db/Attic/data.epd,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- data.epd 12 Feb 2002 16:55:01 -0000 1.1.2.2
+++ data.epd 12 Feb 2002 21:02:42 -0000 1.1.2.3
@@ -1,28 +1,32 @@
-[-
-$r = shift ;
-$set = $r -> {item_set} ;
-$escmode = 0 ;
--]
-=pod
-
-=head1 NAME
-
-[+ $r -> {category_set}{category} +]
-
-
-[$ while ($rec = $$set -> Next) $]
-=head1 [+ $rec -> {heading} +]
-
-[+ $rec -> {description} +]
-
-[$endwhile$]
-
-
-
-=head1 fdat
-
-[- use Data::Dumper ; print OUT Dumper (\%fdat) -]
-
-
-
-
+[-
+$r = shift ;
+$set = $r -> {item_set} ;
+$escmode = 0 ;
+-]
+
+=pod
+
+=head1 NAME
+
+[+ $r -> {category_set}{category} +]
+
+[$ while ($rec = $$set -> Next) $]
+
+=head1 [+ $rec -> {heading} +]
+
+[+ $rec -> {description} +]
+[$endwhile$]
+
+=head1 fdat
+
+ [- use Data::Dumper ; print OUT Dumper (\%fdat) -]
+
+
+
+
+
+
+
+
+
+
1.1.2.4 +1 -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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- epwebapp.pl 12 Feb 2002 16:55:01 -0000 1.1.2.3
+++ epwebapp.pl 12 Feb 2002 21:02:42 -0000 1.1.2.4
@@ -58,7 +58,7 @@
my $db = DBIx::Database -> new ({'!DataSource' => $r -> {dbdsn},
'!Username' => $r -> {dbuser},
'!Password' => $r -> {dbpassword},
- '!DBIAttr' => { RaiseError => 1, PrintError => 1 },
+ '!DBIAttr' => { RaiseError => 1, PrintError => 1, LongReadLen => 32765, LongTruncOk => 0, },
}) ;
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org