(bug #4051) add due date in overdue.tmpl

[koha.git] / C4 / UploadedFile.pm

diff --git a/C4/UploadedFile.pm b/C4/UploadedFile.pm
index 6b72991..dbf192e 100644 (file)
--- a/C4/UploadedFile.pm
+++ b/C4/UploadedFile.pm
@@ -25,8 +25,10 @@ use IO::File;
 
 use vars qw($VERSION);
 
-# set the version for version checking
-$VERSION = 3.00;
+BEGIN {
+       # set the version for version checking
+       $VERSION = 3.00;
+}
 
 =head1 NAME
 
@@ -104,21 +106,35 @@ sub new {
     $fh->binmode(); # Windows compatibility
     $self->{'fh'} = $fh;
     $self->{'tmp_file_name'} = $tmp_file_name;
-    my $session = get_session($sessionID);
-    $session->param("$self->{'fileID'}.uploaded_tmpfile", $tmp_file_name);
-    $session->param('current_upload', $self->{'fileID'});
-    $session->flush();
-    $self->{'session'} = $session;
-    $self->{'name'} = '';
     $self->{'max_size'} = 0;
     $self->{'progress'} = 0;
+    $self->{'name'} = '';
 
     bless $self, $class;
+    $self->_serialize();
+
+    my $session = get_session($sessionID);
+    $session->param('current_upload', $self->{'fileID'});
+    $session->flush();
 
     return $self;
 
 }
 
+sub _serialize {
+    my $self = shift;
+
+    my $prefix = "upload_" . $self->{'fileID'};
+    my $session = get_session($self->{'sessionID'});
+
+    # temporarily take file handle out of structure
+    my $fh = $self->{'fh'};
+    delete $self->{'fh'};
+    $session->param($prefix, $self);
+    $session->flush();
+    $self->{'fh'} =$fh;
+}
+
 =head2 id
 
 =over 4
@@ -151,8 +167,7 @@ sub name {
     my $self = shift;
     if (@_) {
         $self->{'name'} = shift;
-        $self->{'session'}->param("$self->{'fileID'}.uploaded_filename", $self->{'name'});
-        $self->{'session'}->flush();
+        $self->_serialize();
     } else {
         return $self->{'name'};
     }
@@ -200,8 +215,7 @@ sub stash {
     my $percentage = int(($bytes_read / $self->{'max_size'}) * 100);
     if ($percentage > $self->{'progress'}) {
         $self->{'progress'} = $percentage;
-        $self->{'session'}->param("$self->{'fileID'}.uploadprogress", $self->{'progress'});
-        $self->{'session'}->flush();
+        $self->_serialize();
     }
 }
 
@@ -219,9 +233,9 @@ Indicates that all of the bytes have been uploaded.
 
 sub done {
     my $self = shift;
-    $self->{'session'}->param("$self->{'fileID'}.uploadprogress", 'done');
-    $self->{'session'}->flush();
+    $self->{'progress'} = 'done';
     $self->{'fh'}->close();
+    $self->_serialize();
 }
 
 =head2 upload_progress
@@ -246,7 +260,8 @@ sub upload_progress {
 
     my $reported_progress = 0;
     if (defined $fileID and $fileID ne "") {
-        my $progress = $session->param("$fileID.uploadprogress");
+        my $file = C4::UploadedFile->fetch($sessionID, $fileID);
+        my $progress = $file->{'progress'};
         if (defined $progress) {
             if ($progress eq "done") {
                 $reported_progress = 100;
@@ -275,19 +290,13 @@ sub fetch {
     my $sessionID = shift;
     my $fileID = shift;
 
-    my $self = {};
-
-    $self->{'sessionID'} = $sessionID;
-    $self->{'fileID'} = $fileID;
     my $session = get_session($sessionID);
-    $self->{'session'} = $session;
-    $self->{'tmp_file_name'} = $session->param("$self->{'fileID'}.uploaded_tmpfile");
-    $self->{'name'} = $session->param("$self->{'fileID'}.uploaded_filename");
+    my $prefix = "upload_$fileID";
+    my $self = $session->param($prefix);
     my $fh = new IO::File $self->{'tmp_file_name'}, "r";
     $self->{'fh'} = $fh;
 
     bless $self, $class;
-
     return $self;
 }
 
@@ -308,6 +317,9 @@ sub fh {
     return $self->{'fh'};
 }
 
+1;
+__END__
+
 =head1 AUTHOR
 
 Koha Development Team <info@koha.org>