sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sqlite: fix relative path logic for attachdb - closes #817

Browse source
This commit is contained in:
Dane Springmeyer 2011-08-12 19:26:30 +00:00
parent a7e67477a6
commit f1b8f02110
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
plugins/input/sqlite/sqlite_datasource.cpp
View file

@ -137,8 +137,6 @@ void sqlite_datasource::parse_attachdb(std::string const& attachdb) {
beg != tok.end(); ++beg) beg != tok.end(); ++beg)
{ {
std::string const& spec(*beg); std::string const& spec(*beg);
std::string dbname;
std::string filename;
size_t atpos=spec.find('@'); size_t atpos=spec.find('@');
// See if it contains an @ sign // See if it contains an @ sign
@ -147,17 +145,18 @@ void sqlite_datasource::parse_attachdb(std::string const& attachdb) {
} }
// Break out the dbname and the filename // Break out the dbname and the filename
dbname=boost::trim_copy(spec.substr(0, atpos)); std::string dbname = boost::trim_copy(spec.substr(0, atpos));
filename=boost::trim_copy(spec.substr(atpos+1)); std::string filename = boost::trim_copy(spec.substr(atpos+1));
// Normalize the filename and make it relative to dataset_name_ // Normalize the filename and make it relative to dataset_name_
if (filename.compare(":memory:") != 0) { if (filename.compare(":memory:") != 0) {
boost::filesystem::path child_path(filename); boost::filesystem::path child_path(filename);
if (!child_path.has_root_directory() && !child_path.has_root_name()) {
// It is a relative path. Fix it. // It is a relative path. Fix it.
if (!child_path.has_root_directory() && !child_path.has_root_name()) {
boost::filesystem::path absolute_path(dataset_name_); boost::filesystem::path absolute_path(dataset_name_);
absolute_path.remove_filename(); filename = boost::filesystem::absolute(absolute_path.parent_path()/filename).string();
filename=absolute_path.string() + filename;
} }
} }