Changeset 515

Timestamp:

08/24/2010 02:02:16 AM (18 months ago)

Author:

ofer

Message:

Use less and do a bit more, (only use the keys for prefetching)

Location:

trunk/WordPress/plugin/transposh

Files:

• core/parser.php (modified) (3 diffs)
• wp/transposh_db.php (modified) (4 diffs)

trunk/WordPress/plugin/transposh/core/parser.php

@@ -600 +600 @@
             foreach ($this->html->find('text') as $e) {
                 foreach ($e->nodes as $ep) {
-                    if ($ep->phrase) $originals[$ep->phrase] = $ep->phrase;
+                    if ($ep->phrase) $originals[$ep->phrase] = true;
                 }
             }
@@ -606 +606 @@
                 foreach ($this->html->find('[' . $title . ']') as $e) {
                     foreach ($e->nodes as $ep) {
-                        if ($ep->phrase) $originals[$ep->phrase] = $ep->phrase;
+                        if ($ep->phrase) $originals[$ep->phrase] = true;
                     }
                 }
@@ -612 +612 @@
             foreach ($this->html->find('[content]') as $e) {
                 foreach ($e->nodes as $ep) {
-                    if ($ep->phrase) $originals[$ep->phrase] = $ep->phrase;
+                    if ($ep->phrase) $originals[$ep->phrase] = true;
                 }
             }

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

@@ -91 +91 @@
         if (!TP_ENABLE_CACHE) return false;
         $key = $lang . '_' . $original;
-        if ($translated !== null) {
-            $translated = implode('_', $translated);
-        }
-        //If we don't have translation still we want to have it in cache
-        //update cache FIXME, do we really need this null to ""?
+        if ($translated !== null) $translated = implode('_', $translated);
         if (function_exists('apc_store')) {
             $rc = apc_store($key, $translated, $ttl);
@@ -144 +140 @@
     /**
      * Allow fetching of multiple translation requests from the database with a single query
-     * @param array $originals
+     * @param array $originals keys hold the strings...
      * @param string $lang
      */
@@ -150 +146 @@
         if (!$originals) return;
         logger($originals, 4);
-        foreach ($originals as $original) {
+        foreach ($originals as $original => $truth) {
             $original = $GLOBALS['wpdb']->escape(html_entity_decode($original, ENT_NOQUOTES, 'UTF-8'));
             $cached = $this->cache_fetch($original, $lang);
@@ -168 +164 @@
             $this->translations[$row['original']] = array($row['source'], stripslashes($row['translated']));
         }
-        logger($this->translations, 5);
+        logger('prefetched: '.count($this->translations), 5);
     }