#
# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
use Modern::Perl;
use File::Spec;
my $file = $self->full_path;
my $retval = $self->SUPER::delete;
- if( !defined($retval) ) { # undef is Unknown (-1)
- $retval = -1;
- } elsif( $retval eq '0' ) { # 0 => 0E0
- $retval = "0E0";
- } elsif( $retval !~ /^(0E0|1)$/ ) { # Unknown too
- $retval = -1;
- }
return $retval if $params->{keep_file};
if( ! -e $file ) {
- warn "Removing record for $name within category ".
- $self->uploadcategorycode. ", but file was missing.";
+ if ( $self->permanent ) {
+ warn "Removing record for $name within category ".
+ $self->uploadcategorycode. ", but file was missing.";
+ }
} elsif( ! unlink($file) ) {
warn "Problem while deleting: $file";
}
sub full_path {
my ( $self ) = @_;
my $path = File::Spec->catfile(
- $self->permanent?
- $self->permanent_directory: $self->temporary_directory,
+ $self->permanent
+ ? $self->permanent_directory
+ : C4::Context->temporary_directory,
$self->dir,
$self->hashvalue. '_'. $self->filename,
);
sub httpheaders {
my ( $self ) = @_;
- return (
- '-type' => 'application/octet-stream',
- '-attachment' => $self->filename,
- );
+ if( $self->filename =~ /\.pdf$/ ) {
+ return (
+ '-type' => 'application/pdf',
+ 'Content-Disposition' => 'inline; filename="'.$self->filename.'"',
+ );
+ } else {
+ return (
+ '-type' => 'application/octet-stream',
+ '-attachment' => $self->filename,
+ );
+ }
}
=head2 CLASS METHODS
return C4::Context->config('upload_path');
}
-=head3 tmp_directory
-
-Returns root directory for temporary storage
-
-=cut
-
-sub temporary_directory {
- my ( $class ) = @_;
- return File::Spec->tmpdir;
-}
-
=head3 _type
Returns name of corresponding DBIC resultset