From e1585779397f499cd9987c84eb7bb830de98aa17 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Wed, 27 Aug 2014 16:56:11 +0200
Subject: [PATCH] Bug 6536: QA Follow-up for removing warnings from QA tools
Content-Type: text/plain; charset=utf-8

Resolved:
[1]  FAIL   C4/Breeding.pm
FAIL   critic
[2] FAIL   koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
FAIL   forbidden patterns
                forbidden pattern: tab char (line 15)
                forbidden pattern: tab char (line 21)
                forbidden pattern: tab char (line 16)
[3] FAIL   koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
FAIL   forbidden patterns
                forbidden pattern: trailing space char (line 62)
                forbidden pattern: trailing space char (line 54)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
No warnings anymore.
---
 C4/Breeding.pm                                     |    2 +-
 .../prog/en/modules/admin/z3950servers.tt          |    4 ++--
 .../prog/en/modules/help/admin/z3950servers.tt     |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/C4/Breeding.pm b/C4/Breeding.pm
index 293b933..fa3af82 100644
--- a/C4/Breeding.pm
+++ b/C4/Breeding.pm
@@ -363,7 +363,7 @@ sub _create_connection {
             #first remove surrounding spaces at comma and equals-sign
             s/^\s+|\s+$//g;
             my @temp= split '=', $_, 2;
-            @temp= map { s/^\s+|\s+$//g; $_; } @temp;
+            @temp= map { my $c=$_; $c=~s/^\s+|\s+$//g; $c; } @temp;
             $option1->option( $temp[0] => $temp[1] ) if @temp;
         }
     } elsif( $server->{servertype} eq 'zed' ) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
index 46704b3..7d2dd09 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
@@ -51,7 +51,7 @@
         $("#host_docline").hide();
         $("#database_docline").hide();
         [% IF (server.servertype||type) == 'sru' %]
-            $("#host_label").hover( 
+            $("#host_label").hover(
                 function( event ) {
                     $("#host_docline").show();
                 },
@@ -59,7 +59,7 @@
                     $("#host_docline").hide();
                 }
             );
-            $("#database_label").hover( 
+            $("#database_label").hover(
                 function( event ) {
                     $("#database_docline").show();
                 },
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
index 3ca909b..add2483 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
@@ -12,13 +12,13 @@
 
 <p>From the main Z39.50/SRU page, click 'New Z39.50 Server' or 'New SRU server'.</p>
 <ul>
-	<li>'Server name' should be populated with a name that will help you identify the source (such as the library name).</li>
-	<li>'Hostname' will be the address to the Z39.50 target. For a SRU target, only enter the domain name here. (See example below.)</li>
+    <li>'Server name' should be populated with a name that will help you identify the source (such as the library name).</li>
+    <li>'Hostname' will be the address to the Z39.50 target. For a SRU target, only enter the domain name here. (See example below.)</li>
 	<li>'Port' tells Koha what port to listen on to get results from this target.</li>
     <li>'Database' is the name of the database for Z39.50 targets. For SRU targets enter the path name part of the URL (the local part following domain and port). See also example below.</li>
 	<li>'Userid' and 'Password' are only required for servers that are password protected.</li>
 	<li>Check the 'Checked' box if you want this target to always be selected by default.</li>
-	<li>'Rank' lets you enter where in the list you'd like this target to appear. If this is left blank the targets will be in alphabetical order.</li>
+    <li>'Rank' lets you enter where in the list you'd like this target to appear. If this is left blank the targets will be in alphabetical order.</li>
 	<li>'Syntax' is the MARC flavor you use.</li>
 	<li>'Encoding' tells the system how to read special characters.</li>
 	<li>'Timeout' is helpful for targets that take a long while. You can set the timeout so that it doesn't keep trying the target if results aren't found in a reasonable amount of time.</li>
-- 
1.7.7.6