A new Date.pm to use for all date calculations. Mysql date calculations removed from...
[koha.git] / C4 / AuthoritiesMarc.pm
index d08786d..908232f 100644 (file)
@@ -19,9 +19,8 @@ package C4::AuthoritiesMarc;
 use strict;
 require Exporter;
 use C4::Context;
-use C4::Database;
 use C4::Koha;
-use MARC::Record;
+use Encode;
 use C4::Biblio;
 
 use vars qw($VERSION @ISA @EXPORT);
@@ -34,278 +33,208 @@ $VERSION = 0.01;
        &AUTHgettagslib
        &AUTHfindsubfield
        &AUTHfind_authtypecode
-
        &AUTHaddauthority
        &AUTHmodauthority
        &AUTHdelauthority
        &AUTHaddsubfield
-       &AUTHgetauthority
-       
+
+       &AUTHfind_marc_from_kohafield
        &AUTHgetauth_type
-       
+       &AUTHcount_usage
+       &getsummary
        &authoritysearch
-       
-       &MARCmodsubfield
-       &AUTHhtml2marc
-       &AUTHaddword
-       &MARCaddword &MARCdelword
-       &char_decode
+       &XMLgetauthority
+       &XMLgetauthorityhash
+       &XML_readline_withtags
+       &merge
+       &FindDuplicateauth
+       &ZEBRAdelauthority
  );
 
+sub AUTHfind_marc_from_kohafield {
+    my ( $dbh, $kohafield,$authtypecode ) = @_;
+    return 0, 0 unless $kohafield;
+$authtypecode="" unless $authtypecode;
+my $marcfromkohafield;
+       my $sth = $dbh->prepare("select tagfield,tagsubfield from auth_subfield_structure where kohafield= ? and authtypecode=? ");
+       $sth->execute($kohafield,$authtypecode);
+       my ($tagfield,$tagsubfield) = $sth->fetchrow;   
+       return  ($tagfield,$tagsubfield);
+}
 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%")
-
-       # "Normal" statements
-       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;
+## This routine requires rewrite--TG
+       my ($dbh, $tags, $operator, $value, $offset,$length,$authtypecode,$dictionary) = @_;
+###Dictionary flag used to set what to show in summary;
+       my $query;
+       my $attr;
+       my $server;
+       my $mainentrytag;
+       ##first set the authtype search and may be multiple authorities( linked authorities)
+       my $n=0;
+       my @authtypecode;
+                               my @auths=split / /,$authtypecode ;
+                               my ($attrfield)=MARCfind_attr_from_kohafield("authtypecode");
+                               foreach my  $auth (@auths){
+                               $query .=$attrfield." ".$auth." "; ##No truncation on authtype
+                               push @authtypecode ,$auth;
+                               $n++;
                                }
+                       if ($n>1){
+                        $query= "\@or ".$query;
                        }
