Changeset 91

Timestamp:

04/20/06 02:37:27 (2 years ago)

Author:

jordi

Message:

The PDFDocument now can open files names that are in relative path.

Location:

trunk

Files:

• src/PDFDocument.cxx (modified) (4 diffs)
• tests/PDFDocumentTest.cxx (modified) (2 diffs)
• tests/PDFDocumentTest.h (modified) (2 diffs)

trunk/src/PDFDocument.cxx

@@ -30 +30 @@
 static PageLayout convertPageLayout (gint pageLayout);
 static PageMode convertPageMode (gint pageMode);
+static gchar *getAbsoluteFileName (const gchar *fileName);
 
 ///
@@ -81 +82 @@
     g_assert (NULL != filename && "Tried to load a NULL file name");
 
-    gchar *filename_uri = g_filename_to_uri (filename, NULL, error);
+    gchar *absoluteFileName = getAbsoluteFileName (filename);
+    gchar *filename_uri = g_filename_to_uri (absoluteFileName, NULL, error);
+    g_free (absoluteFileName);
     if ( NULL == filename_uri )
     {
@@ -276 +279 @@
 
 ///
-/// @brief Gets the document's page layout from Poppler's page layout.
-///
-/// @param pageLayout Is the page layout that Poppler's glib wrapper gives.
-///
-/// @return The PageLayout based on @a pageLayout.
-///
-PageLayout
-convertPageLayout (gint pageLayout)
-{
-    PageLayout layout = PageLayoutUnset;
-    switch (pageLayout)
-    {
-        case POPPLER_PAGE_LAYOUT_SINGLE_PAGE:
-            layout = PageLayoutSinglePage;
-            break;
-        case POPPLER_PAGE_LAYOUT_ONE_COLUMN:
-            layout = PageLayoutOneColumn;
-            break;
-        case POPPLER_PAGE_LAYOUT_TWO_COLUMN_LEFT:
-            layout = PageLayoutTwoColumnLeft;
-            break;
-        case POPPLER_PAGE_LAYOUT_TWO_COLUMN_RIGHT:
-            layout = PageLayoutTwoColumnRight;
-            break;
-        case POPPLER_PAGE_LAYOUT_TWO_PAGE_LEFT:
-            layout = PageLayoutTwoPageLeft;
-            break;
-        case POPPLER_PAGE_LAYOUT_TWO_PAGE_RIGHT:
-            layout = PageLayoutTwoPageRight;
-            break;
-        case POPPLER_PAGE_LAYOUT_UNSET:
-        default:
-            layout = PageLayoutUnset;
-    }
-
-    return layout;
-}
-
-///
-/// @brief Get the document's page mode.
-///
-/// @param pageLayout Is the page mode that Poppler's catalog gives.
-///
-/// @return The PageLayout based on @a pageMode.
-///
-PageMode
-convertPageMode (gint pageMode)
-{
-    PageMode mode = PageModeUnset;
-    switch (pageMode)
-    {
-        case POPPLER_PAGE_MODE_USE_OUTLINES:
-            mode = PageModeOutlines;
-            break;
-        case POPPLER_PAGE_MODE_USE_THUMBS:
-            mode = PageModeThumbs;
-            break;
-        case POPPLER_PAGE_MODE_FULL_SCREEN:
-            mode = PageModeFullScreen;
-            break;
-        case POPPLER_PAGE_MODE_USE_OC:
-            mode = PageModeOC;
-            break;
-        case POPPLER_PAGE_MODE_USE_ATTACHMENTS:
-            mode = PageModeAttach;
-            break;
-        case POPPLER_PAGE_MODE_NONE:
-        case POPPLER_PAGE_MODE_UNSET:
-        default:
-            mode = PageModeUnset;
-    }
-
-    return mode;
-}
-
-///
 /// @brief Gets the current page's unscaled size.
 ///
@@ -425 +352 @@
     return (renderedPage);
 }
