Merge remote-tracking branch 'kc/new/bug_6351' into kcmaster

[koha_gimpoz] / cataloguing / value_builder / unimarc_field_210c.pl

diff --git a/cataloguing/value_builder/unimarc_field_210c.pl b/cataloguing/value_builder/unimarc_field_210c.pl
index d33c0ef..8ecaeab 100755 (executable)
--- a/cataloguing/value_builder/unimarc_field_210c.pl
+++ b/cataloguing/value_builder/unimarc_field_210c.pl
@@ -18,6 +18,8 @@
 # with Koha; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+#use strict;
+#use warnings; FIXME - Bug 2505
 
 use C4::AuthoritiesMarc;
 use C4::Auth;
@@ -77,7 +79,7 @@ function Blur$function_name(subfield_managed) {
 
 function Clic$function_name(subfield_managed) {
     defaultvalue=escape(document.getElementById(\"$field_number\").value);
-    newin=window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_210c.pl&index=\"+subfield_managed,\"unimarc 225a\",'width=500,height=600,toolbar=false,scrollbars=yes');
+    newin=window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_210c.pl&index=\"+subfield_managed,\"unimarc_225a\",'width=500,height=600,toolbar=false,scrollbars=yes');
 }
 </script>
 ";
@@ -99,12 +101,12 @@ my ($input) = @_;
     my $category = $query->param('category');
     my $resultstring = $query->param('result');
     my $dbh = C4::Context->dbh;
-    
+
     my $startfrom=$query->param('startfrom');
     $startfrom=0 if(!defined $startfrom);
     my ($template, $loggedinuser, $cookie);
     my $resultsperpage;
-    
+
     my $authtypes = getauthtypes;
     my @authtypesloop;
     foreach my $thisauthtype (keys %$authtypes) {
@@ -124,17 +126,25 @@ my ($input) = @_;
         my @operator = $query->param('operator');
         my @value = $query->param('value');
         my $orderby   = $query->param('orderby');
-        
+
         $resultsperpage= $query->param('resultsperpage');
         $resultsperpage = 19 if(!defined $resultsperpage);
-    
+
         # builds tag and subfield arrays
         my @tags;
-    
+
         my ($results,$total) = SearchAuthorities( \@tags,\@and_or,
                                             \@excluding, \@operator, \@value,
                                             $startfrom*$resultsperpage, $resultsperpage,$authtypecode, $orderby);
-                                            
+
+       # Getting the $b if it exists
+       for (@$results) {
+           my $authority = GetAuthority($_->{authid});
+               if ($authority->field('200') and $authority->subfield('200','b')) {
+                   $_->{to_report} = $authority->subfield('200','b');
+           }
+       }
+
         ($template, $loggedinuser, $cookie)
             = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_210c.tmpl",
                     query => $query,
@@ -143,16 +153,16 @@ my ($input) = @_;
                     flagsrequired => {editcatalogue => '*'},
                     debug => 1,
                     });
-    
+
         # multi page display gestion
         my $displaynext=0;
         my $displayprev=$startfrom;
         if(($total - (($startfrom+1)*($resultsperpage))) > 0 ) {
             $displaynext = 1;
         }
-    
+
         my @numbers = ();
-    
+
         if ($total>$resultsperpage) {
             for (my $i=1; $i<$total/$resultsperpage+1; $i++) {
                 if ($i<16) {
@@ -164,17 +174,17 @@ my ($input) = @_;
                 }
             }
         }
-    
+
         my $from = $startfrom*$resultsperpage+1;
         my $to;
-    
+
         if($total < (($startfrom+1)*$resultsperpage)) {
             $to = $total;
         } else {
             $to = (($startfrom+1)*$resultsperpage);
         }
         my $link="../cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_210c.pl&amp;authtypecode=EDITORS&and_or=$and_or&amp;marclist=$marclist&amp;operator=$operator&amp;orderby=$orderby&amp;excluding=$excluding&amp;".join("&amp;",map {"value=".$_} @value)."&amp;op=do_search&amp;type=intranet&amp;index=$index";
-        warn "$link ,".getnbpages($total, $resultsperpage);
+
         $template->param(result => $results) if $results;
         $template->param('index' => $query->param('index'));
         $template->param(startfrom=> $startfrom,
@@ -205,15 +215,15 @@ my ($input) = @_;
                     flagsrequired => {editcatalogue => '*'},
                     debug => 1,
                     });
-    
+
         $template->param(index => $index,
                         resultstring => $resultstring
                         );
     }
-    
+
     $template->param(authtypesloop => \@authtypesloop);
     $template->param(category => $category);
-    
+
     # Print the page
     output_html_with_http_headers $query, $cookie, $template->output;
 }