richter 02/04/07 12:25:04
Modified: . Tag: Embperl2c Changes.pod Old.xs epcmd2.c
test/cmp Tag: Embperl2c escape.htm
test/html Tag: Embperl2c escape.htm
Log:
fixed escmode and print OUT
Revision Changes Path
No revision
No revision
1.129.4.62 +2 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.129.4.61
retrieving revision 1.129.4.62
diff -u -r1.129.4.61 -r1.129.4.62
--- Changes.pod 21 Mar 2002 15:02:43 -0000 1.129.4.61
+++ Changes.pod 7 Apr 2002 19:25:03 -0000 1.129.4.62
@@ -4,6 +4,8 @@
- when setting $r -> param -> filename in an application object
to a relativ path it is interpreted relativ to original request
+ - fix bug with setting of escmode and print Out reported by
+ Eric-Olivier Le Bigot.
=head1 2.0b7 (BETA) 21. Mar. 2002
1.1.2.6 +1 -0 embperl/Attic/Old.xs
Index: Old.xs
===================================================================
RCS file: /home/cvs/embperl/Attic/Old.xs,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Old.xs 29 Jan 2002 09:13:46 -0000 1.1.2.5
+++ Old.xs 7 Apr 2002 19:25:03 -0000 1.1.2.6
@@ -156,6 +156,7 @@
Node_appendChild (DomTree_self (r -> Component.xCurrDomTree), r ->
Component.xCurrNode, r -> Component.nCurrRepeatLevel, ntypCDATA, 0, p, l, 0, 0, NULL)
;
else*/
r -> Component.xCurrNode = Node_insertAfter_CDATA (r->pApp, p, l, (r ->
Component.nCurrEscMode & 3)== 3?1 + (r -> Component.nCurrEscMode & 4):r ->
Component.nCurrEscMode, DomTree_self (r -> Component.xCurrDomTree), r ->
Component.xCurrNode, r -> Component.nCurrRepeatLevel) ;
+ r -> Component.bEscModeSet = -1 ;
}
1.4.2.20 +4 -4 embperl/Attic/epcmd2.c
Index: epcmd2.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcmd2.c,v
retrieving revision 1.4.2.19
retrieving revision 1.4.2.20
diff -u -r1.4.2.19 -r1.4.2.20
--- epcmd2.c 20 Mar 2002 15:31:00 -0000 1.4.2.19
+++ epcmd2.c 7 Apr 2002 19:25:03 -0000 1.4.2.20
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epcmd2.c,v 1.4.2.19 2002/03/20 15:31:00 richter Exp $
+# $Id: epcmd2.c,v 1.4.2.20 2002/04/07 19:25:03 richter Exp $
#
###################################################################################*/
@@ -411,7 +411,7 @@
if (ppSV && *ppSV)
{
s = SV2String (*ppSV, l) ;
- xNode = Node_appendChild (r -> pApp, pDomTree, xOldChild,
nRepeatLevel, ntypText, 0, s, l, 0, 0, NULL) ;
+ xNode = Node_appendChild (r -> pApp, pDomTree, xOldChild,
nRepeatLevel, (r -> Component.nCurrEscMode & 3)?ntypTextHTML:ntypCDATA, 0, s, l, 0, 0,
NULL) ;
if (r -> Component.nCurrEscMode & 2)
Node_selfLevel (r -> pApp, pDomTree, xNode, nRepeatLevel) ->
bFlags |= nflgEscUrl ;
}
@@ -440,7 +440,7 @@
if (i++ > 0)
Node_appendChild (r -> pApp, pDomTree, xOldChild, nRepeatLevel,
ntypCDATA, 0, "&", 5, 0, 0, NULL) ;
pKey = hv_iterkey (pEntry, &l32) ;
- xNode = Node_appendChild (r -> pApp, pDomTree, xOldChild, nRepeatLevel,
ntypText, 0, pKey, l32, 0, 0, NULL) ;
+ xNode = Node_appendChild (r -> pApp, pDomTree, xOldChild, nRepeatLevel,
(r -> Component.nCurrEscMode & 3)?ntypTextHTML:ntypCDATA, 0, pKey, l32, 0, 0, NULL) ;
if (r -> Component.nCurrEscMode & 2)
Node_self (pDomTree, xNode) -> bFlags |= nflgEscUrl ;
@@ -450,7 +450,7 @@
if (pSVValue)
{
s = SV2String (pSVValue, l) ;
- xNode = Node_appendChild (r -> pApp, pDomTree, xOldChild,
nRepeatLevel, ntypText, 0, s, l, 0, 0, NULL) ;
+ xNode = Node_appendChild (r -> pApp, pDomTree, xOldChild,
nRepeatLevel, (r -> Component.nCurrEscMode & 3)?ntypTextHTML:ntypCDATA, 0, s, l, 0, 0,
NULL) ;
if (r -> Component.nCurrEscMode & 2)
Node_selfLevel (r -> pApp, pDomTree, xNode, nRepeatLevel) ->
bFlags |= nflgEscUrl ;
}
No revision
No revision
1.19.4.7 +10 -0 embperl/test/cmp/escape.htm
Index: escape.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/escape.htm,v
retrieving revision 1.19.4.6
retrieving revision 1.19.4.7
diff -u -r1.19.4.6 -r1.19.4.7
--- escape.htm 21 Mar 2002 05:37:51 -0000 1.19.4.6
+++ escape.htm 7 Apr 2002 19:25:04 -0000 1.19.4.7
@@ -179,6 +179,16 @@
5: (this is the value in $a) äöüäöü???<&+
6: (this%20is%20the%20value%20in%20$a)%20������%3F%3F%3F%3C%26%2B%20%20
7: (this is the value in $a) äöüäöü???<&+
+print OUT:
+
+7: éric
+0: �ric
+7: éric
+0: �ric
+7: éric
+0: �ric
+7: éric
+0: �ric
<P>Ok.<P>
No revision
No revision
1.13.4.8 +60 -0 embperl/test/html/escape.htm
Index: escape.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/escape.htm,v
retrieving revision 1.13.4.7
retrieving revision 1.13.4.8
diff -u -r1.13.4.7 -r1.13.4.8
--- escape.htm 21 Mar 2002 05:37:51 -0000 1.13.4.7
+++ escape.htm 7 Apr 2002 19:25:04 -0000 1.13.4.8
@@ -209,6 +209,66 @@
6: [+ $r -> Escape($b, 6) +]
7: [+ $r -> Escape($b, 7) +]
+print OUT:
+
+[-
+local $escmode = 7;
+print OUT "7: �ric\n";
+local $escmode = 0;
+print OUT "0: �ric\n";
+-]
+
+[-
+$escmode = 7;
+print OUT "7: �ric\n";
+$escmode = 0;
+print OUT "0: �ric\n";
+-]
+
+
+[-
+$escmode = 7;
+print OUT "7: �ric\n";
+-]
+
+[-
+$escmode = 0;
+print OUT "0: �ric\n";
+-]
+
+
+[-
+local $escmode = 7;
+print OUT "7: �ric\n";
+-]
+
+
+[-
+local $escmode = 0;
+print OUT "0: �ric\n";
+-]
+
+
+
+
+[-
+$find_if =
+{ '!Table' => 'interface,router',
+'$where' => 'interface.router_id=router.id',
+'!LongNames' => 1,
+ };
+-]
+
+[-
+$escmode = 0;
+-]
+<A HREF="0?[+ $find_if +]">
+
+[-
+$escmode = 7;
+-]
+<A HREF="7?[+ $find_if +]">
+
<P>Ok.<P>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
