MT2502 : Reports Editor's 200$b to biblio's 210$c within unimarc_field_210c plugin

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

diff --git a/cataloguing/value_builder/unimarc_field_210c.pl b/cataloguing/value_builder/unimarc_field_210c.pl
index d33c0ef..3228dc3 100755 (executable)
--- a/cataloguing/value_builder/unimarc_field_210c.pl
+++ b/cataloguing/value_builder/unimarc_field_210c.pl
@@ -134,7 +134,14 @@ my ($input) = @_;
         my ($results,$total) = SearchAuthorities( \@tags,\@and_or,
                                             \@excluding, \@operator, \@value,
                                             $startfrom*$resultsperpage, $resultsperpage,$authtypecode, $orderby);
-                                            
+
+       # Getting the $b if it exists
+       foreach my $_ (@$results) {
+               if ($_->{reported_tag} =~ m/^\$b/) {
+                   $_->{to_report} = substr($_->{reported_tag}, 2);
+           }
+       }
+
         ($template, $loggedinuser, $cookie)
             = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_210c.tmpl",
                     query => $query,

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl
index 4488828..bde1feb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl
@@ -72,7 +72,9 @@
                         <td><!-- TMPL_VAR NAME="summary" --></td>
                         <td><!-- TMPL_VAR NAME="used" --> times</td>
                         <td>
-                            <a href="javascript:report('<!-- TMPL_VAR name="summary" ESCAPE=JS -->')"><img alt="choose" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/arrow.gif" width="32" hspace="0" vspace="0" border="0"></a>
+                           <!-- TMPL_IF NAME="to_report" -->
+                            <a href="javascript:report('<!-- TMPL_VAR name="to_report" ESCAPE=JS -->')"><img alt="choose" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/arrow.gif" width="32" hspace="0" vspace="0" border="0"></a>
+                           <!-- /TMPL_IF -->
                         </td>
                     </tr>
                 <!-- /TMPL_LOOP -->
@@ -91,12 +93,10 @@
 
 function report(summary)
 {    
-    var regexp= /--\s*(.*)/;
-    var result=summary.match(regexp);
     var doc   = opener.document; 
     var field = doc.getElementById('<!-- TMPL_VAR NAME="index" -->');
 
-    field.value = result[1];
+    field.value = summary;
     self.close();
 }
 </script>