# HG changeset patch
# User Tom Fredrik "BFG" Klaussen <bfg@blenning.no>
# Date 1350312770 -7200
# Node ID 3a1e20a5b67ae5bc5597cb8eb46376c0a4921e1b
# Parent  ff5fc61aa5ea501b46c8e226efacaa3b7fa81306# Parent  88904282b8880232be4e633b7bcfb267d27e173d
Branc merge.

diff -r 88904282b888 -r 3a1e20a5b67a StatusCodes.inc
--- a/StatusCodes.inc	Fri Oct 12 16:59:19 2012 +0200
+++ b/StatusCodes.inc	Mon Oct 15 16:52:50 2012 +0200
@@ -303,7 +303,7 @@
     $matches = array();
     preg_match('/HTTP\/\S+\s(\d+)/', $header, $matches);
     if (count($matches) < 1)
-      throw new Exception("Not an http header");
+      throw new InvalidArgumentException("Not an http header");
     $n = $matches[1];
     return $n;
   }
diff -r 88904282b888 -r 3a1e20a5b67a common-functions.inc
--- a/common-functions.inc	Fri Oct 12 16:59:19 2012 +0200
+++ b/common-functions.inc	Mon Oct 15 16:52:50 2012 +0200
@@ -155,7 +155,7 @@
 function getElementByTagName($obj, $name) {
   $elems = $obj->getElementsByTagName($name);
   if ($elems->length != 1) {
-    throw new Exception("More than one tag with name \"${name}\"");
+    throw new UnexpectedValueException("More than one tag with name \"${name}\"");
   }
   $elem = $elems->item(0);
   return $elem;
diff -r 88904282b888 -r 3a1e20a5b67a flag.php
--- a/flag.php	Fri Oct 12 16:59:19 2012 +0200
+++ b/flag.php	Mon Oct 15 16:52:50 2012 +0200
@@ -11,6 +11,11 @@
 $scriptCache = ScriptIncludeCache::instance(__FILE__);
 $scriptCache->includeOnce('Flag.inc');
 
-$flag = new Flag($scriptCache);
-$flag->genPage();
+try {
+  $flag = new Flag($scriptCache);
+  $flag->genPage();
+}
+catch (Exception $e) {
+  errorPage($e, StatusCodes::HTTP_INTERNAL_SERVER_ERROR);
+}
 /// @endcond
diff -r 88904282b888 -r 3a1e20a5b67a index.php
--- a/index.php	Fri Oct 12 16:59:19 2012 +0200
+++ b/index.php	Mon Oct 15 16:52:50 2012 +0200
@@ -23,9 +23,8 @@
 }
 
 try {
-$input = new InputParser(basePath() . "/master.xml", $cache);
-
-$input->genPage();
+  $input = new InputParser(basePath() . "/master.xml", $cache);
+  $input->genPage();
 }
 catch (Exception $e) {
   errorPage($e, StatusCodes::HTTP_INTERNAL_SERVER_ERROR);
diff -r 88904282b888 -r 3a1e20a5b67a sitemap.php
--- a/sitemap.php	Fri Oct 12 16:59:19 2012 +0200
+++ b/sitemap.php	Mon Oct 15 16:52:50 2012 +0200
@@ -11,7 +11,12 @@
 $cache = ScriptIncludeCache::instance(__FILE__);
 $cache->includeOnce('Sitemap.inc', dirname(__FILE__));
 
-$sitemap = new Sitemap("master.xml");
-$sitemap->genPage();
+try {
+  $sitemap = new Sitemap("master.xml");
+  $sitemap->genPage();
+}
+catch (Exception $e) {
+  errorPage($e, StatusCodes::HTTP_INTERNAL_SERVER_ERROR);
+}
 /// @endcond
 ?>