-               }
-               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;
+       
+       my $dosearch;
+       my $and;
+       my $q2;
+       for(my $i = 0 ; $i <= $#{$value} ; $i++)
+       {
 
-       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;
+       if (@$value[$i]){
+       ##If mainentry search $a tag
+               if (@$tags[$i] eq "mainentry") {
+                ($attr)=MARCfind_attr_from_kohafield("mainentry")." ";         
+               }else{
+               ($attr) =MARCfind_attr_from_kohafield("allentry")." ";
                }
-
-       # 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\[$1$tagsubf$2]$2$3/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;
+               if (@$operator[$i] eq 'phrase') {
+                        $attr.="  \@attr 4=1  \@attr 5=100  \@attr 6=3 ";##Phrase, No truncation,all of subfield field must match
                
-               # 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);
+               } else {
+               
+                        $attr .=" \@attr 4=6  \@attr 5=1  ";## Word list, right truncated, anywhere
+               }                
+       
+               
+               $and .=" \@and " ;
+               $attr =$attr."\"".@$value[$i]."\"";
+               $q2 .=$attr;
+       $dosearch=1;            
+       }#if value              
+               
+       }## value loop
+##Add how many queries generated
+$query= $and.$query.$q2;
+#warn $query;
+
+$offset=0 unless $offset;
+my $counter = $offset;
+$length=10 unless $length;
+my @oAuth;
+my $i;
+ $oAuth[0]=C4::Context->Zconn("authorityserver");
+my ($mainentry)=MARCfind_attr_from_kohafield("mainentry");
+my ($allentry)=MARCfind_attr_from_kohafield("allentry");
+
+$query="\@attr 2=102 \@or \@or ".$query." \@attr 7=1 ".$mainentry." 0 \@attr 7=1 ".$allentry." 1"; ## sort on mainfield and subfields
+
+
+my $oAResult;
+ $oAResult= $oAuth[0]->search_pqf($query) ; 
+while (($i = ZOOM::event(\@oAuth)) != 0) {
+    my $ev = $oAuth[$i-1]->last_event();
+#   warn("Authority ", $i-1, ": event $ev (", ZOOM::event_str($ev), ")\n");
+    last if $ev == ZOOM::Event::ZEND;
 }
+ my($error, $errmsg, $addinfo, $diagset) = $oAuth[0]->error_x();
+    if ($error) {
+       warn  "oAuth error: $errmsg ($error) $addinfo $diagset\n";
+       goto NOLUCK;
+    }
 
-# Creates the SQL Request
 
-sub create_request {
-       my ($dbh,$tags, $and_or, $operator, $value) = @_;
+my $nbresults;
+ $nbresults=$oAResult->size();
+my $nremains=$nbresults;       
+       my @result = ();
+       my @finalresult = ();
 
-       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.
+if ($nbresults>0){
 
+##Find authid and linkid fields
 
-       for(my $i=0; $i<=@$value;$i++) {
-               if (@$value[$i]) {
-                       $nb_active++;
-                       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 .= ")";
+while (($counter < $nbresults) && ($counter < ($offset + $length))) {
+##Here we have to extract MARC record and $authid from ZEBRA AUTHORITIES
+my $rec=$oAResult->record($counter);
+my $marcdata=$rec->raw();
+my $authrecord=Encode::decode("utf8",$marcdata);
+$authrecord=XML_xml2hash_onerecord($authrecord);               
+my @linkids;   
+my $separator=C4::Context->preference('authoritysep');
+my $linksummary=" ".$separator;        
+my $authid=XML_readline_onerecord($authrecord,"authid","authorities"); 
+my @linkid=XML_readline_asarray($authrecord,"linkid","authorities");##May have many linked records     
+       
+       foreach my $linkid (@linkid){
+               my $linktype=AUTHfind_authtypecode($dbh,$linkid);
+               my $linkrecord=XMLgetauthorityhash($dbh,$linkid);
+               $linksummary.="<br>&nbsp;&nbsp;&nbsp;&nbsp;<a href='detail.pl?authid=$linkid'>".getsummary($dbh,$linkrecord,$linkid,$linktype).".</a>".$separator;
+               
+       }
+my  $summary;
+unless ($dictionary){
+ $summary=getsummary($dbh,$authrecord,$authid,$authtypecode);
+$summary="<a href='detail.pl?authid=$authid'>".$summary.".</a>";
+       if ( $linksummary ne " ".$separator){
+       $summary="<b>".$summary."</b>".$linksummary;
        }
-       else    # no sql_where2 statement, deleting '('
-       {
-               $sql_where2 = "";
+}else{
+ $summary=getdictsummary($dbh,$authrecord,$authid,$authtypecode);
+}
+my $toggle;
+       if ($counter % 2) {
+               $toggle="#ffffcc";
+       } else {
+               $toggle="white";
        }
-       chop $sql_tables;       # deletes the trailing ','
+my %newline;
+       $newline{'toggle'}=$toggle;     
+       $newline{summary} = $summary;
+       $newline{authid} = $authid;
+       $newline{linkid} = $linkid[0];
+       $newline{even} = $counter % 2;
+       $counter++;
+       push @finalresult, \%newline;
+       }## while counter
+
+
+for (my $z=0; $z<$length; $z++){
+               $finalresult[$z]{used}=AUTHcount_usage($finalresult[$z]{authid});
        
-       return ($sql_tables, $sql_where1, $sql_where2);
+ }# all $z's
+
+
+}## if nbresult
+NOLUCK:
+$oAResult->destroy();
+$oAuth[0]->destroy();
+
+       return (\@finalresult, $nbresults);
 }
 
 
+
 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;
-       $sth = $dbh->prepare("select count(*) from marc_subfield_table where concat(tag,subfieldcode) in ($tags_using_authtype) and 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;
+### try ZOOM search here
+my @oConnection;
+$oConnection[0]=C4::Context->Zconn("biblioserver");
+my $query;
+my ($attrfield)=MARCfind_attr_from_kohafield("authid");
+$query= $attrfield." ".$authid;
+
+my $oResult = $oConnection[0]->search_pqf($query);
+my $event;
+my $i;
+   while (($i = ZOOM::event(\@oConnection)) != 0) {
+       $event = $oConnection[$i-1]->last_event();
+       last if $event == ZOOM::Event::ZEND;
+   }# while
+my $result=$oResult->size() ;
+       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) = @_;
@@ -321,174 +250,129 @@ sub AUTHgettagslib {
        $authtypecode="" unless $authtypecode;
        my $sth;
        my $libfield = ($forlibrarian eq 1)? 'liblibrarian' : 'libopac';
-       # check that framework exists
+
+
+       # check that authority 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= $dbh->prepare(
+"select tagfield,liblibrarian,libopac,mandatory,repeatable from auth_tag_structure where authtypecode=? order by tagfield"
+    );
+
+$sth->execute($authtypecode);
+        my ( $liblibrarian, $libopac, $tag, $res, $tab, $mandatory, $repeatable );
+
+    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;
+    }
+       $sth=      $dbh->prepare("select tagfield,tagsubfield,liblibrarian,libopac,tab, mandatory, repeatable,authorised_value,authtypecode,value_builder,seealso,hidden,isurl,link 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;
+        my $subfield;
+    my $authorised_value;
+    my $authtypecode;
+    my $value_builder;
+    my $kohafield;
+    my $seealso;
+    my $hidden;
+    my $isurl;
+       my $link;
+
+    while (
+        ( $tag,         $subfield,   $liblibrarian,   , $libopac,      $tab,
+        $mandatory,     $repeatable, $authorised_value, $authtypecode,
+        $value_builder,   $seealso,          $hidden,
+        $isurl,                        $link )
+        = $sth->fetchrow
+      )
+    {
+        $res->{$tag}->{$subfield}->{lib}              = ($forlibrarian or !$libopac)?$liblibrarian:$libopac;
+        $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}->{authtypecode}     = $authtypecode;
+        $res->{$tag}->{$subfield}->{value_builder}    = $value_builder;
+        $res->{$tag}->{$subfield}->{seealso}          = $seealso;
+        $res->{$tag}->{$subfield}->{hidden}           = $hidden;
+        $res->{$tag}->{$subfield}->{isurl}            = $isurl;
+        $res->{$tag}->{$subfield}->{link}            = $link;
+    }
+    return $res;
 }
 
 sub AUTHaddauthority {
-# pass the MARC::Record to this function, and it will create the records in the marc tables
+# pass the XML hash to this function, and it will create the records in the authority table
        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");
+       if (!$authid) {
+       my      $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]
-                                               );
-                       }
-               }
+               $authid=$authid+1;
+       }       
+
+##Modified record may also come here use REPLACE -- bulk import comes here
+XML_writeline($record,"authid",$authid,"authorities");
+XML_writeline($record,"authtypecode",$authtypecode,"authorities");
+my $xml=XML_hash2xml($record);
+       my $sth=$dbh->prepare("REPLACE auth_header set marcxml=?,  authid=?,authtypecode=?,datecreated=now()");
+       $sth->execute($xml,$authid,$authtypecode);
+       $sth->finish;   
+       ZEBRAop($dbh,$authid,'specialUpdate',"authorityserver");
+## If the record is linked to another update the linked authorities with new authid
+my @linkids=XML_readline_asarray($record,"linkid","authorities");
+       foreach my $linkid (@linkids){
+       ##Modify the record of linked 
+       AUTHaddlink($dbh,$linkid,$authid);
        }
