clear 'rpm' related code

Change-Id: I820251e094a701b02187a5c6ced8bb74a664c542
Signed-off-by: jongmyeongko <jongmyeong.ko@samsung.com>

diff --git a/include/pkgmgr-info.h b/include/pkgmgr-info.h
index 4c7dcd4..0a97fcc 100644 (file)
--- a/include/pkgmgr-info.h
+++ b/include/pkgmgr-info.h
@@ -1634,7 +1634,7 @@ int pkgmgrinfo_pkginfo_destroy_pkginfo(pkgmgrinfo_pkginfo_h handle);
  * @see                pkgmgrinfo_pkginfo_filter_count()
  * @see                pkgmgrinfo_pkginfo_filter_foreach_pkginfo()
  * @code
-static int get_rpm_pkg_count()
+static int get_tpk_pkg_count()
 {
        int ret = 0;
        int count = 0;
@@ -1642,7 +1642,7 @@ static int get_rpm_pkg_count()
        ret = pkgmgrinfo_pkginfo_filter_create(&handle);
        if (ret != PMINFO_R_OK)
                return -1;
-       ret = pkgmgrinfo_pkginfo_filter_add_string(handle, PMINFO_PKGINFO_PROP_PACKAGE_TYPE, "rpm");
+       ret = pkgmgrinfo_pkginfo_filter_add_string(handle, PMINFO_PKGINFO_PROP_PACKAGE_TYPE, "tpk");
        if (ret != PMINFO_R_OK) {
                pkgmgrinfo_pkginfo_filter_destroy(handle);
                return -1;
@@ -1652,7 +1652,7 @@ static int get_rpm_pkg_count()
                pkgmgrinfo_pkginfo_filter_destroy(handle);
                return -1;
        }
-       printf("No of rpm pkgs: %d\n", count);
+       printf("No of tpk pkgs: %d\n", count);
        pkgmgrinfo_pkginfo_filter_destroy(handle);
        return 0;
 }
@@ -1677,7 +1677,7 @@ int pkgmgrinfo_pkginfo_filter_create(pkgmgrinfo_pkginfo_filter_h *handle);
  * @see                pkgmgrinfo_pkginfo_filter_count()
  * @see                pkgmgrinfo_pkginfo_filter_foreach_pkginfo()
  * @code
-static int get_rpm_pkg_count()
+static int get_tpk_pkg_count()
 {
        int ret = 0;
        int count = 0;
@@ -1685,7 +1685,7 @@ static int get_rpm_pkg_count()
        ret = pkgmgrinfo_pkginfo_filter_create(&handle);
        if (ret != PMINFO_R_OK)
                return -1;
-       ret = pkgmgrinfo_pkginfo_filter_add_string(handle, PMINFO_PKGINFO_PROP_PACKAGE_TYPE, "rpm");
+       ret = pkgmgrinfo_pkginfo_filter_add_string(handle, PMINFO_PKGINFO_PROP_PACKAGE_TYPE, "tpk");
        if (ret != PMINFO_R_OK) {
                pkgmgrinfo_pkginfo_filter_destroy(handle);
                return -1;
@@ -1695,7 +1695,7 @@ static int get_rpm_pkg_count()
                pkgmgrinfo_pkginfo_filter_destroy(handle);
                return -1;
        }
-       printf("No of rpm pkgs: %d\n", count);
+       printf("No of tpk pkgs: %d\n", count);
        pkgmgrinfo_pkginfo_filter_destroy(handle);
        return 0;
 }
@@ -1814,7 +1814,7 @@ int pkgmgrinfo_pkginfo_filter_add_int(pkgmgrinfo_pkginfo_filter_h handle,
  * @see                pkgmgrinfo_pkginfo_filter_count()
  * @see                pkgmgrinfo_pkginfo_filter_foreach_pkginfo()
  * @code
-static int get_rpm_pkg_count()
+static int get_tpk_pkg_count()
 {
        int ret = 0;
        int count = 0;
@@ -1822,7 +1822,7 @@ static int get_rpm_pkg_count()
        ret = pkgmgrinfo_pkginfo_filter_create(&handle);
        if (ret != PMINFO_R_OK)
                return -1;
-       ret = pkgmgrinfo_pkginfo_filter_add_string(handle, PMINFO_PKGINFO_PROP_PACKAGE_TYPE, "rpm");
+       ret = pkgmgrinfo_pkginfo_filter_add_string(handle, PMINFO_PKGINFO_PROP_PACKAGE_TYPE, "tpk");
        if (ret != PMINFO_R_OK) {
                pkgmgrinfo_pkginfo_filter_destroy(handle);
                return -1;
@@ -1832,7 +1832,7 @@ static int get_rpm_pkg_count()
                pkgmgrinfo_pkginfo_filter_destroy(handle);
                return -1;
        }
-       printf("No of rpm pkgs: %d\n", count);
+       printf("No of tpk pkgs: %d\n", count);
        pkgmgrinfo_pkginfo_filter_destroy(handle);
        return 0;
 }
@@ -1867,14 +1867,14 @@ int pkg_list_cb(pkgmgrinfo_pkginfo_h handle, void *user_data)
        return 0;
 }
 
