[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha authorities/auth_finder.pl authorities/aut...
|
From: |
Henri-Damien LAURENT |
|
Subject: |
[Koha-cvs] koha authorities/auth_finder.pl authorities/aut... |
|
Date: |
Fri, 06 Apr 2007 14:48:45 +0000 |
CVSROOT: /cvsroot/koha
Module name: koha
Changes by: Henri-Damien LAURENT <hdl> 07/04/06 14:48:45
Modified files:
authorities : auth_finder.pl authorities-home.pl
authorities.pl blinddetail-biblio-search.pl
detail-biblio-search.pl detail.pl
C4 : AuthoritiesMarc.pm
opac : opac-authoritiesdetail.pl
opac-authorities-home.pl opac-main.pl
Log message:
Code Cleaning : AuthoritiesMARC.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/auth_finder.pl?cvsroot=koha&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/authorities-home.pl?cvsroot=koha&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/authorities.pl?cvsroot=koha&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/blinddetail-biblio-search.pl?cvsroot=koha&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/detail-biblio-search.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/detail.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/C4/AuthoritiesMarc.pm?cvsroot=koha&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-authoritiesdetail.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-authorities-home.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-main.pl?cvsroot=koha&r1=1.24&r2=1.25
Patches:
Index: authorities/auth_finder.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/auth_finder.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- authorities/auth_finder.pl 9 Mar 2007 14:31:17 -0000 1.13
+++ authorities/auth_finder.pl 6 Apr 2007 14:48:45 -0000 1.14
@@ -64,7 +64,7 @@
$resultsperpage= $query->param('resultsperpage');
$resultsperpage = 19 if(!defined $resultsperpage);
- my ($results,$total) = authoritysearch(address@hidden,address@hidden,
+ my ($results,$total) = SearchAuthorities(address@hidden,address@hidden,
address@hidden, address@hidden,
address@hidden,
$startfrom*$resultsperpage,
$resultsperpage,$authtypecode);# $orderby);
Index: authorities/authorities-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/authorities-home.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- authorities/authorities-home.pl 28 Mar 2007 10:39:16 -0000 1.17
+++ authorities/authorities-home.pl 6 Apr 2007 14:48:45 -0000 1.18
@@ -62,7 +62,7 @@
my $startfrom = $query->param('startfrom') || 1;
my $resultsperpage = $query->param('resultsperpage') || 19;
- my ($results,$total) = authoritysearch(
+ my ($results,$total) = SearchAuthorities(
address@hidden,
address@hidden,
address@hidden,
@@ -146,7 +146,7 @@
} elsif ($op eq "delete") {
- &AUTHdelauthority($authid, 1);
+ &DelAuthority($authid, 1);
($template, $loggedinuser, $cookie)
= get_template_and_user({template_name =>
"authorities/authorities-home.tmpl",
Index: authorities/authorities.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/authorities.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- authorities/authorities.pl 29 Mar 2007 13:31:01 -0000 1.21
+++ authorities/authorities.pl 6 Apr 2007 14:48:45 -0000 1.22
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: authorities.pl,v 1.21 2007/03/29 13:31:01 tipaul Exp $
+# $Id: authorities.pl,v 1.22 2007/04/06 14:48:45 hdl Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -349,7 +349,7 @@
my $authtypecode = $input->param('authtypecode');
my $dbh = C4::Context->dbh;
-$authtypecode = &AUTHfind_authtypecode($authid) if !$authtypecode;
+$authtypecode = &GetAuthTypeCode($authid) if !$authtypecode;
my ($template, $loggedinuser, $cookie)
@@ -361,17 +361,17 @@
debug => 1,
});
$template->param(nonav =>
$nonav,index=>$myindex,authtypecode=>$authtypecode,);
-$tagslib = AUTHgettagslib(1,$authtypecode);
+$tagslib = GetTagsLabels(1,$authtypecode);
my $record=-1;
my $encoding="";
-$record = AUTHgetauthority($authid) if ($authid);
+$record = GetAuthority($authid) if ($authid);
my ($oldauthnumtagfield,$oldauthnumtagsubfield);
my ($oldauthtypetagfield,$oldauthtypetagsubfield);
$is_a_modif=0;
if ($authid) {
$is_a_modif=1;
- ($oldauthnumtagfield,$oldauthnumtagsubfield) =
&AUTHfind_marc_from_kohafield("auth_header.authid",$authtypecode);
- ($oldauthtypetagfield,$oldauthtypetagsubfield) =
&AUTHfind_marc_from_kohafield("auth_header.authtypecode",$authtypecode);
+ ($oldauthnumtagfield,$oldauthnumtagsubfield) =
&GetAuthMARCFromKohaField("auth_header.authid",$authtypecode);
+ ($oldauthtypetagfield,$oldauthtypetagsubfield) =
&GetAuthMARCFromKohaField("auth_header.authtypecode",$authtypecode);
}
#------------------------------------------------------------------------------------------------------------------------------
@@ -387,30 +387,23 @@
my @indicator = $input->param('indicator');
my $xml =
TransformHtmlToXml(address@hidden,address@hidden,address@hidden,address@hidden,address@hidden);
# warn $record->as_formatted;
- warn $xml;
+# warn $xml;
my
$record=MARC::Record->new_from_xml($xml,'UTF-8',(C4::Context->preference("marcflavour")
eq "UNIMARC"?"UNIMARCAUTH":C4::Context->preference("marcflavour")));
$record->encoding('UTF-8');
#warn $record->as_formatted;
# check for a duplicate
- my ($duplicateauthid,$duplicateauthvalue) =
C4::AuthoritiesMarc::FindDuplicate($record,$authtypecode) if ($op eq "add") &&
(!$is_a_modif);
+ my ($duplicateauthid,$duplicateauthvalue) =
FindDuplicateAuthority($record,$authtypecode) if ($op eq "add") &&
(!$is_a_modif);
warn "duplicate:$duplicateauthid,$duplicateauthvalue";
my $confirm_not_duplicate = $input->param('confirm_not_duplicate');
# it is not a duplicate (determined either by Koha itself or by user checking
it's not a duplicate)
if (!$duplicateauthid or $confirm_not_duplicate) {
# warn "noduplicate";
if ($is_a_modif ) {
-
$authid=AUTHmodauthority($authid,$record,$authtypecode,1);
+ $authid=ModAuthority($authid,$record,$authtypecode,1);
} else {
- ($authid) = AUTHaddauthority($record,$authid,$authtypecode);
-
+ ($authid) = AddAuthority($record,$authid,$authtypecode);
}
- # now, redirect to detail page
-# if ($nonav){
-#warn ($myindex,$nonav);
-# print
$input->redirect("auth_finder.pl?index=$myindex&nonav=$nonav&authtypecode=$authtypecode");
-# }else{
print $input->redirect("detail.pl?authid=$authid");
-# }
exit;
} else {
# it may be a duplicate, warn the user and do nothing
@@ -464,11 +457,6 @@
authid => $authid ,
authtypecode=>$authtypecode, );
}
-#unless ($op) {
-# warn "BUILDING";
-# build_tabs ($template, $record, $dbh,$encoding);
-# build_hidden_data;
-#}
$template->param(
authid => $authid,
authtypecode => $authtypecode,
Index: authorities/blinddetail-biblio-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/blinddetail-biblio-search.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- authorities/blinddetail-biblio-search.pl 28 Mar 2007 10:39:16 -0000
1.10
+++ authorities/blinddetail-biblio-search.pl 6 Apr 2007 14:48:45 -0000
1.11
@@ -57,13 +57,13 @@
my $authid = $query->param('authid');
my $index = $query->param('index');
my $tagid = $query->param('tagid');
-my $authtypecode = &AUTHfind_authtypecode($authid);
-my $tagslib = &AUTHgettagslib(1,$authtypecode);
+my $authtypecode = &GetAuthTypeCode($authid);
+my $tagslib = &GetTagsLabels(1,$authtypecode);
-my $auth_type = AUTHgetauth_type($authtypecode);
+my $auth_type = GetAuthType($authtypecode);
warn "XX = ".$auth_type->{auth_tag_to_report};
-my $record =AUTHgetauthority($authid);
+my $record =GetAuthority($authid);
warn "record auth :".$record->as_formatted;
# open template
my ($template, $loggedinuser, $cookie)
@@ -123,19 +123,8 @@
$template->param("0XX" =>address@hidden);
-# my $authtypes = getauthtypes;
-# my @authtypesloop;
-# foreach my $thisauthtype (keys %$authtypes) {
-# my $selected = 1 if $thisauthtype eq $authtypecode;
-# my %row =(value => $thisauthtype,
-# selected => $selected,
-# authtypetext =>
$authtypes->{$thisauthtype}{'authtypetext'},
-# );
-# push @authtypesloop, \%row;
-# }
$template->param(authid => $authid?$authid:"",
-# authtypesloop => address@hidden,
index => $index,
tagid => $tagid,
intranetcolorstylesheet =>
C4::Context->preference("intranetcolorstylesheet"),
Index: authorities/detail-biblio-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/detail-biblio-search.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- authorities/detail-biblio-search.pl 9 Mar 2007 14:31:17 -0000 1.4
+++ authorities/detail-biblio-search.pl 6 Apr 2007 14:48:45 -0000 1.5
@@ -58,10 +58,10 @@
my $authid = $query->param('authid');
my $index = $query->param('index');
-my $authtypecode = &AUTHfind_authtypecode($dbh,$authid);
-my $tagslib = &AUTHgettagslib($dbh,1,$authtypecode);
+my $authtypecode = &GetAuthTypeCode($authid);
+my $tagslib = &GetTagsLabels(1,$authtypecode);
-my $record =AUTHgetauthority($dbh,$authid);
+my $record =GetAuthority($authid);
# open template
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name =>
"authorities/detail-biblio-search.tmpl",
@@ -119,52 +119,6 @@
}
}
$template->param("0XX" =>address@hidden);
-# }
-# now, build item tab !
-# the main difference is that datas are in lines and not in columns : thus, we
build the <th> first, then the values...
-# loop through each tag
-# warning : we may have differents number of columns in each row. Thus, we
first build a hash, complete it if necessary
-# then construct template.
-# my @fields = $record->fields();
-# my %witness; #---- stores the list of subfields used at least once, with the
"meaning" of the code
-# my @big_array;
-# foreach my $field (@fields) {
-# next if ($field->tag()<10);
-# my @subf=$field->subfields;
-# my %this_row;
-# # loop through each subfield
-# for my $i (0..$#subf) {
-# next if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab} ne
10);
-# $witness{$subf[$i][0]} =
$tagslib->{$field->tag()}->{$subf[$i][0]}->{lib};
-# $this_row{$subf[$i][0]} =$subf[$i][1];
-# }
-# if (%this_row) {
-# push(@big_array, \%this_row);
-# }
-# }
-# #fill big_row with missing datas
-# foreach my $subfield_code (keys(%witness)) {
-# for (my $i=0;$i<=$#big_array;$i++) {
-# $big_array[$i]{$subfield_code}=" " unless
($big_array[$i]{$subfield_code});
-# }
-# }
-# # now, construct template !
-# my @item_value_loop;
-# my @header_value_loop;
-# for (my $i=0;$i<=$#big_array; $i++) {
-# my $items_data;
-# foreach my $subfield_code (keys(%witness)) {
-# $items_data .="<td>".$big_array[$i]{$subfield_code}."</td>";
-# }
-# my %row_data;
-# $row_data{item_value} = $items_data;
-# push(@item_value_loop,\%row_data);
-# }
-# foreach my $subfield_code (keys(%witness)) {
-# my %header_value;
-# $header_value{header_value} = $witness{$subfield_code};
-# push(@header_value_loop, \%header_value);
-# }
my $authtypes = getauthtypes;
my @authtypesloop;
Index: authorities/detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/detail.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- authorities/detail.pl 28 Mar 2007 10:39:16 -0000 1.7
+++ authorities/detail.pl 6 Apr 2007 14:48:45 -0000 1.8
@@ -19,7 +19,7 @@
=head1 NAME
-etail.pl : script to show an authority in MARC format
+detail.pl : script to show an authority in MARC format
=head1 SYNOPSIS
@@ -70,8 +70,8 @@
-my $authtypecode = &AUTHfind_authtypecode($authid);
-my $tagslib = &AUTHgettagslib(1,$authtypecode);
+my $authtypecode = &GetAuthTypeCode($authid);
+my $tagslib = &GetTagsLabels(1,$authtypecode);
my $record;
if (C4::Context->preference("AuthDisplayHierarchy")){
@@ -85,8 +85,8 @@
my $cnt=0;
my @loophierarchy;
foreach my $element (@tree){
- my %cell;
- my $elementdata = AUTHgetauthority($element);
+ my $cell;
+ my $elementdata = GetAuthority($element);
$record= $elementdata if ($authid==$element);
push @loophierarchy, BuildUnimarcHierarchy($elementdata,"child".$cnt,
$authid);
$cnt++;
@@ -98,9 +98,9 @@
'loophierarchies' =>address@hidden,
);
} else {
- $record=AUTHgetauthority($authid);
+ $record=GetAuthority($authid);
}
-my $count = AUTHcount_usage($authid);
+my $count = CountUsage($authid);
# find the marc field/subfield used in biblio by this authority
my $sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure
where authtypecode=?");
Index: C4/AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- C4/AuthoritiesMarc.pm 5 Apr 2007 12:17:55 -0000 1.44
+++ C4/AuthoritiesMarc.pm 6 Apr 2007 14:48:45 -0000 1.45
@@ -23,7 +23,7 @@
use MARC::Record;
use C4::Biblio;
use C4::Search;
-#use ZOOM;
+
use vars qw($VERSION @ISA @EXPORT);
# set the version for version checking
@@ -31,30 +31,44 @@
@ISA = qw(Exporter);
@EXPORT = qw(
- &AUTHgettagslib
- &AUTHfindsubfield
- &AUTHfind_authtypecode
-
- &AUTHaddauthority
- &AUTHmodauthority
- &AUTHdelauthority
- &AUTHaddsubfield
- &AUTHgetauthority
- &AUTHfind_marc_from_kohafield
- &AUTHgetauth_type
- &AUTHcount_usage
- &getsummary
- &authoritysearch
- &XMLgetauthority
-
+ &GetTagsLabels
+ &GetAuthType
+ &GetAuthTypeCode
+ &GetAuthMARCFromKohaField
&AUTHhtml2marc
+
+ &AddAuthority
+ &ModAuthority
+ &DelAuthority
+ &GetAuthority
+ &GetAuthorityXML
+
+ &CountUsage
+ &CountUsageChildren
+ &SearchAuthorities
+
+ &BuildSummary
&BuildUnimarcHierarchies
&BuildUnimarcHierarchy
+
&merge
- &FindDuplicate
+ &FindDuplicateAuthority
);
-sub AUTHfind_marc_from_kohafield {
+=head2 GetAuthMARCFromKohaField
+
+=over 4
+
+( $tag, $subfield ) = &GetAuthMARCFromKohaField ($kohafield,$authtypecode);
+returns tag and subfield linked to kohafield
+
+Comment :
+Suppose Kohafield is only linked to ONE subfield
+=back
+
+=cut
+sub GetAuthMARCFromKohaField {
+#AUTHfind_marc_from_kohafield
my ( $kohafield,$authtypecode ) = @_;
my $dbh=C4::Context->dbh;
return 0, 0 unless $kohafield;
@@ -67,7 +81,17 @@
return ($tagfield,$tagsubfield);
}
-sub authoritysearch {
+=head2 SearchAuthorities
+
+=over 4
+
+(address@hidden, $nbresults)= &SearchAuthorities($tags, $and_or, $excluding,
$operator, $value, $offset,$length,$authtypecode,$sortby)
+returns ref to array result and count of results returned
+
+=back
+
+=cut
+sub SearchAuthorities {
my ($tags, $and_or, $excluding, $operator, $value,
$offset,$length,$authtypecode,$sortby) = @_;
my $dbh=C4::Context->dbh;
my $query;
@@ -120,6 +144,7 @@
}
##Add how many queries generated
$query= $and.$query.$q2;
+ ## Adding order
$query=' @or @attr 7=1 @attr 1=Heading 0 @or @attr 7=1 @attr
1=Heading-Entity 1'.$query if ($sortby eq "HeadingAsc");
$query=' @or @attr 7=2 @attr 1=Heading 0 @or @attr 7=1 @attr
1=Heading-Entity 1'.$query if ($sortby eq "HeadingDsc");
warn $query;
@@ -131,13 +156,10 @@
my $i;
$oAuth[0]=C4::Context->Zconn("authorityserver" , 1);
my $Anewq= new ZOOM::Query::PQF($query,$oAuth[0]);
- # $Anewq->sortby("1=Heading i< 1=Heading-Entity i< ");
- # $Anewq->sortby("1=Heading i< 1=Heading-Entity i< ");
my $oAResult;
$oAResult= $oAuth[0]->search($Anewq) ;
while (($i = ZOOM::event(address@hidden)) != 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();
@@ -157,41 +179,18 @@
##Find authid and linkid fields
##we may be searching multiple authoritytypes.
## FIXME this assumes that all authid and linkid fields are the same for all
authority types
- # my
($authidfield,$authidsubfield)=AUTHfind_marc_from_kohafield($dbh,"auth_header.authid",$authtypecode[0]);
- # my
($linkidfield,$linkidsubfield)=AUTHfind_marc_from_kohafield($dbh,"auth_header.linkid",$authtypecode[0]);
+ # my
($authidfield,$authidsubfield)=GetAuthMARCFromKohaField($dbh,"auth_header.authid",$authtypecode[0]);
+ # my
($linkidfield,$linkidsubfield)=GetAuthMARCFromKohaField($dbh,"auth_header.linkid",$authtypecode[0]);
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;
- my $linkid;
- my @linkids;
my $separator=C4::Context->preference('authoritysep');
- my $linksummary=" ".$separator;
-
$authrecord = MARC::File::USMARC::decode($marcdata);
-
my $authid=$authrecord->field('001')->data();
- # if ($authrecord->field($linkidfield)){
- # my @fields=$authrecord->field($linkidfield);
- #
- # # foreach my $field (@fields){
- # # # $linkid=$field->subfield($linkidsubfield) ;
- # # # if ($linkid){ ##There is a linked record add fields to
produce summary
- # # # my $linktype=AUTHfind_authtypecode($dbh,$linkid);
- # # # my $linkrecord=AUTHgetauthority($dbh,$linkid);
- # # # $linksummary.="<br> <a
href='detail.pl?authid=$linkid'>".getsummary($dbh,$linkrecord,$linkid,$linktype).".</a>".$separator;
- # # # }
- # # }
- # }#
-
- my $summary=getsummary($authrecord,$authid,$authtypecode);
- # $summary="<a href='detail.pl?authid=$authid'>".$summary.".</a>" if
($intranet);
- # $summary="<a href='detail.pl?authid=$authid'>".$summary.".</a>" if
($intranet);
- # if ($linkid && $linksummary ne " ".$separator){
- # $summary="<b>".$summary."</b>".$linksummary;
- # }
+ my $summary=BuildSummary($authrecord,$authid,$authtypecode);
my $query_auth_tag = "SELECT auth_tag_to_report FROM auth_types
WHERE authtypecode=?";
my $sth = $dbh->prepare($query_auth_tag);
$sth->execute($authtypecode);
@@ -199,17 +198,13 @@
my %newline;
$newline{summary} = $summary;
$newline{authid} = $authid;
- # $newline{linkid} = $linkid;
- # $newline{reported_tag} = $reported_tag;
- # $newline{used} =0;
- # $newline{biblio_fields} = $tags_using_authtype;
$newline{even} = $counter % 2;
$counter++;
push @finalresult, \%newline;
}## while counter
###
for (my $z=0; $z<@finalresult; $z++){
- my $count=AUTHcount_usage($finalresult[$z]{authid});
+ my $count=CountUsage($finalresult[$z]{authid});
$finalresult[$z]{used}=$count;
}# all $z's
@@ -221,7 +216,17 @@
return (address@hidden, $nbresults);
}
-sub AUTHcount_usage {
+=head2 CountUsage
+
+=over 4
+
+$count= &CountUsage($authid)
+counts Usage of Authid in bibliorecords.
+
+=back
+
+=cut
+sub CountUsage {
my ($authid) = @_;
### try ZOOM search here
my $oConnection=C4::Context->Zconn("biblioserver",1);
@@ -239,7 +244,32 @@
return ($result);
}
-sub AUTHfind_authtypecode {
+=head2 CountUsageChildren
+
+=over 4
+
+$count= &CountUsageChildren($authid)
+counts Usage of narrower terms of Authid in bibliorecords.
+
+=back
+
+=cut
+sub CountUsageChildren {
+ my ($authid) = @_;
+}
+
+=head2 GetAuthTypeCode
+
+=over 4
+
+$authtypecode= &GetAuthTypeCode($authid)
+returns authtypecode of an authid
+
+=back
+
+=cut
+sub GetAuthTypeCode {
+#AUTHfind_authtypecode
my ($authid) = @_;
my $dbh=C4::Context->dbh;
my $sth = $dbh->prepare("select authtypecode from auth_header where
authid=?");
@@ -248,7 +278,33 @@
return $authtypecode;
}
-sub AUTHgettagslib {
+=head2 GetTagsLabels
+
+=over 4
+
+$tagslabel= &GetTagsLabels($forlibrarian,$authtypecode)
+returns a ref to hashref of authorities tag and subfield structure.
+
+tagslabel usage :
+$tagslabel->{$tag}->{$subfield}->{'attribute'}
+where attribute takes values in :
+ lib
+ tab
+ mandatory
+ repeatable
+ authorised_value
+ authtypecode
+ value_builder
+ kohafield
+ seealso
+ hidden
+ isurl
+ link
+
+=back
+
+=cut
+sub GetTagsLabels {
my ($forlibrarian,$authtypecode)= @_;
my $dbh=C4::Context->dbh;
$authtypecode="" unless $authtypecode;
@@ -318,16 +374,23 @@
return $res;
}
-sub AUTHaddauthority {
+=head2 AddAuthority
+
+=over 4
+
+$authid= &AddAuthority($record, $authid,$authtypecode)
+returns authid of the newly created authority
+
+Either Create Or Modify existing authority.
+
+=back
+
+=cut
+sub AddAuthority {
# pass the MARC::Record to this function, and it will create the records in
the authority table
my ($record,$authid,$authtypecode) = @_;
my $dbh=C4::Context->dbh;
my $leader=' a ';##Fixme correct leader as this one
just adds utf8 to MARC21
-#substr($leader,8,1)=$leadercode;
-# $record->leader($leader);
-# my
($authfield,$authidsubfield)=AUTHfind_marc_from_kohafield($dbh,"auth_header.authid",$authtypecode);
-# my
($authfield2,$authtypesubfield)=AUTHfind_marc_from_kohafield($dbh,"auth_header.authtypecode",$authtypecode);
-# my
($linkidfield,$linkidsubfield)=AUTHfind_marc_from_kohafield($dbh,"auth_header.linkid",$authtypecode);
# if authid empty => true add, find a new authid number
if (!$authid) {
@@ -339,22 +402,15 @@
##Both authid and authtypecode is expected to be in the same field. Modify
if other requirements arise
$record->add_fields('001',$authid) unless $record->field('001');
$record->add_fields('152','','','b'=>$authtypecode) unless
$record->field('152');
- # $record->add_fields('100','','','b'=>$authtypecode);
warn $record->as_formatted;
$dbh->do("lock tables auth_header WRITE");
$sth=$dbh->prepare("insert into auth_header
(authid,datecreated,authtypecode,marc) values (?,now(),?,?)");
$sth->execute($authid,$authtypecode,$record->as_usmarc);
$sth->finish;
-
}else{
- ##Modified record reinsertid
-# my $idfield=$record->field('001');
-# $record->delete_field($idfield);
$record->add_fields('001',$authid) unless ($record->field('001'));
+ $record->add_fields('100',$authid) unless ($record->field('100'));
$record->add_fields('152','','','b'=>$authtypecode) unless
($record->field('152'));
-# $record->add_fields($authfield,$authid);
-#
$record->add_fields($authfield2,'','',$authtypesubfield=>$authtypecode);
-# warn $record->as_formatted;
$dbh->do("lock tables auth_header WRITE");
my $sth=$dbh->prepare("update auth_header set marc=? where authid=?");
$sth->execute($record->as_usmarc,$authid);
@@ -366,82 +422,45 @@
return ($authid);
}
-sub XMLgetauthority {
- # Returns MARC::XML of the authority passed in parameter.
- my ( $authid ) = @_;
- my $dbh=C4::Context->dbh;
- my $sth =
- $dbh->prepare("select marc from auth_header where authid=? " );
- $sth->execute($authid);
- my ($marc)=$sth->fetchrow;
- $marc=MARC::File::USMARC::decode($marc);
- my $marcxml=$marc->as_xml_record();
- return $marcxml;
+=head2 DelAuthority
-}
+=over 4
-sub AUTHgetauthority {
-# Returns MARC::Record of the biblio passed in parameter.
- my ($authid)address@hidden;
- my $dbh=C4::Context->dbh;
- my $sth=$dbh->prepare("select marc from auth_header where authid=?");
- $sth->execute($authid);
- my ($marc) = $sth->fetchrow;
- my $record=MARC::File::USMARC::decode($marc);
+$authid= &DelAuthority($authid)
+Deletes $authid
- return ($record);
-}
+=back
-sub AUTHgetauth_type {
- my ($authtypecode) = @_;
+=cut
+
+
+sub DelAuthority {
+ my ($authid) = @_;
my $dbh=C4::Context->dbh;
- my $sth=$dbh->prepare("select * from auth_types where authtypecode=?");
- $sth->execute($authtypecode);
- return $sth->fetchrow_hashref;
+
+ ModZebra($authid,"recordDelete","authorityserver");
+ $dbh->do("delete from auth_header where authid=$authid") ;
+
}
-sub AUTHmodauthority {
+sub ModAuthority {
my ($authid,$record,$authtypecode,$merge)address@hidden;
my $dbh=C4::Context->dbh;
- my ($oldrecord)=&AUTHgetauthority($authid);
+ my ($oldrecord)=&GetAuthority($authid);
if ($oldrecord eq $record) {
return;
}
-my $sth=$dbh->prepare("update auth_header set marc=? where authid=?");
-#warn find if linked records exist and delete them
-my($linkidfield,$linkidsubfield)=AUTHfind_marc_from_kohafield("auth_header.linkid",$authtypecode);
-
-if ($oldrecord->field($linkidfield)){
-my @fields=$oldrecord->field($linkidfield);
- foreach my $field (@fields){
-my $linkid=$field->subfield($linkidsubfield) ;
- if ($linkid){
- ##Modify the record of linked
- my $linkrecord=AUTHgetauthority($linkid);
- my $linktypecode=AUTHfind_authtypecode($linkid);
- my (
$linkidfield2,$linkidsubfield2)=AUTHfind_marc_from_kohafield("auth_header.linkid",$linktypecode);
- my @linkfields=$linkrecord->field($linkidfield2);
- foreach my $linkfield (@linkfields){
- if ($linkfield->subfield($linkidsubfield2) eq $authid){
- $linkrecord->delete_field($linkfield);
- $sth->execute($linkrecord->as_usmarc,$linkid);
- ModZebra($linkid,'specialUpdate',"authorityserver");
- }
- }#foreach linkfield
- }
- }#foreach linkid
-}
-#Now rewrite the $record to table with an add
-$authid=AUTHaddauthority($record,$authid,$authtypecode);
+ my $sth=$dbh->prepare("update auth_header set marc=? where authid=?");
+ #Now rewrite the $record to table with an add
+ $authid=AddAuthority($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.p
### they should have a system preference "dontmerge=1" otherwise by default
biblios will be updated
### the $merge flag is now depreceated and will be removed at code cleaning
-
-if (C4::Context->preference('dontmerge') ){
-# save the file in localfile/modified_authorities
+ 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."/";
@@ -451,22 +470,89 @@
open AUTH, "> $filename";
print AUTH $authid;
close AUTH;
-} else {
+ } else {
&merge($authid,$record,$authid,$record);
+ }
+ return $authid;
}
-return $authid;
+
+=head2 GetAuthorityXML
+
+=over 4
+
+$marcxml= &GetAuthorityXML( $authid)
+returns xml form of record $authid
+
+=back
+
+=cut
+sub GetAuthorityXML {
+ # Returns MARC::XML of the authority passed in parameter.
+ my ( $authid ) = @_;
+ my $dbh=C4::Context->dbh;
+ my $sth =
+ $dbh->prepare("select marc from auth_header where authid=? " );
+ $sth->execute($authid);
+ my ($marc)=$sth->fetchrow;
+ $marc=MARC::File::USMARC::decode($marc);
+ my $marcxml=$marc->as_xml_record();
+ return $marcxml;
+
}
-sub AUTHdelauthority {
- my ($authid,$keep_biblio) = @_;
+=head2 GetAuthority
+
+=over 4
+
+$record= &GetAuthority( $authid)
+Returns MARC::Record of the authority passed in parameter.
+
+=back
+
+=cut
+sub GetAuthority {
+ my ($authid)address@hidden;
my $dbh=C4::Context->dbh;
-# if the keep_biblio is set to 1, then authority entries in biblio are
preserved.
+ my $sth=$dbh->prepare("select marc from auth_header where authid=?");
+ $sth->execute($authid);
+ my ($marc) = $sth->fetchrow;
+ my $record=MARC::File::USMARC::decode($marc);
+ return ($record);
+}
-ModZebra($authid,"recordDelete","authorityserver");
- $dbh->do("delete from auth_header where authid=$authid") ;
+=head2 GetAuthType
+
+=over 4
+$result= &GetAuthType( $authtypecode)
+If $authtypecode is not "" then
+ Returns hashref to authtypecode information
+else
+ returns ref to array of hashref information of all Authtypes
+
+=back
+
+=cut
+sub GetAuthType {
+ my ($authtypecode) = @_;
+ my $dbh=C4::Context->dbh;
+ my $sth;
+ if ($authtypecode){
+ $sth=$dbh->prepare("select * from auth_types where authtypecode=?");
+ $sth->execute($authtypecode);
+ } else {
+ $sth=$dbh->prepare("select * from auth_types");
+ $sth->execute;
+ }
+ my $res=$sth->fetchall_arrayref({});
+ if (scalar(@$res)==1){
+ return $res->[0];
+ } else {
+ return $res;
+ }
}
+
sub AUTHhtml2marc {
my ($rtags,$rsubfields,$rvalues,%indicators) = @_;
my $dbh=C4::Context->dbh;
@@ -514,8 +600,20 @@
return $record;
}
+=head2 FindDuplicateAuthority
+
+=over 4
+
+$record= &FindDuplicateAuthority( $record, $authtypecode)
+return $authid,Summary if duplicate is found.
+
+Comments : an improvement would be to return All the records that match.
+
+=back
+
+=cut
-sub FindDuplicate {
+sub FindDuplicateAuthority {
my ($record,$authtypecode)address@hidden;
# warn "IN for ".$record->as_formatted;
@@ -525,36 +623,47 @@
$sth->execute($authtypecode);
my ($auth_tag_to_report) = $sth->fetchrow;
$sth->finish;
-# warn "record :".$record->as_formatted." authtattoreport
:$auth_tag_to_report";
- # build a request for authoritysearch
+# warn "record :".$record->as_formatted." auth_tag_to_report
:$auth_tag_to_report";
+ # build a request for SearchAuthorities
my $query='at='.$authtypecode.' ';
map {$query.= " and he=\"".$_->[1]."\"" if ($_->[0]=~/[A-z]/)}
$record->field($auth_tag_to_report)->subfields() if
$record->field($auth_tag_to_report);
my ($error,$results)=SimpleSearch($query,"authorityserver");
# there is at least 1 result => return the 1st one
if (@$results>0) {
my $marcrecord = MARC::File::USMARC::decode($results->[0]);
- return
$marcrecord->field('001')->data,getsummary($marcrecord,$marcrecord->field('001')->data,$authtypecode);
+ return
$marcrecord->field('001')->data,BuildSummary($marcrecord,$marcrecord->field('001')->data,$authtypecode);
}
# no result, returns nothing
return;
}
-sub getsummary{
-## give this a Marc record to return summary
-my ($record,$authid,$authtypecode)address@hidden;
+=head2 BuildSummary
+
+=over 4
+
+$text= &BuildSummary( $record, $authid, $authtypecode)
+return HTML encoded Summary
+
+Comment : authtypecode can be infered from both record and authid.
+Moreover, authid can also be inferred from $record.
+Would it be interesting to delete those things.
-my $dbh=C4::Context->dbh;
-# my $authtypecode = AUTHfind_authtypecode($dbh,$authid);
- my $authref = getauthtype($authtypecode);
+=back
+
+=cut
+
+sub BuildSummary{
+## give this a Marc record to return summary
+ my ($record,$authid,$authtypecode)address@hidden;
+ my $dbh=C4::Context->dbh;
+ my $authref = GetAuthType($authtypecode);
my $summary = $authref->{summary};
my @fields = $record->fields();
-# chop $tags_using_authtype; # FIXME: why commented out?
my $reported_tag;
-
# if the library has a summary defined, use it. Otherwise, build a
standard one
if ($summary) {
my @fields = $record->fields();
-# $reported_tag = '$9'.$result[$counter];
+ # $reported_tag = '$9'.$result[$counter];
foreach my $field (@fields) {
my $tag = $field->tag();
my $tagvalue = $field->as_string();
@@ -563,7 +672,6 @@
if ($tag eq '001') {
$reported_tag.='$3'.$field->data();
}
-
} else {
my @subf = $field->subfields;
for my $i (0..$#subf) {
@@ -571,9 +679,6 @@
my $subfieldvalue = $subf[$i][1];
my $tagsubf = $tag.$subfieldcode;
$summary =~
s/\[(.?.?.?.?)$tagsubf(.*?)]/$1$subfieldvalue$2\[$1$tagsubf$2]/g;
-# if ($tag eq $auth_tag_to_report) {
-# $reported_tag.='$'.$subfieldcode.$subfieldvalue;
-# }
}
}
}
@@ -658,6 +763,20 @@
return $summary;
}
+=head2 BuildUnimarcHierarchies
+
+=over 4
+
+$text= &BuildUnimarcHierarchies( $authid, $force)
+return text containing trees for hierarchies
+for them to be stored in auth_header
+
+Example of text:
+122,1314,2452;1324,2342,3,2452
+
+=back
+
+=cut
sub BuildUnimarcHierarchies{
my $authid = shift @_;
# warn "authid : $authid";
@@ -665,18 +784,17 @@
my @globalresult;
my $dbh=C4::Context->dbh;
my $hierarchies;
- my $data = AUTHgetheader($authid);
-
+ my $data = GetHeaderAuthority($authid);
if ($data->{'authtrees'} and not $force){
return $data->{'authtrees'};
} elsif ($data->{'authtrees'}){
$hierarchies=$data->{'authtrees'};
} else {
- my $record = AUTHgetauthority($authid);
+ my $record = GetAuthority($authid);
my $found;
foreach my $field ($record->field('550')){
if ($field->subfield('5') && $field->subfield('5') eq 'g'){
- my $parentrecord = AUTHgetauthority($field->subfield('3'));
+ my $parentrecord = GetAuthority($field->subfield('3'));
my $localresult=$hierarchies;
my $trees;
$trees = BuildUnimarcHierarchies($field->subfield('3'));
@@ -697,10 +815,31 @@
#Unless there is no ancestor, I am alone.
$hierarchies="$authid" unless ($hierarchies);
}
- AUTHsavetrees($authid,$hierarchies);
+ AddAuthorityTrees($authid,$hierarchies);
return $hierarchies;
}
+=head2 BuildUnimarcHierarchy
+
+=over 4
+
+$ref= &BuildUnimarcHierarchy( $record, $class,$authid)
+return a hashref in order to display hierarchy for record and final Authid
$authid
+
+"loopparents"
+"loopchildren"
+"class"
+"loopauthid"
+"current_value"
+"value"
+
+"ifparents"
+"ifchildren"
+Those two latest ones should disappear soon.
+
+=back
+
+=cut
sub BuildUnimarcHierarchy{
my $record = shift @_;
my $class = shift @_;
@@ -730,7 +869,17 @@
return \%cell;
}
-sub AUTHgetheader{
+=head2 GetHeaderAuthority
+
+=over 4
+
+$ref= &GetHeaderAuthority( $authid)
+return a hashref in order auth_header table data
+
+=back
+
+=cut
+sub GetHeaderAuthority{
my $authid = shift @_;
my $sql= "SELECT * from auth_header WHERE authid = ?";
my $dbh=C4::Context->dbh;
@@ -740,27 +889,49 @@
return $data;
}
-sub AUTHsavetrees{
+=head2 AddAuthorityTrees
+
+=over 4
+
+$ref= &AddAuthorityTrees( $authid, $trees)
+return success or failure
+
+=back
+
+=cut
+
+sub AddAuthorityTrees{
my $authid = shift @_;
my $trees = shift @_;
my $sql= "UPDATE IGNORE auth_header set authtrees=? WHERE authid = ?";
my $dbh=C4::Context->dbh;
my $rq= $dbh->prepare($sql);
- $rq->execute($trees,$authid);
+ return $rq->execute($trees,$authid);
}
+=head2 merge
+
+=over 4
+
+$ref= &merge(mergefrom,$MARCfrom,$mergeto,$MARCto)
+
+
+Could add some feature : Migrating from a typecode to an other for instance.
+Then we should add some new parameter : bibliotargettag, authtargettag
+
+=back
+
+=cut
sub merge {
my ($mergefrom,$MARCfrom,$mergeto,$MARCto) = @_;
my $dbh=C4::Context->dbh;
- my $authtypecodefrom = AUTHfind_authtypecode($mergefrom);
- my $authtypecodeto = AUTHfind_authtypecode($mergeto);
+ my $authtypecodefrom = GetAuthTypeCode($mergefrom);
+ my $authtypecodeto = GetAuthTypeCode($mergeto);
# return if authority does not exist
my @X = $MARCfrom->fields();
return if $#X == -1;
@X = $MARCto->fields();
return if $#X == -1;
-
-
# search the tag to report
my $sth = $dbh->prepare("select auth_tag_to_report from auth_types where
authtypecode=?");
$sth->execute($authtypecodefrom);
@@ -774,31 +945,29 @@
# search all biblio tags using this authority.
$sth = $dbh->prepare("select distinct tagfield from
marc_subfield_structure where authtypecode=?");
$sth->execute($authtypecodefrom);
-my @tags_using_authtype;
+ my @tags_using_authtype;
while (my ($tagfield) = $sth->fetchrow) {
push @tags_using_authtype,$tagfield."9" ;
}
# now, find every biblio using this authority
-### try ZOOM search here
-my $oConnection=C4::Context->Zconn("biblioserver");
-my $query;
-$query= "an= ".$mergefrom;
-my $oResult = $oConnection->search(new ZOOM::Query::CCL2RPN( $query,
$oConnection ));
-my $count=$oResult->size() if ($oResult);
-my @reccache;
-my $z=0;
-while ( $z<$count ) {
-my $rec;
+ my $oConnection=C4::Context->Zconn("biblioserver");
+ my $query;
+ $query= "an= ".$mergefrom;
+ my $oResult = $oConnection->search(new ZOOM::Query::CCL2RPN( $query,
$oConnection ));
+ my $count=$oResult->size() if ($oResult);
+ my @reccache;
+ my $z=0;
+ while ( $z<$count ) {
+ my $rec;
$rec=$oResult->record($z);
my $marcdata = $rec->raw();
-push @reccache, $marcdata;
-$z++;
-}
-$oResult->destroy();
-foreach my $marc(@reccache){
-
-my $update;
+ push @reccache, $marcdata;
+ $z++;
+ }
+ $oResult->destroy();
+ foreach my $marc(@reccache){
+ my $update;
my $marcrecord;
$marcrecord = MARC::File::USMARC::decode($marc);
foreach my $tagfield (@tags_using_authtype){
@@ -806,12 +975,11 @@
my @tags = $marcrecord->field($tagfield);
foreach my $tag (@tags){
my $tagsubs=$tag->subfield("9");
-#warn "$tagfield:$tagsubs:$mergefrom";
+ #warn "$tagfield:$tagsubs:$mergefrom";
if ($tagsubs== $mergefrom) {
-
$tag->update("9" =>$mergeto);
foreach my $subfield (@record_to) {
-# warn "$subfield,$subfield->[0],$subfield->[1]";
+ # warn "$subfield,$subfield->[0],$subfield->[1]";
$tag->update($subfield->[0] =>$subfield->[1]);
}#for $subfield
}
@@ -822,11 +990,57 @@
}#foreach tagfield
my $oldbiblio = TransformMarcToKoha($dbh,$marcrecord,"") ;
if ($update==1){
- # FIXME : this NEWmodbiblio does not exist anymore...
&ModBiblio($marcrecord,$oldbiblio->{'biblionumber'},GetFrameworkCode($oldbiblio->{'biblionumber'}))
;
}
-}#foreach $marc
+ }#foreach $marc
+ # now, find every other authority linked with this authority
+# my $oConnection=C4::Context->Zconn("authorityserver");
+# my $query;
+# # att 9210 Auth-Internal-authtype
+# # att 9220 Auth-Internal-LN
+# # ccl.properties to add for authorities
+# $query= "= ".$mergefrom;
+# my $oResult = $oConnection->search(new ZOOM::Query::CCL2RPN( $query,
$oConnection ));
+# my $count=$oResult->size() if ($oResult);
+# my @reccache;
+# my $z=0;
+# while ( $z<$count ) {
+# my $rec;
+# $rec=$oResult->record($z);
+# my $marcdata = $rec->raw();
+# push @reccache, $marcdata;
+# $z++;
+# }
+# $oResult->destroy();
+# foreach my $marc(@reccache){
+# my $update;
+# my $marcrecord;
+# $marcrecord = MARC::File::USMARC::decode($marc);
+# foreach my $tagfield (@tags_using_authtype){
+# $tagfield=substr($tagfield,0,3);
+# my @tags = $marcrecord->field($tagfield);
+# foreach my $tag (@tags){
+# my $tagsubs=$tag->subfield("9");
+# #warn "$tagfield:$tagsubs:$mergefrom";
+# if ($tagsubs== $mergefrom) {
+# $tag->update("9" =>$mergeto);
+# foreach my $subfield (@record_to) {
+# # warn "$subfield,$subfield->[0],$subfield->[1]";
+# $tag->update($subfield->[0] =>$subfield->[1]);
+# }#for $subfield
+# }
+# $marcrecord->delete_field($tag);
+# $marcrecord->add_fields($tag);
+# $update=1;
+# }#for each tag
+# }#foreach tagfield
+# my $authoritynumber = TransformMarcToKoha($dbh,$marcrecord,"") ;
+# if ($update==1){
+#
&ModAuthority($marcrecord,$authoritynumber,GetAuthTypeCode($authoritynumber)) ;
+# }
+#
+# }#foreach $marc
}#sub
END { } # module clean-up code here (global destructor)
@@ -840,8 +1054,11 @@
=cut
-# $Id: AuthoritiesMarc.pm,v 1.44 2007/04/05 12:17:55 btoumi Exp $
+# $Id: AuthoritiesMarc.pm,v 1.45 2007/04/06 14:48:45 hdl Exp $
# $Log: AuthoritiesMarc.pm,v $
+# Revision 1.45 2007/04/06 14:48:45 hdl
+# Code Cleaning : AuthoritiesMARC.
+#
# Revision 1.44 2007/04/05 12:17:55 btoumi
# add "sort by" with heading-entity in authorities search
#
@@ -908,7 +1125,7 @@
#
# Revision 1.28.2.17 2007/02/05 13:16:08 hdl
# Removing Link from AuthoritiesMARC summary (caused a problem owed to the API
differences between opac and intranet)
-# + removing $dbh in authoritysearch
+# + removing $dbh in SearchAuthorities
# + adding links in templates on summaries to go to full view.
# (no more links in popup authorities. or should we add it ?)
#
@@ -928,7 +1145,7 @@
# Using search for an= for an authority-Number.
#
# Revision 1.28.2.12 2007/01/09 13:51:31 hdl
-# Bug Fixing : AUTHcount_usage used *synchronous* connection where biblio used
****asynchronous**** one.
+# Bug Fixing : CountUsage used *synchronous* connection where biblio used
****asynchronous**** one.
# First try to get it work.
#
# Revision 1.28.2.11 2007/01/05 14:37:26 btoumi
Index: opac/opac-authoritiesdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-authoritiesdetail.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- opac/opac-authoritiesdetail.pl 28 Mar 2007 10:39:16 -0000 1.3
+++ opac/opac-authoritiesdetail.pl 6 Apr 2007 14:48:45 -0000 1.4
@@ -55,7 +55,7 @@
my $authid = $query->param('authid');
my $authtypecode = &AUTHfind_authtypecode( $authid );
-my $tagslib = &AUTHgettagslib( 1, $authtypecode );
+my $tagslib = &GetTagsLabels( 1, $authtypecode );
# open template
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -88,7 +88,7 @@
# warn "tree :$element";
my %cell;
- my $elementdata = AUTHgetauthority( $element );
+ my $elementdata = GetAuthority( $element );
$record = $elementdata if ( $authid == $element );
push @loophierarchy,
BuildUnimarcHierarchy( $elementdata, "child" . $cnt, $authid );
@@ -103,9 +103,9 @@
}
}
else {
- $record = AUTHgetauthority( $authid );
+ $record = GetAuthority( $authid );
}
-my $count = AUTHcount_usage($authid);
+my $count = CountUsage($authid);
# find the marc field/subfield used in biblio by this authority
my $sth =
Index: opac/opac-authorities-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-authorities-home.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- opac/opac-authorities-home.pl 28 Mar 2007 10:39:16 -0000 1.4
+++ opac/opac-authorities-home.pl 6 Apr 2007 14:48:45 -0000 1.5
@@ -67,7 +67,7 @@
$resultsperpage = 19 if ( !defined $resultsperpage );
my @tags;
my ( $results, $total, @fields ) =
- authoritysearch( address@hidden, address@hidden, address@hidden,
address@hidden,
+ SearchAuthorities( address@hidden, address@hidden, address@hidden,
address@hidden,
address@hidden, $startfrom * $resultsperpage,
$resultsperpage, $authtypecode );
( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -147,7 +147,7 @@
}
elsif ( $op eq "delete" ) {
- &AUTHdelauthority( $authid, 1 );
+ &DelAuthority( $authid, 1 );
( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
Index: opac/opac-main.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-main.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- opac/opac-main.pl 9 Mar 2007 15:12:54 -0000 1.24
+++ opac/opac-main.pl 6 Apr 2007 14:48:45 -0000 1.25
@@ -15,7 +15,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: opac-main.pl,v 1.24 2007/03/09 15:12:54 tipaul Exp $
+# $Id: opac-main.pl,v 1.25 2007/04/06 14:48:45 hdl Exp $
use strict;
require Exporter;
@@ -104,5 +104,9 @@
$template->param(
'Disable_Dictionary' => C4::Context->preference("Disable_Dictionary") )
if ( C4::Context->preference("Disable_Dictionary") );
+$template->param(
+ 'OpacAuthorities' => 1 );
+$template->param(
+ 'OpacCloud' => 1 );
output_html_with_http_headers $input, $cookie, $template->output;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha authorities/auth_finder.pl authorities/aut...,
Henri-Damien LAURENT <=