translate_path() only needs one parameters. remove unused second one

[phpfspot.git] / phpfspot_db.php

diff --git a/phpfspot_db.php b/phpfspot_db.php
index 11ce7c8fc6c970222c06db572a64ec70ae9f9816..90fdb8cc17392088a0d83763b7508b940dc764ce 100644 (file)
--- a/phpfspot_db.php
+++ b/phpfspot_db.php
@@ -2,8 +2,9 @@
 
 /***************************************************************************
  *
 
 /***************************************************************************
  *

- * Copyright (c) by Andreas Unterkircher, unki@netshadow.at
- * All rights reserved
+ * phpfspot, presents your F-Spot photo collection in Web browsers.
+ *
+ * Copyright (c) by Andreas Unterkircher

  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by


@@ -21,6 +22,10 @@
  *
  ***************************************************************************/
 
  *
  ***************************************************************************/
 

+/**
+ * PHPFSPOT_DB class
+ * @package phpfspot
+ */

 class PHPFSPOT_DB {
 
    private $db;
 class PHPFSPOT_DB {
 
    private $db;


@@ -28,6 +33,7 @@ class PHPFSPOT_DB {
    private $parent;
    private $is_connected;
    private $last_error;
    private $parent;
    private $is_connected;
    private $last_error;

+   private $last_query;

 
    /**
     * PHPFSPOT_DB class constructor
 
    /**
     * PHPFSPOT_DB class constructor


@@ -36,13 +42,15 @@ class PHPFSPOT_DB {
     */
    public function __construct($parent, $db_path)
    {
     */
    public function __construct($parent, $db_path)
    {

-      $this->parent = $parent;
+      global $phpfspot;
+
+      $this->parent = $phpfspot;

       $this->db_path = $db_path;
 
       /* We are starting disconnected */
       $this->setConnStatus(false);
 
       $this->db_path = $db_path;
 
       /* We are starting disconnected */
       $this->setConnStatus(false);
 

-      /* Connect to MySQL Database */
+      /* Connect to database */

       $this->db_connect();
 
    } // __construct()
       $this->db_connect();
 
    } // __construct()


@@ -61,7 +69,7 @@ class PHPFSPOT_DB {
    /**
     * PHPFSPOT_DB database connect
     *
    /**
     * PHPFSPOT_DB database connect
     *

-    * This function will connect to the database via MDB2
+    * This function will connect to the database

     */
    private function db_connect()
    {
     */
    private function db_connect()
    {


@@ -72,6 +80,7 @@ class PHPFSPOT_DB {
                $this->setConnStatus(false);
             }
             else {
                $this->setConnStatus(false);
             }
             else {

+               sqlite3_create_function($this->db, 'basename', 1, 'basename');

                $this->setConnStatus(true);
             }
             break;
                $this->setConnStatus(true);
             }
             break;


@@ -118,6 +127,8 @@ class PHPFSPOT_DB {
    public function db_query($query = "")
    {
       if($this->getConnStatus()) {
    public function db_query($query = "")
    {
       if($this->getConnStatus()) {

+   
+         $this->last_query = $query;

 
          switch($this->parent->cfg->db_access) {
             case 'native':
 
          switch($this->parent->cfg->db_access) {
             case 'native':


@@ -153,6 +164,8 @@ class PHPFSPOT_DB {
    {
       if($this->getConnStatus()) {
 
    {
       if($this->getConnStatus()) {
 

+         $this->last_query = $query;
+

          switch($this->parent->cfg->db_access) {
             case 'native':
                if(($result = sqlite3_exec($this->db, $query)) === false)
          switch($this->parent->cfg->db_access) {
             case 'native':
                if(($result = sqlite3_exec($this->db, $query)) === false)


@@ -197,10 +210,10 @@ class PHPFSPOT_DB {
          $result = $this->db_query($query);
          switch($this->parent->cfg->db_access) {
             case 'native':
          $result = $this->db_query($query);
          switch($this->parent->cfg->db_access) {
             case 'native':

-               $row = $result->fetchRow();
+               $row = $this->db_fetch_object($result);

                break;
             case 'pdo':
                break;
             case 'pdo':

-               $row = $result[0];
+               $row = $result->fetch();

                break;
          }
          return $row;
                break;
          }
          return $row;


@@ -229,19 +242,6 @@ class PHPFSPOT_DB {
 
    } // db_getNumRows()
 
 
    } // db_getNumRows()
 

-   /**
-    * PHPFSPOT_DB get primary key
-    *
-    * This function returns the primary key of the last
-    * operated insert SQL query.
-    */
-   public function db_getid()
-   {
-      /* Get the last primary key ID from execute query */
-      return mysql_insert_id($this->db->connection);
-      
-   } // db_getid()
-

    /**
     * PHPFSPOT_DB check table exists
     *
    /**
     * PHPFSPOT_DB check table exists
     *


@@ -308,6 +308,7 @@ class PHPFSPOT_DB {
    private function ThrowError($string)
    {
       if(!defined('DB_NOERROR'))  {
    private function ThrowError($string)
    {
       if(!defined('DB_NOERROR'))  {

+         print "Error during query: ". $this->last_query ."<br /><br />\n";

          print "<br /><br />". $string ."<br /><br />\n";
          try {
             throw new Exception;
          print "<br /><br />". $string ."<br /><br />\n";
          try {
             throw new Exception;