diff options
Diffstat (limited to 'server/thumb-server-internal.c')
-rwxr-xr-x | server/thumb-server-internal.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/server/thumb-server-internal.c b/server/thumb-server-internal.c index 14b3cbf..99c2e20 100755 --- a/server/thumb-server-internal.c +++ b/server/thumb-server-internal.c @@ -60,13 +60,6 @@ gboolean _thumb_daemon_start_jobs(gpointer data) void _thumb_daemon_finish_jobs(void) { - sqlite3 *sqlite_db_handle = _media_thumb_db_get_handle(); - - if (sqlite_db_handle != NULL) { - _media_thumb_db_disconnect(); - thumb_dbg("sqlite3 handle is alive. So disconnect to sqlite3"); - } - /* Shutdown ecore-evas */ ecore_evas_shutdown(); g_main_loop_quit(g_thumb_server_mainloop); @@ -422,18 +415,10 @@ int _media_thumb_process(thumbMsg *req_msg, thumbMsg *res_msg) return MS_MEDIA_ERR_FILE_NOT_EXIST; } - err = _media_thumb_db_connect(req_msg->uid); - if (err != MS_MEDIA_ERR_NONE) { - thumb_err("_media_thumb_mb_svc_connect failed: %d", err); - res_msg->status = MS_MEDIA_ERR_DB_CONNECT_FAIL; - return err; - } - - err = _media_thumb_get_thumb_from_db_with_size(origin_path, thumb_path, max_length, &origin_w, &origin_h); + err = _media_thumb_get_thumb_from_db_with_size(origin_path, thumb_path, max_length, &origin_w, &origin_h, req_msg->uid); if (err == MS_MEDIA_ERR_NONE) { res_msg->origin_width = origin_w; res_msg->origin_height = origin_h; - _media_thumb_db_disconnect(); return MS_MEDIA_ERR_NONE; } else { if (strlen(thumb_path) == 0) { @@ -441,7 +426,6 @@ int _media_thumb_process(thumbMsg *req_msg, thumbMsg *res_msg) if (err != MS_MEDIA_ERR_NONE) { thumb_err("_media_thumb_get_hash_name failed - %d", err); strncpy(thumb_path, THUMB_EMPTY_STR, max_length); - _media_thumb_db_disconnect(); res_msg->status = err; return err; } @@ -494,7 +478,6 @@ int _media_thumb_process(thumbMsg *req_msg, thumbMsg *res_msg) SAFE_FREE(data); strncpy(thumb_path, THUMB_EMPTY_STR, max_length); - _media_thumb_db_disconnect(); res_msg->status = err; return err; } else { @@ -528,8 +511,6 @@ DB_UPDATE: res_msg->status = err; } - _media_thumb_db_disconnect(); - return err; } |