[ardb] r257 committed - Use absolute paths to access XSL templates....

[codesite...@google.com]

Revision: 257
Author: gokturk...@gmail.com
Date: Thu Jul 4 19:40:40 2013
Log: Use absolute paths to access XSL templates.

Relative addressing fails because the xsl folder is inside the ARDB package
folder, whereas the CWD is the directory where the database file is located.


http://code.google.com/p/ardb/source/detail?r=257

Modified:
/trunk/wxARDB/src/deckmodel.cpp
/trunk/wxARDB/src/inventorymodel.cpp

=======================================
--- /trunk/wxARDB/src/deckmodel.cpp Tue Apr 6 13:42:44 2010
+++ /trunk/wxARDB/src/deckmodel.cpp Thu Jul 4 19:40:40 2013
@@ -578,13 +578,10 @@
bool
DeckModel::ExportToHTML ()
{
- Database *pDatabase = Database::Instance ();
wxString sXSL, sConfEntry = wxT("DeckHTMLTemplate");
wxString sFile = StripInvalidFilename(m_sName);

- if (pDatabase == NULL) return false;
-
- sXSL << pDatabase->GetDatabaseDirectory ()
+ sXSL << *g_pArdbDir
<< wxFileName::GetPathSeparator ()
<< wxT("xsl/deck2html_eldb.xsl");

@@ -607,13 +604,10 @@
bool
DeckModel::ExportToJOL ()
{
- Database *pDatabase = Database::Instance ();
wxString sXSL, sConfEntry = wxT("DeckJOLTemplate");
wxString sFile = StripInvalidFilename(m_sName);

- if (pDatabase == NULL) return false;
-
- sXSL << pDatabase->GetDatabaseDirectory ()
+ sXSL << *g_pArdbDir
<< wxFileName::GetPathSeparator ()
<< wxT("xsl/deck2jol.xsl");

@@ -635,13 +629,10 @@
bool
DeckModel::ExportToLackey()
{
- Database *pDatabase = Database::Instance ();
wxString sXSL, sConfEntry = wxT("DeckLackeyTemplate");
wxString sFile = StripInvalidFilename(m_sName);

- if (pDatabase == NULL) return false;
-
- sXSL << pDatabase->GetDatabaseDirectory ()
+ sXSL << *g_pArdbDir
<< wxFileName::GetPathSeparator ()
<< wxT("xsl/deck2lackey.xsl");

@@ -664,13 +655,10 @@
bool
DeckModel::ExportToPhpBB ()
{
- Database *pDatabase = Database::Instance ();
wxString sXSL, sConfEntry = wxT("DeckPhpBBTemplate");
wxString sFile = StripInvalidFilename(m_sName);

- if (pDatabase == NULL) return false;
-
- sXSL << pDatabase->GetDatabaseDirectory ()
+ sXSL << *g_pArdbDir
<< wxFileName::GetPathSeparator ()
<< wxT("xsl/deck2phpbb.xsl");

@@ -693,14 +681,11 @@
bool
DeckModel::ExportToText ()
{
- Database *pDatabase = Database::Instance ();
wxString sXSL;
wxString sConfEntry = wxT("DeckTextTemplate");
wxString sFile = StripInvalidFilename(m_sName);

- if (pDatabase == NULL) return false;
-
- sXSL << pDatabase->GetDatabaseDirectory ()
+ sXSL << *g_pArdbDir
<< wxFileName::GetPathSeparator ()
<< wxT("xsl/deck2text.xsl");

@@ -744,7 +729,6 @@
DeckModel::ExportToSecretLibrary(wxString &sUsername, wxString &sPassword)
{
bool result;
- Database *pDatabase = Database::Instance ();
wxString sCryptXSL;
wxString sLibraryXSL;
wxString sTitleXSL;
@@ -757,25 +741,23 @@
wxString sAuthor = wxT("");
wxString sDesc = wxT("");

- if (pDatabase == NULL) return false;
-
- sCryptXSL << pDatabase->GetDatabaseDirectory ()
+ sCryptXSL << *g_pArdbDir
<< wxFileName::GetPathSeparator ()
<< wxT("xsl/crypt2text.xsl");

- sLibraryXSL << pDatabase->GetDatabaseDirectory ()
+ sLibraryXSL << *g_pArdbDir
<< wxFileName::GetPathSeparator ()
<< wxT("xsl/library2text.xsl");

- sTitleXSL << pDatabase->GetDatabaseDirectory ()
+ sTitleXSL << *g_pArdbDir
<< wxFileName::GetPathSeparator ()
<< wxT("xsl/title2text.xsl");

- sAuthorXSL << pDatabase->GetDatabaseDirectory ()
+ sAuthorXSL << *g_pArdbDir
<< wxFileName::GetPathSeparator ()
<< wxT("xsl/author2text.xsl");

- sDescXSL << pDatabase->GetDatabaseDirectory ()
+ sDescXSL << *g_pArdbDir
<< wxFileName::GetPathSeparator ()
<< wxT("xsl/desc2text.xsl");

=======================================
--- /trunk/wxARDB/src/inventorymodel.cpp Sat Jul 31 20:47:57 2010
+++ /trunk/wxARDB/src/inventorymodel.cpp Thu Jul 4 19:40:40 2013
@@ -85,13 +85,10 @@
bool
InventoryModel::ExportToCSV ()
{
- Database *pDatabase = Database::Instance ();
wxString sXSL, sConfEntry = wxT("InventoryCSVTemplate");
wxString sFile = m_sName;

- if (pDatabase == NULL) return false;
-
- sXSL << pDatabase->GetDatabaseDirectory ()
+ sXSL << *g_pArdbDir
<< wxFileName::GetPathSeparator ()
<< wxT("xsl/inv2csv.xsl");

@@ -122,13 +119,10 @@
bool
InventoryModel::ExportToHTML ()
{
- Database *pDatabase = Database::Instance ();
wxString sXSL, sConfEntry = wxT("InventoryHTMLTemplate");
wxString sFile = m_sName;

- if (pDatabase == NULL) return false;
-
- sXSL << pDatabase->GetDatabaseDirectory ()
+ sXSL << *g_pArdbDir
<< wxFileName::GetPathSeparator ()
<< wxT("xsl/inv2html.xsl");

@@ -159,13 +153,10 @@
bool
InventoryModel::ExportToText ()
{
- Database *pDatabase = Database::Instance ();
wxString sXSL, sConfEntry = wxT("InventoryTextTemplate");
wxString sFile = m_sName;

- if (pDatabase == NULL) return false;
-
- sXSL << pDatabase->GetDatabaseDirectory ()
+ sXSL << *g_pArdbDir
<< wxFileName::GetPathSeparator ()
<< wxT("xsl/inv2text.xsl");