Changeset 26469

Timestamp:

06/28/10 17:15:09 (3 years ago)

Author:

piotras

Message:

Add implicit lang order. Refs #1863

Files:

• branches/ragnaroek/midgard/core/midgard/src/midgard_core_query_builder.c (modified) (2 diffs)
• branches/ragnaroek/midgard/core/midgard/src/query_builder.c (modified) (2 diffs)

branches/ragnaroek/midgard/core/midgard/src/midgard_core_query_builder.c

@@ -204 +204 @@
-        gboolean multilang_fallback = _midgard_core_qb_is_multilingual(builder);
-        gboolean unset_lang = builder->priv->unset_lang;
-        const gchar *multilang_order = "ASC";
-        GString *ml_sql = g_string_new ("");;
-
@@ -396 +395 @@
-        }
-
-        if (multilang_fallback && !unset_lang) {
-
-                if (!builder->priv->orders)
-                        g_string_append (sql, " ORDER BY ");
-                else 
-                        g_string_append (sql, ", ");
-
-                if (mgd_lang (mgd) > mgd_get_default_lang (mgd))
-                        multilang_order = "DESC";
-
-                g_string_append_printf (sql, "%s_i.lang %s ", 
-                                builder->priv->schema->table, multilang_order);
-        }
-
-        g_string_append (ml_sql, sql->str);
-        g_string_free (sql, TRUE);

branches/ragnaroek/midgard/core/midgard/src/query_builder.c

@@ -115 +115 @@
-        builder->priv->limit = G_MAXUINT;
-
+
+        /* Part of Multilang fallback */
+        gboolean multilang_fallback = _midgard_core_qb_is_multilingual(builder);
+        gboolean unset_lang = builder->priv->unset_lang;
+        const gchar *multilang_order = "ASC";
+
+        /* Add lang order implicitly, it must be added as first order */
+        if (multilang_fallback && !unset_lang) {
+
+                if (mgd_lang (mgd) > mgd_get_default_lang (mgd))
+                        multilang_order = "DESC";
+
+                midgard_query_builder_add_order(builder, "lang", multilang_order);
+        }
+
-        if (builder->priv->type && builder->priv->schema) {
-                return builder;
@@ -121 +136 @@
-                return NULL;
-        }
+
+
-}
-