[Astrospaces-commits] SF.net SVN: astrospaces: [63] trunk/functions

[<cal...@us...>]

Revision: 63
          http://astrospaces.svn.sourceforge.net/astrospaces/?rev=63&view=rev
Author:   caleb870
Date:     2007-07-30 17:54:55 -0700 (Mon, 30 Jul 2007)

Log Message:
-----------
Moved remotely

Added Paths:
-----------
    trunk/functions/adodb/adodb-errorpear.inc.php

Removed Paths:
-------------
    trunk/functions/adodb-errorpear.inc.php

Copied: trunk/functions/adodb/adodb-errorpear.inc.php (from rev 62, trunk/functions/adodb-errorpear.inc.php)
===================================================================
--- trunk/functions/adodb/adodb-errorpear.inc.php	                        (rev 0)
+++ trunk/functions/adodb/adodb-errorpear.inc.php	2007-07-31 00:54:55 UTC (rev 63)
@@ -0,0 +1,87 @@
+<?php
+/** 
+ * @version V4.66 28 Sept 2005 (c) 2000-2005 John Lim (jl...@na...). All rights reserved.
+ * Released under both BSD license and Lesser GPL library license. 
+ * Whenever there is any discrepancy between the two licenses, 
+ * the BSD license will take precedence. 
+ *
+ * Set tabs to 4 for best viewing.
+ * 
+ * Latest version is available at http://php.weblogs.com
+ * 
+*/
+include_once('PEAR.php');
+
+if (!defined('ADODB_ERROR_HANDLER'))
+	define('ADODB_ERROR_HANDLER','ADODB_Error_PEAR');
+
+/*
+* Enabled the following if you want to terminate scripts when an error occurs
+*/
+//PEAR::setErrorHandling (PEAR_ERROR_DIE);
+
+/*
+* Name of the PEAR_Error derived class to call.
+*/
+if (!defined('ADODB_PEAR_ERROR_CLASS'))
+	define('ADODB_PEAR_ERROR_CLASS','PEAR_Error');
+
+/*
+* Store the last PEAR_Error object here
+*/
+global $ADODB_Last_PEAR_Error;
+
+$ADODB_Last_PEAR_Error = false;
+
+  /**
+* Error Handler with PEAR support. This will be called with the following params
+*
+* @param $dbms		the RDBMS you are connecting to
+* @param $fn		the name of the calling function (in uppercase)
+* @param $errno		the native error number from the database 
+* @param $errmsg	the native error msg from the database
+* @param $p1		$fn specific parameter - see below
+* @param $P2		$fn specific parameter - see below
+	*/
+function ADODB_Error_PEAR($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
+{
+	global $ADODB_Last_PEAR_Error;
+
+	if (error_reporting() == 0)
+		return; // obey @ protocol
+
+	switch($fn) {
+		case 'EXECUTE':
+			$sql = $p1;
+			$inputparams = $p2;
+			$s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")";
+			break;
+
+		case 'PCONNECT':
+		case 'CONNECT':
+			$host = $p1;
+			$database = $p2;
+			$s = "$dbms error: [$errno: $errmsg] in $fn('$host', ?, ?, '$database')";
+			break;
+
+		default:
+			$s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)";
+			break;
+	}
+
+	$class = ADODB_PEAR_ERROR_CLASS;
+	$ADODB_Last_PEAR_Error = new $class($s, $errno, $GLOBALS['_PEAR_default_error_mode'], $GLOBALS['_PEAR_default_error_options'], $errmsg);
+	//print "<p>!$s</p>";
+}
+
+/**
+* Returns last PEAR_Error object. This error might be for an error that
+* occured several sql statements ago.
+*/
+function &ADODB_PEAR_Error()
+{
+	global $ADODB_Last_PEAR_Error;
+
+	return $ADODB_Last_PEAR_Error;
+}
+?>
\ No newline at end of file

Deleted: trunk/functions/adodb-errorpear.inc.php
===================================================================
--- trunk/functions/adodb-errorpear.inc.php	2007-07-31 00:54:43 UTC (rev 62)
+++ trunk/functions/adodb-errorpear.inc.php	2007-07-31 00:54:55 UTC (rev 63)
@@ -1,87 +0,0 @@
-<?php
-/** 
- * @version V4.66 28 Sept 2005 (c) 2000-2005 John Lim (jl...@na...). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
- * Whenever there is any discrepancy between the two licenses, 
- * the BSD license will take precedence. 
- *
- * Set tabs to 4 for best viewing.
- * 
- * Latest version is available at http://php.weblogs.com
- * 
-*/
-include_once('PEAR.php');
-
-if (!defined('ADODB_ERROR_HANDLER'))
-	define('ADODB_ERROR_HANDLER','ADODB_Error_PEAR');
-
-/*
-* Enabled the following if you want to terminate scripts when an error occurs
-*/
-//PEAR::setErrorHandling (PEAR_ERROR_DIE);
-
-/*
-* Name of the PEAR_Error derived class to call.
-*/
-if (!defined('ADODB_PEAR_ERROR_CLASS'))
-	define('ADODB_PEAR_ERROR_CLASS','PEAR_Error');
-
-/*
-* Store the last PEAR_Error object here
-*/
-global $ADODB_Last_PEAR_Error;
-
-$ADODB_Last_PEAR_Error = false;
-
-  /**
-* Error Handler with PEAR support. This will be called with the following params
-*
-* @param $dbms		the RDBMS you are connecting to
-* @param $fn		the name of the calling function (in uppercase)
-* @param $errno		the native error number from the database 
-* @param $errmsg	the native error msg from the database
-* @param $p1		$fn specific parameter - see below
-* @param $P2		$fn specific parameter - see below
-	*/
-function ADODB_Error_PEAR($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
-{
-	global $ADODB_Last_PEAR_Error;
-
-	if (error_reporting() == 0)
-		return; // obey @ protocol
-
-	switch($fn) {
-		case 'EXECUTE':
-			$sql = $p1;
-			$inputparams = $p2;
-			$s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")";
-			break;
-
-		case 'PCONNECT':
-		case 'CONNECT':
-			$host = $p1;
-			$database = $p2;
-			$s = "$dbms error: [$errno: $errmsg] in $fn('$host', ?, ?, '$database')";
-			break;
-
-		default:
-			$s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)";
-			break;
-	}
-
-	$class = ADODB_PEAR_ERROR_CLASS;
-	$ADODB_Last_PEAR_Error = new $class($s, $errno, $GLOBALS['_PEAR_default_error_mode'], $GLOBALS['_PEAR_default_error_options'], $errmsg);
-	//print "<p>!$s</p>";
-}
-
-/**
-* Returns last PEAR_Error object. This error might be for an error that
-* occured several sql statements ago.
-*/
-function &ADODB_PEAR_Error()
-{
-	global $ADODB_Last_PEAR_Error;
-
-	return $ADODB_Last_PEAR_Error;
-}
-?>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.