-static int get_rpm_pkg_list()
+static int get_tpk_pkg_list()
 {
        int ret = 0;
        pkgmgrinfo_pkginfo_filter_h handle;
        ret = pkgmgrinfo_pkginfo_filter_create(&handle);
        if (ret != PMINFO_R_OK)
                return -1;
-       ret = pkgmgrinfo_pkginfo_filter_add_string(handle, PMINFO_PKGINFO_PROP_PACKAGE_TYPE, "rpm");
+       ret = pkgmgrinfo_pkginfo_filter_add_string(handle, PMINFO_PKGINFO_PROP_PACKAGE_TYPE, "tpk");
        if (ret != PMINFO_R_OK) {
                pkgmgrinfo_pkginfo_filter_destroy(handle);
                return -1;
@@ -1913,7 +1913,7 @@ int pkgmgrinfo_pkginfo_usr_filter_foreach_pkginfo(pkgmgrinfo_pkginfo_filter_h ha
  * @post               pkgmgrinfo_pkginfo_filter_destroy()
  * @see                pkgmgrinfo_pkginfo_filter_foreach_pkginfo()
  * @code
-static int get_rpm_pkg_count()
+static int get_tpk_pkg_count()
 {
        int ret = 0;
        int count = 0;
@@ -1921,7 +1921,7 @@ static int get_rpm_pkg_count()
        ret = pkgmgrinfo_pkginfo_filter_create(&handle);
        if (ret != PMINFO_R_OK)
                return -1;
-       ret = pkgmgrinfo_pkginfo_filter_add_string(handle, PMINFO_PKGINFO_PROP_PACKAGE_TYPE, "rpm");
+       ret = pkgmgrinfo_pkginfo_filter_add_string(handle, PMINFO_PKGINFO_PROP_PACKAGE_TYPE, "tpk");
        if (ret != PMINFO_R_OK) {
                pkgmgrinfo_pkginfo_filter_destroy(handle);
                return -1;
@@ -1931,7 +1931,7 @@ static int get_rpm_pkg_count()
                pkgmgrinfo_pkginfo_filter_destroy(handle);
                return -1;
        }
-       printf("No of rpm pkgs: %d\n", count);
+       printf("No of tpk pkgs: %d\n", count);
        pkgmgrinfo_pkginfo_filter_destroy(handle);
        return 0;
 }

diff --git a/include/pkgmgrinfo_basic.h b/include/pkgmgrinfo_basic.h
index eb129bf..22a0c63 100644 (file)
--- a/include/pkgmgrinfo_basic.h
+++ b/include/pkgmgrinfo_basic.h
@@ -163,7 +163,7 @@ typedef struct package_x {
        const char *update;                     /**< package update flag, no xml part*/
        const char *appsetting;         /**< package app setting flag, attr, default: "false"*/
        const char *system;             /**< package system flag, no xml part*/
-       const char *type;               /**< package type, attr, default: "rpm"*/
+       const char *type;               /**< package type, attr*/
        const char *package_size;               /**< package size for external installation, attr*/
        const char *installed_time;             /**< installed time after finishing of installation, no xml part*/
        const char *installed_storage;          /**< package currently installed storage, no xml part*/

diff --git a/parser/manifest.xsd.ref b/parser/manifest.xsd.ref
index 5aa4430..3a499b7 100644 (file)
--- a/parser/manifest.xsd.ref
+++ b/parser/manifest.xsd.ref
@@ -55,11 +55,8 @@
   </xs:simpleType>
   <xs:simpleType name="PackageType">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="rpm"/>
       <xs:enumeration value="tpk"/>
       <xs:enumeration value="wgt"/>
-      <xs:enumeration value="apk"/>
-      <xs:enumeration value="coretpk"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="ProfileType">

diff --git a/parser/pkgmgr_parser.c b/parser/pkgmgr_parser.c
index 60b7b51..d174446 100644 (file)
--- a/parser/pkgmgr_parser.c
+++ b/parser/pkgmgr_parser.c
@@ -1941,7 +1941,7 @@ static int __process_manifest(xmlTextReaderPtr reader, manifest_x *mfx, uid_t ui
                        __save_xml_attribute(reader, "version", &mfx->version, NULL);
                        __save_xml_attribute(reader, "size", &mfx->package_size, NULL);
                        __save_xml_attribute(reader, "install-location", &mfx->installlocation, "internal-only");
-                       __save_xml_attribute(reader, "type", &mfx->type, "rpm");
+                       __save_xml_attribute(reader, "type", &mfx->type, "tpk");
                        __save_xml_attribute(reader, "root_path", &mfx->root_path, NULL);
                        __save_xml_attribute(reader, "csc_path", &mfx->csc_path, NULL);
                        __save_xml_attribute(reader, "appsetting", &mfx->appsetting, "false");

diff --git a/parser/pkgmgr_parser_db.c b/parser/pkgmgr_parser_db.c
index d56a705..fe9bd66 100644 (file)
--- a/parser/pkgmgr_parser_db.c
+++ b/parser/pkgmgr_parser_db.c
@@ -86,7 +86,7 @@ sqlite3 *pkgmgr_cert_db;
 
 #define QUERY_CREATE_TABLE_PACKAGE_INFO "create table if not exists package_info " \
                                                "(package text primary key not null, " \
-                                               "package_type text DEFAULT 'rpm', " \
+                                               "package_type text DEFAULT 'tpk', " \
                                                "package_version text, " \
                                                "package_api_version text, " \
                                                "package_tep_name text, " \