commit 31700e63067962c632d9fa3d7a4d699a657e8e08
author William M. Brack <wbrack@src.gnome.org> Wed Jun 13 20:33:02 2007 +0000
committer William M. Brack <wbrack@src.gnome.org> Wed Jun 13 20:33:02 2007 +0000
tree f55cf78e77a4686d7ff88451ca40c94035065c24
parent 38431c330858906736d95befc1e33933f46194dd

fixed problem in previous fix to xmlXPathNodeSetSort

* xpath.c: fixed problem in previous fix to xmlXPathNodeSetSort

svn path=/trunk/; revision=3640

xpath.c

diff --git a/xpath.c b/xpath.c
index 8f6545a..9c4db87 100644
--- a/xpath.c
+++ b/xpath.c
@@ -3057,7 +3057,8 @@
 		precedence1 = 2; /* element is parent */
 		node1 = node1->parent;
 	    }
-	    if ((node1 == NULL) || (node1->type != XML_ELEMENT_NODE)) {
+	    if ((node1 == NULL) || (node1->type != XML_ELEMENT_NODE) ||
+		(0 <= (long) node1->content)) {
 		/*
 		* Fallback for whatever case.
 		*/
@@ -3194,11 +3195,6 @@
 
 turtle_comparison:
 
-    if (miscNode1 != NULL)
-	node1 = miscNode1;
-    if (miscNode2 != NULL)
-	node2 = miscNode2;
-
     if (node1 == node2->prev)
 	return(1);
     if (node1 == node2->next)