Changeset 532 for branches

Timestamp:

09/19/07 17:41:53 (14 months ago)

Author:

david

Message:

• throw exception on bad connection

Location:

branches/strict-xml-branch/plugins/input/postgis

Files:

• connection.hpp (modified) (2 diffs)
• connection_manager.hpp (modified) (1 diff)

branches/strict-xml-branch/plugins/input/postgis/connection.hpp

@@ -26 +26 @@
 #define CONNECTION_HPP
 
+#include <mapnik/datasource.hpp>
+
 extern "C" 
 {
@@ -42 +44 @@
       {
          conn_=PQconnectdb(connection_str.c_str());
-         if (PQstatus(conn_) == CONNECTION_BAD)
+         if (PQstatus(conn_) != CONNECTION_OK)
          {
-            std::clog << "connection  ["<< connection_str<< "] failed\n"
-                      << PQerrorMessage(conn_)<< std::endl;
+             std::string s("PSQL error");
+             if (conn_ )
+             {
+                 std::string msg = PQerrorMessage( conn_ );
+                 if ( ! msg.empty() )
+                 {
+                     s += ":\n" + msg.substr( 0, msg.size() - 1 );
+                 }
+             } 
+             throw mapnik::datasource_exception( s );
          }
       }

branches/strict-xml-branch/plugins/input/postgis/connection_manager.hpp

@@ -58 +58 @@
       T* operator()() const
       {
-         return new T(connection_string());
+          return new T(connection_string());
       }