From d386108ddc9d4029d846b41a5319bb7027ebda03 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Thu, 31 Dec 2015 16:00:10 +0000
Subject: [PATCH] Bug 14629 - [QA Followup] Pass invalid ISSN through
 GetVariationsOfISSN

This is an optional follow up depending on community opinion.

While copying over the code form the ISBN portion I noticed that with
aggressive matching enabled invalid ISBNs (and hence ISSNs) were being
stripped from the record.

I think in the case of a library exporting records, making changes, and
reimporting they would expect to get a match on ISSN or ISBN whether or
not the number is valid.

This patch changes the subroutine to return the original ISSN in the
case of it being invalid.

To test:
With first patch only export a record with an invalid ISSN and reimport
with AggressiveMatchOnISSN enabled and match on ISSN - you should not get a match
Apply this patch
reimport the file and you should find a match.
---
 C4/Koha.pm | 7 +++++--
 t/Koha.t   | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/C4/Koha.pm b/C4/Koha.pm
index be686d7..1fded54 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -1931,8 +1931,11 @@ sub GetVariationsOfISSN {
 
     my @issns;
 
-    push( @issns, NormalizeISSN({ issn => $issn }) );
-    push( @issns, NormalizeISSN({ issn => $issn, strip_hyphen => 1 }) );
+    if( NormalizeISSN({issn => $issn}) ){
+        push( @issns, NormalizeISSN({ issn => $issn }) );
+        push( @issns, NormalizeISSN({ issn => $issn, strip_hyphen => 1 }) );
+    }
+    else { push( @issns, $issn) }
 
     # Strip out any "empty" strings from the array
     @issns = grep { defined($_) && $_ =~ /\S/ } @issns;
diff --git a/t/Koha.t b/t/Koha.t
index 2f5e9c6..c757ab1 100755
--- a/t/Koha.t
+++ b/t/Koha.t
@@ -25,7 +25,7 @@ use Module::Load::Conditional qw/check_install/;
 
 BEGIN {
     if ( check_install( module => 'Test::DBIx::Class' ) ) {
-        plan tests => 36;
+        plan tests => 37;
     } else {
         plan skip_all => "Need Test::DBIx::Class"
     }
@@ -134,6 +134,7 @@ eval {
 ok($@ eq '', 'NormalizeISSN does not throw exception when parsing invalid ISSN');
 
 @issns = GetVariationsOfISSNs('abc');
-is(scalar(@issns), 0, 'zero variations returned of invalid ISSN');
+is($issns[0], 'abc', 'Original ISSN passed through even if invalid');
+is(scalar(@issns), 1, 'zero additional variations returned of invalid ISSN');
 
 1;
-- 
2.1.4