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

+ shape plugin logging cosmetics

Browse source
This commit is contained in:
Lucio Asnaghi 2010-11-18 23:46:01 +00:00
parent 2906ba8d0d
commit a5f582f77e
4 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
plugins/input/shape/shape.cpp
View file

@ -54,7 +54,7 @@ shape_datasource::shape_datasource(const parameters &params, bool bind)
desc_(*params.get<std::string>("type"), *params.get<std::string>("encoding","utf-8")) desc_(*params.get<std::string>("type"), *params.get<std::string>("encoding","utf-8"))
{ {
boost::optional<std::string> file = params.get<std::string>("file"); boost::optional<std::string> file = params.get<std::string>("file");
if (!file) throw datasource_exception("missing <file> parameter"); if (!file) throw datasource_exception("Shape Plugin: missing <file> parameter");
boost::optional<std::string> base = params.get<std::string>("base"); boost::optional<std::string> base = params.get<std::string>("base");
if (base) if (base)
@ -76,12 +76,12 @@ void shape_datasource::bind() const
if (!boost::filesystem::exists(shape_name_ + ".shp")) if (!boost::filesystem::exists(shape_name_ + ".shp"))
{ {
throw datasource_exception("shapefile '" + shape_name_ + ".shp' does not exist"); throw datasource_exception("Shape Plugin: shapefile '" + shape_name_ + ".shp' does not exist");
} }
if (boost::filesystem::is_directory(shape_name_ + ".shp")) if (boost::filesystem::is_directory(shape_name_ + ".shp"))
{ {
throw datasource_exception("shapefile '" + shape_name_ + ".shp' appears to be a directory not a file"); throw datasource_exception("Shape Plugin: shapefile '" + shape_name_ + ".shp' appears to be a directory not a file");
} }
try try
@ -115,7 +115,7 @@ void shape_datasource::bind() const
} }
default: default:
#ifdef MAPNIK_DEBUG #ifdef MAPNIK_DEBUG
std::clog << "unknown type "<<fd.type_<<"\n"; std::clog << "Shape Plugin: unknown type " << fd.type_ << std::endl;
#endif #endif
break; break;
} }
@ -128,7 +128,7 @@ void shape_datasource::bind() const
} }
catch (...) catch (...)
{ {
std::clog << " got exception ... \n"; std::clog << "Shape Plugin: got exception... " << std::endl;
throw; throw;
} }
@ -144,7 +144,7 @@ void shape_datasource::init(shape_io& shape) const
if (file_code!=9994) if (file_code!=9994)
{ {
//invalid file code //invalid file code
throw datasource_exception((boost::format("wrong file code : %d") % file_code).str()); throw datasource_exception("Shape Plugin: " + (boost::format("wrong file code : %d") % file_code).str());
} }
shape.shp().skip(5*4); shape.shp().skip(5*4);
@ -154,7 +154,7 @@ void shape_datasource::init(shape_io& shape) const
if (version!=1000) if (version!=1000)
{ {
//invalid version number //invalid version number
throw datasource_exception((boost::format("invalid version number: %d") % version).str()); throw datasource_exception("Shape Plugin: " + (boost::format("invalid version number: %d") % version).str());
} }
#ifdef MAPNIK_DEBUG #ifdef MAPNIK_DEBUG
@ -171,8 +171,8 @@ void shape_datasource::init(shape_io& shape) const
double mmin = shape.shp().read_double(); double mmin = shape.shp().read_double();
double mmax = shape.shp().read_double(); double mmax = shape.shp().read_double();
std::clog << "Z min/max " << zmin << "," << zmax << "\n"; std::clog << "Shape Plugin: Z min/max " << zmin << "," << zmax << std::endl;
std::clog << "M min/max " << mmin << "," << mmax << "\n"; std::clog << "Shape Plugin: M min/max " << mmin << "," << mmax << "\n";
#else #else
shape.shp().skip(4*8); shape.shp().skip(4*8);
#endif #endif
@ -193,9 +193,9 @@ void shape_datasource::init(shape_io& shape) const
//} //}
#ifdef MAPNIK_DEBUG #ifdef MAPNIK_DEBUG
std::clog << extent_ << std::endl; std::clog << "Shape Plugin: extent=" << extent_ << std::endl;
std::clog << "file_length=" << file_length_ << std::endl; std::clog << "Shape Plugin: file_length=" << file_length_ << std::endl;
std::clog << "shape_type=" << shape_type << std::endl; std::clog << "Shape Plugin: shape_type=" << shape_type << std::endl;
#endif #endif
} }