+return ($authid);
+}
+
+sub AUTHaddlink{
+my ($dbh,$linkid,$authid)=@_;
+my $record=XMLgetauthorityhash($dbh,$linkid);
+my $authtypecode=AUTHfind_authtypecode($dbh,$linkid);
+#warn "adding l:$linkid,a:$authid,auth:$authtypecode";
+XML_writeline($record,"linkid",$authid,"authorities");
+my $xml=XML_hash2xml($record);
+$dbh->do("lock tables header WRITE");
+       my $sth=$dbh->prepare("update auth_header set marcxml=? where authid=?");
+       $sth->execute($xml,$linkid);
+       $sth->finish;   
        $dbh->do("unlock tables");
-       return $authid;
+       ZEBRAop($dbh,$linkid,'specialUpdate',"authorityserver");
 }
 
 
-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 XMLgetauthority {
+    # Returns MARC::XML of the authority passed in parameter.
+    my ( $dbh, $authid ) = @_;
+    my $sth =  $dbh->prepare("select marcxml from auth_header where authid=? "  );
+    $sth->execute($authid);
+ my ($marcxml)=$sth->fetchrow;
+       $marcxml=Encode::decode('utf8',$marcxml);
+ return ($marcxml);
 }
 
-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 XMLgetauthorityhash {
+## Utility to return  hashed MARCXML
+my ($dbh,$authid)=@_;
+my $xml=XMLgetauthority($dbh,$authid);
+my $xmlhash=XML_xml2hash_onerecord($xml);
+return $xmlhash;
 }
 
