BUG: refs #516. Can now use applet uploader for multi-file revision u…

…pload
midasplatform · Oct 30, 2012 · 23e9831 · 23e9831
1 parent a8253ea
commit 23e9831
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 9 deletions.
diff --git a/core/controllers/UploadController.php b/core/controllers/UploadController.php
@@ -181,13 +181,28 @@ public function javarevisionsessionAction()
     $this->disableLayout();
     $this->disableView();
 
-    session_start();
-
     $changes = $this->_getParam('changes');
     $license = $this->_getParam('license');
+    $itemId = $this->_getParam('itemId');
+    $item = $this->Item->load($itemId);
+    if(!isset($itemId) || !$item)
+      {
+      throw new Zend_Exception('Invalid itemId', 404);
+      }
+    $rev = $this->Item->getLastRevision($item);
+    if($rev)
+      {
+      $revNumber = $rev->getRevision() + 1;
+      }
+    else
+      {
+      $revNumber = 1;
+      }
+
+    session_start();
     $this->userSession->JavaUpload->changes = $changes;
     $this->userSession->JavaUpload->license = $license;
-
+    $this->userSession->JavaUpload->revNumber = $revNumber;
     session_write_close();
     }
 
@@ -531,12 +546,20 @@ function processjavarevisionuploadAction()
         {
         $license = null;
         }
+      if(isset($this->userSession->JavaUpload->revNumber))
+        {
+        $revNumber = $this->userSession->JavaUpload->revNumber;
+        }
+      else
+        {
+        $revNumber = 1;
+        }
 
       try
         {
-        $item = $this->Component->Upload->createNewRevision($this->userSession->Dao, $data['filename'],
-                                                            $data['path'], $changes, $parentId, null,
-                                                            $license, $data['md5'], (bool)$testingMode);
+        $this->Component->Upload->createNewRevision($this->userSession->Dao, $data['filename'],
+                                                    $data['path'], $changes, $parentId, $revNumber,
+                                                    $license, $data['md5'], (bool)$testingMode);
         }
       catch(Exception $e)
         {

diff --git a/core/controllers/components/UploadComponent.php b/core/controllers/components/UploadComponent.php
@@ -344,7 +344,6 @@ public function createNewRevision($userDao, $name, $path, $changes, $itemId, $it
       throw new Zend_Exception('Parent permissions errors');
       }
 
-
     if($itemRevisionDao == null)
       {
       Zend_Loader::loadClass("ItemRevisionDao", BASE_PATH . '/core/models/dao');
@@ -380,7 +379,6 @@ public function createNewRevision($userDao, $name, $path, $changes, $itemId, $it
       $itemRevisionModel->save($itemRevisionDao);
       }
 
-
     // Add bitstreams to the revision
     Zend_Loader::loadClass('BitstreamDao', BASE_PATH . '/core/models/dao');
     $bitstreamDao = new BitstreamDao;

diff --git a/core/public/js/upload/upload.revision.js b/core/public/js/upload/upload.revision.js
@@ -10,7 +10,8 @@ midas.upload.revision = {};
 midas.upload.revision.sendFormToJavaSession = function () {
     $.post(json.global.webroot+'/upload/javarevisionsession', {
         changes: $('textarea[name=revisionChanges]:last').val(),
-        license: $('select[name=licenseSelect]:last').val()
+        license: $('select[name=licenseSelect]:last').val(),
+        itemId: json.item.item_id
     });
 }