Merge all storage tables

Change-Id: I3fd61307e74a57b66d6171ab5f33115514a9fb54
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/packaging/dcm-service.spec b/packaging/dcm-service.spec
index 2993e5c7ba231a941aa45c9b0d6286bc6f9bc97b..7cc96f127fe20cd8ee993ac1f3ec5780817e6ff6 100644 (file)
--- a/packaging/dcm-service.spec
+++ b/packaging/dcm-service.spec
@@ -1,6 +1,6 @@
 Name:       dcm-service
 Summary:    A media DCM(Digital Contents Management) Service
-Version:    0.2.1
+Version:    0.2.2
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/dcm_svc_db.c b/src/dcm_svc_db.c
index 2fdfb19e2722d2f905e7c342ee537d22dfb8774d..0f00fcc2d7722fdd568dd44f6914ef8a63a2e9cb 100755 (executable)
--- a/src/dcm_svc_db.c
+++ b/src/dcm_svc_db.c
@@ -25,12 +25,12 @@
 
 #define DB_TABLE_FACE "face"
 #define DB_TABLE_FACE_SCAN_LIST "face_scan_list"
-#define DB_VIEW_MEDIA "media_view"
+#define DB_TABLE_MEDIA "media"
 
 #define FACE_ITEM "media_id, face_rect_x , face_rect_y, face_rect_w , face_rect_h, face_orientation"
-#define SELECT_MEDIA_INFO_BY_FILE_PATH_FROM_DB "SELECT media_id, media_width, media_height, media_orientation, media_mime_type, media_modified_time FROM "DB_VIEW_MEDIA" WHERE media_path = '%q';"
-#define SELECT_SCAN_TYPE "SELECT CASE WHEN "DB_VIEW_MEDIA".media_modified_time="DB_TABLE_FACE_SCAN_LIST".modified_time THEN 1 WHEN "DB_TABLE_FACE_SCAN_LIST".modified_time=0 THEN 3 ELSE 2 END result\
-                                               FROM "DB_TABLE_FACE_SCAN_LIST" INNER JOIN "DB_VIEW_MEDIA" ON "DB_TABLE_FACE_SCAN_LIST".media_id="DB_VIEW_MEDIA".media_id WHERE "DB_TABLE_FACE_SCAN_LIST".media_id='%q';"
+#define SELECT_MEDIA_INFO_BY_FILE_PATH_FROM_DB "SELECT media_id, media_width, media_height, media_orientation, media_mime_type, media_modified_time FROM "DB_TABLE_MEDIA" WHERE media_path = '%q';"
+#define SELECT_SCAN_TYPE "SELECT CASE WHEN "DB_TABLE_MEDIA".media_modified_time="DB_TABLE_FACE_SCAN_LIST".modified_time THEN 1 WHEN "DB_TABLE_FACE_SCAN_LIST".modified_time=0 THEN 3 ELSE 2 END result\
+                                               FROM "DB_TABLE_FACE_SCAN_LIST" INNER JOIN "DB_TABLE_MEDIA" ON "DB_TABLE_FACE_SCAN_LIST".media_id="DB_TABLE_MEDIA".media_id WHERE "DB_TABLE_FACE_SCAN_LIST".media_id='%q';"
 #define INSERT_FACE_ITEM_TO_DB "INSERT OR IGNORE INTO " DB_TABLE_FACE" (" FACE_ITEM") VALUES ('%q', %d, %d, %d, %d, %d);"
 #define SELECT_FACE_COUNT_BY_MEDIA_ID          "SELECT COUNT(*) FROM " DB_TABLE_FACE" WHERE media_id = '%q';"