+
+
+
 sub AUTHgetauth_type {
        my ($authtypecode) = @_;
        my $dbh=C4::Context->dbh;
@@ -496,97 +380,76 @@ sub AUTHgetauth_type {
        $sth->execute($authtypecode);
        return $sth->fetchrow_hashref;
 }
+
+
 sub AUTHmodauthority {
-       my ($dbh,$authid,$record,$delete)=@_;
-       my $oldrecord=&AUTHgetauthority($dbh,$authid);
+## $record is expected to be an xmlhash
+       my ($dbh,$authid,$record,$authtypecode)=@_;
+       my ($oldrecord)=&XMLgetauthorityhash($dbh,$authid);
+### This equality is very dodgy ,It porobaby wont work
        if ($oldrecord eq $record) {
-               return;
+               return $authid;
        }
-# 1st delete the authority,
-# 2nd recreate it
-       &AUTHdelauthority($dbh,$authid,1);
-       &AUTHaddauthority($dbh,$record,$authid);
-       # FIXME : modify the authority in biblio too.
+##
+my $sth=$dbh->prepare("update auth_header set marcxml=? where authid=?");
+# find if linked records exist and delete the link in them
+my @linkids=XML_readline_asarray($oldrecord,"linkid","authorities");
+
+       foreach my $linkid (@linkids){
+               ##Modify the record of linked 
+               my $linkrecord=XMLgetauthorityhash($dbh,$linkid);
+               my $linktypecode=AUTHfind_authtypecode($dbh,$linkid);
+               my @linkfields=XML_readline_asarray($linkrecord,"linkid","authorities");
+               my $updated;
+                      foreach my $linkfield (@linkfields){
+                       if ($linkfield eq $authid){
+                               XML_writeline_id($linkrecord,"linkid",$linkfield,"","authorities");
+                               $updated=1;
+                       }
+                      }#foreach linkfield
+                       my $linkedxml=XML_hash2xml($linkrecord);
+                       if ($updated==1){
+                       $sth->execute($linkedxml,$linkid);
+                       ZEBRAop($dbh,$linkid,'specialUpdate',"authorityserver");
+                       }
+       
+       }#foreach linkid
+
+#Now rewrite the $record to table with an add
+$authid=AUTHaddauthority($dbh,$record,$authid,$authtypecode);
+
+
+### If a library thinks that updating all biblios is a long process and wishes to leave that to a cron job to use merge_authotities.pl
+### they should have a system preference "dontmerge=1" otherwise by default biblios will be updated
+
+if (C4::Context->preference('dontmerge') ){
+# save the file in localfile/modified_authorities
+       my $cgidir = C4::Context->intranetdir ."/cgi-bin";
+       unless (opendir(DIR, "$cgidir")) {
+                       $cgidir = C4::Context->intranetdir."/";
+       } 
+
+       my $filename = $cgidir."/localfile/modified_authorities/$authid.authid";
+       open AUTH, "> $filename";
+       print AUTH $authid;
+       close AUTH;
+}else{
+       &merge($dbh,$authid,$record,$authid,$record);
+}
+return $authid;
 }
 
 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");
-       $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);
+# if the keep_biblio is set to 1, then authority entries in biblio are preserved.
+# FIXME : delete or not in biblio tables (depending on $keep_biblio flag) is not implemented
+ZEBRAop($dbh,$authid,"recordDelete","authorityserver");
 }
 
