diff --git a/controllers/components/ApiComponent.php b/controllers/components/ApiComponent.php index cb88167..01ceb3e 100644 --- a/controllers/components/ApiComponent.php +++ b/controllers/components/ApiComponent.php @@ -219,30 +219,44 @@ class Slicerpackages_ApiComponent extends AppComponent $uploadComponent = $componentLoader->loadComponent('Upload'); $extensionModel = $modelLoader->loadModel('Extension', 'slicerpackages'); $extensionDao = $extensionModel->matchExistingExtension($args); + + $this->getLogger()->err("[".getmypid()."] ".basename(__FILE__)." - ".__FUNCTION__." - line:".__LINE__); if($extensionDao == null) { + $this->getLogger()->err("[".getmypid()."] ".basename(__FILE__)." - ".__FUNCTION__." - line:".__LINE__); $item = $uploadComponent->createUploadedItem($userDao, $args['name'], $tmpfile, $folder); // Set the revision comment to the extension's revision + $this->getLogger()->err("[".getmypid()."] ".basename(__FILE__)." - ".__FUNCTION__." - line:".__LINE__); $itemModel = $modelLoader->loadModel('Item'); + $this->getLogger()->err("[".getmypid()."] ".basename(__FILE__)." - ".__FUNCTION__." - line:".__LINE__); $itemRevisionModel = $modelLoader->loadModel('ItemRevision'); + $this->getLogger()->err("[".getmypid()."] ".basename(__FILE__)." - ".__FUNCTION__." - line:".__LINE__); $itemRevision = $itemModel->getLastRevision($item); + $this->getLogger()->err("[".getmypid()."] ".basename(__FILE__)." - ".__FUNCTION__." - line:".__LINE__); $itemRevision->setChanges($args['revision']); + $this->getLogger()->err("[".getmypid()."] ".basename(__FILE__)." - ".__FUNCTION__." - line:".__LINE__); $itemRevisionModel->save($itemRevision); + $this->getLogger()->err("[".getmypid()."] ".basename(__FILE__)." - ".__FUNCTION__." - line:".__LINE__); if(!$item) { throw new Exception('Failed to create item', -1); } + $this->getLogger()->err("[".getmypid()."] ".basename(__FILE__)." - ".__FUNCTION__." - line:".__LINE__); $extensionModel->loadDaoClass('ExtensionDao', 'slicerpackages'); + $this->getLogger()->err("[".getmypid()."] ".basename(__FILE__)." - ".__FUNCTION__." - line:".__LINE__); $extensionDao = new Slicerpackages_ExtensionDao(); } else { + $this->getLogger()->err("[".getmypid()."] ".basename(__FILE__)." - ".__FUNCTION__." - line:".__LINE__); $item = $extensionDao->getItem(); + $this->getLogger()->err("[".getmypid()."] ".basename(__FILE__)." - ".__FUNCTION__." - line:".__LINE__); $uploadComponent->createNewRevision($userDao, $args['name'], $tmpfile, $args['revision'], $item->getKey()); } + $this->getLogger()->err("[".getmypid()."] ".basename(__FILE__)." - ".__FUNCTION__." - line:".__LINE__); $extensionDao->setItemId($item->getKey()); $extensionDao->setSubmissiontype($args['submissiontype']); $extensionDao->setPackagetype($args['packagetype']); @@ -288,6 +302,7 @@ class Slicerpackages_ApiComponent extends AppComponent $extensionDao->setContributors($args['contributors']); } + $this->getLogger()->err("[".getmypid()."] ".basename(__FILE__)." - ".__FUNCTION__." - line:".__LINE__); $extensionModel->save($extensionDao); return array('extension' => $extensionDao);