6
plugins/input/shape/shape_featureset.cpp
View file

@ -57,7 +57,7 @@ shape_featureset<filterT>::shape_featureset(const filterT& filter,
{ {
std::ostringstream s; std::ostringstream s;
s << "Shapefile Plugin: Error: no attribute by the name of '" << *pos << "'" s << "Shape Plugin: error no attribute by the name of '" << *pos << "'"
<< ", available attributes are:"; << ", available attributes are:";
for (int i=0;i<shape_.dbf().num_fields();++i) for (int i=0;i<shape_.dbf().num_fields();++i)
{ {
@ -254,7 +254,7 @@ feature_ptr shape_featureset<filterT>::next()
} }
catch (...) catch (...)
{ {
std::clog << "error processing attributes " << std::endl; std::clog << "Shape Plugin: error processing attributes " << std::endl;
} }
++pos; ++pos;
} }
@ -264,7 +264,7 @@ feature_ptr shape_featureset<filterT>::next()
else else
{ {
#ifdef MAPNIK_DEBUG #ifdef MAPNIK_DEBUG
std::clog<<" total shapes read="<<count_<<"\n"; std::clog << "Shape Plugin: total shapes read=" << count_ << std::endl;
#endif #endif
return feature_ptr(); return feature_ptr();
} }

8
plugins/input/shape/shape_index_featureset.cpp
View file

@ -55,7 +55,7 @@ shape_index_featureset<filterT>::shape_index_featureset(const filterT& filter,
std::sort(ids_.begin(),ids_.end()); std::sort(ids_.begin(),ids_.end());
#ifdef MAPNIK_DEBUG #ifdef MAPNIK_DEBUG
std::clog<< "query size=" << ids_.size() << "\n"; std::clog << "Shape Plugin: query size=" << ids_.size() << std::endl;
#endif #endif
itr_ = ids_.begin(); itr_ = ids_.begin();
@ -78,7 +78,7 @@ shape_index_featureset<filterT>::shape_index_featureset(const filterT& filter,
{ {
std::ostringstream s; std::ostringstream s;
s << "Shapefile Plugin: Error: no attribute by the name of '" << *pos << "'" s << "Shape Plugin: error no attribute by the name of '" << *pos << "'"
<< ", available attributes are:"; << ", available attributes are:";
for (int i=0;i<shape_.dbf().num_fields();++i) for (int i=0;i<shape_.dbf().num_fields();++i)
{ {
@ -224,7 +224,7 @@ feature_ptr shape_index_featureset<filterT>::next()
} }
catch (...) catch (...)
{ {
std::clog<<"exception caught\n"; std::clog << "Shape Plugin: exception caught..." << std::endl;
} }
++pos; ++pos;
} }
@ -235,7 +235,7 @@ feature_ptr shape_index_featureset<filterT>::next()
{ {
#ifdef MAPNIK_DEBUG #ifdef MAPNIK_DEBUG
std::clog<<count_<<" features\n"; std::clog << "Shape Plugin: " << count_ << " features" << std::endl;
#endif #endif
return feature_ptr(); return feature_ptr();
} }

4
plugins/input/shape/shape_io.cpp
View file

@ -49,14 +49,14 @@ shape_io::shape_io(const std::string& shape_name)
{ {
if (!boost::filesystem::exists(shape_name + INDEX)) if (!boost::filesystem::exists(shape_name + INDEX))
{ {
throw datasource_exception("Shape Plugin Warning: Could not open index: '" + shape_name + INDEX + "' does not exist"); throw datasource_exception("Shape Plugin: Warning - Could not open index: '" + shape_name + INDEX + "' does not exist");
} }
index_= boost::shared_ptr<shape_file>(new shape_file(shape_name + INDEX)); index_= boost::shared_ptr<shape_file>(new shape_file(shape_name + INDEX));
} }
catch (...) catch (...)
{ {
std::cerr << "Shape Plugin Warning: Could not open index: '" + shape_name + INDEX + "'\n"; std::cerr << "Shape Plugin: Warning - Could not open index: '" + shape_name + INDEX + "'" << std::endl;
} }
} }