Changeset 67

Timestamp:

03/11/2009 10:41:24 AM (3 years ago)

Author:

ofer

Message:

Updated database structure a bit, need to discuss some code there as I added a few TODOs

File:

• trunk/WordPress/plugin/transposh/transposh.php (modified) (7 diffs)

trunk/WordPress/plugin/transposh/transposh.php

@@ -42 +42 @@
 
 //Database version
-define("DB_VERSION", "1.0");
+define("DB_VERSION", "1.01");
 
 //Constant used as key in options database
@@ -287 +287 @@
         return;
     }
-    
+
 
     $overlib_dir = "$plugin_url/js/overlibmws";
@@ -588 +588 @@
 function setup_db()
 {
-
-    global $wpdb;
+    logger("Enter " . __METHOD__  );
+        global $wpdb;
     require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
-    $table_name = $wpdb->prefix . TRANSLATIONS_TABLE;
-
-    if($wpdb->get_var("SHOW TABLES LIKE '$table_name'") != $table_name)
-    {
+    $installed_ver = get_option(TRANSPOSH_DB_VERSION);
+
+    if( $installed_ver != DB_VERSION ) {
+                $table_name = $wpdb->prefix . TRANSLATIONS_TABLE;
+
+    //if($wpdb->get_var("SHOW TABLES LIKE '$table_name'") != $table_name)
+    //{
         logger("Attempting to create table $table_name", 0);
-        $sql = "CREATE TABLE " . $table_name . " (original VARCHAR(256) NOT NULL,
-                                                  lang CHAR(5) NOT NULL,
-                                                  translated VARCHAR(256),
-                                                  PRIMARY KEY (original, lang)) ";
+        $sql = "CREATE TABLE $table_name (original VARCHAR(256) NOT NULL,
+                                lang CHAR(5) NOT NULL,
+                                translated VARCHAR(256),
+                                source TINYINT NOT NULL,
+                                PRIMARY KEY (original, lang)) ";
 
 
@@ -606 +610 @@
 
         //Verify that newly created table is ready for use.
-        $insert = "INSERT INTO " . $table_name . " (original, translated, lang) " .
-        "VALUES ('Hello','Hi There','zz')";
-
-        $result = $wpdb->query($insert);
-
-        if($result === FALSE)
-        {
-            logger("Error failed to create $table_name !!!", 0);
-        }
-        else
-        {
-            logger("Table $table_name was created successfuly", 0);
-            add_option(TRANSPOSH_DB_VERSION, DB_VERSION);
-        }
-    }
-
-    $table_name = $wpdb->prefix . TRANSLATIONS_LOG;
-
-    if($wpdb->get_var("SHOW TABLES LIKE '$table_name'") != $table_name)
-    {
+        //$insert = "INSERT INTO " . $table_name . " (original, translated, lang) " .
+        //"VALUES ('Hello','Hi There','zz')";
+
+        //$result = $wpdb->query($insert);
+
+        //if($result === FALSE)
+        //{
+            //logger("Error failed to create $table_name !!!", 0);
+        //}
+        //else
+        //{
+                // logger("Table $table_name was created successfuly", 0);
+        //}
+    //}
+
+        $table_name = $wpdb->prefix . TRANSLATIONS_LOG;
+
+    //if($wpdb->get_var("SHOW TABLES LIKE '$table_name'") != $table_name)
+    //{
         logger("Attempting to create table $table_name", 0);
         $sql = "CREATE TABLE " . $table_name . " (original VARCHAR(256) NOT NULL,
@@ -636 +639 @@
 
         dbDelta($sql);
+        // TODO: check
+                update_option(TRANSPOSH_DB_VERSION, DB_VERSION);
     }
 
@@ -731 +736 @@
     logger("Enter " . __METHOD__, 3);
 
+    $db_version = get_option(TRANSPOSH_DB_VERSION);
+
+    if ($db_version != DB_VERSION)
+    {
+        setup_db();
+        //$admin_msg = "Translation database version ($db_version) is not comptabile with this plugin (". DB_VERSION . ")  <br>";
+
+        logger("Updating database in plugin loaded", 0);
+        //Some error occured - notify admin and deactivate plugin
+        //add_action('admin_notices', 'plugin_install_error');
+    }
+
+    // TODO: This is wrong? and also deactivation fails
     if (get_option(TRANSPOSH_DB_VERSION) == NULL)
     {
@@ -740 +758 @@
     }
 
-    $db_version = get_option(TRANSPOSH_DB_VERSION);
-
-    if ($db_version != DB_VERSION)
-    {
-        $admin_msg = "Translation database version ($db_version) is not comptabile with this plugin (". DB_VERSION . ")  <br>";
-
-        logger("Messsage to admin: $admin_msg", 0);
-        //Some error occured - notify admin and deactivate plugin
-        add_action('admin_notices', 'plugin_install_error');
-    }
-}
-
-/*
- * Gets the plugin name to be used in activation/decativation hooks. 
+}
+
+/*
+ * Gets the plugin name to be used in activation/decativation hooks.
  * Keep only the file name and its containing directory. Don't use the full
- * path as it will break when using symbollic links. 
+ * path as it will break when using symbollic links.
  */
 function get_plugin_name()
 {
-        $file = __FILE__;       
+        $file = __FILE__;
         $file = str_replace('\\','/',$file); // sanitize for Win32 installs
         $file = preg_replace('|/+|','/', $file); // remove any duplicate slash
-        
+
         //keep only the file name and its parent directory
         $file = preg_replace('/.*\/([^\/]+\/[^\/]+)$/', '$1', $file);