Changeset 8222 for sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/adodb-iterator.inc.php

Timestamp:

09/26/13 15:41:49 (11 years ago)

Author:

angelo

Message:

Ticket #3491 - Compatibilizar Expresso com novas versoes do PHP

File:

• sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/adodb-iterator.inc.php (modified) (2 diffs)

sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/adodb-iterator.inc.php

@@ -2 +2 @@
 
 /*
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V5.18 3 Sep 2012   (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
@@ -19 +19 @@
                 
         Iterator code based on http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2
+        
+        
+        Moved to adodb.inc.php to improve performance.
  */
  
 
- class ADODB_Iterator implements Iterator {
 
-    private $rs;
-
-    function __construct($rs) 
-        {
-        $this->rs = $rs;
-    }
-    function rewind() 
-        {
-        $this->rs->MoveFirst();
-    }
-
-        function valid() 
-        {
-        return !$this->rs->EOF;
-    }
-        
-    function key() 
-        {
-        return $this->rs->_currentRow;
-    }
-        
-    function current() 
-        {
-        return $this->rs->fields;
-    }
-        
-    function next() 
-        {
-        $this->rs->MoveNext();
-    }
-        
-        function __call($func, $params)
-        {
-                return call_user_func_array(array($this->rs, $func), $params);
-        }
-
-        
-        function hasMore()
-        {
-                return !$this->rs->EOF;
-        }
-
-}
-
-
-class ADODB_BASE_RS implements IteratorAggregate {
-    function getIterator() {
-        return new ADODB_Iterator($this);
-    }
-        
-        /* this is experimental - i don't really know what to return... */
-        function __toString()
-        {
-                include_once(ADODB_DIR.'/toexport.inc.php');
-                return _adodb_export($this,',',',',false,true);
-        }
-}