+
+///
+/// @brief Gets the document's page layout from Poppler's page layout.
+///
+/// @param pageLayout Is the page layout that Poppler's glib wrapper gives.
+///
+/// @return The PageLayout based on @a pageLayout.
+///
+PageLayout
+convertPageLayout (gint pageLayout)
+{
+    PageLayout layout = PageLayoutUnset;
+    switch (pageLayout)
+    {
+        case POPPLER_PAGE_LAYOUT_SINGLE_PAGE:
+            layout = PageLayoutSinglePage;
+            break;
+        case POPPLER_PAGE_LAYOUT_ONE_COLUMN:
+            layout = PageLayoutOneColumn;
+            break;
+        case POPPLER_PAGE_LAYOUT_TWO_COLUMN_LEFT:
+            layout = PageLayoutTwoColumnLeft;
+            break;
+        case POPPLER_PAGE_LAYOUT_TWO_COLUMN_RIGHT:
+            layout = PageLayoutTwoColumnRight;
+            break;
+        case POPPLER_PAGE_LAYOUT_TWO_PAGE_LEFT:
+            layout = PageLayoutTwoPageLeft;
+            break;
+        case POPPLER_PAGE_LAYOUT_TWO_PAGE_RIGHT:
+            layout = PageLayoutTwoPageRight;
+            break;
+        case POPPLER_PAGE_LAYOUT_UNSET:
+        default:
+            layout = PageLayoutUnset;
+    }
+
+    return layout;
+}
+
+///
+/// @brief Get the document's page mode.
+///
+/// @param pageLayout Is the page mode that Poppler's catalog gives.
+///
+/// @return The PageLayout based on @a pageMode.
+///
+PageMode
+convertPageMode (gint pageMode)
+{
+    PageMode mode = PageModeUnset;
+    switch (pageMode)
+    {
+        case POPPLER_PAGE_MODE_USE_OUTLINES:
+            mode = PageModeOutlines;
+            break;
+        case POPPLER_PAGE_MODE_USE_THUMBS:
+            mode = PageModeThumbs;
+            break;
+        case POPPLER_PAGE_MODE_FULL_SCREEN:
+            mode = PageModeFullScreen;
+            break;
+        case POPPLER_PAGE_MODE_USE_OC:
+            mode = PageModeOC;
+            break;
+        case POPPLER_PAGE_MODE_USE_ATTACHMENTS:
+            mode = PageModeAttach;
+            break;
+        case POPPLER_PAGE_MODE_NONE:
+        case POPPLER_PAGE_MODE_UNSET:
+        default:
+            mode = PageModeUnset;
+    }
+
+    return mode;
+}
+
+///
+/// @brief Gets the absolute path of a filename.
+///
+/// This function checks if the given @a fileName is an absolute path. If
+/// it is then it returns a copy of it, otherwise it prepends the current
+/// working directory to it.
+///
+/// @param fileName The filename to get the absolute path from.
+///
+/// @return A copy of the absolute path to the file name. This copy must be
+///         freed when no longer needed.
+///
+gchar *
+getAbsoluteFileName (const gchar *fileName)
+{
+    gchar *absoluteFileName = NULL;
+    if ( g_path_is_absolute (fileName) )
+    {
+        absoluteFileName = g_strdup (fileName);
+    }
+    else
+    {
+        gchar *currentDir = g_get_current_dir ();
+        absoluteFileName = g_build_filename (currentDir, fileName, NULL);
+        g_free (currentDir);
+    }
+
+    return absoluteFileName;
+}

trunk/tests/PDFDocumentTest.cxx

@@ -37 +37 @@
     gchar *currentDir = g_get_current_dir ();
     gchar *filePath = g_build_filename (currentDir, TEST_DIR, fileName, NULL);
+    g_free (currentDir);
 
     return filePath;
@@ -289 +290 @@
     g_free (testFile);
 }
+
+///
+/// @brief Test loading a relative path filename.
+///
+/// Poppler's glib wrapper needs an URI instead of just a filename, but
+/// in order to build it I need an absolute path. This check test that
+/// giving a relative path converts it to absolute and loads the file
+/// properly.
+///
+void
+PDFDocumentTest::relativePath ()
+{
+    CPPUNIT_ASSERT (m_Document->loadFile (TEST_DIR "test1.pdf", NULL, NULL));
+    CPPUNIT_ASSERT (m_Document->isLoaded ());
+    CPPUNIT_ASSERT_EQUAL (0,
+            g_ascii_strcasecmp (TEST_DIR "test1.pdf", 
+                                m_Document->getFileName ()));
+}
+
 
 ///

trunk/tests/PDFDocumentTest.h

@@ -31 +31 @@
         CPPUNIT_TEST (encryptedFile);
         CPPUNIT_TEST (validFile);
+        CPPUNIT_TEST (relativePath);
         CPPUNIT_TEST (pageChange);
         CPPUNIT_TEST (pageRotate);
@@ -46 +47 @@
             void encryptedFile (void);
             void validFile (void);
+            void relativePath (void);
             void pageChange (void);
             void pageRotate (void);