Changeset 660 for trunk

Timestamp:

08/13/2011 02:20:09 AM (9 months ago)

Author:

ofer

Message:

Added remove duplication from translation to maint, and a killer bug when memcached is installed but the db was down

Location:

trunk/WordPress/plugin/transposh/wp

Files:

• transposh_admin.php (modified) (1 diff)
• transposh_db.php (modified) (3 diffs)

trunk/WordPress/plugin/transposh/wp/transposh_admin.php

@@ -232 +232 @@
         }
 
-        if (!(class_exists('Memcache') && @$this->memcache->connect(TP_MEMCACHED_SRV, TP_MEMCACHED_PORT)) && !function_exists('apc_fetch') && !function_exists('xcache_get') && !function_exists('eaccelerator_get')) {
+        if (!(class_exists('Memcache') /*!!&& $this->memcache->connect(TP_MEMCACHED_SRV, TP_MEMCACHED_PORT)*/) && !function_exists('apc_fetch') && !function_exists('xcache_get') && !function_exists('eaccelerator_get')) {
             $this->add_warning('tp_cache_warning', __('We were not able to find a supported in-memory caching engine, installing one can improve performance.', TRANSPOSH_TEXT_DOMAIN) . ' <a href="http://transposh.org/faq#performance">' . __('Check Transposh FAQs', TRANSPOSH_TEXT_DOMAIN) . '</a>');
         }

trunk/WordPress/plugin/transposh/wp/transposh_db.php

@@ -54 +54 @@
 
         if (class_exists('Memcache')) {
-            logger('I am using memcached!', 3);
+            logger('I am using pecl-Memcache!', 3);
             $this->memcache_working = true;
             $this->memcache = new Memcache;
             @$this->memcache->connect(TP_MEMCACHED_SRV, TP_MEMCACHED_PORT) or $this->memcache_working = false;
-            logger($this->memcache_working);
-        }
+        }
+        // I have space in keys issues...
+        /* elseif (class_exists('Memcached')) {
+          logger('I am using pecl-Memcached!', 3);
+          $this->memcache_working = true;
+          $this->memcache = new Memcached();
+          //if (!count($this->memcache->getServerList())) {
+          $this->memcache->addServer(TP_MEMCACHED_SRV, TP_MEMCACHED_PORT);
+          // }
+          //@$this->memcache->connect(TP_MEMCACHED_SRV, TP_MEMCACHED_PORT) or $this->memcache_working = false;
+          } */
+        logger($this->memcache_working);
     }
 
@@ -74 +84 @@
         if ($this->memcache_working) {
             $cached = $this->memcache->get($key);
-            logger('memcached', 5);
+            logger('memcached ' . $key . ' ' . $cached, 5);
         } elseif (function_exists('apc_fetch')) {
             $cached = apc_fetch($key, $rc);
@@ -790 +800 @@
             $this->cache_delete($row->original, $row->lang);
         }
+
+        // clean duplication in the translation table (don't know how it ever happened...)
+        $dedup = 'SELECT * , count( * )' .
+                ' FROM ' . $this->translation_table .
+                ' GROUP BY `original` , `lang`' .
+                ' HAVING count( * ) >1';
+        $rows = $GLOBALS['wpdb']->get_results($dedup);
+        logger($dedup, 3);
+        foreach ($rows as $row) {
+            $row->original = $GLOBALS['wpdb']->escape($row->original);
+            $row->lang = $GLOBALS['wpdb']->escape($row->lang);
+            list($source, $tranlation) = $this->fetch_translation($row->original, $row->lang);
+            if ($source != NULL) {
+                $delvalues = "(original ='{$row->original}' AND lang='{$row->lang}'";
+                $update = "DELETE FROM " . $this->translation_table . " WHERE $delvalues";
+                logger($update, 3);
+                $result = $GLOBALS['wpdb']->query($update);
+            }
+            $row->translated = $GLOBALS['wpdb']->escape($translation);
+            $row->source = $GLOBALS['wpdb']->escape($source);
+            $values = "('{$row->original}','{$row->lang}','{$row->translated}','$row->source')";
+            $update = "INSERT INTO " . $this->translation_table . " (original, lang, translated, source) VALUES $values";
+            logger($update, 3);
+            $result = $GLOBALS['wpdb']->query($update);
+            $this->cache_delete($row->original, $row->lang);
+        }
+
         // check for discrepencies (last translation in log does not equal current translation)
         // TODO