Attachment 9960 Details for Bug 7961 – Bug 7961 - Local cover images should support CSV link files

[patch] Bug 7961 - Local cover images should support CSV link files

Bug-7961---Local-cover-images-should-support-CSV-l.patch (text/plain), 2.58 KB, created by Dobrica Pavlinusic on 2012-06-06 15:40:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dobrica Pavlinusic

Created: 2012-06-06 15:40:16 UTC

Size: 2.58 KB

patch

obsolete

>From 2c8b7d289d3b85902b76400d0cd53993524d50e3 Mon Sep 17 00:00:00 2001
>From: Dobrica Pavlinusic <dpavlin@rot13.org>
>Date: Sat, 14 Apr 2012 11:39:20 +0200
>Subject: [PATCH] Bug 7961 - Local cover images should support CSV link files
>
>Corrent code doesn't have support for filenames which contain spaces
>or commans which breaks CSV files saved from spreadsheet similar to:
>
>  12345, "conver image, with spaces.jpg"
>
>This patch tweaks file parsing a bit. We are always splitting line to
>only two values (to support commas as part of filename) and removing
>spaces only on beginning and end of filename (to cover space after
>comma in CSV example above while preserving spaces in filename).
>
>With this change only invalid character in picture filename left
>are quotes (") which are commonly used to quote strings with spaces.
>
>Covers added will be logged in action_log, using CATALOGUING / MODIFY
>action (which is shown as "Catalog" in tools > Log viewer)
>
>Test scenario:
>
>1. collect pictures with spaces and commas in name
>2. dump file list into CSV file and add biblio number as first column
>   (name of file is idlink.txt or datalink.txt)
>3. create zip with CSV file and pictures
>4. verify that all pictures got uploaded and linked to biblio records
>5. verify that modification log includes cover image name
>---
> tools/upload-cover-image.pl |    8 ++++++--
> 1 files changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/tools/upload-cover-image.pl b/tools/upload-cover-image.pl
>index 7552e28..f73e7cd 100755
>--- a/tools/upload-cover-image.pl
>+++ b/tools/upload-cover-image.pl
>@@ -48,6 +48,7 @@ use C4::Auth;
> use C4::Output;
> use C4::Images;
> use C4::UploadedFile;
>+use C4::Log;
> 
> my $debug = 1;
> 
>@@ -143,10 +144,13 @@ if ($fileID) {
>                             $error = 'DELERR';
>                         }
>                         else {
>-                            ( $biblionumber, $filename ) = split $delim, $line;
>+                            ( $biblionumber, $filename ) = split $delim, $line, 2;
>                             $biblionumber =~
>                               s/[\"\r\n]//g;    # remove offensive characters
>-                            $filename =~ s/[\"\r\n\s]//g;
>+                            $filename =~ s/[\"\r\n]//g;
>+                            $filename =~ s/^\s+//;
>+                            $filename =~ s/\s+$//;
>+                            logaction('CATALOGUING', 'MODIFY', $biblionumber, "cover image: $filename");
>                             my $srcimage = GD::Image->new("$dir/$filename");
>                             if ( defined $srcimage ) {
>                                 $total++;
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 7961: 9190 | 9796 | 9960 | 10105