-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 ZEBRAdelauthority {
+my ($dbh,$authid)=@_;
+       $dbh->do("delete from auth_header where authid=$authid") ;
 }
 
 sub AUTHfind_authtypecode {
@@ -597,225 +460,380 @@ sub AUTHfind_authtypecode {
        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 FindDuplicateauth {
+### Should receive an xmlhash
+       my ($record,$authtypecode)=@_;
+       my $dbh = C4::Context->dbh;
+       my $sth = $dbh->prepare("select auth_tag_to_report from auth_types where authtypecode=?");
+       $sth->execute($authtypecode);
+       my ($auth_tag_to_report) = $sth->fetchrow;
+       $sth->finish;
+       # build a request for authoritysearch
+       my (@tags, @and_or, @excluding, @operator, @value, $offset, $length);
+       
+#      if ($record->field($auth_tag_to_report)) {
+                               push @tags, $auth_tag_to_report;
+                               push @operator, "all";
+                                @value, XML_readline_asarray($record,"","",$auth_tag_to_report);
+#                      }
+       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>0) {
+               return @$finalresult[0]->{authid},@$finalresult[0]->{summary};
+       }
+       # no result, returns nothing
+       return;
 }
 
-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];
+sub getsummary{
+## give this an XMLhash record to return summary
+my ($dbh,$record,$authid,$authtypecode)=@_;
+ my $authref = getauthtype($authtypecode);
+               my $summary = $authref->{summary};
+               # if the library has a summary defined, use it. Otherwise, build a standard one
+       if ($summary) {
+                       my $fields = $record->{'datafield'};
+                       foreach my $field (@$fields) {
+                               my $tag = $field->{'tag'};                              
+                               if ($tag<10) {
+                               my $tagvalue = XML_readline_onerecord($record,"","",$field->{tag});
+                               $summary =~ s/\[(.?.?.?.?)$tag\*(.*?)]/$1$tagvalue$2\[$1$tag$2]/g;
+                               } else {
+                                       my @subf = XML_readline_withtags($record,"","",$tag);
+                                       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;
+                                       }## each subf
+                               }#tag >10
+                       }##each field
+                       $summary =~ s/\[(.*?)]//g;
+                       $summary =~ s/\n/<br>/g;
+       } else {
+## $summary did not exist create a standard summary
+                       my $heading; # = $authref->{summary};
+                       my $altheading;
+                       my $seeheading;
+                       my $see;
+                       my $fields = $record->{datafield};
+                       if (C4::Context->preference('marcflavour') eq 'UNIMARC') {
+                       # construct UNIMARC summary, that is quite different from MARC21 one
+                       foreach my $field (@$fields) {
+                               # accepted form
+                               if ($field->{tag} = ~/'2..'/) {
+                                       foreach my $subfield ("a".."z"){
+                                       ## Fixme-- if UNICODE uses numeric subfields as well add them
+                                       $heading.=XML_readline_onerecord($record,"","",$field->{tag},$subfield); 
+                                       }
+                               }##tag 2..
+                               # rejected form(s)
+                               if ($field->{tag} = ~/'4..'/) {
+                                       my $value;
+                                       foreach my $subfield ("a".."z"){
+                                       ## Fixme-- if UNICODE uses numeric subfields as well add them
+                                       $value.=XML_readline_onerecord($record,"","",$field->{tag},$subfield);
+                                       }
+                                       $summary.= "&nbsp;&nbsp;&nbsp;<i>".$value."</i><br/>";
+                                       $summary.= "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>see:</i> ".$heading."<br/>";
+                               }##tag 4..
+                               # see :
+                               if ($field->{tag} = ~/'5..'/) {
+                                       my $value;
+                                       foreach my $subfield ("a".."z"){
+                                       ## Fixme-- if UNICODE uses numeric subfields as well add them
+                                       $value.=XML_readline_onerecord($record,"","",$field->{tag},$subfield);
+                                       }
+                                       $summary.= "&nbsp;&nbsp;&nbsp;<i>".$value."</i><br/>";
+                                       $summary.= "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>see:</i> ".$heading."<br/>";
+                               }# tag 5..
+                               # // form
+                               if ($field->{tag} = ~/'7..'/) {
+                                       my $value;
+                                       foreach my $subfield ("a".."z"){
+                                       ## Fixme-- if UNICODE uses numeric subfields as well add them
+                                       $value.=XML_readline_onerecord($record,"","",$field->{tag},$subfield);
+                                       }
+                                       $seeheading.= "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>see also:</i> ".$value."<br />";  
+                                       $altheading.= "&nbsp;&nbsp;&nbsp;".$value."<br />";
+                                       $altheading.= "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>see also:</i> ".$heading."<br />";
+                               }# tag 7..
+                       }## Foreach fields
+                               $summary = "<b>".$heading."</b><br />".$seeheading.$altheading.$summary;        
+                    } else {
+                       # construct MARC21 summary
+                       foreach my $field (@$fields) {
+                               my $tag="1..";
+                                 if($field->{tag}  =~ /^$tag/) {
+                                             if ($field->{tag} eq '150') {
+                                               my $value;
+                                               foreach my $subfield ("a".."z"){
+                                                $value=XML_readline_onerecord($record,"","","150",$subfield); 
+                                               $heading.="\$".$subfield.$value if $value;
+                                                       }
+                                             }else{                            
+                                               foreach my $subfield ("a".."z"){
+                                               $heading.=XML_readline_onerecord($record,"","",$field->{tag},$subfield); 
+                                                       }
+                                            }### tag 150 or else
+                                  }##tag 1..
+                               my $tag="4..";
+                                if($field->{tag}  =~ /^$tag/) {
+                                       foreach my $subfield ("a".."z"){
+                                               $seeheading.=XML_readline_onerecord($record,"","",$field->{tag},$subfield); 
+                                               }
+                                       $seeheading.= "&nbsp;&nbsp;&nbsp;".$seeheading."<br />";
+                                       $seeheading.= "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>see:</i> ".$seeheading."<br />";  
+                               } #tag 4..
+                               my $tag="5..";
+                                if($field->{tag}  =~ /^$tag/) {
+                                       my $value;
+                                       foreach my $subfield ("a".."z"){
+                                               $value.=XML_readline_onerecord($record,"","",$field->{tag},$subfield); 
+                                               }
+                                       $seeheading.= "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>see also:</i> ".$value."<br />";  
+                                       $altheading.= "&nbsp;&nbsp;&nbsp;".$value."<br />";
+                                       $altheading.= "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>see also:</i> ".$altheading."<br />";
+                               }#tag 5..
+                                       
+                       }##for each field
+                   $summary.=$heading.$seeheading.$altheading;         
+               }##USMARC vs UNIMARC
+       }###Summary exists or not
+return $summary;
+}
+sub getdictsummary{
+## give this a XML record to return a brief summary
+my ($dbh,$record,$authid,$authtypecode)=@_;
+ my $authref = getauthtype($authtypecode);
+               my $summary = $authref->{summary};
+               my $fields = $record->{'datafield'};
+               # if the library has a summary defined, use it. Otherwise, build a standard one
+       if ($summary) {
+                       foreach my $field (@$fields) {
+                               my $tag = $field->{'tag'};                              
+                               if ($tag<10) {
+                               my $tagvalue = XML_readline_onerecord($record,"","",$field->{tag});
+                               $summary =~ s/\[(.?.?.?.?)$tag\*(.*?)]/$1$tagvalue$2\[$1$tag$2]/g;
+                               } else {
+                                       my @subf = XML_readline_withtags($record,"","",$tag);
+                                       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;
+                                       }## each subf
+                               }#tag >10
+                       }##each field
+                       $summary =~ s/\[(.*?)]//g;
+                       $summary =~ s/\n/<br>/g;
                } else {
-                       if (@$rtags[$i] <10) {
-                               $prevvalue=@$rvalues[$i];
-                       } else {
-                               if (@$rvalues[$i]) {
-                                       $field->add_subfields(@$rsubfields[$i] => @$rvalues[$i]);
-                               }
+                       my $heading; # = $authref->{summary};
+                       my $altheading;
+                       my $seeheading;
+                       my $see;
+                       my $fields = $record->{datafield};
+                       if (C4::Context->preference('marcflavour') eq 'UNIMARC') {
+                       # construct UNIMARC summary, that is quite different from MARC21 one
+                       foreach my $field (@$fields) {
+                               # accepted form
+                               if ($field->{tag} = ~/'2..'/) {
+                                       foreach my $subfield ("a".."z"){
+                                       ## Fixme-- if UNICODE uses numeric subfields as well add them
+                                       $heading.=XML_readline_onerecord($record,"","",$field->{tag},$subfield); 
+                                       }
+                               }##tag 2..
                        }
-                       $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;
+                               $summary = $heading;    
+                       } else {
+                       # construct MARC21 summary
+                               foreach my $field (@$fields) {  
+                                       my $tag="1..";
+                                        if($field->{tag}  =~ /^$tag/) {                        
+                                               $heading.= XML_readline_onerecord($record,"","",$field->{tag},"a");
+                                       }
+                               } #each fieldd
+                               
+                               $summary=$heading;
+                       }# USMARC vs UNIMARC
+               }### Summary exists
+return $summary;
 }
 
