Changeset 16439

Timestamp:

05/22/08 21:43:48 (3 months ago)

Author:

piotras

Message:

Multilang fallback ported from 1-9

Files:

• trunk/midgard/core/midgard/src/midgard_core_query_builder.c (modified) (10 diffs)
• trunk/midgard/core/midgard/src/query_builder.c (modified) (3 diffs)

trunk/midgard/core/midgard/src/midgard_core_query_builder.c

@@ -32 +32 @@
-#include "midgard_user.h"
-#include "midgard_core_object.h"
+#include "midgard_object_class.h"
-
-MidgardQueryBuilderPrivate *midgard_query_builder_private_new(void)
@@ -125 +126 @@
-}
-
+gboolean _midgard_core_qb_is_multilingual(MidgardQueryBuilder *builder)
+{
+        MidgardObjectClass *klass = (MidgardObjectClass*)g_type_class_peek(builder->priv->type);
+        MidgardConnection *mgd = builder->priv->mgd;
+        
+        if(!midgard_object_class_is_multilang(klass))
+                return FALSE;
+        
+        if(builder->priv->unset_lang)
+                return FALSE;
+        
+        if(MGD_GET_LANG_ID(mgd) == MGD_GET_DEFAULT_LANG_ID(mgd))
+                return FALSE;
+        
+        if(builder->priv->lang < 0)
+                return TRUE;
+        
+        return FALSE;
+}
+
+static void __sql_add_constraints(GString *sql, MidgardQueryBuilder *builder)
+{
+        GSList *clist = NULL;
+        GSList *jlist = NULL;
+        guint j = 0;
+        
+        for(clist = builder->priv->constraints;
+                        clist != NULL; clist = clist->next) {
+                
+                if(j > 0)
+                        g_string_append(sql, " AND ");
+                
+                g_string_append(sql,
+                                MIDGARD_QUERY_CONSTRAINT(clist->data)->priv->condition);
+                
+                for(jlist = ((MidgardQueryConstraint*)clist->data)->priv->joins;
+                                jlist != NULL; jlist = jlist->next) {
+                        
+                        g_string_append(sql, " AND ");
+                        g_string_append(sql,
+                                        ((MidgardQueryConstraintPrivate*)jlist->data)->condition);
+                }
+                
+                j++;
+        }
+        
+        if(builder->priv->constraints == NULL)
+                g_string_append(sql, "1=1");
+}
+
-gchar *_midgard_core_qb_get_sql(
-                MidgardQueryBuilder *builder, guint mode, gchar *select)
@@ -133 +184 @@
-        /* FIXME, error reporting needed */
-        if(builder->priv->error != 0) {
-            
-            
+               
+               
-        }
+
+        guint multilang_fallback = _midgard_core_qb_is_multilingual(builder);
+        MidgardConnection *mgd = builder->priv->mgd;
-
-        /* SELECT */
@@ -147 +201 @@
-        g_hash_table_foreach(builder->priv->tables, _add_table_foreach, &tlist);
-
+        GString *tables = g_string_new("");
+
-        guint l = 0;
-        GSList *nlist; 
@@ -152 +208 @@
-        
-                if(l < 1)
-sql
+tables
-                else 
-sql
+tables
-                                        ", %s", (gchar *) nlist->data);
-                l++;
@@ -161 +217 @@
-                g_slist_free(tlist);
-
+        g_string_append(sql, tables->str);
+
-        /* WHERE */
-        g_string_append(sql, " WHERE ");
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if(builder->priv->groups != NULL) {
@@ -207 +267 @@
-        /* Join tables from ORDER BY */
-        GSList *olist = NULL;
-
+GSList *
-        guint i = 0;
-        if(builder->priv->orders != NULL) {
@@ -226 +286 @@
-
-        if (builder->priv->schema->use_lang == 1) {
+
-                g_string_append(sql, " AND ");
-                g_string_append(sql, builder->priv->schema->table);
@@ -232 +293 @@
-                g_string_append(sql, "_i.sid");  
-               
-
-
+
+
+
+
-                        g_string_append(sql, " AND ");
-                        g_string_append(sql, builder->priv->schema->table);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        }           
-
@@ -305 +349 @@
-        }
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-        return g_string_free(sql, FALSE);

trunk/midgard/core/midgard/src/query_builder.c

@@ -354 +354 @@
-                return NULL; 
-        }
-
-        if (builder->priv->schema->use_lang == 1) {
-                
-                gchar *guid = NULL;
-                GList *nlist = NULL;
-                
-                /* Reverse list only if we have user defined lang 
-                 * and lang 0 as fallback */
-                if((midgard_connection_get_lang_id(builder->priv->mgd, NULL) != 0)
-                                && builder->priv->lang == -1)
-                        list = g_list_reverse(list);
-
-                for(; list ; list = list->next){     
-                       
-                        /* Bit of hack, records could be returned with lang DESC */
-                        
-                        if(select_type == MQB_SELECT_OBJECT) {
-                                g_object_get(G_OBJECT(list->data), "guid", &guid, NULL);
-                        } else if (select_type == MQB_SELECT_GUID) {
-                                guid = g_strdup((gchar *)list->data);
-                        }
-                        /* Changed to find_custom due to bug in GLib docs */
-                        /* g_list_find never returns NULL */
-                        /* We could use g_hash_table as well */
-                        if((tmp_list = g_list_find_custom(tmp_list, 
-                                                guid, _compare_ml_guid))) {
-                                
-                                g_free((gchar *)tmp_list->data);  
-                                tmp_list->data = g_strdup(""); /* FIXME */
-                                
-                                if(select_type == MQB_SELECT_OBJECT) {
-                                        g_object_unref(G_OBJECT(list->data));
-                                } else if (select_type == MQB_SELECT_GUID) {
-                                        /* TODO check leak, none for now */
-                                        /* g_free(list->data); */
-                                }
-                                
-                        } else {
-                                nlist = g_list_append(nlist, list->data);                          
-                        }       
-                        tmp_list = g_list_prepend(tmp_list, (gpointer)guid);
-                }          
-                
-                /* Free unused guids */
-                for(; tmp_list ; tmp_list = tmp_list->next){
-                        g_free((gchar *)tmp_list->data);
-                }
-                g_list_free(tmp_list);
-                g_list_free(list);
-                list = nlist;
-        }    
-        
-        if(holder)
-                holder->elements = g_list_length(list);
-
-        /* Reverse list again so we get initial state */
-        if((midgard_connection_get_lang_id(builder->priv->mgd, NULL) != 0)
-                        && builder->priv->lang == -1)
-                list = g_list_reverse(list);
-
-        return list;     
@@ -455 +399 @@
-guint midgard_query_builder_count(MidgardQueryBuilder *builder)
-{
-
-
+
-        MIDGARD_ERRNO_SET(builder->priv->mgd, MGD_ERR_OK);
-MidgardTypeHolder *holder = g_new(MidgardTypeHolder, 1);
+
-        GList *list =
-
-
+
+
+
+
+
+
+
+
+
+
-        if(list != NULL){
-                
-
-
-
+
+
+
+
-                g_list_free(list);
-        }
-
+
+
-}
-
@@ -776 +729 @@
-        /* We get guids only */
-        if(select_type == MQB_SELECT_GUID) {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        }
-