From 369527637b683694e93c493878c4376bed3e2307 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Wed, 4 May 2005 15:39:07 +0000
Subject: [PATCH] synch'ing 2.2 and head

---
 C4/Acquisition.pm       |   2 +-
 C4/Auth.pm              |  49 +-
 C4/Auth_with_ldap.pm    |  14 +-
 C4/AuthoritiesMarc.pm   | 959 ++++++++++++++++++++++++++++++++++++++++
 C4/Biblio.pm            |  93 ++--
 C4/Breeding.pm          |  53 ++-
 C4/Bull.pm              |  22 +-
 C4/Circulation/Circ2.pm |   4 +-
 C4/Members.pm           |   8 +-
 C4/Search.pm            | 115 ++---
 C4/SearchMarc.pm        |   9 +-
 C4/Suggestions.pm       |  15 +-
 12 files changed, 1162 insertions(+), 181 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 2fd80043fd..1c5fbae378 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -397,7 +397,7 @@ sub getorders {
 		left join aqbasket on aqbasket.basketno=aqorders.basketno 
 		left join borrowers on aqbasket.authorisedby=borrowers.borrowernumber
 		where booksellerid=? and (quantity > quantityreceived or
-		quantityreceived is NULL)
+		quantityreceived is NULL) and datecancellationprinted is NULL
 		group by basketno order by aqbasket.basketno");
 	$sth->execute($supplierid);
 	my @results = ();
