fix #8131 - chinese translations
[Pman.Core] / DataObjects / Core_templatestr.php
index 60d4e6f..a800750 100644 (file)
@@ -45,8 +45,9 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
             $this->applyFiltersTree($q,$roo);
         }
         
-        if(!empty($q['on_table']) && !is_numeric($q['template_id'])){
+        if(!empty($q['on_table']) && (empty($q['template_id']) || !is_numeric($q['template_id']))){
             $this->template_id = 0;
+             $this->whereAdd("  join_src_id_id.txt != ''");
         }
         if (!empty($q['_search_txt'])) {
             $str = $this->escape($q['_search_txt']);
@@ -83,7 +84,6 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
      */
     function onTableChange($roo, $obj, $chg)
     {
-        
         $ff = HTML_FlexyFramework::get()->Pman_Core;
             
         if(empty($ff['DataObjects_Core_templatestr']['tables'])){
@@ -94,18 +94,42 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
             return;
         }
         $cols = $ff['DataObjects_Core_templatestr']['tables'][$tn];
-        
-        
+
+        $used = array();
         foreach($cols as $c) {
+            
+            if(strpos($c, ',') !== false) {
+                $arr = explode(',', $c);
+                $c = $arr[0];
+                $cond = $arr[1];
+
+                $ar = explode('=', $cond);
+                $key = $ar[0];
+
+                // skip if condition not fulfilled
+                if($obj->{$ar[0]} != $ar[1]) {
+                    continue;
+                }
+            }
+
+            // skip if empty string
+            if(empty($obj->$c)) {
+                continue;
+            }
+
             $x = $this->factory($this->tableName());
             $x->on_id = $obj->pid();
             $x->on_table = $tn;
             $x->on_col = $c;
             $x->lang = ''; /// eg. base language..
             $up = $x->find(true);
-            if ($up && $x->txt == $obj->$c) {
-                continue; // update an no change..
+
+            // skip when no change
+            if($up && $x->txt == $obj->$c) {
+                $used[] = $x->id;
+                continue;
             }
+
             $x->active = 1;
             $x->src_id = 0;
             $x->txt = $obj->$c;
@@ -114,6 +138,23 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
             $x->updated = date('Y-m-d H:i:s', strtotime("NOW"));
             $up ? $x->update() : $x->insert();
         }
+
+        // make sure the used one are active
+        if(count($used)) {
+            $t = DB_DataObject::factory($this->tableName());
+            // activate the aprent data
+            $t->query("UPDATE core_templatestr
+                SET active = 1 WHERE id in (" . implode(',' ,$used) . ")
+            ");
+            // activate the child data
+            $t->query("UPDATE  core_templatestr 
+            SET active = 1
+              WHERE
+                 src_id IN (". implode(',' ,$used) . ")
+                AND
+                lang != ''
+            ");
+        }
         
         
     }
@@ -127,22 +168,25 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
         switch(true) {
             
             case ($q['node'] == 'transtree'):
+            case ($q['node'] == 'langlist'):
                // DB_DataObject::debugLevel(1);
                 $x = DB_Dataobject::Factory($this->tableName());
                 $x->selectAdd();
                 $x->selectAdd('distinct(lang) as lang');
+                
+                $x->selectAdd("i18n_translate('l', lang, 'en') as lang_name");
                 $x->whereAdd("lang != ''");
                 $ret= array();
-                foreach( $x->fetchAll('lang') as $l) {
+                foreach( $x->fetchAll() as $l) {
                     $ret[] = array(
-                        'text'=>$l,
-                        'id' => 'lang:'.$l,
+                        'text'=>$l->lang_name,
+                        'id' => $q['node'] == 'langlist' ? $l->lang : 'lang:'.$l->lang ,
                         'language' => true
                     );
                 }
                 if (empty($ret)) {
                     $ret[] = array(
-                        'text'=>'en',
+                        'text'=>'English',
                         'id' => 'lang:en',
                         'language' => true
                     );
@@ -158,6 +202,7 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
                 $x->selectAdd();
                 $x->selectAdd('distinct(view_name) as view_name');
                 $x->lang = $lang;
+                $x->whereAdd('join_template_id_id.is_deleted = 0');
                 $x->orderBy('view_name DESC');
                 $x->find();
                 while($x->fetch()) {
@@ -167,11 +212,24 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
                         'leaf' => false
                     );
                 }
+
+                $ff = HTML_FlexyFramework::get()->Pman_Core;
+
+                if(!empty($ff['DataObjects_Core_templatestr']['tables'])){
+                    foreach($ff['DataObjects_Core_templatestr']['tables'] as $table=>$v){
+                        $ret[] = array(
+                            'text'=> $table,
+                            'on_table' => $table,
+                            'id' => 'table:'. $lang .':'. $table,
+                            'leaf' => true
+                        );
+                    }
+                }
                 
-                
+                 
                 $roo->jdata($ret);
                 
-                   break;
+                break;
                 
                 
             case  preg_match('/^view:/', $q['node']):
@@ -179,33 +237,24 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
                
                 $bits= explode(":",preg_replace('/^view:/', '', $q['node']));
                 
-                 $x = DB_DataObject::factory($this->tableName());
+                $x = DB_DataObject::factory($this->tableName());
                 $x->autoJoin();
                 $x->selectAdd();
                 $x->selectAdd('distinct(core_templatestr.template_id) as template_id');
                 $x->whereAdd("join_template_id_id.view_name = '{$x->escape($bits[1])}'");
+                $x->whereAdd('join_template_id_id.is_deleted = 0');
                 $x->lang = $bits[0];
                 $ids = $x->fetchAll('template_id');
                 
                 $ret= array();
                 //add the table type lists
-                
+                /*
                 $ff = HTML_FlexyFramework::get()->Pman_Core;
                 
-                if(!empty($ff['DataObjects_Core_templatestr']['tables'])){
-                    foreach($ff['DataObjects_Core_templatestr']['tables'] as $table=>$v){
-                        $ret[] = array(
-                            'text'=> $table,
-                            'on_table' => $table,
-                            'id' => 0,
-                            'leaf' => true
-                        );
-                    }
-                }
                 
 //                $x->orderBy('template ASC');
 //                $x->whereAdd("lang != ''");
-                
+                */
                 //below are old code
                 $xx = DB_Dataobject::Factory('core_template');
                 $xx->whereAddIn('id', $ids, 'int');
@@ -252,9 +301,8 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
         //print_r($words);exit;
         // grab original
         $tt = DB_DataObject::factory($this->tableName());
-
-
-        $t = DB_DataObject::factory($this->tableName());
+        $t = clone($tt);
         $t->template_id = $tmpl->id;
         $t->whereAdd("lang = ''");
         
@@ -281,6 +329,11 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
             
             
             $v = trim($v);
+
+            // skip empty words
+            if(empty($v)) {
+                continue;
+            }
             
             $md = $keyvalue ? $k : md5($v);
             
@@ -307,7 +360,8 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
             $active[] = $cur[$md];
             
             // we have it already? - 
-            $tt->query("UPDATE {$this->tableName()}
+            $t = DB_DataObject::factory($this->tableName());
+            $t->query("UPDATE {$this->tableName()}
                         SET active= 1
                         WHERE
                         id = ".$cur[$md]);
@@ -434,18 +488,23 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
         
         // find all the id's from lang that have not been generated..
         
-        //find the origanal 
-        $t = DB_DataObject::factory($tn);
-        $t->whereAdd("lang = ''");
-        $t->active = 1;
         
-        //old code, this did not support the on_table
-//        $id_tmp = $t->fetchAll('id','template_id');
-//        $ids = array_keys($id_tmp);
-        $id_tmp = array();
-        //new code for support the sync tables 
-        foreach($t->fetchAll() as $ori){
-            $id_tmp[$ori->id] = $ori;
+        static $id_tmp = false;
+        
+        if ($id_tmp == false) {
+            //find the origanal 
+            $t = DB_DataObject::factory($tn);
+            $t->whereAdd("lang = ''");
+            $t->active = 1;
+            
+            //old code, this did not support the on_table
+    //        $id_tmp = $t->fetchAll('id','template_id');
+    //        $ids = array_keys($id_tmp);
+            $id_tmp = array();
+            //new code for support the sync tables 
+            foreach($t->fetchAll() as $ori){
+                $id_tmp[$ori->id] = $ori;
+            }
         }
         $ids = array_keys($id_tmp);
         
@@ -456,25 +515,33 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
         //$t->active = 1;
         $got = $t->fetchAll('src_id');
         $missing = array_diff($ids, $got);
-        foreach($missing as $id) {
-            
-            $t = DB_DataObject::factory($tn);
-            $t->setFrom(array(
-                'src_id' => $id,
-                'txt' =>  '',
-                'lang' => $lang,
-                'updated' => date('Y-m-d H:i:s', strtotime("NOW")),
-                'template_id'=> $id_tmp[$id]->template_id,
-                'on_table' => $id_tmp[$id]->on_table,
-                'on_id' => $id_tmp[$id]->on_id,
-                'on_col' => $id_tmp[$id]->on_col,
-                'active' => 1,
-                // no md5um
-            ));
-            $t->insert();
-        }
-        
         
+        if (empty($missing)) {
+            return;
+        }
+        $t = DB_DataObject::factory($tn);
+        $q = "CREATE TEMPORARY TABLE core_templatestr_insert SELECT
+            id as src_id,
+            '' as txt,
+            '$lang' as lang,
+            NOW() as updated,
+            template_id,
+            on_table,
+            on_id,
+            on_col,
+            1 as active
+            FROM core_templatestr
+            WHERE
+            id IN (". implode(',', $missing) . ")
+        ";
+        //echo $q; exit;
+        DB_DataObject::factory($tn)->query($q);
+        $q = "INSERT INTO $tn (src_id, txt, lang, updated, template_id, on_table,on_id, on_col, active) SELECT * FROM core_templatestr_insert";
+        DB_DataObject::factory($tn)->query($q);
+        $q = "DROP TEMPORARY TABLE core_templatestr_insert";
+        DB_DataObject::factory($tn)->query($q);
+            
+      
         
     }
     
@@ -483,8 +550,7 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
     
     function translateFlexyString($flexy, $string)
     {
-        //var_dump($string);
-        $debug = false;;
+         $debug = false;;
         //if (!empty($_REQUEST['_debug'])) { $debug= true; }
         
         // using $flexy->currentTemplate -> find the template we are looking at..
@@ -496,6 +562,15 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
         
         $ff = HTML_FlexyFramework::get();
         $view_name = isset($ff->Pman_Core['view_name']) ? $ff->Pman_Core['view_name'] : false;
+        if (empty($view_name)) {
+            $pg = HTML_FlexyFramework::get()->page;
+            if (isset($pg->templateViewName)) {
+                $view_name = $pg->templateViewName;
+            }
+            
+        }
+        
+        
         
         if ($debug) { var_dump(array('view_name'=> $view_name)); }
         
@@ -510,6 +585,7 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
         
         $tmpname = substr($flexy->currentTemplate, strlen($td) +1);
         
+         
         if (isset($cache[$tmpname]) && $cache[$tmpname] === false) {
             if ($debug) { echo "from cache no match - $string\n"; }
             return $string;
@@ -538,36 +614,69 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
         } else {
             $tmpl = $cache[$tmpname] ;
         }
-         
+        
+        
     
-        //get original template id 
+        //get original template id
+        /*
         $orig = DB_DataObject::factory($this->tableName());
         $orig->lang = '';
         $orig->template_id = $tmpl->id;
         $orig->active = 1;
+        
+        $cache[$tmpname]->words = 
+        
         if(!$orig->get( 'mdsum' , md5(trim($string)))){
              //var_dump('no text? '. $string);
             if ($debug) { echo "no original string found tplid: {$tmpl->id}\n"; }
             return false;
         }
-         
-        //find out the text by language
-        $x = DB_DataObject::factory($this->tableName());
-        $x->lang = $flexy->options['locale'];
-        $x->template_id = $tmpl->id;
-        if(!$x->get('src_id', $orig->id)){
-            //var_dump('no trans found' . $orig->id);
-            if ($debug) { echo "no translation found\n"; }
+        */
+        
+        if (empty($cache[$tmpname]->translations)) {
+        
+            //find out the text by language
+            //DB_DataObject::DebugLevel(1);
+            $x = DB_DataObject::factory($this->tableName());
+            $x->lang = $flexy->options['locale'];
+            $x->template_id = $tmpl->id;
+            $x->autoJoin();
+            $cache[$tmpname]->translations = $x->fetchAll('src_id_mdsum', 'txt');
+            if (empty($cache[$tmpname]->translations)) {
+                $cache[$tmpname]->translations = true;
+            }
+            //var_Dump($cache[$tmpname]->translations);
+        }
+        
+        
+        if ($cache[$tmpname]->translations === true) {
+            return $string;
+        }
+        //var_dump("Checking: " . md5(trim($string)));
+        
+        if (!empty($cache[$tmpname]->translations [md5(trim($string))])){
+           // var_dump("RETURNING: ". $cache[$tmpname]->translations [md5(trim($string))]);
+            return $cache[$tmpname]->translations [md5(trim($string))];
+        }
+        return $string;
+        
+    }
+    
+    
+    function translateChanged($flexy)
+    {
+        
+        $date = $this->lastUpdated($flexy);
+        if ($date === false) {
             return false;
         }
-        if ($debug) { echo "returning $x->txt\n"; }
-        //var_Dump($x->txt);
-        return empty($x->txt) ? $string : $x->txt;
+        $utime = file_exists($flexy->compiledTemplate) ?  filemtime( $flexy->compiledTemplate) : 0;
+        return strtotime($date) >  $utime;
     }
     
     // determine if a complied template need recompling
     
-    function translateChanged($flexy)
+    function lastUpdated($flexy)
     {
         //return true;
         // var_dump('check changed?');
@@ -577,12 +686,14 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
         //var_dump($flexy->compiledTemplate);
         $utime = file_exists($flexy->compiledTemplate) ?  filemtime( $flexy->compiledTemplate) : 0;
         
-        
+       
         static $cache = array(); // cache of templates..
         
         $ff = HTML_FlexyFramework::get();
         $view_name = isset($ff->Pman_Core['view_name']) ? $ff->Pman_Core['view_name'] : false;
         
+        // find which of the template directories was actually used for the template.
+        
         $tempdir = '';
         foreach($flexy->options['templateDir'] as $td) {
             if (substr($flexy->currentTemplate, 0, strlen($td)) == $td) {
@@ -594,6 +705,7 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
         
         $tmpname = substr($flexy->currentTemplate, strlen($td) +1);
         
+        // we do not have any record of this template..
         if (isset($cache[$tmpname]) && $cache[$tmpname] === false) {
             return false;
         }
@@ -627,11 +739,67 @@ class Pman_Core_DataObjects_Core_templatestr extends DB_DataObject
         $x->lang = $flexy->options['locale'];
         $x->active = 1;
         $x->template_id = $tmpl->id;
-        $x->whereAdd("updated > '". date('Y-m-d H:i:s', $utime)."'");
-        
-        return $x->count() ? true : false;
+        //$x->whereAdd("updated > '". date('Y-m-d H:i:s', $utime)."'");
+        if ($x->count() < 1) {
+            return false; // we don't have any record of it.
+        }
+        $x->selectAdd();
+        $x->selectAdd('max(updated) as max_updated');
+        $x->find(true);
+        return $x->max_updated;
         
         
     }
     
+    function toRooArray($req) {
+        $ret = $this->toArray();
+
+        if (empty($req['csvCols'])) {
+            return $ret;
+        }
+
+        // for download
+
+        // translations for table columns
+        if(!empty($ret['on_table']) && !empty($ret['on_id']) && !empty($ret['on_col'])) {
+            $ret['template_id_view_name'] = 'database';
+            $ret['template_id_template'] = $ret['on_table'] . ':' . $ret['on_col'];
+        }
+
+        return $ret;
+    }
+
+    function postListFilter($ar, $au, $req)
+    {
+        if (empty($req['csvCols'])) {
+            return $ar;
+        }
+
+        // for download
+
+        $ret = array();
+
+        foreach($ar as $v) {
+            if(empty($v['on_table']) || empty($v['on_id']) || empty($v['on_col'])) {
+                $ret[] = $v;
+                continue;
+            }
+
+            // translations for table columns
+            // avoid duplicate (same src_id_mdsum, same on_table, same on_col, but different on_id)
+
+            $key = $v['on_table'] . ':' . $v['on_col'] . ':' . $v['src_id_mdsum'];
+
+            if(!empty($ret[$key])) {
+                continue;
+            }
+
+            $ret[$key] = $v;
+        }
+
+        $ret = array_values($ret);
+        
+        return $ret;
+
+    }
 }