diff options
author | Sung-jae Park <nicesj.park@samsung.com> | 2013-09-16 15:52:11 +0900 |
---|---|---|
committer | Sung-jae Park <nicesj.park@samsung.com> | 2013-09-16 15:52:11 +0900 |
commit | cc00c1b5f3e327892529ed26b1130353392a6228 (patch) | |
tree | 8d1ab94a584202cf40a0f301ec8df7a7da930ea2 | |
parent | 941b30125c131c0fdd83f64c3db397552fb9ebaa (diff) | |
download | data-provider-master-cc00c1b5f3e327892529ed26b1130353392a6228.tar.gz data-provider-master-cc00c1b5f3e327892529ed26b1130353392a6228.tar.bz2 data-provider-master-cc00c1b5f3e327892529ed26b1130353392a6228.zip |
Fix the default content info bug.
If there is no definition of content info,
it should be "".
Change-Id: I25fd26e61a881190b1a2cdcbe003f76a146ea20f
-rw-r--r-- | packaging/data-provider-master.spec | 4 | ||||
-rw-r--r-- | pkgmgr_livebox/src/service_register.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packaging/data-provider-master.spec b/packaging/data-provider-master.spec index 10781ba..7111562 100644 --- a/packaging/data-provider-master.spec +++ b/packaging/data-provider-master.spec @@ -1,6 +1,6 @@ Name: data-provider-master Summary: Master service provider for liveboxes. -Version: 0.25.12 +Version: 0.25.13 Release: 1 Group: HomeTF/Livebox License: Flora License @@ -86,7 +86,7 @@ if [ ! -s %{buildroot}/opt/dbspace/.livebox.db ]; then echo "LiveBox DB file is not exists, initiate it" sqlite3 %{buildroot}/opt/dbspace/.livebox.db <<EOF CREATE TABLE box_size ( pkgid TEXT NOT NULL, size_type INTEGER, preview TEXT, touch_effect INTEGER, need_frame INTEGER, FOREIGN KEY(pkgid) REFERENCES pkgmap(pkgid) ON DELETE CASCADE); -CREATE TABLE client (pkgid TEXT PRIMARY KEY NOT NULL, icon TEXT, name TEXT, auto_launch TEXT, pd_size TEXT, content TEXT DEFAULT 'default', nodisplay INTEGER, setup TEXT, mouse_event INTEGER, FOREIGN KEY(pkgid) REFERENCES pkgmap(pkgid) ON DELETE CASCADE); +CREATE TABLE client (pkgid TEXT PRIMARY KEY NOT NULL, icon TEXT, name TEXT, auto_launch TEXT, pd_size TEXT, content TEXT, nodisplay INTEGER, setup TEXT, mouse_event INTEGER, FOREIGN KEY(pkgid) REFERENCES pkgmap(pkgid) ON DELETE CASCADE); CREATE TABLE groupinfo ( id INTEGER PRIMARY KEY AUTOINCREMENT, cluster TEXT NOT NULL, category TEXT NOT NULL, pkgid TEXT NOT NULL, FOREIGN KEY(pkgid) REFERENCES pkgmap(pkgid) ON DELETE CASCADE); CREATE TABLE groupmap (option_id INTEGER PRIMARY KEY AUTOINCREMENT, id INTEGER, pkgid TEXT NOT NULL, ctx_item TEXT NOT NULL, FOREIGN KEY(id) REFERENCES groupinfo(id), FOREIGN KEY(pkgid) REFERENCES pkgmap(pkgid) ON DELETE CASCADE); CREATE TABLE i18n ( pkgid TEXT NOT NULL, lang TEXT COLLATE NOCASE, name TEXT, icon TEXT, FOREIGN KEY(pkgid) REFERENCES pkgmap(pkgid) ON DELETE CASCADE); diff --git a/pkgmgr_livebox/src/service_register.c b/pkgmgr_livebox/src/service_register.c index 01c36be..ae02359 100644 --- a/pkgmgr_livebox/src/service_register.c +++ b/pkgmgr_livebox/src/service_register.c @@ -83,7 +83,7 @@ * +-------+------+---------+-------------+---------+---------+-----------+-------+-------------+ * | - | - | - | - | - | - | - | - | - } * +-------+------+---------+-------------+---------+---------+-----------+-------+-------------+ - * CREATE TABLE client ( pkgid TEXT PRIMARY KEY NOT NULL, icon TEXT, name TEXT, auto_launch TEXT, pd_size TEXT, content TEXT DEFAULT "default", nodisplay INTEGER, setup TEXT, mouse_event, FOREIGN KEY(pkgid) REFERENCES pkgmap(pkgid) ) + * CREATE TABLE client ( pkgid TEXT PRIMARY KEY NOT NULL, icon TEXT, name TEXT, auto_launch TEXT, pd_size TEXT, content TEXT, nodisplay INTEGER, setup TEXT, mouse_event, FOREIGN KEY(pkgid) REFERENCES pkgmap(pkgid) ) * * = auto_launch = UI-APPID * = pd_size = WIDTHxHEIGHT @@ -640,7 +640,7 @@ static inline int db_create_client(void) ddl = "CREATE TABLE client (" \ "pkgid TEXT PRIMARY KEY NOT NULL, icon TEXT, name TEXT, " \ - "auto_launch TEXT, pd_size TEXT, content TEXT DEFAULT 'default', nodisplay INTEGER, setup TEXT, mouse_event INTEGER, FOREIGN KEY(pkgid) REFERENCES pkgmap(pkgid) ON DELETE CASCADE)"; + "auto_launch TEXT, pd_size TEXT, content TEXT, nodisplay INTEGER, setup TEXT, mouse_event INTEGER, FOREIGN KEY(pkgid) REFERENCES pkgmap(pkgid) ON DELETE CASCADE)"; if (sqlite3_exec(s_info.handle, ddl, NULL, NULL, &err) != SQLITE_OK) { ErrPrint("Failed to execute the DDL (%s)\n", err); return -EIO; |