Heavy improvements to caching system. Now, if cache is installed the system relays...

[mailer.git] / inc / db / lib-mysql3.php

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 9bf9d9eaf98b8b0036243c2fd122bb6deeaf37b1..14fa713b84649b96421e2456fbdb454ca93f49d3 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -4,11 +4,11 @@
  * ===============                              Last change: 08/29/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
- * File              : lib.php                                          *
+ * File              : lib-mysql3.php                                   *
  * -------------------------------------------------------------------- *
- * Short description :                                                  *
+ * Short description : Database layer for MySQL +3.x server             *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  :                                                  *
+ * Kurzbeschreibung  : Datenbankschicht fuer MySQL +3.x Server          *
  * -------------------------------------------------------------------- *
  *                                                                      *
  * -------------------------------------------------------------------- *
@@ -48,12 +48,16 @@ function SQL_QUERY($sql_string, $F, $L) {
        $querytimeBefore = array_sum(explode(' ', microtime()));
 
        // Run SQL command
+       //* DEBUG: */ echo $sql_string."<br />\n";
        $result = @mysql_query($sql_string, $link)
         or ADD_FATAL($F." (".$L."):".mysql_error()."<br />
 ".MYSQL_QUERY_STRING."<br />
 ".$sql_string);
 
-       // Starting time
+       // Save last successfull query
+       $_CONFIG['db_last_query'] = $sql_string;
+
+       // Ending time
        $querytimeAfter = array_sum(explode(' ', microtime()));
 
        // Calculate query time
@@ -70,24 +74,26 @@ function SQL_QUERY($sql_string, $F, $L) {
                //
                // Debugging stuff...
                //
-               $fp = @fopen(PATH."inc/cache/debug.log", 'a') or mxchange_die("Cannot write debug.log!");
+               $fp = @fopen(PATH."inc/cache/mysql.log", 'a') or mxchange_die("Cannot write mysql.log!");
                if (!isset($OK)) {
                        // Write first entry
                        fwrite($fp, "Module=".$GLOBALS['module']."\n");
                        $OK = true;
-               }
+               } // END - if
                fwrite($fp, $F."(LINE=".$L."|NUM=".SQL_NUMROWS($result)."|AFFECTED=".SQL_AFFECTEDROWS()."|QUERYTIME:".$queryTime."): ".str_replace('\r', "", str_replace('\n', " ", $sql_string))."\n");
                fclose($fp);
-       }
+       } // END - if
 
        // Count DB hits
        if (!isset($_CONFIG['db_hits'])) {
                // Count in dummy variable
-               $_CONFIG['db_hits'] = 0;
+               $_CONFIG['db_hits'] = 1;
        } else {
                // Count to config array
                $_CONFIG['db_hits']++;
        }
+
+       // Return the result
        return $result;
 }
 
@@ -172,25 +178,22 @@ function SQL_SELECT_DB($dbName, $link, $F, $L) {
        return $select;
 }
 // SQL close link
-function SQL_CLOSE($link, $F, $L) {
+function SQL_CLOSE(&$link, $F, $L) {
+       // Is there still a valid link?
+       if (!is_resource($link)) {
+               // Skip double close
+               return false;
+       } // END - if
+
        global $_CONFIG, $cacheInstance, $cacheArray;
        if ((GET_EXT_VERSION("cache") >= "0.0.7") && (isset($_CONFIG['db_hits'])) && (isset($_CONFIG['cache_hits'])) && (is_object($cacheInstance))) {
                // Update counter for db/cache
-               $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET db_hits=%s, cache_hits=%s WHERE config=0 LIMIT 1",
-                       array(bigintval($_CONFIG['db_hits']), bigintval($_CONFIG['cache_hits'])), __FILE__, __LINE__);
-
-               // Update cache here
-               if (GET_EXT_VERSION("cache") >= "0.1.2") {
-                       if ($cacheInstance->cache_file("config", true)) {
-                               // Replace data
-                               $cacheInstance->cache_replace("cache_hits", $_CONFIG['cache_hits'], "0", $cacheArray);
-                               $cacheInstance->cache_replace("db_hits"   , $_CONFIG['db_hits']   , "0", $cacheArray);
-                       }
-               }
-       }
+               UPDATE_CONFIG(array("db_hits", "cache_hits"), array(bigintval($_CONFIG['db_hits']), bigintval($_CONFIG['cache_hits'])));
+       } // END - if
 
-       // Close database link
+       // Close database link and forget the link
        $close = @mysql_close($link) or ADD_FATAL($F." (".$L."):".mysql_error());
+       $link = null;
        return $close;
 }
 // SQL free result
@@ -201,6 +204,7 @@ function SQL_FREERESULT($result) {
 // SQL string escaping
 function SQL_QUERY_ESC($qstring, $data, $file, $line, $run=true, $strip=true) {
        global $link;
+       $query = "";
        $eval = "\$query = sprintf(\"".$qstring."\"";
        foreach ($data as $var) {
                if ((!empty($var)) || ($var === 0)) {
@@ -217,10 +221,15 @@ function SQL_QUERY_ESC($qstring, $data, $file, $line, $run=true, $strip=true) {
        //
        // Debugging
        //
-       //$fp = fopen(PATH."escape_debug.log", 'a') or mxchange_die("Cannot write debug.log!");
-       //fwrite($fp, $file."(".$line."): ".str_replace('\r', "", str_replace('\n', " ", $eval))."\n");
+       //$fp = fopen(PATH."inc/cache/escape_debug.log", 'a') or mxchange_die("Cannot write debug.log!");
+       //fwrite($fp, $file."(".$line."): ".str_replace("\r", "", str_replace("\n", " ", $eval))."\n");
        //fclose($fp);
-       eval($eval);
+       @eval($eval);
+       if (empty($query)) {
+               print "eval=".htmlentities($eval)."<pre>";
+               debug_print_backtrace();
+               die("</pre>");
+       }
        if ($run) {
                // Run SQL query (default)
                return SQL_QUERY($query, $file, $line);