[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha authorities/authorities.pl C4/AuthoritiesM... [rel_3_0]
|
From: |
Henri-Damien LAURENT |
|
Subject: |
[Koha-cvs] koha authorities/authorities.pl C4/AuthoritiesM... [rel_3_0] |
|
Date: |
Thu, 12 Oct 2006 22:04:47 +0000 |
CVSROOT: /cvsroot/koha
Module name: koha
Branch: rel_3_0
Changes by: Henri-Damien LAURENT <hdl> 06/10/12 22:04:47
Modified files:
authorities : authorities.pl
C4 : AuthoritiesMarc.pm
koha-tmpl/intranet-tmpl/prog/en/authorities:
authorities-home.tmpl
authorities.tmpl
detail.tmpl
searchresultlist.tmpl
Log message:
Authorities working with zebra.
zebra Configuration files are comitted next.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/authorities.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.15.2.1&r2=1.15.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/C4/AuthoritiesMarc.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.28.2.1&r2=1.28.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2&r2=1.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
Patches:
Index: authorities/authorities.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/authorities.pl,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -b -r1.15.2.1 -r1.15.2.2
--- authorities/authorities.pl 1 Sep 2006 13:13:33 -0000 1.15.2.1
+++ authorities/authorities.pl 12 Oct 2006 22:04:47 -0000 1.15.2.2
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: authorities.pl,v 1.15.2.1 2006/09/01 13:13:33 toins Exp $
+# $Id: authorities.pl,v 1.15.2.2 2006/10/12 22:04:47 hdl Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -386,17 +386,18 @@
my @ind_tag = $input->param('ind_tag');
my @indicator = $input->param('indicator');
my $xml =
MARChtml2xml(address@hidden,address@hidden,address@hidden,address@hidden,address@hidden);
- #warn $xml;
- my $record=MARC::Record->new_from_xml($xml,'UTF-8');
+# warn $record->as_formatted;
+ 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;
#warn "IN ADDBIB";
# check for a duplicate
- my ($duplicateauthid,$duplicateauthvalue) =
C4::AuthoritiesMarc::FindDuplicate($record,$authtypecode) if ($op eq "add") &&
(!$is_a_modif);
+# my ($duplicateauthid,$duplicateauthvalue) =
C4::AuthoritiesMarc::FindDuplicate($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) {
+# if (!$duplicateauthid or $confirm_not_duplicate) {
# warn "noduplicate";
if ($is_a_modif ) {
$authid=AUTHmodauthority($dbh,$authid,$record,$authtypecode,1);
@@ -405,23 +406,23 @@
}
# now, redirect to detail page
- if ($nonav){
+# if ($nonav){
#warn ($myindex,$nonav);
- print
$input->redirect("auth_finder.pl?index=$myindex&nonav=$nonav&authtypecode=$authtypecode");
- }else{
- print $input->redirect("detail.pl?nonav=$nonav&authid=$authid");
- }
+# print
$input->redirect("auth_finder.pl?index=$myindex&nonav=$nonav&authtypecode=$authtypecode");
+# }else{
+ print $input->redirect("detail.pl?authid=$authid");
+# }
exit;
- } else {
+# } else {
#warn "duplicate";
# it may be a duplicate, warn the user and do nothing
- build_tabs ($template, $record, $dbh,$encoding);
- build_hidden_data;
- $template->param(authid =>$authid,
- duplicateauthid =>
$duplicateauthid,
- duplicateauthvalue =>
$duplicateauthvalue,
- );
- }
+# build_tabs ($template, $record, $dbh,$encoding);
+# build_hidden_data;
+# $template->param(authid =>$authid,
+# duplicateauthid =>
$duplicateauthid,
+# duplicateauthvalue =>
$duplicateauthvalue,
+# );
+# }
#------------------------------------------------------------------------------------------------------------------------------
} elsif ($op eq "addfield") {
#------------------------------------------------------------------------------------------------------------------------------
Index: C4/AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.28.2.1
retrieving revision 1.28.2.2
diff -u -b -r1.28.2.1 -r1.28.2.2
--- C4/AuthoritiesMarc.pm 31 Aug 2006 16:18:31 -0000 1.28.2.1
+++ C4/AuthoritiesMarc.pm 12 Oct 2006 22:04:47 -0000 1.28.2.2
@@ -77,7 +77,7 @@
my @authtypecode;
my @auths=split / /,$authtypecode ;
foreach my $auth (@auths){
- $query .=" address@hidden 1=1013 address@hidden
5=100 ".$auth; ##No truncation on authtype
+ $query .=" address@hidden 1=Authority/format-id
address@hidden 5=100 ".$auth; ##No truncation on authtype
push @authtypecode ,$auth;
$n++;
}
@@ -93,24 +93,19 @@
if (@$value[$i]){
##If mainentry search $a tag
- if (@$tags[$i] eq "mainentry") {
- $attr =" address@hidden 1=21 ";
+ if (@$tags[$i] eq "mainmainentry") {
+ $attr =" address@hidden 1=Heading ";
+ }elsif (@$tags[$i] eq "mainentry") {
+ $attr =" address@hidden 1=Heading-Entity ";
}else{
- $attr =" address@hidden 1=47 ";
+ $attr =" address@hidden 1=Any ";
}
-
-
-
-
if (@$operator[$i] eq 'phrase') {
$attr.=" address@hidden 4=1 address@hidden 5=100
address@hidden 6=2 ";##Phrase, No truncation,all of subfield field must match
} else {
-
$attr .=" address@hidden 4=6 address@hidden 5=1 ";##
Word list, right truncated, anywhere
}
-
-
$and .=" address@hidden " ;
$attr =$attr."\""address@hidden"\"";
$q2 .=$attr;
@@ -120,17 +115,19 @@
}
##Add how many queries generated
$query= $and.$query.$q2;
-#warn $query;
+warn $query;
$offset=0 unless $offset;
my $counter = $offset;
$length=10 unless $length;
my @oAuth;
my $i;
- $oAuth[0]=C4::Context->Zconnauth("authorityserver");
+ $oAuth[0]=C4::Context->Zconn("authorityserver");
+
#$oAuth[0]->connect;
-my $Anewq= new ZOOM::Query::PQF($query);
-$Anewq->sortby("1=21 i< 1=47 i< ");
+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) {
@@ -157,87 +154,89 @@
##Find authid and linkid fields
##we may be searching multiple authoritytypes.
##Fix me 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]);
-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;
+# 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]);
+ 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($authidfield)->subfield($authidsubfield);
- 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($dbh,$authrecord,$authid,$authtypecode);
-$summary="<a href='detail.pl?authid=$authid'>".$summary.".</a>";
-if ($linkid && $linksummary ne " ".$separator){
-$summary="<b>".$summary."</b>".$linksummary;
-}
+ 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($dbh,$authrecord,$authid,$authtypecode);
+ $summary="<a href='detail.pl?authid=$authid'>".$summary.".</a>";
+ # if ($linkid && $linksummary ne " ".$separator){
+ # $summary="<b>".$summary."</b>".$linksummary;
+ # }
+ my $query_auth_tag = "SELECT auth_tag_to_report FROM auth_types WHERE
authtypecode=?";
+ my $sth = $dbh->prepare($query_auth_tag);
+ $sth->execute($authtypecode);
+ my $auth_tag_to_report = $sth->fetchrow;
my %newline;
$newline{summary} = $summary;
$newline{authid} = $authid;
- $newline{linkid} = $linkid;
-# $newline{used} =0;
-# $newline{biblio_fields} = $tags_using_authtype;
+ # $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
-###
-my @oConnection;
-
-
-my @oResult;
-$oConnection[0]=C4::Context->Zconnauth("biblioserver");
-for (my $z=0; $z<@finalresult; $z++){
+ ###
+ my @oConnection;
+ my @oResult;
+ $oConnection[0]= C4::Context->Zconn("biblioserver");
+ for (my $z=0; $z<@finalresult; $z++){
my $nquery;
-
- $nquery= "address@hidden GILS 1=2057 ".$finalresult[$z]{authid};
- $nquery="address@hidden ".$nquery." address@hidden GILS 1=2057
".$finalresult[$z]{linkid} if $finalresult[$z]{linkid};
+ $nquery= "address@hidden 1=Koha-Auth-Number
".$finalresult[$z]{authid};
+# # $nquery="address@hidden ".$nquery." address@hidden GILS 1=2057
".$finalresult[$z]{linkid} if $finalresult[$z]{linkid};
$oResult[$z] = $oConnection[0]->search_pqf($nquery);
-
-
-OTHERS:
-while (($i = ZOOM::event(address@hidden)) != 0) {
- my $ev = $oConnection[0]->last_event();
-# warn("connection ", $i-1, ": event $ev (", ZOOM::event_str($ev), ")\n");
- last if $ev == ZOOM::Event::ZEND;
-}
-if ($i !=0){
- my($error, $errmsg, $addinfo, $diagset) = $oConnection[0]->error_x();
- if ($error) {
- warn "oConnection $ error: $errmsg ($error) $addinfo\n";
- ##In fact its an error. Should we inform at least the librarian?
- next;
- }
-
+#
+# FIXME : I Don't what this code is suposed to do
+# OTHERS:
+# while (($i = ZOOM::event(address@hidden)) != 0) {
+# my $ev = $oConnection[0]->last_event();
+# # warn("connection ", $i-1, ": event $ev (", ZOOM::event_str($ev),
")\n");
+# last if $ev == ZOOM::Event::ZEND;
+# }
+# if ($i !=0){
+# my($error, $errmsg, $addinfo, $diagset) = $oConnection[0]->error_x();
+# if ($error) {
+# warn "oConnection $ error: $errmsg ($error) $addinfo\n";
+# ##In fact its an error. Should we inform at least the librarian?
+# next;
+# }
+#
my $count=$oResult[$z]->size() ;
$finalresult[$z]{used}=$count;
-# $oResult->destroy();
-# $oConnection[$i-1]->destroy();
-}
+# # $oResult->destroy();
+# # $oConnection[$i-1]->destroy();
+# }
}# all $z's
-
+#
}## if nbresult
NOLUCK:
@@ -401,9 +400,9 @@
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);
+# 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) {
@@ -411,23 +410,26 @@
$sth->execute;
($authid)=$sth->fetchrow;
$authid=$authid+1;
-
-##Insert the recordID in MARC record
-
-##Both authid and authtypecode is expected to be in the same field. Modify if
other requirements arise
-
$record->add_fields($authfield,'','',$authidsubfield=>$authid,$authtypesubfield=>$authtypecode);
-
+ ##Insert the recordID in MARC record
+ ##Both authid and authtypecode is expected to be in the same field. Modify
if other requirements arise
+ $record->add_fields('001',$authid);
+ $record->add_fields('152','','','b'=>$authtypecode);
+# $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($authfield);
-$record->delete_field($idfield);
-$record->add_fields($authfield,'','',$authtypesubfield=>$authtypecode,$authidsubfield=>$authid);
-
+ ##Modified record reinsertid
+# my $idfield=$record->field('001');
+# $record->delete_field($idfield);
+ $record->add_fields('001',$authid) unless ($record->field('001'));
+ $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);
@@ -436,17 +438,17 @@
$dbh->do("unlock tables");
zebraop($dbh,$authid,'specialUpdate',"authorityserver");
-if ($record->field($linkidfield)){
-my @fields=$record->field($linkidfield);
-
- foreach my $field (@fields){
-my $linkid=$field->subfield($linkidsubfield) ;
- if ($linkid){
- ##Modify the record of linked
- AUTHaddlink($dbh,$linkid,$authid);
- }
- }
-}
+# if ($record->field($linkidfield)){
+# my @fields=$record->field($linkidfield);
+#
+# foreach my $field (@fields){
+# my $linkid=$field->subfield($linkidsubfield) ;
+# if ($linkid){
+# ##Modify the record of linked
+# AUTHaddlink($dbh,$linkid,$authid);
+# }
+# }
+# }
return ($authid);
}
@@ -692,15 +694,22 @@
my $authref = getauthtype($authtypecode);
my $summary = $authref->{summary};
my @fields = $record->fields();
-# chop $tags_using_authtype;
+# 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];
foreach my $field (@fields) {
my $tag = $field->tag();
my $tagvalue = $field->as_string();
$summary =~
s/\[(.?.?.?.?)$tag\*(.*?)]/$1$tagvalue$2\[$1$tag$2]/g;
if ($tag<10) {
+ if ($tag eq '001') {
+ $reported_tag.='$3'.$field->data();
+ }
+
} else {
my @subf = $field->subfields;
for my $i (0..$#subf) {
@@ -708,6 +717,9 @@
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;
+# }
}
}
}
@@ -863,7 +875,7 @@
}#foreach tagfield
my $oldbiblio = MARCmarc2koha($dbh,$marcrecord,"") ;
if ($update==1){
-
&NEWmodbiblio($marcrecord,$oldbiblio->{'biblionumber'},undef,"0000") ;
+
&NEWmodbiblio($dbh,$marcrecord,$oldbiblio->{'biblionumber'},undef,"0000") ;
}
}#foreach $marc
@@ -880,13 +892,14 @@
=cut
-# $Id: AuthoritiesMarc.pm,v 1.28.2.1 2006/08/31 16:18:31 toins Exp $
+# $Id: AuthoritiesMarc.pm,v 1.28.2.2 2006/10/12 22:04:47 hdl Exp $
# $Log: AuthoritiesMarc.pm,v $
-# Revision 1.28.2.1 2006/08/31 16:18:31 toins
-# $dbh param remove from a function
+# Revision 1.28.2.2 2006/10/12 22:04:47 hdl
+# Authorities working with zebra.
+# zebra Configuration files are comitted next.
#
-# Revision 1.28 2006/08/02 16:40:23 kados
-# rolling back previous merge, will do manually
+# Revision 1.9.2.17.2.2 2006/07/27 16:34:56 kados
+# syncing with rel_2_2 .. .untested.
#
# Revision 1.9.2.17.2.1 2006/05/28 18:49:12 tgarip1957
# This is an unusual commit. The main purpose is a working model of Zebra on a
modified rel2_2.
Index: koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl 4 Apr
2006 10:05:48 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl 12 Oct
2006 22:04:47 -0000 1.1.2.1
@@ -32,6 +32,21 @@
</tr>
<tr>
<th>
+ <label for="value_mainmainentry">Main entry ($a only)</label>
+ <input type="hidden" name="marclist" value="mainmainentry">
+ </th>
+ <td>
+ <select name="operator">
+ <option value="contains">contains</option>
+ <option value="start">start by</option>
+ </select>
+ </td>
+ <td>
+ <input id="value_mainmainentry" type="text" name="value" value="<!--
TMPL_VAR NAME="value" -->">
+ </td>
+ </tr>
+ <tr>
+ <th>
<label for="value_mainentry">Main entry</label>
<input type="hidden" name="marclist" value="mainentry">
<input type="hidden" name="and_or" value="and">
Index: koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl 19 May
2006 17:49:14 -0000 1.2
+++ koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl 12 Oct
2006 22:04:47 -0000 1.2.2.1
@@ -13,7 +13,6 @@
<!-- /TMPL_IF -->
<form method="post" name="f">
<input type="hidden" name="op" value="add">
- <input type="hidden" name="addfield_field">
<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR
NAME="authtypecode" -->">
<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
@@ -152,7 +151,7 @@
alertString2 += "\n- "+ total_missing_mandatory_subfields +_("
mandatory fields empty (see bold subfields)");
alert(alertString2);
} else {
- document.forms[0].submit();
+ document.forms['f'].submit();
}
}
function Dopop(link,i) {
Index: koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl 4 Apr 2006
10:05:48 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl 12 Oct 2006
22:04:47 -0000 1.1.2.1
@@ -17,7 +17,7 @@
<li><a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR
NAME="authid" -->')" class="button authority">Print</a></li>
- <li><a
href="../search.marc/search.pl?type=intranet&op=do_search&marclist=<!--
TMPL_VAR NAME="biblio_fields" -->&operator==&value=<!-- TMPL_VAR
NAME="authid" -->&and_or=and&excluding=" class="button authority"><!--
TMPL_VAR name="count" --> biblios</li>
+ <li><a
href="../search.marc/search.pl?type=intranet&op=do_search&address@hidden
1=Koha-Auth-Number <!--TMPL_VAR Name="authid" -->" class="button
authority"><!-- TMPL_VAR name="count" --> biblios</li>
</ul>
</div>
Index: koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl 4 Apr
2006 10:05:48 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl 12 Oct
2006 22:04:47 -0000 1.1.2.1
@@ -32,7 +32,7 @@
<td><!-- TMPL_VAR NAME="summary" --></td>
<!-- TMPL_UNLESS name="isEDITORS" -->
<td>
- <a
href="../search.marc/search.pl?type=intranet&op=do_search&marclist=<!--
TMPL_VAR NAME="biblio_fields" -->&operator==&value=<!-- TMPL_VAR
NAME="authid" -->&and_or=and&excluding=" class="button authority"><!--
TMPL_VAR NAME="used" --> biblio(s)</a>
+ <a
href="../search.marc/search.pl?type=intranet&op=do_search&address@hidden
1=Koha-Auth-Number <!--TMPL_VAR Name="authid" -->" class="button
authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a>
</td>
<!-- /TMPL_UNLESS -->
<td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha authorities/authorities.pl C4/AuthoritiesM... [rel_3_0],
Henri-Damien LAURENT <=