diff --git a/C4/Auth.pm b/C4/Auth.pm
index 86fec56d08..0f85d3cd9e 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -130,7 +130,7 @@ sub get_template_and_user {
 		# We are going to use the $flags returned by checkauth
 		# to create the template's parameters that will indicate
 		# which menus the user can access.
-		if ($flags->{superlibrarian} == 1)
+		if ($flags && $flags->{superlibrarian} == 1)
 		{
 			$template->param(CAN_user_circulate => 1);
 			$template->param(CAN_user_catalogue => 1);
@@ -146,46 +146,53 @@ sub get_template_and_user {
 			$template->param(CAN_user_management => 1);
 			$template->param(CAN_user_tools => 1); }
 		
-		if ($flags->{circulate} == 1) {
+		if ($flags && $flags->{circulate} == 1) {
 			$template->param(CAN_user_circulate => 1); }
 
-		if ($flags->{catalogue} == 1) {
+		if ($flags && $flags->{catalogue} == 1) {
 			$template->param(CAN_user_catalogue => 1); }
-		
-		if ($flags->{parameters} == 1) {
+		
+
+		if ($flags && $flags->{parameters} == 1) {
 			$template->param(CAN_user_parameters => 1);	
 			$template->param(CAN_user_management => 1);
 			$template->param(CAN_user_tools => 1); }
-		
-		if ($flags->{borrowers} == 1) {
+		
+
+		if ($flags && $flags->{borrowers} == 1) {
 			$template->param(CAN_user_borrowers => 1); }
-		
-		if ($flags->{permissions} == 1) {
+		
+
+		if ($flags && $flags->{permissions} == 1) {
 			$template->param(CAN_user_permission => 1); }
 		
-		if ($flags->{reserveforothers} == 1) {
+		if ($flags && $flags->{reserveforothers} == 1) {
 			$template->param(CAN_user_reserveforothers => 1); }
-		
-		if ($flags->{borrow} == 1) {
+		
+
+		if ($flags && $flags->{borrow} == 1) {
 			$template->param(CAN_user_borrow => 1); }
-		
-		if ($flags->{reserveforself} == 1) {
+		
+
+		if ($flags && $flags->{reserveforself} == 1) {
 			$template->param(CAN_user_reserveforself => 1); }
-		
-		if ($flags->{editcatalogue} == 1) {
+		
+
+		if ($flags && $flags->{editcatalogue} == 1) {
 			$template->param(CAN_user_editcatalogue => 1); }
-		
-		if ($flags->{updatecharges} == 1) {
+		
+
+		if ($flags && $flags->{updatecharges} == 1) {
 			$template->param(CAN_user_updatecharge => 1); }
 		
-		if ($flags->{acquisition} == 1) {
+		if ($flags && $flags->{acquisition} == 1) {
 			$template->param(CAN_user_acquisition => 1); }
 		
-		if ($flags->{management} == 1) {
+		if ($flags && $flags->{management} == 1) {
 			$template->param(CAN_user_management => 1);
 			$template->param(CAN_user_tools => 1); }
 		
-		if ($flags->{tools} == 1) {
+		if ($flags && $flags->{tools} == 1) {
 			$template->param(CAN_user_tools => 1); }
 		
 	}
diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm
index 685494ac5a..eee1ac58be 100644
--- a/C4/Auth_with_ldap.pm
+++ b/C4/Auth_with_ldap.pm
@@ -162,30 +162,30 @@ sub get_template_and_user {
 
 		if ($flags->{catalogue} == 1) {
 			$template->param(CAN_user_catalogue => 1); }
-		
+		
 		if ($flags->{parameters} == 1) {
 			$template->param(CAN_user_parameters => 1);	
 			$template->param(CAN_user_management => 1);
 			$template->param(CAN_user_tools => 1); }
-		
+		
 		if ($flags->{borrowers} == 1) {
 			$template->param(CAN_user_borrowers => 1); }
-		
+		
 		if ($flags->{permissions} == 1) {
 			$template->param(CAN_user_permission => 1); }
 		
 		if ($flags->{reserveforothers} == 1) {
 			$template->param(CAN_user_reserveforothers => 1); }
-		
+		
 		if ($flags->{borrow} == 1) {
 			$template->param(CAN_user_borrow => 1); }
-		
+		
 		if ($flags->{reserveforself} == 1) {
 			$template->param(CAN_user_reserveforself => 1); }
-		
+		
 		if ($flags->{editcatalogue} == 1) {
 			$template->param(CAN_user_editcatalogue => 1); }
-		
+		
 		if ($flags->{updatecharges} == 1) {
 			$template->param(CAN_user_updatecharge => 1); }
 		
diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
index a0cabe8e7e..2be1244879 100644
--- a/C4/AuthoritiesMarc.pm
+++ b/C4/AuthoritiesMarc.pm
@@ -29,6 +29,962 @@ use vars qw($VERSION @ISA @EXPORT);
 # set the version for version checking
 $VERSION = 0.01;
 
+@ISA = qw(Exporter);
+@EXPORT = qw(
+	&AUTHgettagslib
+	&AUTHfindsubfield
+	&AUTHfind_authtypecode
+
+	&AUTHaddauthority
+	&AUTHmodauthority
+	&AUTHdelauthority
+	&AUTHaddsubfield
+	&AUTHgetauthority
+	
+	&AUTHgetauth_type
+	&AUTHcount_usage
+	
+	&authoritysearch
+	
+	&MARCmodsubfield
+	&AUTHhtml2marc
+	&AUTHaddword
+	&MARCaddword &MARCdelword
+	&char_decode
+	&FindDuplicate
+ );
+
+sub authoritysearch {
+	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$authtypecode) = @_;
+	# build the sql request. She will look like :
+	# select m1.bibid
+	#		from auth_subfield_table as m1, auth_subfield_table as m2
+	#		where m1.authid=m2.authid and
+	#		(m1.subfieldvalue like "Des%" and m2.subfieldvalue like "27%")
+
+	# the marclist may contain "mainentry". In this case, search the tag_to_report, that depends on
+	# the authtypecode. Then, search on $a of this tag_to_report
+	for (my $i=0;$i<$#{$tags};$i++) {
+		if (@$tags[$i] eq "mainentry") {
+			my $sth = $dbh->prepare("select auth_tag_to_report from auth_types where authtypecode=?");
+			$sth->execute($authtypecode);
+			my ($tag_to_report) = $sth->fetchrow;
+			@$tags[$i] = $tag_to_report."a";
+		}
+	}
+
+	# "Normal" statements
+	# quote marc fields/subfields
+	for (my $i=0;$i<=$#{$tags};$i++) {
+		if (@$tags[$i]) {
+			@$tags[$i] = $dbh->quote(@$tags[$i]);
+		}
+	}
+	my @normal_tags = ();
+	my @normal_and_or = ();
+	my @normal_operator = ();
+	my @normal_value = ();
+	# Extracts the NOT statements from the list of statements
+	for(my $i = 0 ; $i <= $#{$value} ; $i++)
+	{
+		if(@$operator[$i] eq "contains") # if operator is contains, splits the words in separate requests
+		{
+			foreach my $word (split(/ /, @$value[$i]))
+			{
+				unless (C4::Context->stopwords->{uc($word)}) {	#it's NOT a stopword => use it. Otherwise, ignore
+					my $tag = substr(@$tags[$i],0,3);
+					my $subf = substr(@$tags[$i],3,1);
+					push @normal_tags, @$tags[$i];
+					push @normal_and_or, "and";	# assumes "foo" and "bar" if "foo bar" is entered
+					push @normal_operator, @$operator[$i];
+					push @normal_value, $word;
+				}
+			}
+		}
+		else
+		{
+			push @normal_tags, @$tags[$i];
+			push @normal_and_or, @$and_or[$i];
+			push @normal_operator, @$operator[$i];
+			push @normal_value, @$value[$i];
+		}
+	}
+
+	# Finds the basic results without the NOT requests
+	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
+
+	my $sth;
+
+	if ($sql_where2) {
+		$sth = $dbh->prepare("select distinct m1.authid from auth_header,$sql_tables where  m1.authid=auth_header.authid and auth_header.authtypecode=? and $sql_where2 and ($sql_where1)");
+		warn "Q2 : select distinct m1.authid from auth_header,$sql_tables where  m1.authid=auth_header.authid and auth_header.authtypecode=? and $sql_where2 and ($sql_where1)";
+	} else {
+		$sth = $dbh->prepare("select distinct m1.authid from auth_header,$sql_tables where  m1.authid=auth_header.authid and auth_header.authtypecode=? and $sql_where1");
+		warn "Q : select distinct m1.authid from auth_header,$sql_tables where  m1.authid=auth_header.authid and auth_header.authtypecode=? and $sql_where1";
+	}
+	$sth->execute($authtypecode);
+	my @result = ();
+	while (my ($authid) = $sth->fetchrow) {
+			push @result,$authid;
+		}
+
+	# we have authid list. Now, loads summary from [offset] to [offset]+[length]
+	my $counter = $offset;
+	my @finalresult = ();
+	my $oldline;
+	while (($counter <= $#result) && ($counter <= ($offset + $length))) {
+# 		warn " HERE : $counter, $#result, $offset, $length";
+		# get MARC::Record of the authority
+		my $record = AUTHgetauthority($dbh,$result[$counter]);
+		# then build the summary
+		my $authtypecode = AUTHfind_authtypecode($dbh,$result[$counter]);
+		my $authref = getauthtype($authtypecode);
+		my $summary = $authref->{summary};
+		my @fields = $record->fields();
+		foreach my $field (@fields) {
+			my $tag = $field->tag();
+			if ($tag<10) {
+			} else {
+				my @subf = $field->subfields;
+				for my $i (0..$#subf) {
+					my $subfieldcode = $subf[$i][0];
+					my $subfieldvalue = $subf[$i][1];
+					my $tagsubf = $tag.$subfieldcode;
+					$summary =~ s/\[(.?.?.?)$tagsubf(.*?)]/$1$subfieldvalue$2\[$1$tagsubf$2]/g;
+				}
+			}
+		}
+		$summary =~ s/\[(.*?)]//g;
+		$summary =~ s/\n/<br>/g;
+
+		# find biblio MARC field using this authtypecode (to jump to biblio)
+		my $authtypecode = AUTHfind_authtypecode($dbh,$result[$counter]);
+		my $sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure where authtypecode=?");
+		$sth->execute($authtypecode);
+		my $tags_using_authtype;
+		while (my ($tagfield) = $sth->fetchrow) {
+# 			warn "TAG : $tagfield";
+			$tags_using_authtype.= $tagfield."9,";
+		}
+		chop $tags_using_authtype;
+		
+		# then add a line for the template loop
+		my %newline;
+		$newline{summary} = $summary;
+		$newline{authid} = $result[$counter];
+		$newline{used} = &AUTHcount_usage($result[$counter]);
+		$newline{biblio_fields} = $tags_using_authtype;
+		$counter++;
+		push @finalresult, \%newline;
+	}
+	my $nbresults = $#result + 1;
+	return (\@finalresult, $nbresults);
+}
+
+# Creates the SQL Request
+
+sub create_request {
+	my ($dbh,$tags, $and_or, $operator, $value) = @_;
+
+	my $sql_tables; # will contain marc_subfield_table as m1,...
+	my $sql_where1; # will contain the "true" where
+	my $sql_where2 = "("; # will contain m1.authid=m2.authid
+	my $nb_active=0; # will contain the number of "active" entries. and entry is active is a value is provided.
+	my $nb_table=1; # will contain the number of table. ++ on each entry EXCEPT when an OR  is provided.
+
+
+	for(my $i=0; $i<=@$value;$i++) {
+		if (@$value[$i]) {
+			$nb_active++;
+#			warn " @$tags[$i]";
+			if ($nb_active==1) {
+				if (@$operator[$i] eq "start") {
+					$sql_tables .= "auth_subfield_table as m$nb_table,";
+					$sql_where1 .= "(m1.subfieldvalue like ".$dbh->quote("@$value[$i]%");
+					if (@$tags[$i]) {
+						$sql_where1 .=" and m1.tag+m1.subfieldcode in (@$tags[$i])";
+					}
+					$sql_where1.=")";
+				} elsif (@$operator[$i] eq "contains") {	
+				$sql_tables .= "auth_word as m$nb_table,";
+					$sql_where1 .= "(m1.word  like ".$dbh->quote("@$value[$i]%");
+					if (@$tags[$i]) {
+						 $sql_where1 .=" and m1.tagsubfield in (@$tags[$i])";
+					}
+					$sql_where1.=")";
+				} else {
+
+					$sql_tables .= "auth_subfield_table as m$nb_table,";
+					$sql_where1 .= "(m1.subfieldvalue @$operator[$i] ".$dbh->quote("@$value[$i]");
+					if (@$tags[$i]) {
+						 $sql_where1 .=" and m1.tag+m1.subfieldcode in (@$tags[$i])";
+					}
+					$sql_where1.=")";
+				}
+			} else {
+				if (@$operator[$i] eq "start") {
+					$nb_table++;
+					$sql_tables .= "auth_subfield_table as m$nb_table,";
+					$sql_where1 .= "@$and_or[$i] (m$nb_table.subfieldvalue like ".$dbh->quote("@$value[$i]%");
+					if (@$tags[$i]) {
+					 	$sql_where1 .=" and m$nb_table.tag+m$nb_table.subfieldcode in (@$tags[$i])";
+					}
+					$sql_where1.=")";
+					$sql_where2 .= "m1.authid=m$nb_table.authid and ";
+				} elsif (@$operator[$i] eq "contains") {
+					if (@$and_or[$i] eq 'and') {
+						$nb_table++;
+						$sql_tables .= "auth_word as m$nb_table,";
+						$sql_where1 .= "@$and_or[$i] (m$nb_table.word like ".$dbh->quote("@$value[$i]%");
+						if (@$tags[$i]) {
+							$sql_where1 .=" and m$nb_table.tagsubfield in(@$tags[$i])";
+						}
+						$sql_where1.=")";
+						$sql_where2 .= "m1.authid=m$nb_table.authid and ";
+					} else {
+						$sql_where1 .= "@$and_or[$i] (m$nb_table.word like ".$dbh->quote("@$value[$i]%");
+						if (@$tags[$i]) {
+							$sql_where1 .="  and m$nb_table.tag+m$nb_table.subfieldid in (@$tags[$i])";
+						}
+						$sql_where1.=")";
+						$sql_where2 .= "m1.authid=m$nb_table.authid and ";
+					}
+				} else {
+					$nb_table++;
+					$sql_tables .= "auth_subfield_table as m$nb_table,";
+					$sql_where1 .= "@$and_or[$i] (m$nb_table.subfieldvalue @$operator[$i] ".$dbh->quote(@$value[$i]);
+					if (@$tags[$i]) {
+					 	$sql_where1 .="  and m$nb_table.tag+m$nb_table.subfieldcode in (@$tags[$i])";
+					}
+					$sql_where2 .= "m1.authid=m$nb_table.authid and ";
+					$sql_where1.=")";
+				}
+			}
+		}
+	}
+
+	if($sql_where2 ne "(")	# some datas added to sql_where2, processing
+	{
+		$sql_where2 = substr($sql_where2, 0, (length($sql_where2)-5)); # deletes the trailing ' and '
+		$sql_where2 .= ")";
+	}
+	else	# no sql_where2 statement, deleting '('
+	{
+		$sql_where2 = "";
+	}
+	chop $sql_tables;	# deletes the trailing ','
+	
+	return ($sql_tables, $sql_where1, $sql_where2);
+}
+
+
+sub AUTHcount_usage {
+	my ($authid) = @_;
+	my $dbh = C4::Context->dbh;
+	# find MARC fields using this authtype
+	my $authtypecode = AUTHfind_authtypecode($dbh,$authid);
+	my $sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure where authtypecode=?");
+	$sth->execute($authtypecode);
+	my $tags_using_authtype;
+	while (my ($tagfield) = $sth->fetchrow) {
+# 		warn "TAG : $tagfield";
+		$tags_using_authtype.= "'".$tagfield."9',";
+	}
+	chop $tags_using_authtype;
+	if ($tags_using_authtype) {
+		$sth = $dbh->prepare("select count(*) from marc_subfield_table where concat(tag,subfieldcode) in ($tags_using_authtype) and subfieldvalue=?");
+	} else {
+		$sth = $dbh->prepare("select count(*) from marc_subfield_table where subfieldvalue=?");
+	}
+# 	warn "Q : select count(*) from marc_subfield_table where concat(tag,subfieldcode) in ($tags_using_authtype) and subfieldvalue=$authid";
+	$sth->execute($authid);
+	my ($result) = $sth->fetchrow;
+# 	warn "Authority $authid TOTAL USED : $result";
+	return $result;
+}
+
+# merging 2 authority entries. After a merge, the "from" can be deleted.
+# sub AUTHmerge {
+# 	my ($auth_merge_from,$auth_merge_to) = @_;
+# 	my $dbh = C4::Context->dbh;
+# 	# find MARC fields using this authtype
+# 	my $authtypecode = AUTHfind_authtypecode($dbh,$authid);
+# 	# retrieve records
+# 	my $record_from = AUTHgetauthority($dbh,$auth_merge_from);
+# 	my $record_to = AUTHgetauthority($dbh,$auth_merge_to);
+# 	my $sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure where authtypecode=?");
+# 	$sth->execute($authtypecode);
+# 	my $tags_using_authtype;
+# 	while (my ($tagfield) = $sth->fetchrow) {
+# 		warn "TAG : $tagfield";
+# 		$tags_using_authtype.= "'".$tagfield."9',";
+# 	}
+# 	chop $tags_using_authtype;
+# 	# now, find every biblio using this authority
+# 	$sth = $dbh->prepare("select bibid,tag,tag_indicator,tagorder from marc_subfield_table where tag+subfieldid in ($tags_using_authtype) and subfieldvalue=?");
+# 	$sth->execute($authid);
+# 	# and delete entries before recreating them
+# 	while (my ($bibid,$tag,$tag_indicator,$tagorder) = $sth->fetchrow) {
+# 		&MARCdelsubfield($dbh,$bibid,$tag);
+# 		
+# 	}
+# 
+# }
+
+sub AUTHfind_authtypecode {
+	my ($dbh,$authid) = @_;
+	my $sth = $dbh->prepare("select authtypecode from auth_header where authid=?");
+	$sth->execute($authid);
+	my ($authtypecode) = $sth->fetchrow;
+	return $authtypecode;
+}
+ 
+
+sub AUTHgettagslib {
+	my ($dbh,$forlibrarian,$authtypecode)= @_;
+	$authtypecode="" unless $authtypecode;
+	my $sth;
+	my $libfield = ($forlibrarian eq 1)? 'liblibrarian' : 'libopac';
+	# check that framework exists
+	$sth=$dbh->prepare("select count(*) from auth_tag_structure where authtypecode=?");
+	$sth->execute($authtypecode);
+	my ($total) = $sth->fetchrow;
+	$authtypecode="" unless ($total >0);
+	$sth=$dbh->prepare("select tagfield,$libfield as lib,mandatory,repeatable from auth_tag_structure where authtypecode=? order by tagfield");
+	$sth->execute($authtypecode);
+	my ($lib,$tag,$res,$tab,$mandatory,$repeatable);
+	while ( ($tag,$lib,$mandatory,$repeatable) = $sth->fetchrow) {
+		$res->{$tag}->{lib}=$lib;
+		$res->{$tab}->{tab}=""; # XXX
+		$res->{$tag}->{mandatory}=$mandatory;
+		$res->{$tag}->{repeatable}=$repeatable;
+	}
+
+	$sth=$dbh->prepare("select tagfield,tagsubfield,$libfield as lib,tab, mandatory, repeatable,authorised_value,value_builder,seealso from auth_subfield_structure where authtypecode=? order by tagfield,tagsubfield");
+	$sth->execute($authtypecode);
+
+	my $subfield;
+	my $authorised_value;
+	my $thesaurus_category;
+	my $value_builder;
+	my $kohafield;
+	my $seealso;
+	my $hidden;
+	my $isurl;
+	while ( ($tag, $subfield, $lib, $tab, $mandatory, $repeatable,$authorised_value,$value_builder,$seealso) = $sth->fetchrow) {
+		$res->{$tag}->{$subfield}->{lib}=$lib;
+		$res->{$tag}->{$subfield}->{tab}=$tab;
+		$res->{$tag}->{$subfield}->{mandatory}=$mandatory;
+		$res->{$tag}->{$subfield}->{repeatable}=$repeatable;
+		$res->{$tag}->{$subfield}->{authorised_value}=$authorised_value;
+		$res->{$tag}->{$subfield}->{thesaurus_category}=$thesaurus_category;
+		$res->{$tag}->{$subfield}->{value_builder}=$value_builder;
+		$res->{$tag}->{$subfield}->{seealso}=$seealso;
+		$res->{$tag}->{$subfield}->{hidden}=$hidden;
+		$res->{$tag}->{$subfield}->{isurl}=$isurl;
+	}
+	return $res;
+}
+
+sub AUTHaddauthority {
+# pass the MARC::Record to this function, and it will create the records in the marc tables
+	my ($dbh,$record,$authid,$authtypecode) = @_;
+	my @fields=$record->fields();
+# 	warn "IN AUTHaddauthority $authid => ".$record->as_formatted;
+# adding main table, and retrieving authid
+# if authid is sent, then it's not a true add, it's only a re-add, after a delete (ie, a mod)
+# if authid empty => true add, find a new authid number
+	unless ($authid) {
+		$dbh->do("lock tables auth_header WRITE,auth_subfield_table WRITE, auth_word WRITE, stopwords READ");
+		my $sth=$dbh->prepare("insert into auth_header (datecreated,authtypecode) values (now(),?)");
+		$sth->execute($authtypecode);
+		$sth=$dbh->prepare("select max(authid) from auth_header");
+		$sth->execute;
+		($authid)=$sth->fetchrow;
+		$sth->finish;
+	}
+	my $fieldcount=0;
+	# now, add subfields...
+	foreach my $field (@fields) {
+		$fieldcount++;
+		if ($field->tag() <10) {
+				&AUTHaddsubfield($dbh,$authid,
+						$field->tag(),
+						'',
+						$fieldcount,
+						'',
+						1,
+						$field->data()
+						);
+		} else {
+			my @subfields=$field->subfields();
+			foreach my $subfieldcount (0..$#subfields) {
+				&AUTHaddsubfield($dbh,$authid,
+						$field->tag(),
+						$field->indicator(1).$field->indicator(2),
+						$fieldcount,
+						$subfields[$subfieldcount][0],
+						$subfieldcount+1,
+						$subfields[$subfieldcount][1]
+						);
+			}
+		}
+	}
+	$dbh->do("unlock tables");
+	return $authid;
+}
+
+
+sub AUTHaddsubfield {
+# Add a new subfield to a tag into the DB.
+	my ($dbh,$authid,$tagid,$tag_indicator,$tagorder,$subfieldcode,$subfieldorder,$subfieldvalues) = @_;
+	# if not value, end of job, we do nothing
+	if (length($subfieldvalues) ==0) {
+		return;
+	}
+	if (not($subfieldcode)) {
+		$subfieldcode=' ';
+	}
+	my @subfieldvalues = split /\|/,$subfieldvalues;
+	foreach my $subfieldvalue (@subfieldvalues) {
+		my $sth=$dbh->prepare("insert into auth_subfield_table (authid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue) values (?,?,?,?,?,?,?)");
+		$sth->execute($authid,(sprintf "%03s",$tagid),$tagorder,$tag_indicator,$subfieldcode,$subfieldorder,$subfieldvalue);
+		if ($sth->errstr) {
+			warn "ERROR ==> insert into auth_subfield_table (authid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue) values ($authid,$tagid,$tagorder,$tag_indicator,$subfieldcode,$subfieldorder,$subfieldvalue)\n";
+		}
+		&AUTHaddword($dbh,$authid,$tagid,$tagorder,$subfieldcode,$subfieldorder,$subfieldvalue);
+	}
+}
+
+sub AUTHgetauthority {
+# Returns MARC::Record of the biblio passed in parameter.
+    my ($dbh,$authid)=@_;
+    my $record = MARC::Record->new();
+#---- TODO : the leader is missing
+	$record->leader('                        ');
+    my $sth=$dbh->prepare("select authid,subfieldid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue
+		 		 from auth_subfield_table
+		 		 where authid=? order by tag,tagorder,subfieldcode
+		 	 ");
+	$sth->execute($authid);
+	my $prevtagorder=1;
+	my $prevtag='XXX';
+	my $previndicator;
+	my $field; # for >=10 tags
+	my $prevvalue; # for <10 tags
+	while (my $row=$sth->fetchrow_hashref) {
+		if ($row->{tagorder} ne $prevtagorder || $row->{tag} ne $prevtag) {
+			$previndicator.="  ";
+			if ($prevtag <10) {
+ 			$record->add_fields((sprintf "%03s",$prevtag),$prevvalue) unless $prevtag eq "XXX"; # ignore the 1st loop
+			} else {
+				$record->add_fields($field) unless $prevtag eq "XXX";
+			}
+			undef $field;
+			$prevtagorder=$row->{tagorder};
+			$prevtag = $row->{tag};
+			$previndicator=$row->{tag_indicator};
+			if ($row->{tag}<10) {
+				$prevvalue = $row->{subfieldvalue};
+			} else {
+				$field = MARC::Field->new((sprintf "%03s",$prevtag), substr($row->{tag_indicator}.'  ',0,1), substr($row->{tag_indicator}.'  ',1,1), $row->{'subfieldcode'}, $row->{'subfieldvalue'} );
+			}
+		} else {
+			if ($row->{tag} <10) {
+ 				$record->add_fields((sprintf "%03s",$row->{tag}), $row->{'subfieldvalue'});
+ 			} else {
+				$field->add_subfields($row->{'subfieldcode'}, $row->{'subfieldvalue'} );
+ 			}
+ 			$prevtag= $row->{tag};
+			$previndicator=$row->{tag_indicator};
+		}
+	}
+	# the last has not been included inside the loop... do it now !
+	if ($prevtag ne "XXX") { # check that we have found something. Otherwise, prevtag is still XXX and we
+						# must return an empty record, not make MARC::Record fail because we try to
+						# create a record with XXX as field :-(
+		if ($prevtag <10) {
+			$record->add_fields($prevtag,$prevvalue);
+		} else {
+	#  		my $field = MARC::Field->new( $prevtag, "", "", %subfieldlist);
+			$record->add_fields($field);
+		}
+	}
+	return $record;
+}
+
+sub AUTHgetauth_type {
+	my ($authtypecode) = @_;
+	my $dbh=C4::Context->dbh;
+	my $sth=$dbh->prepare("select * from auth_types where authtypecode=?");
+	$sth->execute($authtypecode);
+	return $sth->fetchrow_hashref;
+}
+sub AUTHmodauthority {
+	my ($dbh,$authid,$record,$delete)=@_;
+	my $oldrecord=&AUTHgetauthority($dbh,$authid);
+	if ($oldrecord eq $record) {
+		return;
+	}
+# 1st delete the authority,
+# 2nd recreate it
+	&AUTHdelauthority($dbh,$authid,1);
+	&AUTHaddauthority($dbh,$record,$authid,AUTHfind_authtypecode($dbh,$authid));
+	# save the file in localfile/modified_authorities
+	my $filename = C4::Context->config("intranetdir")."/localfile/modified_authorities/$authid.authid";
+	open AUTH, "> $filename";
+	print AUTH $authid;
+	close AUTH;
+}
+
+sub AUTHdelauthority {
+	my ($dbh,$authid,$keep_biblio) = @_;
+# if the keep_biblio is set to 1, then authority entries in biblio are preserved.
+# This flag is set when the delauthority is called by modauthority
+# due to a too complex structure of MARC (repeatable fields and subfields),
+# the best solution for a modif is to delete / recreate the record.
+
+	my $record = AUTHgetauthority($dbh,$authid);
+	$dbh->do("delete from auth_header where authid=$authid") unless $keep_biblio;
+	$dbh->do("delete from auth_subfield_table where authid=$authid");
+	$dbh->do("delete from auth_word where authid=$authid");
+# FIXME : delete or not in biblio tables (depending on $keep_biblio flag)
+}
+
+sub AUTHmodsubfield {
+# Subroutine changes a subfield value given a subfieldid.
+	my ($dbh, $subfieldid, $subfieldvalue )=@_;
+	$dbh->do("lock tables auth_subfield_table WRITE");
+	my $sth=$dbh->prepare("update auth_subfield_table set subfieldvalue=? where subfieldid=?");
+	$sth->execute($subfieldvalue, $subfieldid);
+	$dbh->do("unlock tables");
+	$sth->finish;
+	$sth=$dbh->prepare("select authid,tag,tagorder,subfieldcode,subfieldid,subfieldorder from auth_subfield_table where subfieldid=?");
+	$sth->execute($subfieldid);
+	my ($authid,$tagid,$tagorder,$subfieldcode,$x,$subfieldorder) = $sth->fetchrow;
+	$subfieldid=$x;
+	&AUTHdelword($dbh,$authid,$tagid,$tagorder,$subfieldcode,$subfieldorder);
+	&AUTHaddword($dbh,$authid,$tagid,$tagorder,$subfieldcode,$subfieldorder,$subfieldvalue);
+	return($subfieldid, $subfieldvalue);
+}
+
+sub AUTHfindsubfield {
+    my ($dbh,$authid,$tag,$subfieldcode,$subfieldorder,$subfieldvalue) = @_;
+    my $resultcounter=0;
+    my $subfieldid;
+    my $lastsubfieldid;
+    my $query="select subfieldid from auth_subfield_table where authid=? and tag=? and subfieldcode=?";
+    my @bind_values = ($authid,$tag, $subfieldcode);
+    if ($subfieldvalue) {
+	$query .= " and subfieldvalue=?";
+	push(@bind_values,$subfieldvalue);
+    } else {
+	if ($subfieldorder<1) {
+	    $subfieldorder=1;
+	}
+	$query .= " and subfieldorder=?";
+	push(@bind_values,$subfieldorder);
+    }
+    my $sti=$dbh->prepare($query);
+    $sti->execute(@bind_values);
+    while (($subfieldid) = $sti->fetchrow) {
+	$resultcounter++;
+	$lastsubfieldid=$subfieldid;
+    }
+    if ($resultcounter>1) {
+		# Error condition.  Values given did not resolve into a unique record.  Don't know what to edit
+		# should rarely occur (only if we use subfieldvalue with a value that exists twice, which is strange)
+		return -1;
+    } else {
+		return $lastsubfieldid;
+    }
+}
+
+sub AUTHfindsubfieldid {
+	my ($dbh,$authid,$tag,$tagorder,$subfield,$subfieldorder) = @_;
+	my $sth=$dbh->prepare("select subfieldid from auth_subfield_table
+				where authid=? and tag=? and tagorder=?
+					and subfieldcode=? and subfieldorder=?");
+	$sth->execute($authid,$tag,$tagorder,$subfield,$subfieldorder);
+	my ($res) = $sth->fetchrow;
+	unless ($res) {
+		$sth=$dbh->prepare("select subfieldid from auth_subfield_table
+				where authid=? and tag=? and tagorder=?
+					and subfieldcode=?");
+		$sth->execute($authid,$tag,$tagorder,$subfield);
+		($res) = $sth->fetchrow;
+	}
+    return $res;
+}
+
+sub AUTHfind_authtypecode {
+	my ($dbh,$authid) = @_;
+	my $sth = $dbh->prepare("select authtypecode from auth_header where authid=?");
+	$sth->execute($authid);
+	my ($authtypecode) = $sth->fetchrow;
+	return $authtypecode;
+}
+
+sub AUTHdelsubfield {
+# delete a subfield for $authid / tag / tagorder / subfield / subfieldorder
+    my ($dbh,$authid,$tag,$tagorder,$subfield,$subfieldorder) = @_;
+    $dbh->do("delete from auth_subfield_table where authid='$authid' and
+			tag='$tag' and tagorder='$tagorder'
+			and subfieldcode='$subfield' and subfieldorder='$subfieldorder'
+			");
+}
+
+sub AUTHhtml2marc {
+	my ($dbh,$rtags,$rsubfields,$rvalues,%indicators) = @_;
+	my $prevtag = -1;
+	my $record = MARC::Record->new();
+# 	my %subfieldlist=();
+	my $prevvalue; # if tag <10
+	my $field; # if tag >=10
+	for (my $i=0; $i< @$rtags; $i++) {
+		# rebuild MARC::Record
+		if (@$rtags[$i] ne $prevtag) {
+			if ($prevtag < 10) {
+				if ($prevvalue) {
+					$record->add_fields((sprintf "%03s",$prevtag),$prevvalue);
+				}
+			} else {
+				if ($field) {
+					$record->add_fields($field);
+				}
+			}
+			$indicators{@$rtags[$i]}.='  ';
+			if (@$rtags[$i] <10) {
+				$prevvalue= @$rvalues[$i];
+			} else {
+				$field = MARC::Field->new( (sprintf "%03s",@$rtags[$i]), substr($indicators{@$rtags[$i]},0,1),substr($indicators{@$rtags[$i]},1,1), @$rsubfields[$i] => @$rvalues[$i]);
+			}
+			$prevtag = @$rtags[$i];
+		} else {
+			if (@$rtags[$i] <10) {
+				$prevvalue=@$rvalues[$i];
+			} else {
+				if (@$rvalues[$i]) {
+					$field->add_subfields(@$rsubfields[$i] => @$rvalues[$i]);
+				}
+			}
+			$prevtag= @$rtags[$i];
+		}
+	}
+	# the last has not been included inside the loop... do it now !
+	$record->add_fields($field);
+# 	warn $record->as_formatted;
+	return $record;
+}
+
+sub AUTHaddword {
+# split a subfield string and adds it into the word table.
+# removes stopwords
+    my ($dbh,$authid,$tag,$tagorder,$subfieldid,$subfieldorder,$sentence) =@_;
+    $sentence =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g;
+    my @words = split / /,$sentence;
+    my $stopwords= C4::Context->stopwords;
+    my $sth=$dbh->prepare("insert into auth_word (authid, tagsubfield, tagorder, subfieldorder, word, sndx_word)
+			values (?,concat(?,?),?,?,?,soundex(?))");
+    foreach my $word (@words) {
+# we record only words longer than 2 car and not in stopwords hash
+	if (length($word)>2 and !($stopwords->{uc($word)})) {
+	    $sth->execute($authid,$tag,$subfieldid,$tagorder,$subfieldorder,$word,$word);
+	    if ($sth->err()) {
+		warn "ERROR ==> insert into auth_word (authid, tagsubfield, tagorder, subfieldorder, word, sndx_word) values ($authid,concat($tag,$subfieldid),$tagorder,$subfieldorder,$word,soundex($word))\n";
+	    }
+	}
+    }
+}
+
+sub AUTHdelword {
+# delete words. this sub deletes all the words from a sentence. a subfield modif is done by a delete then a add
+    my ($dbh,$authid,$tag,$tagorder,$subfield,$subfieldorder) = @_;
+    my $sth=$dbh->prepare("delete from auth_word where authid=? and tagsubfield=concat(?,?) and tagorder=? and subfieldorder=?");
+    $sth->execute($authid,$tag,$subfield,$tagorder,$subfieldorder);
+}
+
+sub char_decode {
+	# converts ISO 5426 coded string to ISO 8859-1
+	# sloppy code : should be improved in next issue
+	my ($string,$encoding) = @_ ;
+	$_ = $string ;
+# 	$encoding = C4::Context->preference("marcflavour") unless $encoding;
+	if ($encoding eq "UNIMARC") {
+		s/\xe1/Æ/gm ;
+		s/\xe2/Ð/gm ;
+		s/\xe9/Ø/gm ;
+		s/\xec/þ/gm ;
+		s/\xf1/æ/gm ;
+		s/\xf3/ð/gm ;
+		s/\xf9/ø/gm ;
+		s/\xfb/ß/gm ;
+		s/\xc1\x61/à/gm ;
+		s/\xc1\x65/è/gm ;
+		s/\xc1\x69/ì/gm ;
+		s/\xc1\x6f/ò/gm ;
+		s/\xc1\x75/ù/gm ;
+		s/\xc1\x41/À/gm ;
+		s/\xc1\x45/È/gm ;
+		s/\xc1\x49/Ì/gm ;
+		s/\xc1\x4f/Ò/gm ;
+		s/\xc1\x55/Ù/gm ;
+		s/\xc2\x41/Á/gm ;
+		s/\xc2\x45/É/gm ;
+		s/\xc2\x49/Í/gm ;
+		s/\xc2\x4f/Ó/gm ;
+		s/\xc2\x55/Ú/gm ;
+		s/\xc2\x59/Ý/gm ;
+		s/\xc2\x61/á/gm ;
+		s/\xc2\x65/é/gm ;
+		s/\xc2\x69/í/gm ;
+		s/\xc2\x6f/ó/gm ;
+		s/\xc2\x75/ú/gm ;
+		s/\xc2\x79/ý/gm ;
+		s/\xc3\x41/Â/gm ;
+		s/\xc3\x45/Ê/gm ;
+		s/\xc3\x49/Î/gm ;
+		s/\xc3\x4f/Ô/gm ;
+		s/\xc3\x55/Û/gm ;
+		s/\xc3\x61/â/gm ;
+		s/\xc3\x65/ê/gm ;
+		s/\xc3\x69/î/gm ;
+		s/\xc3\x6f/ô/gm ;
+		s/\xc3\x75/û/gm ;
+		s/\xc4\x41/Ã/gm ;
+		s/\xc4\x4e/Ñ/gm ;
+		s/\xc4\x4f/Õ/gm ;
+		s/\xc4\x61/ã/gm ;
+		s/\xc4\x6e/ñ/gm ;
+		s/\xc4\x6f/õ/gm ;
+		s/\xc8\x45/Ë/gm ;
+		s/\xc8\x49/Ï/gm ;
+		s/\xc8\x65/ë/gm ;
+		s/\xc8\x69/ï/gm ;
+		s/\xc8\x76/ÿ/gm ;
+		s/\xc9\x41/Ä/gm ;
+		s/\xc9\x4f/Ö/gm ;
+		s/\xc9\x55/Ü/gm ;
+		s/\xc9\x61/ä/gm ;
+		s/\xc9\x6f/ö/gm ;
+		s/\xc9\x75/ü/gm ;
+		s/\xca\x41/Å/gm ;
+		s/\xca\x61/å/gm ;
+		s/\xd0\x43/Ç/gm ;
+		s/\xd0\x63/ç/gm ;
+		# this handles non-sorting blocks (if implementation requires this)
+		$string = nsb_clean($_) ;
+	} elsif ($encoding eq "USMARC" || $encoding eq "MARC21") {
+		if(/[\xc1-\xff]/) {
+			s/\xe1\x61/à/gm ;
+			s/\xe1\x65/è/gm ;
+			s/\xe1\x69/ì/gm ;
+			s/\xe1\x6f/ò/gm ;
+			s/\xe1\x75/ù/gm ;
+			s/\xe1\x41/À/gm ;
+			s/\xe1\x45/È/gm ;
+			s/\xe1\x49/Ì/gm ;
+			s/\xe1\x4f/Ò/gm ;
+			s/\xe1\x55/Ù/gm ;
+			s/\xe2\x41/Á/gm ;
+			s/\xe2\x45/É/gm ;
+			s/\xe2\x49/Í/gm ;
+			s/\xe2\x4f/Ó/gm ;
+			s/\xe2\x55/Ú/gm ;
+			s/\xe2\x59/Ý/gm ;
+			s/\xe2\x61/á/gm ;
+			s/\xe2\x65/é/gm ;
+			s/\xe2\x69/í/gm ;
+			s/\xe2\x6f/ó/gm ;
+			s/\xe2\x75/ú/gm ;
+			s/\xe2\x79/ý/gm ;
+			s/\xe3\x41/Â/gm ;
+			s/\xe3\x45/Ê/gm ;
+			s/\xe3\x49/Î/gm ;
+			s/\xe3\x4f/Ô/gm ;
+			s/\xe3\x55/Û/gm ;
+			s/\xe3\x61/â/gm ;
+			s/\xe3\x65/ê/gm ;
+			s/\xe3\x69/î/gm ;
+			s/\xe3\x6f/ô/gm ;
+			s/\xe3\x75/û/gm ;
+			s/\xe4\x41/Ã/gm ;
+			s/\xe4\x4e/Ñ/gm ;
+			s/\xe4\x4f/Õ/gm ;
+			s/\xe4\x61/ã/gm ;
+			s/\xe4\x6e/ñ/gm ;
+			s/\xe4\x6f/õ/gm ;
+			s/\xe8\x45/Ë/gm ;
+			s/\xe8\x49/Ï/gm ;
+			s/\xe8\x65/ë/gm ;
+			s/\xe8\x69/ï/gm ;
+			s/\xe8\x76/ÿ/gm ;
+			s/\xe9\x41/Ä/gm ;
+			s/\xe9\x4f/Ö/gm ;
+			s/\xe9\x55/Ü/gm ;
+			s/\xe9\x61/ä/gm ;
+			s/\xe9\x6f/ö/gm ;
+			s/\xe9\x75/ü/gm ;
+			s/\xea\x41/Å/gm ;
+			s/\xea\x61/å/gm ;
+			# this handles non-sorting blocks (if implementation requires this)
+			$string = nsb_clean($_) ;
+		}
+	}
+	return($string) ;
+}
+
+sub nsb_clean {
+	my $NSB = '\x88' ;		# NSB : begin Non Sorting Block
+	my $NSE = '\x89' ;		# NSE : Non Sorting Block end
+	# handles non sorting blocks
+	my ($string) = @_ ;
+	$_ = $string ;
+	s/$NSB/(/gm ;
+	s/[ ]{0,1}$NSE/) /gm ;
+	$string = $_ ;
+	return($string) ;
+}
+
+sub FindDuplicate {
+	my ($record,$authtypecode)=@_;
+	warn "IN for ".$record->as_formatted;
+	my $dbh = C4::Context->dbh;
+
+#	warn "".$record->as_formatted;
+	my $sth = $dbh->prepare("select auth_tag_to_report,summary from auth_types where authtypecode=?");
+	$sth->execute($authtypecode);
+	my ($auth_tag_to_report,$taglist) = $sth->fetchrow;
+	$sth->finish;
+	# build a request for authoritysearch
+	my (@tags, @and_or, @excluding, @operator, @value, $offset, $length);
+	# search on biblio.title
+#	warn " tag a reporter : $auth_tag_to_report";
+# 	warn "taglist ".$taglist;
+	my @subfield = split /\[/,  $taglist;
+	my $max = @subfield;
+	for (my $i=1; $i<$max;$i++){
+		warn " ".$subfield[$i];
+		$subfield[$i]=substr($subfield[$i],3,1);
+# 		warn " ".$subfield[$i];
+	}
+	
+	if ($record->fields($auth_tag_to_report)) {
+		my $sth = $dbh->prepare("select tagfield,tagsubfield from auth_subfield_structure where tagfield=? and authtypecode=? ");
+		$sth->execute($auth_tag_to_report,$authtypecode);
+#		warn " field $auth_tag_to_report exists";
+		while (my ($tag,$subfield) = $sth->fetchrow){
+			if ($record->field($tag)->subfield($subfield)) {
+				warn "tag :".$tag." subfield: $subfield value : ".$record->field($tag)->subfield($subfield);
+				push @tags, $tag.$subfield;
+#				warn "'".$tag.$subfield."' value :". $record->field($tag)->subfield($subfield);
+				push @and_or, "and";
+				push @excluding, "";
+				push @operator, "=";
+				push @value, $record->field($tag)->subfield($subfield);
+			}
+		}
+ 	}
+ 
+	my ($finalresult,$nbresult) = authoritysearch($dbh,\@tags,\@and_or,\@excluding,\@operator,\@value,0,10,$authtypecode);
+	# there is at least 1 result => return the 1st one
+	if ($nbresult) {
+		warn "XXXXX $nbresult => ".@$finalresult[0]->{authid},@$finalresult[0]->{summary};
+		return @$finalresult[0]->{authid},@$finalresult[0]->{summary};
+	}
+	# no result, returns nothing
+	return;
+}
+
+
+END { }       # module clean-up code here (global destructor)
+
+=back
+
+=head1 AUTHOR
+
+Koha Developement team <info@koha.org>
+
+Paul POULAIN paul.poulain@free.fr
+
+=cut
+
+# $Id$
+# $Log$
+# Revision 1.16  2005/05/04 15:43:43  tipaul
+# synch'ing 2.2 and head
+#
+# Revision 1.9.2.3  2005/04/28 08:45:33  tipaul
+# porting FindDuplicate feature for authorities from HEAD to rel_2_2, works correctly now.
+#
+# Revision 1.9.2.2  2005/02/28 14:03:13  tipaul
+# * adding search on "main entry" (ie $a subfield) on a given authority (the "search everywhere" field is still here).
+# * adding a select box to requet "contain" or "begin with" search.
+# * fixing some bug in authority search (related to "main entry" search)
+#
+# Revision 1.9.2.1  2005/02/24 13:12:13  tipaul
+# saving authority modif in a text file. This will be used soon with another script (in crontab). The script in crontab will retrieve every authorityid in the directory localfile/authorities and modify every biblio using this authority. Those modifs may be long. So they can't be done through http, because we may encounter a webserver timeout, and kill the process before end of the job.
+# So, it will be done through a cron job.
+# (/me agree we need some doc for command line scripts)
+#
+# Revision 1.9  2004/12/23 09:48:11  tipaul
+# Minor changes in summary "exploding" (the 3 digits AFTER the subfield were not on the right place).
+#
+# Revision 1.8  2004/11/05 10:11:39  tipaul
+# export auth_count_usage (bugfix)
+#
+# Revision 1.7  2004/09/23 16:13:00  tipaul
+# Bugfix in modification
+#
+# Revision 1.6  2004/08/18 16:00:24  tipaul
+# fixes for authorities management
+#
+# Revision 1.5  2004/07/05 13:37:22  doxulting
+# First step for working authorities
+#
+# Revision 1.4  2004/06/22 11:35:37  tipaul
+# removing % at the beginning of a string to avoid loooonnnngggg searchs
+#
+# Revision 1.3  2004/06/17 08:02:13  tipaul
+# merging tag & subfield in auth_word for better perfs
+#
+# Revision 1.2  2004/06/10 08:29:01  tipaul
+# MARC authority management (continued)
+#
+# Revision 1.1  2004/06/07 07:35:01  tipaul
+# MARC authority management package
+#
+package C4::AuthoritiesMarc;
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+use strict;
+require Exporter;
+use C4::Context;
+use C4::Database;
+use C4::Koha;
+use MARC::Record;
+use C4::Biblio;
+
+use vars qw($VERSION @ISA @EXPORT);
+
+# set the version for version checking
+$VERSION = 0.01;
+
 @ISA = qw(Exporter);
 @EXPORT = qw(
 	&AUTHgettagslib
@@ -925,6 +1881,9 @@ Paul POULAIN paul.poulain@free.fr
 
 # $Id$
 # $Log$
+# Revision 1.16  2005/05/04 15:43:43  tipaul
+# synch'ing 2.2 and head
+#
 # Revision 1.15  2005/05/04 14:18:39  hdl
 # adding Marc Record to authoritysearch report
 #
diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index f870afe43d..47cd2266ee 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -241,13 +241,13 @@ sub MARCgettagslib {
     $frameworkcode = "" unless ( $total > 0 );
     $sth =
       $dbh->prepare(
-"select tagfield,$libfield as lib,mandatory,repeatable from marc_tag_structure where frameworkcode=? order by tagfield"
+"select tagfield,liblibrarian,libopac,mandatory,repeatable from marc_tag_structure where frameworkcode=? order by tagfield"
     );
     $sth->execute($frameworkcode);
-    my ( $lib, $tag, $res, $tab, $mandatory, $repeatable );
+    my ( $liblibrarian, $libopac, $tag, $res, $tab, $mandatory, $repeatable );
 
-    while ( ( $tag, $lib, $mandatory, $repeatable ) = $sth->fetchrow ) {
-        $res->{$tag}->{lib}        = $lib;
+    while ( ( $tag, $liblibrarian, $libopac, $mandatory, $repeatable ) = $sth->fetchrow ) {
+        $res->{$tag}->{lib}        = ($forlibrarian or !$libopac)?$liblibrarian:$libopac;
         $res->{$tab}->{tab}        = "";            # XXX
         $res->{$tag}->{mandatory}  = $mandatory;
         $res->{$tag}->{repeatable} = $repeatable;
@@ -255,7 +255,7 @@ sub MARCgettagslib {
 
     $sth =
       $dbh->prepare(
-"select tagfield,tagsubfield,$libfield as lib,tab, mandatory, repeatable,authorised_value,authtypecode,value_builder,kohafield,seealso,hidden,isurl,link from marc_subfield_structure where frameworkcode=? order by tagfield,tagsubfield"
+"select tagfield,tagsubfield,liblibrarian,libopac,tab, mandatory, repeatable,authorised_value,authtypecode,value_builder,kohafield,seealso,hidden,isurl,link from marc_subfield_structure where frameworkcode=? order by tagfield,tagsubfield"
     );
     $sth->execute($frameworkcode);
 
@@ -270,14 +270,14 @@ sub MARCgettagslib {
 	my $link;
 
     while (
-        ( $tag,         $subfield,   $lib,              $tab,
+        ( $tag,         $subfield,   $liblibrarian,   , $libopac,      $tab,
         $mandatory,     $repeatable, $authorised_value, $authtypecode,
         $value_builder, $kohafield,  $seealso,          $hidden,
         $isurl,			$link )
         = $sth->fetchrow
       )
     {
-        $res->{$tag}->{$subfield}->{lib}              = $lib;
+        $res->{$tag}->{$subfield}->{lib}              = ($forlibrarian or !$libopac)?$liblibrarian:$libopac;
         $res->{$tag}->{$subfield}->{tab}              = $tab;
         $res->{$tag}->{$subfield}->{mandatory}        = $mandatory;
         $res->{$tag}->{$subfield}->{repeatable}       = $repeatable;
@@ -298,13 +298,6 @@ sub MARCfind_marc_from_kohafield {
     return 0, 0 unless $kohafield;
 	my $relations = C4::Context->marcfromkohafield;
 	return ($relations->{$frameworkcode}->{$kohafield}->[0],$relations->{$frameworkcode}->{$kohafield}->[1]);
-#     my $sth =
-#       $dbh->prepare(
-# "select tagfield,tagsubfield from marc_subfield_structure where frameworkcode=? and kohafield=?"
-#     );
-#     $sth->execute($frameworkcode,$kohafield);
-#     my ( $tagfield, $tagsubfield ) = $sth->fetchrow;
-#     return ( $tagfield, $tagsubfield );
 }
 
 sub MARCfind_oldbiblionumber_from_MARCbibid {
@@ -418,6 +411,7 @@ sub MARCaddsubfield {
         $tagorder, $subfieldcode, $subfieldorder, $subfieldvalues
       )
       = @_;
+	  return unless $subfieldvalues;
 # warn "$tagid / $subfieldcode / $subfieldvalues";
     # if not value, end of job, we do nothing
 #     if ( length($subfieldvalues) == 0 ) {
@@ -710,37 +704,9 @@ sub MARCdelitem {
 
 sub MARCmoditem {
 	my ($dbh,$record,$bibid,$itemnumber,$delete)=@_;
-
-	my $oldrecord=&MARCgetitem($dbh,$bibid,$itemnumber);
-	# if nothing to change, don't waste time...
-	if ($oldrecord eq $record) {
-		return;
-	}
-	# otherwise, skip through each subfield...
-	my @fields = $record->fields();
-	# search old MARC item
-	my $sth2 = $dbh->prepare("select tagorder from marc_subfield_table,marc_subfield_structure where marc_subfield_table.tag=marc_subfield_structure.tagfield and marc_subfield_table.subfieldcode=marc_subfield_structure.tagsubfield and bibid=? and kohafield='items.itemnumber' and subfieldvalue=?");
-	$sth2->execute($bibid,$itemnumber);
-	my ($tagorder) = $sth2->fetchrow_array();
-	foreach my $field (@fields) {
-		my $oldfield = $oldrecord->field($field->tag());
-		my @subfields=$field->subfields();
-		my $subfieldorder=0;
-		foreach my $subfield (@subfields) {
-			$subfieldorder++;
-			if ($oldfield eq 0 or (length($oldfield->subfield(@$subfield[0])) ==0) ) {
-		# just adding datas...
-				&MARCaddsubfield($dbh,$bibid,$field->tag(),$field->indicator(1).$field->indicator(2),
-						$tagorder,@$subfield[0],$subfieldorder,@$subfield[1]);
-			} else {
-		# modify he subfield if it's a different string
-				if ($oldfield->subfield(@$subfield[0]) ne @$subfield[1] ) {
-					my $subfieldid=&MARCfindsubfieldid($dbh,$bibid,$field->tag(),$tagorder,@$subfield[0],$subfieldorder);
-					&MARCmodsubfield($dbh,$subfieldid,@$subfield[1]);
-				}
-			}
-		}
-	}
+	my $biblionumber = MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid);
+	&MARCdelitem($dbh,$bibid,$itemnumber);
+	&MARCadditem($dbh,$record,$biblionumber);
 }
 
 sub MARCmodsubfield {
@@ -1180,7 +1146,7 @@ sub MARCaddword {
         $subfieldid, $subfieldorder, $sentence
       )
       = @_;
-    $sentence =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g;
+    $sentence =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
     my @words = split / /, $sentence;
     my $stopwords = C4::Context->stopwords;
     my $sth       =
@@ -2549,11 +2515,15 @@ sub FindDuplicate {
 	my ($record)=@_;
 	my $dbh = C4::Context->dbh;
 	my $result = MARCmarc2koha($dbh,$record,'');
+	my $sth;
+	my ($biblionumber,$bibid,$title);
 	# search duplicate on ISBN, easy and fast...
-	my $sth = $dbh->prepare("select biblio.biblionumber,bibid,title from biblio,biblioitems,marc_biblio where biblio.biblionumber=biblioitems.biblionumber and marc_biblio.biblionumber=biblioitems.biblionumber and isbn=?");
-	$sth->execute($result->{'isbn'});
-	my ($biblionumber,$bibid,$title) = $sth->fetchrow;
-	return $biblionumber,$bibid,$title if ($biblionumber);
+	if ($result->{isbn}) {
+		$sth = $dbh->prepare("select biblio.biblionumber,bibid,title from biblio,biblioitems,marc_biblio where biblio.biblionumber=biblioitems.biblionumber and marc_biblio.biblionumber=biblioitems.biblionumber and isbn=?");
+		$sth->execute($result->{'isbn'});
+		($biblionumber,$bibid,$title) = $sth->fetchrow;
+		return $biblionumber,$bibid,$title if ($biblionumber);
+	}
 	# a more complex search : build a request for SearchMarc::catalogsearch()
 	my (@tags, @and_or, @excluding, @operator, @value, $offset,$length);
 	# search on biblio.title
@@ -2653,8 +2623,27 @@ Paul POULAIN paul.poulain@free.fr
 
 # $Id$
 # $Log$
-# Revision 1.117  2005/03/07 08:55:29  tipaul
-# synch'ing with 2.2
+# Revision 1.118  2005/05/04 15:40:01  tipaul
+# synch'ing 2.2 and head
+#
+# Revision 1.115.2.9  2005/04/07 10:05:25  tipaul
+# adding / to the list of symbols that are replace by spaces for searches
+#
+# Revision 1.115.2.8  2005/03/25 16:23:49  tipaul
+# some improvements :
+# * return immediatly when a subfield is empty
+# * search duplicate on isbn must be done only when there is an isbn ;-)
+#
+# Revision 1.115.2.7  2005/03/10 15:52:28  tipaul
+# * adding glass to opac marc detail.
+# * changing glasses behaviour : It now appears only on subfields that have a "link" value. Avoid useless glasses and removes nothing. **** WARNING **** : if you don't change you MARC parameters, glasses DISAPPEAR, because no subfields have a link value. So you MUST "reactivate" them manually. If you want to enable the search glass on field 225$a (collection in UNIMARC), just put 225a to "link" field (Koha >> parameters >> framework >> 225 field >> subfield >> modify $a >> enter 225a in link input field (without quotes or anything else)
+# * fixing bug with libopac
+#
+# Revision 1.115.2.6  2005/03/09 15:56:01  tipaul
+# Changing MARCmoditem to be like MARCmodbiblio : a modif is a delete & create.
+# Longer, but solves problems with repeated subfields.
+#
+# The previous version was not buggy except under certain circumstances (a repeated subfield, that does not exist usually in items)
 #
 # Revision 1.115.2.5  2005/02/24 13:54:04  tipaul
 # exporting MARCdelsubfield sub. It's used in authority merging.
diff --git a/C4/Breeding.pm b/C4/Breeding.pm
index 4e17bb0c94..1583fda21f 100644
--- a/C4/Breeding.pm
+++ b/C4/Breeding.pm
@@ -52,7 +52,7 @@ This module doesn't do anything.
 =cut
 
 @ISA = qw(Exporter);
-@EXPORT = qw(&ImportBreeding);
+@EXPORT = qw(&ImportBreeding &BreedingSearch);
 
 sub  ImportBreeding {
 	my ($marcrecords,$overwrite_biblio,$filename,$encoding,$z3950random) = @_;
@@ -124,4 +124,55 @@ where isbn=? and title=?");
 	return ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported);
 }
 
+
+=item BreedingSearch
+
+  ($count, @results) = &BreedingSearch($title,$isbn,$random);
+C<$title> contains the title,
+C<$isbn> contains isbn or issn,
+C<$random> contains the random seed from a z3950 search.
+
+C<$count> is the number of items in C<@results>. C<@results> is an
+array of references-to-hash; the keys are the items from the C<marc_breeding> table of the Koha database.
+
+=cut
+
+sub BreedingSearch {
+	my ($title,$isbn,$z3950random) = @_;
+	my $dbh   = C4::Context->dbh;
+	my $count = 0;
+	my ($query,@bind);
+	my $sth;
+	my @results;
+
+	$query = "Select id,file,isbn,title,author from marc_breeding where ";
+	if ($z3950random) {
+		$query .= "z3950random = ?";
+		@bind=($z3950random);
+	} else {
+	    @bind=();
+		if ($title) {
+			$query .= "title like ?";
+			push(@bind,"$title%");
+		}
+		if ($title && $isbn) {
+			$query .= " and ";
+		}
+		if ($isbn) {
+			$query .= "isbn like ?";
+			push(@bind,"$isbn%");
+		}
+	}
+	$sth   = $dbh->prepare($query);
+	$sth->execute(@bind);
+	while (my $data = $sth->fetchrow_hashref) {
+			$results[$count] = $data;
+			$count++;
+	} # while
+
+	$sth->finish;
+	return($count, @results);
+} # sub breedingsearch
+
+
 END { }       # module clean-up code here (global destructor)
diff --git a/C4/Bull.pm b/C4/Bull.pm
index d7ef65e64d..752e03847a 100755
--- a/C4/Bull.pm
+++ b/C4/Bull.pm
@@ -46,7 +46,7 @@ Give all XYZ functions
 @ISA = qw(Exporter);
 @EXPORT = qw(&newsubscription &modsubscription &delsubscription &getsubscriptions &getsubscription 
 			&getsubscriptionfrombiblionumber &get_subscription_list_from_biblionumber
-			&modsubscriptionhistory
+			&modsubscriptionhistory &newissue
 			&getserials &serialchangestatus
 			&Find_Next_Date, &Get_Next_Seq
 			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
@@ -176,7 +176,10 @@ sub get_subscription_list_from_biblionumber {
 	$sth->execute($biblionumber);
 	my @res;
 	while (my $subs = $sth->fetchrow_hashref) {
-		$subs->{'startdate'} = format_date($subs->{'startdate'});
+		$subs->{startdate} = format_date($subs->{startdate});
+		$subs->{opacnote} =~ s/\n/\<br\/\>/g;
+		$subs->{missinglist} =~ s/\n/\<br\/\>/g;
+		$subs->{recievedlist} =~ s/\n/\<br\/\>/g;
 		push @res,$subs;
 	}
 	return \@res;
@@ -259,6 +262,9 @@ sub modsubscriptionhistory {
 	my ($subscriptionid,$histstartdate,$enddate,$recievedlist,$missinglist,$opacnote,$librariannote)=@_;
 	my $dbh=C4::Context->dbh;
 	my $sth = $dbh->prepare("update subscriptionhistory set histstartdate=?,enddate=?,recievedlist=?,missinglist=?,opacnote=?,librariannote=? where subscriptionid=?");
+	$recievedlist =~ s/^,//g;
+	$missinglist =~ s/^,//g;
+	$opacnote =~ s/^,//g;
 	$sth->execute($histstartdate,$enddate,$recievedlist,$missinglist,$opacnote,$librariannote,$subscriptionid);
 }
 # get every serial not arrived for a given subscription
@@ -313,8 +319,7 @@ sub serialchangestatus {
 		my ($newserialseq,$newlastvalue1,$newlastvalue2,$newlastvalue3,$newinnerloop1,$newinnerloop2,$newinnerloop3) = Get_Next_Seq($val);
 		# next date (calculated from actual date & frequency parameters)
 		my $nextplanneddate = Get_Next_Date($planneddate,$val);
-		$sth = $dbh->prepare("insert into serial (serialseq,subscriptionid,biblionumber,status, planneddate) values (?,?,?,?,?)");
-		$sth->execute($newserialseq, $subscriptionid, $val->{'biblionumber'}, 1, $nextplanneddate);
+		newissue($newserialseq, $subscriptionid, $val->{'biblionumber'}, 1, $nextplanneddate);
 		$sth = $dbh->prepare("update subscription set lastvalue1=?, lastvalue2=?,lastvalue3=?,
 														innerloop1=?,innerloop2=?,innerloop3=?
 														where subscriptionid = ?");
@@ -322,6 +327,13 @@ sub serialchangestatus {
 	}
 }
 
+sub newissue {
+	my ($serialseq,$subscriptionid,$biblionumber,$status, $planneddate) = @_;
+	my $dbh = C4::Context->dbh;
+	my $sth = $dbh->prepare("insert into serial (serialseq,subscriptionid,biblionumber,status, planneddate) values (?,?,?,?,?)");
+	$sth->execute($serialseq,$subscriptionid,$biblionumber,$status, $planneddate);
+}
+
 sub Get_Next_Date(@) {
 	my ($planneddate,$subscription) = @_;
 	my $resultdate;
@@ -350,7 +362,7 @@ sub Get_Next_Date(@) {
 		$resultdate=DateCalc($planneddate,"3 months");
 	}
 	if ($subscription->{periodicity} == 9) {
-		$resultdate=DateCalc($planneddate,"2 weeks");
+		$resultdate=DateCalc($planneddate,"6 months");
 	}
 	if ($subscription->{periodicity} == 10) {
 		$resultdate=DateCalc($planneddate,"1 year");
diff --git a/C4/Circulation/Circ2.pm b/C4/Circulation/Circ2.pm
index 34e2a6d620..14a9e46573 100755
--- a/C4/Circulation/Circ2.pm
+++ b/C4/Circulation/Circ2.pm
@@ -858,8 +858,8 @@ sub issuebook {
 					CancelReserve($biblionumber,0,$res->{'borrowernumber'});
 					warn "CancelReserve $res->{'itemnumber'}, $res->{'borrowernumber'}";
 				} else {
-					my $tobrcd = ReserveWaiting($res->{'itemnumber'}, $res->{'borrowernumber'});
-					transferbook($tobrcd,$barcode, 1);
+# 					my $tobrcd = ReserveWaiting($res->{'itemnumber'}, $res->{'borrowernumber'});
+# 					transferbook($tobrcd,$barcode, 1);
 					warn "transferbook";
 				}
 			}
diff --git a/C4/Members.pm b/C4/Members.pm
index e2fdff65ee..560f1d4557 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -103,13 +103,13 @@ sub modmember {
 	$data{'expiry'}=format_date_in_iso($data{'expiry'});
 	my $query="update borrowers set title='$data{'title'}',expiry='$data{'expiry'}',
 	cardnumber='$data{'cardnumber'}',sex='$data{'sex'}',ethnotes='$data{'ethnicnotes'}',
-	streetaddress='$data{'address'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}',
+	streetaddress='$data{'streetaddress'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}',
 	altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}',
 	emailaddress='$data{'emailaddress'}',dateenrolled='$data{'joining'}',streetcity='$data{'streetcity'}',
 	altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}',
 	categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
 	borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'surname'}',
-	initials='$data{'initials'}',physstreet='$data{'streetaddress'}',ethnicity='$data{'ethnicity'}',
+	initials='$data{'initials'}',physstreet='$data{'physstreet'}',ethnicity='$data{'ethnicity'}',
 	gonenoaddress='$data{'gna'}',lost='$data{'lost'}',debarred='$data{'debarred'}',
 	textmessaging='$data{'textmessaging'}', branchcode = '$data{'branchcode'}',
 	zipcode = '$data{'zipcode'}',homezipcode='$data{'homezipcode'}', sort1='$data{'sort1'}', sort2='$data{'sort2'}'
@@ -137,12 +137,12 @@ sub newmember {
 	firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity,
 	altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,
 	initials,ethnicity,physstreet,branchcode,zipcode,homezipcode,sort1,sort2) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}',
-	'$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}',
+	'$data{'sex'}','$data{'ethnotes'}','$data{'streetaddress'}','$data{'faxnumber'}',
 	'$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}',
 	'$data{'joining'}','$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}',
 	'$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}',
 	'$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}',
-	'$data{'ethnicity'}','$data{'streetaddress'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}','$data{'sort1'}','$data{'sort2'}')";
+	'$data{'ethnicity'}','$data{'physstreet'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}','$data{'sort1'}','$data{'sort2'}')";
 	my $sth=$dbh->prepare($query);
 	$sth->execute;
 	$sth->finish;
diff --git a/C4/Search.pm b/C4/Search.pm
index 1f1d4b2db8..649273fda5 100755
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -64,7 +64,7 @@ on what is passed to it, it calls the appropriate search function.
 &getboracctrecord &ItemType &itemissues &subject &subtitle
 &addauthor &bibitems &barcodes &findguarantees &allissues
 &findguarantor &getwebsites &getwebbiblioitems &catalogsearch &itemcount2
-&isbnsearch &breedingsearch &getbranchname &getborrowercategory);
+&isbnsearch &getbranchname &getborrowercategory);
 # make all your functions, whether exported or not;
 
 
@@ -1305,11 +1305,12 @@ sub ItemInfo {
 					WHERE items.biblionumber = ?
 					AND biblioitems.biblioitemnumber = items.biblioitemnumber
 					AND biblio.biblionumber = items.biblionumber";
-	if ($type ne 'intra'){
-		$query .= " and ((items.itemlost<>1 and items.itemlost <> 2)
-		or items.itemlost is NULL)
-		and (wthdrawn <> 1 or wthdrawn is NULL)";
-	}
+# buggy : opac & librarian interface can show the same info level & itemstatus should not be hardcoded
+# 	if ($type ne 'intra'){
+# 		$query .= " and ((items.itemlost<>1 and items.itemlost <> 2)
+# 		or items.itemlost is NULL)
+# 		and (wthdrawn <> 1 or wthdrawn is NULL)";
+# 	}
 	$query .= " order by items.dateaccessioned desc";
 	my $sth=$dbh->prepare($query);
 	$sth->execute($biblionumber);
@@ -1324,15 +1325,17 @@ sub ItemInfo {
 		$data->{cardnumber} = $idata->{cardnumber};
 		$datedue = format_date($idata->{'date_due'});
 		}
-		if ($data->{'itemlost'} eq '2'){
-			$datedue='Very Overdue';
-		}
-		if ($data->{'itemlost'} eq '1'){
-			$datedue='Lost';
-		}
-		if ($data->{'wthdrawn'} eq '1'){
-			$datedue="Cancelled";
-		}
+# buggy : hardcoded & non-translatable
+# more : why don't you want to show the datedue if it's very very overdue ?
+# 		if ($data->{'itemlost'} eq '2'){
+# 			$datedue='Very Overdue';
+# 		}
+# 		if ($data->{'itemlost'} eq '1'){
+# 			$datedue='Lost';
+# 		}
+# 		if ($data->{'wthdrawn'} eq '1'){
+# 			$datedue="Cancelled";
+# 		}
 		if ($datedue eq ''){
 	#	$datedue="Available";
 			my ($restype,$reserves)=C4::Reserves2::CheckReserves($data->{'itemnumber'});
@@ -1365,20 +1368,22 @@ sub ItemInfo {
 	}
 	$sth->finish;
 	#FIXME: ordering/indentation here looks wrong
-	my $sth2=$dbh->prepare("Select * from aqorders where biblionumber=?");
-	$sth2->execute($biblionumber);
-	my $data;
-	my $ocount;
-	if ($data=$sth2->fetchrow_hashref){
-		$ocount=$data->{'quantity'} - $data->{'quantityreceived'};
-		if ($ocount > 0){
-		$data->{'ocount'}=$ocount;
-		$data->{'order'}="One Order";
-		$results[$i]=$data;
-		}
-	}
-	$sth2->finish;
-	
+# buggy : count in $i+1 the info on qty ordered for $i : total shown is real total +1
+# useless : Koha 2.2.2 now automatically show the existing number of items
+# and if there is no items, and at least one is on order, show "on order".
+# 	my $sth2=$dbh->prepare("Select * from aqorders where biblionumber=?");
+# 	$sth2->execute($biblionumber);
+# 	my $data;
+# 	my $ocount;
+# 	if ($data=$sth2->fetchrow_hashref){
+# 		$ocount=$data->{'quantity'} - $data->{'quantityreceived'};
+# 		if ($ocount > 0){
+# 		$data->{'ocount'}=$ocount;
+# 		$data->{'order'}="One Order";
+# 		$results[$i]=$data;
+# 		}
+# 	}
+# 	$sth2->finish;
 	return(@results);
 }
 
@@ -2443,58 +2448,6 @@ and itemtype = 'WEB'");
 } # sub getwebbiblioitems
 
 
-=item breedingsearch
-
-  ($count, @results) = &breedingsearch($title,$isbn,$random);
-C<$title> contains the title,
-C<$isbn> contains isbn or issn,
-C<$random> contains the random seed from a z3950 search.
-
-C<$count> is the number of items in C<@results>. C<@results> is an
-array of references-to-hash; the keys are the items from the C<marc_breeding> table of the Koha database.
-
-=cut
-
-sub breedingsearch {
-	my ($title,$isbn,$z3950random) = @_;
-	my $dbh   = C4::Context->dbh;
-	my $count = 0;
-	my ($query,@bind);
-	my $sth;
-	my @results;
-
-	$query = "Select id,file,isbn,title,author from marc_breeding where ";
-	if ($z3950random) {
-		$query .= "z3950random = ?";
-		@bind=($z3950random);
-	} else {
-	    @bind=();
-		if ($title) {
-			$query .= "title like ?";
-			push(@bind,"$title%");
-		}
-		if ($title && $isbn) {
-			$query .= " and ";
-		}
-		if ($isbn) {
-			$query .= "isbn like ?";
-			push(@bind,"$isbn%");
-		}
-	}
-	$sth   = $dbh->prepare($query);
-	$sth->execute(@bind);
-	while (my $data = $sth->fetchrow_hashref) {
-			$results[$count] = $data;
-			$count++;
-	} # while
-
-	$sth->finish;
-	return($count, @results);
-} # sub breedingsearch
-
-
-
-
 
 =item isbnsearch
 
diff --git a/C4/SearchMarc.pm b/C4/SearchMarc.pm
index 95dec14ad4..0f02c1b3a2 100644
--- a/C4/SearchMarc.pm
+++ b/C4/SearchMarc.pm
@@ -216,7 +216,7 @@ sub catalogsearch {
 		@$value[$i] =~ s/\*/%/g;
 		# remove % at the beginning
 		@$value[$i] =~ s/^%//g;
-	    @$value[$i] =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g if @$operator[$i] eq "contains";
+	    @$value[$i] =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g if @$operator[$i] eq "contains";
 		if(@$excluding[$i])	# NOT statements
 		{
 			$any_not = 1;
@@ -335,7 +335,7 @@ sub catalogsearch {
 	my $counter = $offset;
 	# HINT : biblionumber as bn is important. The hash is fills biblionumber with items.biblionumber.
 	# so if you dont' has an item, you get a not nice empty value.
-	$sth = $dbh->prepare("SELECT biblio.biblionumber as bn,biblio.*, biblioitems.*,marc_biblio.bibid,itemtypes.notforloan
+	$sth = $dbh->prepare("SELECT biblio.biblionumber as bn,biblio.*, biblioitems.*,marc_biblio.bibid,itemtypes.notforloan,itemtypes.description
 							FROM biblio, marc_biblio 
 							LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
 							LEFT JOIN itemtypes on itemtypes.itemtype=biblioitems.itemtype
@@ -388,7 +388,8 @@ sub catalogsearch {
 			$lineCN{itemcallnumber} = $item->{itemcallnumber};
 			$lineCN{location} = $item->{location};
 			$lineCN{date_due} = format_date($date_due);
-			$lineCN{notforloan} = $notforloanstatus{$item->{notforloan}} if ($item->{notforloan});
+			$lineCN{notforloan} = $notforloanstatus{$line->{notforloan}} if ($line->{notforloan}); # setting not forloan if itemtype is not for loan
+			$lineCN{notforloan} = $notforloanstatus{$item->{notforloan}} if ($item->{notforloan}); # setting not forloan it this item is not for loan
 			$notforloan=0 unless ($item->{notforloan} or $item->{wthdrawn} or $item->{itemlost});
 			push @CNresults,\%lineCN;
 			$totalitems++;
@@ -399,7 +400,7 @@ sub catalogsearch {
 		$newline{totitem} = $totalitems;
 		# if $totalitems == 0, check if it's being ordered.
 		if ($totalitems == 0) {
-			my $sth = $dbh->prepare("select count(*) from aqorders where biblionumber=?");
+			my $sth = $dbh->prepare("select count(*) from aqorders where biblionumber=? and datecancellationprinted is NULL");
 			$sth->execute($biblionumber);
 			my ($ordered) = $sth->fetchrow;
 			$newline{onorder} = 1 if $ordered;
diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm
index d528af4f5d..93bcca2a53 100644
--- a/C4/Suggestions.pm
+++ b/C4/Suggestions.pm
@@ -24,6 +24,7 @@ require Exporter;
 use DBI;
 use C4::Context;
 use C4::Output;
+use Mail::Sendmail;
 # use C4::Interface::CGI::Output;
 use vars qw($VERSION @ISA @EXPORT);
 
@@ -108,8 +109,11 @@ sub searchsuggestion  {
 		$query .= " and status=?";
 	}
 	if ($suggestedbyme) {
-		push @sql_params,$user;
-		$query .= " and suggestedby=?";
+		if ($suggestedbyme eq -1) {
+		} else {
+			push @sql_params,$user;
+			$query .= " and suggestedby=?";
+		}
 	} else {
 		$query .= " and managedby is NULL";
 	}
@@ -200,7 +204,12 @@ sub changestatus {
 					byfirstname => $emailinfo->{byfirstname},
 					bysurname => $emailinfo->{bysurname},
 					);
-	warn "mailing => ".$template->output;
+	my %mail = ( To => $emailinfo->{byemail},
+				 From => $emailinfo->{libemail},
+				 Subject => 'Koha suggestion',
+				 Message => "".$template->output
+				 );
+sendmail(%mail);
 # 	warn "sending email to $emailinfo->{byemail} from $emailinfo->{libemail} to notice new status $emailinfo->{status} for $emailinfo->{title} / $emailinfo->{author}";
 }
 
-- 
2.20.1