Major changes:

getAttribute('foo', true) now puts you on the attribute, not the element node
cleaned up the XML_XPath_result initialization (no longer create an StdClass when calling class)
fixed sorting for childNodes() and getElementsByTagName() generated result objects
cleaned up sorting in result object, and added comments (so I don't forget again how I did it)
major speed enhancements (calling user defined functions methods is slow, so tried to trim that down)
don't create a result object in the _quick_evaluate function since we don't need it anyway
enabled relative xpath queries differently, in_xpathQuery = array(query, node) for relative...
added relative xpath queries for the _quick_evaluate feature
anything else I just can't remember I will mention in my next commit


git-svn-id: http://svn.php.net/repository/pear/packages/XML_XPath/trunk@85012 c90b9560-bf6c-de11-be94-00142212c4b1

XPath.php

@@ -41,13 +41,14 @@
 define('XML_XPATH_NO_DOM',                 -5);
 define('XML_XPATH_INVALID_INDEX',          -6);
 define('XML_XPATH_INVALID_NODESET',        -7);
-define('XML_XPATH_NOT_LOADED',             -8);
-define('XML_XPATH_INVALID_NODETYPE',       -9);
-define('XML_XPATH_FILE_NOT_WRITABLE',     -10);
-define('XML_XPATH_NODE_REQUIRED',         -11);
-define('XML_XPATH_INDEX_SIZE',            -12);
-define('XML_PARSE_ERROR',                 -13);
-define('XML_DUPLICATE_ROOT',              -14);
+define('XML_XPATH_NULL_POINTER',           -8);
+define('XML_XPATH_NOT_LOADED',             -9);
+define('XML_XPATH_INVALID_NODETYPE',      -10);
+define('XML_XPATH_FILE_NOT_WRITABLE',     -11);
+define('XML_XPATH_NODE_REQUIRED',         -12);
+define('XML_XPATH_INDEX_SIZE',            -13);
+define('XML_PARSE_ERROR',                 -14);
+define('XML_DUPLICATE_ROOT',              -15);
 
 // }}}
 // {{{ includes
@@ -191,31 +192,43 @@ function getOne($in_xpathQuery, $in_movePointer = false)
      * @access public
      * @return object result object {or XML_XPath_Error exception}
      */
-    function evaluate($in_xpathQuery, $in_movePointer = false, $in_relative = false) 
+    function &evaluate($in_xpathQuery, $in_movePointer = false) 
     {
         // Make sure we have loaded an xml document and were able to create an xpath context
-        if (!is_a_php_class($this->ctx, 'xpathcontext')) {
+        if (get_class($this->ctx) != 'XPathContext') {
             return PEAR::raiseError(null, XML_XPATH_NOT_LOADED, null, E_USER_ERROR, null, 'XML_XPath_Error', true);
         }
 
-        if ($in_relative) {
+        // enable relative xpath queries (I don't check a valid dom object yet)
+        settype($in_xpathQuery, 'array');
+        if (isset($in_xpathQuery[1])) {
             $sep = '/';
             // those double slashes cause an anomally
-            if (substr($in_xpathQuery, 0, 2) == '//') {
+            if (substr($in_xpathQuery[0], 0, 2) == '//') {
                 $sep = '';
             }
+            
+            if ($in_xpathQuery[1] == 'current()') {
+                $in_xpathQuery[1] = $this->getNodePath($this->pointer);
+            }
+            else {
+                $in_xpathQuery[1] = $this->getNodePath($in_xpathQuery[1]);
+            }
 
-            $in_xpathQuery = $this->getNodePath($this->pointer) . $sep . $in_xpathQuery;
+            $xpathQuery = $in_xpathQuery[1] . $sep . $in_xpathQuery[0];
+        }
+        else {
+            $xpathQuery = reset($in_xpathQuery);
         }
 
-        if (!$result = @xpath_eval($this->ctx, $in_xpathQuery)) {
-            return PEAR::raiseError(null, XML_XPATH_INVALID_QUERY, null, E_USER_WARNING, "XML_XPath query: $in_xpathQuery", 'XML_XPath_Error', true);
+        if (!$result = @xpath_eval($this->ctx, $xpathQuery)) {
+            return PEAR::raiseError(null, XML_XPATH_INVALID_QUERY, null, E_USER_WARNING, "XML_XPath query: $xpathQuery", 'XML_XPath_Error', true);
         }
 
-        $resultObj = new XML_XPath_result($result, $in_xpathQuery, $this->xml, $this->ctx);
+        $resultObj =& new XML_XPath_result($result->type == XPATH_NODESET ? $result->nodeset : $result->value, $result->type, $xpathQuery, $this->ctx);
 
-        if ($in_movePointer && $resultObj->resultType() == XPATH_NODESET && $resultObj->numResults()) {
-            $this->setPointer($resultObj->getPointer());
+        if ($in_movePointer && $result->type == XPATH_NODESET && !empty($result->nodeset)) {
+            $this->pointer = reset($result->nodeset);
         }
 
         return $resultObj;
@@ -265,6 +278,7 @@ function errorMessage($in_value)
                 XML_XPATH_INVALID_INDEX         => 'invalid index',
                 XML_XPATH_INVALID_NODESET       => 'requires nodeset and one of appropriate type',
                 XML_XPATH_NOT_LOADED            => 'DomDocument has not been loaded',
+                XML_XPATH_NULL_POINTER          => 'Null pointer, probably due to empty result object',
                 XML_XPATH_INVALID_NODETYPE      => 'invalid nodetype for requested feature',
                 XML_XPATH_FILE_NOT_WRITABLE     => 'file could not be written',
                 XML_XPATH_NODE_REQUIRED         => 'DomNode required for operation',