--- trunk/xx_pgsql.php	2004/03/04 21:42:17	39
+++ trunk/xx_pgsql.php	2004/03/04 22:43:17	41
@@ -42,9 +42,12 @@
 }
 
 function xx_fetch_array ($rs) {
-	XXX_debug("xx_fetch_array row: ".$GLOBALS["xx_element_nr"]);
-	$arr = @pg_fetch_array($rs, $GLOBALS["xx_element_nr"]);
-	$GLOBALS["xx_element_nr"]++;
+	if ($GLOBALS["xx_element_nr $rs"] > pg_num_rows($rs)) {
+		return;
+	}
+	XXX_debug("xx_fetch_array ($rs) row: ".$GLOBALS["xx_element_nr $rs"]);
+	$arr = @pg_fetch_array($rs, $GLOBALS["xx_element_nr $rs"]);
+	$GLOBALS["xx_element_nr $rs"]++;
 	return $arr;
 }
 
@@ -111,12 +114,13 @@
 
 	$sql = preg_replace('/password\(([^\)]+)\)/is', 'md5(\\1)', $sql);
 
-	$GLOBALS["xx_element_nr"] = 0;
 	$GLOBALS["pg_last_sql"] = $sql;
 
 	XXX_debug("xx_query [transformed]: $sql");
 
 	$ret = pg_query($con, $sql);
+	
+	$GLOBALS["xx_element_nr $ret"] = 0;
 
 	$GLOBALS["pg_last_oid"] = pg_last_oid($ret);
 	if ($ret) {