richter 02/05/21 05:09:08
Modified: . Tag: Embperl2c DOM.xs epapinit.c epdom.c epdom.h
Embperl/Syntax Tag: Embperl2c Test2.pm
test/cmp Tag: Embperl2c changeattr.htm
test/html Tag: Embperl2c changeattr.htm
Log:
-
Revision Changes Path
No revision
No revision
1.1.2.27 +3 -3 embperl/DOM.xs
Index: DOM.xs
===================================================================
RCS file: /home/cvs/embperl/DOM.xs,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -r1.1.2.26 -r1.1.2.27
--- DOM.xs 2 Mar 2002 19:55:46 -0000 1.1.2.26
+++ DOM.xs 21 May 2002 12:09:07 -0000 1.1.2.27
@@ -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.26 2002/03/02 19:55:46 richter Exp $
+# $Id: DOM.xs,v 1.1.2.27 2002/05/21 12:09:07 richter Exp $
#
###################################################################################
@@ -347,7 +347,7 @@
pDomTree = DomTree_self (pAttr -> xDomTree) ;
Attr_selfValue (r -> pApp, pDomTree, Attr_self(pDomTree, pAttr -> xNode), r ->
Component.nCurrRepeatLevel, &sAttrText) ;
- RETVAL = newSVpv (sAttrText, ArrayGetSize (r -> pApp, sAttrText)) ;
+ RETVAL = sAttrText?newSVpv (sAttrText, 0):&sv_undef ;
StringFree (r -> pApp, &sAttrText) ;
OUTPUT:
RETVAL
@@ -368,7 +368,7 @@
pAttr = Attr_self(pDomTree, xAttr) ;
Attr_selfValue (r -> pApp, pDomTree, pAttr , r -> Component.nCurrRepeatLevel,
&sAttrText) ;
- RETVAL = newSVpv (sAttrText, ArrayGetSize (r -> pApp, sAttrText)) ;
+ RETVAL = sAttrText?newSVpv (sAttrText, 0):&sv_undef ;
StringFree (r -> pApp, &sAttrText) ;
OUTPUT:
RETVAL
1.1.2.36 +14 -3 embperl/epapinit.c
Index: epapinit.c
===================================================================
RCS file: /home/cvs/embperl/epapinit.c,v
retrieving revision 1.1.2.35
retrieving revision 1.1.2.36
diff -u -r1.1.2.35 -r1.1.2.36
--- epapinit.c 20 May 2002 12:59:09 -0000 1.1.2.35
+++ epapinit.c 21 May 2002 12:09:07 -0000 1.1.2.36
@@ -10,20 +10,31 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epapinit.c,v 1.1.2.35 2002/05/20 12:59:09 richter Exp $
+# $Id: epapinit.c,v 1.1.2.36 2002/05/21 12:09:07 richter Exp $
#
###################################################################################*/
#include "ep.h"
-#include <http_core.h>
/* use getenv from runtime library and not from Perl */
#undef getenv
#undef getpid
-//#define gettid GetCurrentThreadId
#ifdef APACHE
+
+#include <http_core.h>
+
+#ifndef gettid
+#ifdef WIN32
+#define gettid GetCurrentThreadId
+#else
+static int gettid()
+ {
+ return 0 ;
+ }
+#endif
+#endif
static int bApDebug = 0 ;
1.4.2.89 +16 -5 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.4.2.88
retrieving revision 1.4.2.89
diff -u -r1.4.2.88 -r1.4.2.89
--- epdom.c 20 May 2002 07:04:24 -0000 1.4.2.88
+++ epdom.c 21 May 2002 12:09:07 -0000 1.4.2.89
@@ -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.88 2002/05/20 07:04:24 richter Exp $
+# $Id: epdom.c,v 1.4.2.89 2002/05/21 12:09:07 richter Exp $
#
###################################################################################*/
@@ -3017,7 +3017,7 @@
if (pNode -> xNext == pNode -> xNdx)
return NULL ;
- if ((pParent = Node_self (pDomTree, pNode -> xParent)) != NULL)
+ if ((pParent = Node_selfLevel (a, pDomTree, pNode -> xParent, nRepeatLevel)) !=
NULL)
{
if (pParent -> xChilds == pNode -> xNext)
return NULL ;
@@ -3059,7 +3059,7 @@
if (pNode -> xNext == pNode -> xNdx)
return 0 ;
- pParent = Node_self (pDomTree, pNode -> xParent) ;
+ pParent = Node_selfLevel (a, pDomTree, pNode -> xParent, nRepeatLevel) ;
if (pParent -> xChilds == pNode -> xNext)
return 0 ;
@@ -3087,7 +3087,7 @@
if (pNode -> xPrev == pNode -> xNdx)
return 0 ;
- pParent = Node_self (pDomTree, pNode -> xParent) ;
+ pParent = Node_selfLevel (a, pDomTree, pNode -> xParent, nRepeatLevel) ;
if (pParent -> xChilds == pNode -> xNdx)
return 0 ;
@@ -3120,7 +3120,7 @@
if (pNode -> xPrev == pNode -> xNdx)
return 0 ;
- pParent = Node_self (pDomTree, pNode -> xParent) ;
+ pParent = Node_selfLevel (a, pDomTree, pNode -> xParent, nRepeatLevel) ;
if (pParent -> xChilds == pNode -> xNdx)
return 0 ;
@@ -3793,9 +3793,20 @@
{
struct tNodeData * pNode ;
+ struct tNodeData * pAttrNode ;
if (!pAttr)
return NULL ;
+
+ pAttrNode = Attr_selfNode(pAttr) ;
+ pNode = Node_selfLevel (a, pDomTree, pAttrNode -> xNdx, nRepeatLevel) ;
+ if (pNode != pAttrNode)
+ {
+ pAttr = Element_selfGetAttribut (a, pDomTree, pNode, NULL, pAttr -> xName) ;
+ if (!pAttr)
+ return NULL ;
+ }
+
if (!(pAttr -> bFlags & aflgAttrChilds))
return Ndx2String (pAttr -> xValue) ;
1.4.2.50 +2 -1 embperl/Attic/epdom.h
Index: epdom.h
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.h,v
retrieving revision 1.4.2.49
retrieving revision 1.4.2.50
diff -u -r1.4.2.49 -r1.4.2.50
--- epdom.h 27 Feb 2002 11:58:23 -0000 1.4.2.49
+++ epdom.h 21 May 2002 12:09:08 -0000 1.4.2.50
@@ -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.49 2002/02/27 11:58:23 richter Exp $
+# $Id: epdom.h,v 1.4.2.50 2002/05/21 12:09:08 richter Exp $
#
###################################################################################*/
@@ -464,6 +464,7 @@
#endif
#define xNode_selfLevelNull(pDomTree,pNode) ((pDomTree) ->
pLookup[(pNode)->xNdx].pLookupLevel?(pDomTree) -> pLookup[(pNode)->xNdx].pLookupLevel
-> xNullNode:(pNode) -> xNdx)
+#define xNode_levelNull(pDomTree,xNode) ((pDomTree) ->
pLookup[(xNode)].pLookupLevel?(pDomTree) -> pLookup[(xNode)].pLookupLevel ->
xNullNode:(xNode))
#define Node_parentNode(a,pDomTree,xNode,nLevel)
(Node_selfLevel(a,pDomTree,xNode,nLevel)->xParent)
No revision
No revision
1.1.2.3 +1 -1 embperl/Embperl/Syntax/Attic/Test2.pm
Index: Test2.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/Test2.pm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Test2.pm 17 May 2002 14:07:02 -0000 1.1.2.2
+++ Test2.pm 21 May 2002 12:09:08 -0000 1.1.2.3
@@ -51,5 +51,5 @@
sub rewrite_url
{
warn "rewrite_url got $_[0]\n" ;
- return "12";
+ return "**$_[0]**12**";
}
No revision
No revision
1.1.2.2 +9 -4 embperl/test/cmp/Attic/changeattr.htm
Index: changeattr.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/changeattr.htm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- changeattr.htm 17 May 2002 14:07:02 -0000 1.1.2.1
+++ changeattr.htm 21 May 2002 12:09:08 -0000 1.1.2.2
@@ -1,18 +1,23 @@
<!-- 1 qq -->
-<qq href="12">dairy</qq>
+<qq href="**ab**12**">dairy</qq>
<!-- 2 qq -->
-<qq href="12">dairy</qq>
+<qq href="**http://dairy milk**12**">dairy</qq>
<!-- 1 a -->
-<a href="12">dairy</a>
+<a href="**ab**12**">dairy</a>
<!-- 2 a -->
-<a href="12">dairy</a>
+<a href="**http://dairy milk**12**">dairy</a>
+
+<!-- foreach a -->
+
+<a href="**a**12**">XX</a>
+<a href="**b**12**">XX</a>
<!-- end -->
No revision
No revision
1.1.2.3 +3 -0 embperl/test/html/Attic/changeattr.htm
Index: changeattr.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/Attic/changeattr.htm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- changeattr.htm 21 May 2002 07:48:31 -0000 1.1.2.2
+++ changeattr.htm 21 May 2002 12:09:08 -0000 1.1.2.3
@@ -1,6 +1,7 @@
[$ syntax + Test2 $]
+
[- $candy = "http://dairy milk"; -]
<!-- 1 qq -->
@@ -19,10 +20,12 @@
<a href="[+ $candy +]">dairy</a>
+
<!-- foreach a -->
[$ foreach $s ('a','b') $]
<a href="[+ $s +]">XX</a>
[$ endforeach $]
+
<!-- end -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
