X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;f=application%2Fcontrollers%2FPathController.php;h=394da6921cac13042844cc78e0a5e4d99a839041;hb=e534c17db2f3986751f4a96900e4aaae56d34873;hp=375b83e8e32c798dbcdbe956a3be3000f74f3a4e;hpb=1f6105289a49079809c2a4677b561bc82c62db88;p=syj.git diff --git a/application/controllers/PathController.php b/application/controllers/PathController.php index 375b83e..394da69 100644 --- a/application/controllers/PathController.php +++ b/application/controllers/PathController.php @@ -8,7 +8,7 @@ class PathController extends Zend_Controller_Action $formData = $this->_helper->SyjPostData->getPostData('Syj_Form_Geom'); $path = new Syj_Model_Path(); - $user = $this->_helper->SyjSession->user(); + $user = $this->_helper->SyjUserManager->current(); if (!$user and !$formData["geom_accept"]) { throw new Syj_Exception_Request(); } @@ -52,7 +52,7 @@ class PathController extends Zend_Controller_Action } } - $user = $this->_helper->SyjSession->user(); + $user = $this->_helper->SyjUserManager->current(); if (!$path->isCreator($user)) { throw new Syj_Exception_Forbidden(); } @@ -78,7 +78,7 @@ class PathController extends Zend_Controller_Action } if ($geom::name != "LineString") { - throw new Syj_Exception_Request(); + throw new Syj_Exception_InvalidGeomUpload(); } $path->geom = $geom; @@ -90,20 +90,7 @@ class PathController extends Zend_Controller_Action /* now, saving !*/ $pathMapper = new Syj_Model_PathMapper(); - try { - $pathMapper->save ($path); - } catch(Zend_Db_Statement_Exception $e) { - if ($e->getCode() == 23505) { // 23505: Unique violation throw new Syj_Exception_Request(); - $message = $e->getMessage(); - if (strpos($message, 'paths_geom_key') !== false) { - throw new Syj_Exception_Request("uniquepath"); - } else { - throw $e; - } - } else { - throw $e; - } - } + $pathMapper->save ($path); } }