Catch PlanckError

df7cb · msdemlei · commit 229b55a0cf04 · 2021-04-22T14:01:36.000+02:00
This is thrown by the C++ healpix lib when a polygon is not convex.
diff --git a/expected/moc.out b/expected/moc.out
@@ -748,3 +748,6 @@ SELECT smoc(6, p) FROM g;
  5/4522 6/
 (1 row)
 
+-- lswscans/data/part1/Bruceplatten/FITS/B3558b.fits
+SELECT smoc(6, '{(1.28867804735846 , 0.421769766439468),(1.40564002826964 , 0.201070262502835),(1.27597340819331 , 0.210561432516079),(1.28707379974056 , 0.351693515652388)}'::spoly);
+ERROR:  MOC processing error: polygon is not convex
diff --git a/process_moc.cpp b/process_moc.cpp
@@ -12,6 +12,7 @@
 #include <sstream>
 #include <exception>
 #include <stdexcept>
+#include <cxxabi.h> /* __cxa_current_exception_type */
 
 #include <healpix_base.h>
 
@@ -37,10 +38,15 @@
 		delete p;							\
 		error_out(e.what(), 0);				\
 	}										\
+	catch (PlanckError & e)				\
+	{										\
+		delete p;							\
+		error_out(e.what(), 0);				\
+	}										\
 	catch (...)								\
 	{										\
 		delete p;							\
-		error_out("unknown exception", 0);	\
+		error_out(__cxxabiv1::__cxa_current_exception_type()->name(), 0);	\
 	}
 
 using std::size_t;
diff --git a/sql/moc.sql b/sql/moc.sql
@@ -165,3 +165,6 @@ SELECT smoc(3, '{(.1,.1), (.1,-1), (-1,-1), (-1, .1)}'::spoly);
 CREATE TABLE g (p spoly);
 INSERT INTO g (p) VALUES (spoly '{(1.48062434277764d , -0.112757492761271d),(1.48062583213677d , -0.0763898467955446d),(1.44427278313068d, -0.0762453395638312d),(1.44413625055362d , -0.112726631135703d)}');
 SELECT smoc(6, p) FROM g;
+
+-- lswscans/data/part1/Bruceplatten/FITS/B3558b.fits
+SELECT smoc(6, '{(1.28867804735846 , 0.421769766439468),(1.40564002826964 , 0.201070262502835),(1.27597340819331 , 0.210561432516079),(1.28707379974056 , 0.351693515652388)}'::spoly);
