- add comment to document us_chunk_inx in sql file

- fix chunk upload to work with recent filerepo changes
Follow up r104687

diff --git a/includes/upload/UploadFromChunks.php b/includes/upload/UploadFromChunks.php
index 3a5f809..1bc7e85 100644 (file)
--- a/includes/upload/UploadFromChunks.php
+++ b/includes/upload/UploadFromChunks.php
@@ -56,7 +56,7 @@ class UploadFromChunks extends UploadFromFile {
                $this->mFileKey = $this->mLocalFile->getFileKey();
 
                // Output a copy of this first to chunk 0 location:
-               $status = $this->outputChunk( $this->mLocalFile->getPath() );
+               $status = $this->outputChunk( $this->mLocalFile->getLocalRefPath() );
                
                // Update db table to reflect initial "chunk" state 
                $this->updateChunkStatus();

diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 1900bbb..3655018 100644 (file)
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -966,7 +966,8 @@ CREATE TABLE /*_*/uploadstash (
        us_timestamp varbinary(14) not null,
 
        us_status varchar(50) not null,
-       
+
+       -- chunk counter starts at 0, current offset is stored in us_size
        us_chunk_inx int unsigned NULL,
 
        -- file properties from File::getPropsFromPath.  these may prove unnecessary.