[Koha-cvs] koha admin/checkmarc.pl koha-tmpl/intranet-tmpl... [rel_2_2]

[Antoine Farnault]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Antoine Farnault <toins>	07/02/28 08:51:26

Modified files:
	admin          : checkmarc.pl 
	koha-tmpl/intranet-tmpl/default/en/parameters: checkmarc.tmpl 

Log message:
	reporting bug fix from 2.2.7.1 to 2.2.7.
	LOG was :
		BUGFIX : removing "biblionumber and biblioitemnumber MUST be in the same MARC tag", as it's no more true (since koha 2.2.4 iirc) : you can have biblionumber mapped to a MARC field  and biblioitemnumber mapped to another.
		
		However, the other needs are still valid (they must be mapped and in tab -1)
		
		BUG also in 2.2 and rel_3_0 branches

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/checkmarc.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.6.2.4&r2=1.6.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.10.2.1&r2=1.10.2.2

Patches:
Index: admin/checkmarc.pl
===================================================================
RCS file: /sources/koha/koha/admin/checkmarc.pl,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -b -r1.6.2.4 -r1.6.2.5
--- admin/checkmarc.pl	5 Feb 2006 21:59:21 -0000	1.6.2.4
+++ admin/checkmarc.pl	28 Feb 2007 08:51:26 -0000	1.6.2.5
@@ -60,7 +60,7 @@
 $sth = $dbh->prepare("select tagfield,tab from marc_subfield_structure where kohafield=\"biblioitems.biblioitemnumber\"");
 $sth->execute;
 my ($res2,$tab2) = $sth->fetchrow;
-if ($res && $res2 && ($res eq $res2) && $tab==-1 && $tab2==-1) {
+if ($res && $res2 && $tab==-1 && $tab2==-1) {
 	$template->param(biblionumber => 0);
 } else {
 	$template->param(biblionumber => 1);

Index: koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/Attic/checkmarc.tmpl,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -b -r1.10.2.1 -r1.10.2.2
--- koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl	6 Jun 2005 16:10:57 -0000	1.10.2.1
+++ koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl	28 Feb 2007 08:51:26 -0000	1.10.2.2
@@ -118,7 +118,6 @@
 			<td><b>biblio and biblionumber</b></td>
 			<td>The biblio.biblionumber and biblioitems.biblioitemnumber fields MUST :<br/>
 				<li>be mapped to a MARC subfield,</li>
-				<li>be in the SAME tag (for example : 090$a and 090$b)</li>
 				<li>be in tab -1</li></td>
 		</tr>
 	<!-- TMPL_ELSE -->