Attachment 39637 Details for Bug 6874 – Bug 6874: [QA Follow-up] Adjustments for opac-retrieve

[patch] Bug 6874: [QA Follow-up] Adjustments for opac-retrieve

Bug-6874-QA-Follow-up-Adjustments-for-opac-retriev.patch (text/plain), 3.12 KB, created by Marcel de Rooy on 2015-05-28 12:53:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2015-05-28 12:53:11 UTC

Size: 3.12 KB

patch

obsolete

>From 13d382621553479fef3a49abb61da9c59a1d5c02 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Wed, 27 May 2015 13:52:25 +0200
>Subject: [PATCH] Bug 6874: [QA Follow-up] Adjustments for opac-retrieve
>Content-Type: text/plain; charset=utf-8
>
>Adds httpheaders sub to UploadedFiles; this will be extended on a new
>report. (Idea is to add configurable headers for file extensions.)
>Trivial unit test added.
>Small cosmetic changes to opac-retrieve-file.
>
>Test plan:
>Run test UploadedFiles.t
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> C4/UploadedFiles.pm            |   14 ++++++++++++++
> opac/opac-retrieve-file.pl     |   22 ++++++----------------
> t/db_dependent/UploadedFiles.t |    6 +++++-
> 3 files changed, 25 insertions(+), 17 deletions(-)
>
>diff --git a/C4/UploadedFiles.pm b/C4/UploadedFiles.pm
>index 341b5b6..c03acbf 100644
>--- a/C4/UploadedFiles.pm
>+++ b/C4/UploadedFiles.pm
>@@ -290,4 +290,18 @@ sub DelUploadedFile {
>     return $retval;
> }
> 
>+=head2 httpheaders
>+
>+    httpheaders returns http headers for a retrievable upload
>+    Will be extended by report 14282
>+
>+=cut
>+
>+sub httpheaders {
>+    my $file= shift;
>+    return
>+        ( '-type' => 'application/octet-stream',
>+          '-attachment' => $file, );
>+}
>+
> 1;
>diff --git a/opac/opac-retrieve-file.pl b/opac/opac-retrieve-file.pl
>index 4c122d2..419f2bd 100755
>--- a/opac/opac-retrieve-file.pl
>+++ b/opac/opac-retrieve-file.pl
>@@ -27,21 +27,11 @@ my $input = new CGI;
> 
> my $id = $input->param('id');
> my $file = C4::UploadedFiles::GetUploadedFile($id);
>-exit 1 if not $file;
>+exit 1 if !$file || !-f $file->{filepath};
> 
>-my $file_path = $file->{filepath};
>-
>-if( -f $file_path ) {
>-    open my $fh, '<', $file_path or die "Can't open file: $!";
>-    print $input->header(
>-        -type => "application/octet-stream",
>-        -attachment => $file->{filename}
>-    );
>-    while(<$fh>) {
>-        print $_;
>-    }
>-} else {
>-    exit 1;
>+open my $fh, '<', $file->{filepath} or die "Can't open file: $!";
>+print $input->header( C4::UploadedFiles::httpheaders( $file->{filename} ));
>+while(<$fh>) {
>+    print $_;
> }
>-
>-exit 0;
>+close $fh;
>diff --git a/t/db_dependent/UploadedFiles.t b/t/db_dependent/UploadedFiles.t
>index dfa1c47..908f9f9 100644
>--- a/t/db_dependent/UploadedFiles.t
>+++ b/t/db_dependent/UploadedFiles.t
>@@ -3,7 +3,7 @@
> use Modern::Perl;
> use File::Temp qw/ tempdir /;
> use Test::CGI::Multipart;
>-use Test::More tests => 17;
>+use Test::More tests => 18;
> use Test::Warn;
> 
> use t::lib::Mocks;
>@@ -55,3 +55,7 @@ my $UploadResult;
> warning_like { $UploadResult=C4::UploadedFiles::UploadFile($testfilename,'../',$testfile_fh->handle); } qr/^Filename or dirname contains '..'. Aborting upload/, "Expected warning for bad file upload.";
> is($UploadResult, undef, "UploadFile with dir containing \"..\" return undef");
> is(C4::UploadedFiles::GetUploadedFile(), undef, 'GetUploadedFile without parameters returns undef');
>+
>+#trivial test for httpheaders
>+my @hdrs = C4::UploadedFiles::httpheaders('does_not_matter_yet');
>+is( @hdrs == 4 && $hdrs[1] =~ /application\/octet-stream/, 1, 'Simple test for httpheaders'); #TODO Will be extended on report 14282
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 6874: 5439 | 5440 | 5764 | 7114 | 7980 | 8234 | 8468 | 10664 | 10673 | 10863 | 10982 | 11098 | 11634 | 12355 | 12356 | 12357 | 12358 | 14130 | 14131 | 14132 | 14133 | 16343 | 16354 | 16355 | 16356 | 16357 | 16370 | 16693 | 16694 | 16695 | 16696 | 16697 | 16698 | 16699 | 16712 | 16713 | 16714 | 16715 | 16716 | 16717 | 16718 | 16719 | 17368 | 17369 | 18767 | 18768 | 18769 | 18770 | 18771 | 18772 | 18773 | 18774 | 18775 | 18776 | 18777 | 18891 | 18892 | 18893 | 18894 | 20059 | 20060 | 20779 | 21432 | 21433 | 21434 | 21435 | 21436 | 21489 | 21543 | 21546 | 21635 | 21798 | 21799 | 21800 | 21801 | 21802 | 21803 | 23588 | 23589 | 23590 | 23591 | 23607 | 23608 | 23609 | 23610 | 23611 | 23612 | 23613 | 26418 | 26419 | 26420 | 26421 | 26422 | 26423 | 26424 | 26878 | 26879 | 26880 | 26881 | 26882 | 26883 | 26884 | 27114 | 27125 | 27154 | 27155 | 27225 | 30362 | 30363 | 30364 | 30365 | 30366 | 30367 | 30368 | 30369 | 30370 | 30371 | 32384 | 32385 | 32386 | 32387 | 32388 | 32389 | 32390 | 32391 | 32392 | 32393 | 36198 | 36199 | 36200 | 36201 | 36202 | 36203 | 36204 | 36205 | 36206 | 36207 | 36208 | 36209 | 36210 | 36211 | 36213 | 36214 | 36215 | 36216 | 36217 | 36218 | 36219 | 36220 | 36221 | 36222 | 36223 | 36224 | 36225 | 36226 | 36227 | 36228 | 36229 | 36230 | 36231 | 36232 | 37681 | 37682 | 37683 | 37684 | 37685 | 37686 | 37687 | 37688 | 37689 | 37690 | 37691 | 37692 | 37693 | 37694 | 37696 | 37697 | 37698 | 37699 | 37700 | 37701 | 37702 | 37703 | 37704 | 37705 | 37706 | 38911 | 38912 | 38913 | 38914 | 38915 | 38916 | 38917 | 38918 | 38919 | 38920 | 38921 | 38922 | 38923 | 38924 | 38925 | 38926 | 38927 | 38928 | 38929 | 38930 | 38931 | 38932 | 38933 | 38934 | 38935 | 38936 | 39113 | 39114 | 39115 | 39116 | 39117 | 39118 | 39119 | 39120 | 39121 | 39122 | 39123 | 39626 | 39627 | 39628 | 39629 | 39630 | 39631 | 39632 | 39633 | 39634 | 39635 | 39636 | 39637 | 39638 | 41275 | 41276 | 41277 | 41278 | 41279 | 41280 | 41281 | 41282 | 41283 | 41284 | 41285 | 41286 | 41287 | 41288 | 41448 | 41449 | 41450 | 41783