[Liblas-commits] hg-main-tree: fix up #37 to add better error handling for base_t...

[liblas-commits at liblas.org]

details:   http://hg.libpc.orghg-main-tree/rev/42e1b3e69f3f
changeset: 1075:42e1b3e69f3f
user:      Howard Butler <hobu.inc at gmail.com>
date:      Fri Aug 12 14:46:55 2011 -0500
description:
fix up #37 to add better error handling for base_table_boundary_wkt

diffstat:

 src/drivers/oci/Writer.cpp |  14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r f2459a56b514 -r 42e1b3e69f3f src/drivers/oci/Writer.cpp
--- a/src/drivers/oci/Writer.cpp	Fri Aug 12 14:14:56 2011 -0500
+++ b/src/drivers/oci/Writer.cpp	Fri Aug 12 14:46:55 2011 -0500
@@ -469,6 +469,7 @@
 
 std::string Writer::LoadSQLData(std::string const& filename)
 {
+    std::cout << "LoadSQLData for " << filename << std::endl;
     if (!FileUtils::fileExists(filename))
     {
         std::ostringstream oss;
@@ -761,12 +762,23 @@
 
     if (!FileUtils::fileExists(base_table_boundary_wkt))
     {
+        if (!IsValidWKT(base_table_boundary_wkt))
+        {
+            std::ostringstream oss;
+            oss << "WKT for base_table_boundary_wkt was not valid and '" << base_table_boundary_wkt
+                << "' doesn't exist as a file";
+            throw pdal::pdal_error(oss.str());
+        }        
         wkt_s << base_table_boundary_wkt;
     } else {
+        std::cout << "loading: " << base_table_boundary_wkt << std::endl;
         std::string wkt = LoadSQLData(base_table_boundary_wkt);
         if (!IsValidWKT(wkt))
         {
-            throw pdal::pdal_error("WKT for base_table_boundary_wkt was not valid");
+            std::ostringstream oss;
+            oss << "WKT for base_table_boundary_wkt was from file '" << base_table_boundary_wkt 
+                << "' is not valid";
+            throw pdal::pdal_error(oss.str());
         }
         wkt_s << wkt;
     }