-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 merge {
+##mergefrom is authid MARCfrom is marcxml hash of authority
+### mergeto ditto
+       my ($dbh,$mergefrom,$MARCfrom,$mergeto,$MARCto) = @_;
+       return unless (defined $MARCfrom);
+       return unless (defined $MARCto);
+       my $authtypecodefrom = AUTHfind_authtypecode($dbh,$mergefrom);
+       my $authtypecodeto = AUTHfind_authtypecode($dbh,$mergeto);
+       # return if authority does not exist
+       
+       # search the tag to report
+       my $sth = $dbh->prepare("select auth_tag_to_report from auth_types where authtypecode=?");
+       $sth->execute($authtypecodefrom);
+       my ($auth_tag_to_report) = $sth->fetchrow;
+       my @record_to;
+       # search all biblio tags using this authority.
+       $sth = $dbh->prepare("select distinct tagfield from biblios_subfield_structure where authtypecode=? ");
+       $sth->execute($authtypecodefrom);
+my @tags_using_authtype;
+       while (my ($tagfield) = $sth->fetchrow) {
+               push @tags_using_authtype,$tagfield ;
+       }
+## The subfield for linking authorities is stored in koha_attr named auth_biblio_link_subf
+## This way we may use whichever subfield we want without harcoding 9 in
+my ($dummyfield,$tagsubfield)=MARCfind_marc_from_kohafield("auth_biblio_link_subf","biblios");
+       # now, find every biblio using this authority
+### try ZOOM search here
+my @oConnection;
+ $oConnection[0]=C4::Context->Zconn("biblioserver");
+##$oConnection[0]->option(elementSetName=>"biblios"); ##  Needs a fix
+my $query;
+my ($attr2)=MARCfind_attr_from_kohafield("authid");
+my $attrfield.=$attr2;
+$query= $attrfield." ".$mergefrom;
+my ($event,$i);
+my $oResult = $oConnection[0]->search_pqf($query);
+  while (($i = ZOOM::event(\@oConnection)) != 0) {
+       $event = $oConnection[$i-1]->last_event();
+       last if $event == ZOOM::Event::ZEND;
+   }# while event
+my $count=$oResult->size();
+my @reccache;
+my $z=0;
+while ( $z<$count ) {
+my $rec;
+       $rec=$oResult->record($z);
+       my $marcdata = $rec->raw();
+my $koharecord=Encode::decode("utf8",$marcdata);
+$koharecord=XML_xml2hash($koharecord);
+ my ( $xmlrecord, @itemsrecord) = XML_separate($koharecord);
+
+push @reccache, $xmlrecord;
+$z++;
 }
-
-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($_) ;
+$oResult->destroy();
+$oConnection[0]->destroy();
+      foreach my $xmlhash (@reccache){
+       my $update;
+       foreach my $tagfield (@tags_using_authtype){
+
+       ###Change the authid in biblio
+       $xmlhash=XML_writeline_id($xmlhash,$mergefrom,$mergeto,$tagfield,$tagsubfield);
+       ### delete all subfields of bibliorecord
+       $xmlhash=XML_delete_withid($xmlhash,$mergeto,$tagfield,$tagsubfield);
+       ####Read all the data in from authrecord
+       my @record_to=XML_readline_withtags($MARCto,"","",$auth_tag_to_report);
+       ##Write the data to biblio
+               foreach my $subfield (@record_to) {
+               ## Replace the data in MARCXML with the new matching authid
+               XML_writeline_withid($xmlhash,$tagsubfield,$mergeto,$subfield->[1],$tagfield,$subfield->[0]);
+               $update=1;
+               }#foreach  $subfield            
+               }#foreach tagfield
+               if ($update==1){
+               my $biblionumber=XML_readline_onerecord($xmlhash,"biblionumber","biblios");
+               my $frameworkcode=MARCfind_frameworkcode($dbh,$biblionumber);
+               NEWmodbiblio($dbh,$biblionumber,$xmlhash,$frameworkcode) ;
                }
-       }
-       return($string) ;
+               
+     }#foreach $xmlhash
+}#sub
+
+sub XML_writeline_withid{
+## Only used in authorities to update biblios with matching authids
+my ($xml,$idsubf,$id,$newvalue,$tag,$subf)=@_;
+my $biblio=$xml->{'datafield'};
+my $updated=0;
+    if ($tag>9){
+       foreach my $data (@$biblio){
+                       if ($data->{'tag'} eq $tag){
+                       my @subfields=$data->{'subfield'};
+                       foreach my $subfield ( @subfields){
+                             foreach my $code ( @$subfield){
+                               if ($code->{'code'} eq $idsubf && $code->{'content'} eq $id){
+                               ###This is the correct tag -- Now reiterate and update
+                                       my @newsubs;
+                                         foreach my $code ( @$subfield){               
+                                               if ($code->{'code'} eq $subf ){
+                                               $code->{'content'}=$newvalue;
+                                               $updated=1;
+                                               }
+                                          push @newsubs, $code;
+                                       }## each code updated
+                                       if (!$updated){
+                                       ##Create the subfield if it did not exist       
+                                       push @newsubs,{code=>$subf,content=>$newvalue};
+                                       $data->{subfield}= \@newsubs;
+                                       $updated=1;
+                                        }### created   
+                               }### correct tag with id
+                             }#each code
+                       }##each subfield        
+               }# tag match
+                }## each datafield
+    }### tag >9
+return $xml;
+}
+sub XML_delete_withid{
+## Currently  only usedin authorities
+### deletes all the subfields of a matching authid
+my ($xml,$id,$tag,$idsubf)=@_;
+my $biblio=$xml->{'datafield'};
+    if ($tag>9){
+       foreach my $data (@$biblio){
+                       if ($data->{'tag'} eq $tag){
+                       my @subfields=$data->{'subfield'};
+                       foreach my $subfield ( @subfields){
+                             foreach my $code ( @$subfield){
+                               if ($code->{'code'} eq $idsubf && $code->{'content'} eq $id){
+                               ###This is the correct tag -- Now reiterate and delete all but id subfield
+                                         foreach my $code ( @$subfield){               
+                                               if ($code->{'code'} ne $idsubf ){
+                                               $code->{'content'}="";                                  
+                                               }                                          
+                                         }## each code deleted 
+                               }### correct tag with id
+                             }#each code
+                       }## each subfield       
+               }## tag matches
+                }## each datafield
+    }# tag >9
+return $xml;
 }
 
