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

fix compile of pgsql2sqlite

Browse source
This commit is contained in:
Dane Springmeyer 2011-11-13 15:02:29 -08:00
parent e2382d0578
commit cccacb3f2c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/pgsql2sqlite/main.cpp
View file

@ -100,7 +100,7 @@ int main ( int argc, char** argv)
boost::shared_ptr<Connection> conn(creator()); boost::shared_ptr<Connection> conn(creator());
std::string query = vm["query"].as<std::string>(); std::string query = vm["query"].as<std::string>();
std::string output_table_name = vm.count("table") ? vm["table"].as<std::string>() : mapnik::table_from_sql(query); std::string output_table_name = vm.count("table") ? vm["table"].as<std::string>() : mapnik::sql_utils::table_from_sql(query);
std::string output_file = vm["file"].as<std::string>(); std::string output_file = vm["file"].as<std::string>();
std::cout << "output_table : " << output_table_name << "\n"; std::cout << "output_table : " << output_table_name << "\n";

4
utils/pgsql2sqlite/pgsql2sqlite.hpp
View file

@ -92,7 +92,7 @@ void pgsql2sqlite(Connection conn,
select_sql << " from (" << query << ") as query"; select_sql << " from (" << query << ") as query";
std::string table_name = mapnik::table_from_sql(query); std::string table_name = mapnik::sql_utils::table_from_sql(query);
std::string schema_name=""; std::string schema_name="";
std::string::size_type idx=table_name.find_last_of('.'); std::string::size_type idx=table_name.find_last_of('.');
@ -279,7 +279,7 @@ void pgsql2sqlite(Connection conn,
} }
case 1700: case 1700:
{ {
std::string str = mapnik::numeric2string(buf); std::string str = mapnik::sql_utils::numeric2string(buf);
try try
{ {
double val = boost::lexical_cast<double>(str); double val = boost::lexical_cast<double>(str);