BUG: Fixing issue with upload when the file already exists

ENH: Added statistics when migration from MIDAS2

Author: Julien Jomier

core/controllers/UserController.php

@@ -45,7 +45,7 @@ function indexAction()
       $users = $this->User->getPublicUsers();
       }
 
-    $this->Component->Sortdao->field = 'name';
+    $this->Component->Sortdao->field = 'firstname';
     $this->Component->Sortdao->order = 'asc';
     usort($users, array($this->Component->Sortdao, 'sortByName'));
     $users = $this->Component->Sortdao->arrayUniqueDao($users);

core/controllers/components/MIDAS2MigrationComponent.php

@@ -48,7 +48,8 @@ private function _createFolderForItem($collectionId, $parentFolderid)
     {
     set_time_limit(0);
     $modelLoader = new MIDAS_ModelLoader;
-    $Folder = $modelLoader->loadModel("Folder");  
+    $Folder = $modelLoader->loadModel("Folder");
+    $Bitstream = $modelLoader->loadModel("Bitstream");  
     $Item = $modelLoader->loadModel("Item");  
     $ItemRevision = $modelLoader->loadModel("ItemRevision");
     $Group = $modelLoader->loadModel("Group");  
@@ -268,10 +269,10 @@ private function _createFolderForItem($collectionId, $parentFolderid)
 
             $UploadComponent = new UploadComponent();
             $UploadComponent->uploadBitstream($bitstreamDao, $assetstoreDao);
-            unset($UploadComponent);
 
             // Upload the bitstream ifnecessary (based on the assetstore type)
             $ItemRevision->addBitstream($itemRevisionDao, $bitstreamDao);
+            unset($UploadComponent);
             }
           }          
         }

core/controllers/components/UploadComponent.php

@@ -56,7 +56,8 @@ private function _uploadLocalBitstream($bitstreamdao, $assetstoredao)
     // This should be rare (MD5 has a low probably for collisions)
     if(file_exists($fullpath))
       {
-      //throw new Zend_Exception("File already in the assetstore.");   
+      // Set the new path
+      $bitstreamdao->setPath($path);
       return false;
       }
 
@@ -72,7 +73,6 @@ private function _uploadLocalBitstream($bitstreamdao, $assetstoredao)
 
     // Set the new path
     $bitstreamdao->setPath($path);
-    
     } // end _uploadLocalBitstream()
 
   /** Upload a bitstream */  
@@ -393,7 +393,7 @@ public function createNewRevision($userDao, $name, $path, $item_revision, $chang
     $bitstreamDao->setAssetstoreId($defaultAssetStoreId);
     $assetstoreDao = $assetstoreModel->load($defaultAssetStoreId);
 
-    // Upload the bitstream ifnecessary (based on the assetstore type)
+    // Upload the bitstream if necessary (based on the assetstore type)
     $this->uploadBitstream($bitstreamDao, $assetstoreDao);
     $checksum = $bitstreamDao->getChecksum();
     $tmpBitstreamDao = $bitstreamModel->getByChecksum($checksum);

core/models/pdo/ItemRevisionModel.php

@@ -122,21 +122,17 @@ function addBitstream($itemRevisionDao, $bitstreamDao)
     $modelLoad = new MIDAS_ModelLoader();
     $BitstreamModel = $modelLoad->loadModel('Bitstream');
     $ItemModel = $modelLoad->loadModel('Item');
-  //  $TaskModel = $modelLoad->loadModel('Task');
+    // $TaskModel = $modelLoad->loadModel('Task');
 
     $bitstreamDao->setItemrevisionId($itemRevisionDao->getItemrevisionId());
 
     // Save the bistream
-    if(!isset($bitstreamDao->saved) || !$bitstreamDao->saved)
-      {
-      $bitstreamDao->setDate(date('c'));
-      $BitstreamModel->save($bitstreamDao);
-      }
+    $bitstreamDao->setDate(date('c'));
+    $BitstreamModel->save($bitstreamDao);
 
     $item = $itemRevisionDao->getItem($bitstreamDao);
     $item->setSizebytes($this->getSize($itemRevisionDao));
     $item->setDate(date('c'));
-    
 
     $modulesThumbnail =  Zend_Registry::get('notifier')->notify(MIDAS_NOTIFY_CREATE_THUMBNAIL);
     if(empty($modulesThumbnail))

core/views/user/index.phtml

@@ -24,7 +24,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/user/user.index.j
       ?>  
       <div class="userBlock">
       <a class="userTitle" href="<?php echo $this->webroot.'/user/'.$user->getKey();?>">
-      <?php echo $user->getFirstname()?></a>
+      <?php echo $user->getFirstname().' '.$user->getLastname()?></a>
       <br/>
       </div>
   <?php