-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 XML_readline_withtags {
+my ($xml,$kohafield,$recordtype,$tag,$subf)=@_;
+#$xml represents one record of MARCXML as perlhashed 
+## returns an array of read fields--useful for reading repeated fields
+### $recordtype is needed for mapping the correct field if supplied
+### If only $tag is given reads the whole tag
+###Returns subfieldcodes as well
+my @value;
+ ($tag,$subf)=MARCfind_marc_from_kohafield($kohafield,$recordtype) if $kohafield;
+if ($tag){
+### Only datafields are read
+my $biblio=$xml->{'datafield'};
+ if ($tag>9){
+       foreach my $data (@$biblio){
+           if ($data->{'tag'} eq $tag){
+               foreach my $subfield ( $data->{'subfield'}){
+                   foreach my $code ( @$subfield){
+                       if ($code->{'code'} eq $subf || !$subf){
+                       push @value,[$code->{'code'},$code->{'content'}];
+                       }
+                  }# each code
+               }# each subfield
+          }### tag found
+       }## each tag
+   }##tag >9
+}## if tag 
+return @value;
 }
 
 END { }       # module clean-up code here (global destructor)
@@ -831,7 +849,41 @@ Paul POULAIN paul.poulain@free.fr
 =cut
 
 # $Id$
-# $Log$
+
+# Revision 1.30  2006/09/06 16:21:03  tgarip1957
+# Clean up before final commits
+#
+# Revision 1.9.2.6  2005/06/07 10:02:00  tipaul
+# porting dictionnary search from head to 2.2. there is now a ... facing titles, author & subject, to search in biblio & authorities existing values.
+#
+# Revision 1.9.2.5  2005/05/31 14:50:46  tipaul
+# fix for authority merging. There was a bug on official installs
+#
+# Revision 1.9.2.4  2005/05/30 11:24:15  tipaul
+# fixing a bug : when a field was repeated, the last field was also repeated. (Was due to the "empty" field in html between fields : to separate fields, in html, an empty field is automatically added. in AUTHhtml2marc, this empty field was not discarded correctly)
+#
+# 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
 #
@@ -850,3 +902,4 @@ Paul POULAIN paul.poulain@free.fr
 # Revision 1.1  2004/06/07 07:35:01  tipaul
 # MARC authority management package
 #
+