Merge "Use sql function instead" into tizen

[platform/core/multimedia/libmedia-service.git] / src / common / media-svc-db-utils.c

diff --git a/src/common/media-svc-db-utils.c b/src/common/media-svc-db-utils.c
index 9660175..954cc4f 100755 (executable)
--- a/src/common/media-svc-db-utils.c
+++ b/src/common/media-svc-db-utils.c
@@ -18,14 +18,13 @@
  */
 
 #include <unistd.h>
-#include <media-util.h>
+#include <media-util-db.h>
 #include <errno.h>
+
 #include "media-svc-env.h"
 #include "media-svc-debug.h"
 #include "media-svc-util.h"
 #include "media-svc-db-utils.h"
-#include "media-util-err.h"
-#include "media-util-db.h"
 #include "media-svc-media.h"
 
 static GHashTable *table;
@@ -55,23 +54,23 @@ static void __add_table_info(const char *name,
 {
        table_info_s *tbl = NULL;
 
-       if (!STRING_VALID(name))
+       if (!name)
                return;
 
-       if (STRING_VALID(trigger_name)) {
-               if(!STRING_VALID(event_table) || !STRING_VALID(action_table))
+       if (trigger_name) {
+               if(!event_table || !action_table)
                        return;
        }
 
        tbl = g_new0(table_info_s, 1);
 
-       if (STRING_VALID(trigger_name)) {
+       if (trigger_name) {
                tbl->trigger_name = g_strdup(trigger_name);
                tbl->event_table = g_strdup(event_table);
                tbl->action_table = g_strdup(action_table);
        }
 
-       if (STRING_VALID(view_name))
+       if (view_name)
                tbl->view_name = g_strdup(view_name);
 
        g_hash_table_insert(table, (gpointer)name, (gpointer)tbl);
@@ -264,7 +263,7 @@ int _media_svc_make_table_query(const char *table_name, media_svc_table_slist_e
 
                /*create trigger */
                if (col_ptr->is_trigger) {
-                       if (STRING_VALID(tb->trigger_name)) {
+                       if (tb->trigger_name) {
                                if (strncmp(table_name, DB_TABLE_ALBUM, strlen(DB_TABLE_ALBUM)) == 0) {
                                        g_string_append_printf(trigger_query, DB_QUERY_TRIGGER_WITH_COUNT,
                                                                                        tb->trigger_name, tb->event_table, tb->action_table, tb->event_table,
@@ -363,7 +362,7 @@ int _media_svc_init_table_query(void)
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_type", DB_TYPE_INT, NULL, false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_mime_type", DB_TYPE_TEXT, NULL, false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_size", DB_TYPE_INT, "DEFAULT 0", false, false, true);
-       __add_column_info(&column_list[DB_LIST_MEDIA], "media_added_time", DB_TYPE_INT, "DEFAULT 0", false, false, true);
+       __add_column_info(&column_list[DB_LIST_MEDIA], "media_added_time", DB_TYPE_INT, "DEFAULT (unixepoch())", false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_modified_time", DB_TYPE_INT, "DEFAULT 0", false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "folder_id", DB_TYPE_INT, "DEFAULT 0", false, false, false);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_thumbnail_path", DB_TYPE_TEXT, NULL, false, false, true);
@@ -373,12 +372,12 @@ int _media_svc_init_table_query(void)
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_artist", DB_TYPE_TEXT, NULL, false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_album_artist", DB_TYPE_TEXT, NULL, false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_genre", DB_TYPE_TEXT, NULL, false, false, true);
-       __add_column_info(&column_list[DB_LIST_MEDIA], "media_composer", DB_TYPE_TEXT, NULL, false, false, true);
+       __add_column_info(&column_list[DB_LIST_MEDIA], "media_composer", DB_TYPE_TEXT, "DEFAULT ''", false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_year", DB_TYPE_TEXT, NULL, false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_recorded_date", DB_TYPE_TEXT, NULL, false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_copyright", DB_TYPE_TEXT, NULL, false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_track_num", DB_TYPE_TEXT, NULL, false, false, true);
-       __add_column_info(&column_list[DB_LIST_MEDIA], "media_description", DB_TYPE_TEXT, NULL, false, false, true);
+       __add_column_info(&column_list[DB_LIST_MEDIA], "media_description", DB_TYPE_TEXT, "DEFAULT ''", false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_bitrate", DB_TYPE_INT, "DEFAULT -1", false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_bitpersample", DB_TYPE_INT, "DEFAULT 0", false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_samplerate", DB_TYPE_INT, "DEFAULT -1", false, false, true);
@@ -658,7 +657,7 @@ int _media_svc_sql_query_list(GList **query_list, uid_t uid)
                                /* column limit = 2000 */
                        }
 
-                       SAFE_STRLCAT(query_bundle, sql, sizeof(query_bundle));
+                       g_strlcat(query_bundle, sql, sizeof(query_bundle));
                        total_len += query_len;
 
                        SQLITE3_SAFE_FREE(sql);