mysql/core_translate_lookup.sql

diff --git a/mysql/core_translate_lookup.sql b/mysql/core_translate_lookup.sql
index e3da82b..e7a3b9a 100644 (file)
--- a/mysql/core_translate_lookup.sql
+++ b/mysql/core_translate_lookup.sql
@@ -5,19 +5,38 @@ DELIMITER $$
 CREATE FUNCTION core_translate_lookup(
     in_ontable VARCHAR(128),
     in_onid INT(11),
-    in_name VARCHAR(128),
+    in_col VARCHAR(128),
+    in_lang VARCHAR(8),
     in_default TEXT
 )  
 RETURNS TEXT NOT DETERMINISTIC READS SQL DATA 
     BEGIN
 
         DECLARE v_ret TEXT;
+        DECLARE v_id INT(11);
         
+        SET v_id = 0;
         
+        SELECT
+            v_id,
+            v_ret
+        FROM
+            core_templatestr
+        WHERE
+            on_id = in_onid
+            AND
+            on_table = in_ontable
+            AND
+            on_col = in_col
+            AND
+            lang = in_lang
+            AND
+            txt != ''
+            
+        IF v_id < 1 THEN
+            RETURN in_default;
+        END IF;
         
-        
-        SELECT COUNT(id) INTO v_ret FROM Images WHERE ontable = in_ontable AND onid = in_onid AND is_deleted = 0;
-
         RETURN v_ret;
 
     END $$