From 9b3ef53338a470cae7f5c1aa4efebd6f9766246c Mon Sep 17 00:00:00 2001
From: Lucio Asnaghi <kunitoki@gmail.com>
Date: Mon, 29 Nov 2010 09:15:43 +0000
Subject: [PATCH] - improved error reporting in shape plugin

---
 plugins/input/shape/shape.cpp                  | 4 ++--
 plugins/input/shape/shape_featureset.cpp       | 6 +++---
 plugins/input/shape/shape_index_featureset.cpp | 8 ++++----
 plugins/input/shape/shape_io.cpp               | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugins/input/shape/shape.cpp b/plugins/input/shape/shape.cpp
index f201e4bc3..6aa407d16 100644
--- a/plugins/input/shape/shape.cpp
+++ b/plugins/input/shape/shape.cpp
@@ -123,12 +123,12 @@ void shape_datasource::bind() const
     }
     catch (datasource_exception& ex)
     {
-        std::clog<<ex.what()<<std::endl;
+        std::clog << "Shape Plugin: error processing field attributes, " << ex.what() << std::endl;
         throw;
     }
     catch (...)
     {
-        std::clog << "Shape Plugin: got exception... " << std::endl;
+        std::clog << "Shape Plugin: error processing field attributes" << std::endl;
         throw;
     }
     
diff --git a/plugins/input/shape/shape_featureset.cpp b/plugins/input/shape/shape_featureset.cpp
index f60d3aa07..083fd3d8f 100644
--- a/plugins/input/shape/shape_featureset.cpp
+++ b/plugins/input/shape/shape_featureset.cpp
@@ -57,14 +57,14 @@ shape_featureset<filterT>::shape_featureset(const filterT& filter,
         {
             std::ostringstream s;
 
-            s << "Shape Plugin: error no attribute by the name of '" << *pos << "'"
-            << ", available attributes are:";
+            s << "error no attribute by the name of '" << *pos << "'"
+                << ", available attributes are:";
             for (int i=0;i<shape_.dbf().num_fields();++i)
             {
                 s << " '" << shape_.dbf().descriptor(i).name_ << "'";
             }
             
-            throw mapnik::datasource_exception( s.str() );
+            throw mapnik::datasource_exception( "Shape Plugin: " + s.str() );
         }
         ++pos;
     }
diff --git a/plugins/input/shape/shape_index_featureset.cpp b/plugins/input/shape/shape_index_featureset.cpp
index ee1a11467..8177d1d0b 100644
--- a/plugins/input/shape/shape_index_featureset.cpp
+++ b/plugins/input/shape/shape_index_featureset.cpp
@@ -78,14 +78,14 @@ shape_index_featureset<filterT>::shape_index_featureset(const filterT& filter,
         {
             std::ostringstream s;
 
-            s << "Shape Plugin: error no attribute by the name of '" << *pos << "'"
-            << ", available attributes are:";
+            s << "error no attribute by the name of '" << *pos << "'"
+                << ", available attributes are:";
             for (int i=0;i<shape_.dbf().num_fields();++i)
             {
                 s << " '" << shape_.dbf().descriptor(i).name_ << "'";
             }
             
-            throw mapnik::datasource_exception( s.str() );
+            throw mapnik::datasource_exception( "Shape Plugin: " + s.str() );
         }
         ++pos;
     }
@@ -224,7 +224,7 @@ feature_ptr shape_index_featureset<filterT>::next()
                 }
                 catch (...)
                 {
-                    std::clog << "Shape Plugin: exception caught..." << std::endl;
+                    std::clog << "Shape Plugin: error processing attributes" << std::endl;
                 }
                 ++pos;
             }
diff --git a/plugins/input/shape/shape_io.cpp b/plugins/input/shape/shape_io.cpp
index 7095b44e6..a8ba76fca 100644
--- a/plugins/input/shape/shape_io.cpp
+++ b/plugins/input/shape/shape_io.cpp
@@ -49,14 +49,14 @@ shape_io::shape_io(const std::string& shape_name)
     {
         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: could not open index: '" + shape_name + INDEX + "' does not exist");
         }
 
         index_= boost::shared_ptr<shape_file>(new shape_file(shape_name + INDEX));
     }
     catch (...)
     {
-        std::cerr << "Shape Plugin: Warning - Could not open index: '" + shape_name + INDEX + "'" << std::endl;
+        std::cerr << "Shape Plugin: warning - could not open index: '" + shape_name + INDEX + "'" << std::endl;
     }
 }