[ITC][media-content][NonACR][Fix book tc fail for tv profile]

Change-Id: Ia41e3d8c0119db5921d2bc7d74e7aebba020b723
Signed-off-by: Nibha Sharma <nibha.sharma@samsung.com>

diff --git a/scripts_tpk/inst.sh b/scripts_tpk/inst.sh
index 2101c41ad03e813d3eea27894d2b71b54836769c..e357cda8623f6818009adcf7423a34c6d9b59a83 100755 (executable)
--- a/scripts_tpk/inst.sh
+++ b/scripts_tpk/inst.sh
@@ -310,6 +310,12 @@ applist=`ls $DEVICE_SUITE_TARGET_30/res | grep -e tpk -e rpk | cut -d '-' -f1`
     if [ -f $DEVICE_PHYSICAL_STORAGE_30/TestText.txt ]; then
             rm -f $DEVICE_PHYSICAL_STORAGE_30/TestText.txt
     fi
+    if [ -f $DEVICE_PHYSICAL_STORAGE_30/itc_test.pdf ]; then
+            rm -f $DEVICE_PHYSICAL_STORAGE_30/itc_test.pdf
+    fi
+    if [ -f $DEVICE_PHYSICAL_STORAGE_30/itc_test.epub ]; then
+            rm -f $DEVICE_PHYSICAL_STORAGE_30/itc_test.epub
+    fi
     if [ -d $DEVICE_PHYSICAL_STORAGE_30/Text ]; then
             rm -rf $DEVICE_PHYSICAL_STORAGE_30/Text
     fi

diff --git a/src/itc/media-content/ITs-media-content-book.c b/src/itc/media-content/ITs-media-content-book.c
index 230c0076b5d1c3b4fd1a1a53beca1ae9fddbd524..62647829322106e54a698f456ca76fd773c42733 100755 (executable)
--- a/src/itc/media-content/ITs-media-content-book.c
+++ b/src/itc/media-content/ITs-media-content-book.c
@@ -61,6 +61,7 @@ void ITs_media_content_book_startup(void)
         pszMediaId = NULL;\r
         g_hBookDst = NULL;\r
         g_hBook = NULL;\r
+       g_hBookInfo = NULL;\r
         int nRet;\r
         nRet = media_content_connect();\r
         if(nRet != MEDIA_CONTENT_ERROR_NONE){\r
@@ -68,6 +69,13 @@ void ITs_media_content_book_startup(void)
                 return;\r
         }\r
 \r
+       nRet = GetInternalStorageIdandPath();\r
+       PRINT_RESULTNONE_CLEANUP(0, nRet, "GetInternalStorageId", "Return Value Not Correct", media_content_disconnect());\r
+\r
+       AppendPaths(g_szInternalStoragePath, TESTBOOK, g_szBookPath);\r
+       nRet = media_info_insert_to_db(g_szBookPath, &g_hBookInfo);\r
+       PRINT_RESULTNONE_CLEANUP(MEDIA_CONTENT_ERROR_NONE, nRet, "media_info_insert_to_db", MediaContentGetError(nRet), media_content_disconnect());\r
+\r
         char *pszCondition = "MEDIA_TYPE=5 AND MEDIA_STORAGE_TYPE=0";\r
         nRet = media_filter_create(&g_hFilter);\r
         PRINT_RESULTNONE(MEDIA_CONTENT_ERROR_NONE, nRet, "media_filter_create", MediaContentGetError(nRet));\r
@@ -116,7 +124,11 @@ void ITs_media_content_book_cleanup(void)
                 media_filter_destroy(g_hFilter);\r
                 g_hFilter = NULL;\r
         }\r
-\r
+       if(g_hBookInfo)\r
+       {\r
+               media_info_destroy(g_hBookInfo);\r
+               g_hBookInfo = NULL;\r
+       }\r
         media_content_disconnect();\r
 }\r
 \r

diff --git a/src/itc/media-content/ITs-media-content-info.c b/src/itc/media-content/ITs-media-content-info.c
index 53967360a3cb76bdfdf16a37a0c4eb2534c98875..fe801b36cbb31a40332c3b710f03d0d55e08b0d8 100755 (executable)
--- a/src/itc/media-content/ITs-media-content-info.c
+++ b/src/itc/media-content/ITs-media-content-info.c
@@ -448,10 +448,12 @@ void ITs_media_content_info_startup(void)
                remove(ERR_LOG);
        }
        char *pszMediaId = NULL;
+       g_hTextInfo = NULL;
        g_bMediaContentStartup = false;
        g_hAudioInfo = NULL;
        g_hImageInfo = NULL;
        g_hVideoInfo = NULL;
+       g_hBookInfo = NULL;
        g_bIsScanFeatureSupported = false;
        g_bIsScanFeatureNotSupported = false;
        g_bScanFeatureMismatch= false;
@@ -541,6 +543,7 @@ void ITs_media_content_info_cleanup(void)
        if(g_hTextInfo)
        {
                media_info_destroy(g_hTextInfo);
+               g_hTextInfo = NULL;
        }
        if(g_hAudioInfo)
        {
@@ -560,6 +563,7 @@ void ITs_media_content_info_cleanup(void)
        if(g_hBookInfo)
        {
                media_info_destroy(g_hBookInfo);
+               g_hBookInfo = NULL;
        }
        if(g_bMediaContentStartup && g_bIsScanFeatureSupported)
        {