[Koha-cvs] koha updateitem.pl C4/Auth.pm C4/Output.pm C4/R... [dev_week]
Joshua Ferraro
jmf at kados.org
Thu Aug 3 07:25:42 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Joshua Ferraro <kados> 06/08/03 05:25:42
Modified files:
. : updateitem.pl
C4 : Auth.pm Output.pm Reserves2.pm Search.pm
C4/Circulation : Fines.pm
koha-tmpl/intranet-tmpl/npl/en/authorities: auth_finder.tmpl
authorities-home.tmpl
blinddetail-biblio-search.tmpl
searchresultlist-auth.tmpl
searchresultlist.tmpl
opac : opac-addbookbybiblionumber.pl
opac-authoritiesdetail.pl opac-detail.pl
opac-dictionary.pl opac-userupdate.pl
Log message:
sync with rel_2_2, the bugfixes I made today
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/updateitem.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.9.2.1&r2=1.9.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.36.2.18.2.4&r2=1.36.2.18.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Output.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.51.2.2&r2=1.51.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Reserves2.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.38&r2=1.38.4.1
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.99.2.11.2.15&r2=1.99.2.11.2.16
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Fines.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.9.2.2&r2=1.9.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/auth_finder.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4.2.1&r2=1.1.2.4.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities-home.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.6.2.1&r2=1.1.2.6.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/blinddetail-biblio-search.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.1&r2=1.1.2.3.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist-auth.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.6.2.1&r2=1.1.2.6.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.1&r2=1.1.2.3.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-addbookbybiblionumber.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.6.2.1&r2=1.1.2.6.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-authoritiesdetail.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2&r2=1.1.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-detail.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.14.2.19.2.1&r2=1.14.2.19.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-dictionary.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.1&r2=1.1.2.3.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-userupdate.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.11.2.5&r2=1.11.2.5.2.1
Patches:
Index: updateitem.pl
===================================================================
RCS file: /sources/koha/koha/Attic/updateitem.pl,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.1.2.1
diff -u -b -r1.9.2.1 -r1.9.2.1.2.1
--- updateitem.pl 8 Feb 2005 20:34:51 -0000 1.9.2.1
+++ updateitem.pl 3 Aug 2006 05:25:41 -0000 1.9.2.1.2.1
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: updateitem.pl,v 1.9.2.1 2005/02/08 20:34:51 oleonard Exp $
+# $Id: updateitem.pl,v 1.9.2.1.2.1 2006/08/03 05:25:41 kados Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -84,7 +84,7 @@
notes => $notes,
homebranch => $homebranch,
lost => $lost,
- wthdranw => $wthdrawn
+ wthdrawn => $wthdrawn
});
if ($lost ==1){
my $dbh = C4::Context->dbh;
Index: C4/Auth.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth.pm,v
retrieving revision 1.36.2.18.2.4
retrieving revision 1.36.2.18.2.5
diff -u -b -r1.36.2.18.2.4 -r1.36.2.18.2.5
--- C4/Auth.pm 24 Jul 2006 05:26:19 -0000 1.36.2.18.2.4
+++ C4/Auth.pm 3 Aug 2006 05:25:41 -0000 1.36.2.18.2.5
@@ -593,7 +593,7 @@
$flags->{'superlibrarian'}=1;
}
if ($userid eq 'demo' && C4::Context->config('demo')) {
- # Demo user that can do "anything" (demo=1 in /etc/koha.conf)
+ # Deco user that can do "anything" (demo=1 in /etc/koha.conf)
$flags->{'superlibrarian'}=1;
}
return $flags if $flags->{superlibrarian};
Index: C4/Output.pm
===================================================================
RCS file: /sources/koha/koha/C4/Output.pm,v
retrieving revision 1.51.2.2
retrieving revision 1.51.2.2.2.1
diff -u -b -r1.51.2.2 -r1.51.2.2.2.1
--- C4/Output.pm 9 Feb 2006 15:01:54 -0000 1.51.2.2
+++ C4/Output.pm 3 Aug 2006 05:25:41 -0000 1.51.2.2.2.1
@@ -1,6 +1,6 @@
package C4::Output;
-# $Id: Output.pm,v 1.51.2.2 2006/02/09 15:01:54 kados Exp $
+# $Id: Output.pm,v 1.51.2.2.2.1 2006/08/03 05:25:41 kados Exp $
#package to deal with marking up output
#You will need to edit parts of this pm
@@ -62,7 +62,7 @@
# FIXME - POD
sub gettemplate {
my ($tmplbase, $opac, $query) = @_;
-if (!$query){
+ if (!$query){
warn "no query in gettemplate";
}
my $htdocs;
Index: C4/Reserves2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.38
retrieving revision 1.38.4.1
diff -u -b -r1.38 -r1.38.4.1
--- C4/Reserves2.pm 15 Dec 2004 10:47:09 -0000 1.38
+++ C4/Reserves2.pm 3 Aug 2006 05:25:41 -0000 1.38.4.1
@@ -3,7 +3,7 @@
package C4::Reserves2;
-# $Id: Reserves2.pm,v 1.38 2004/12/15 10:47:09 tipaul Exp $
+# $Id: Reserves2.pm,v 1.38.4.1 2006/08/03 05:25:41 kados Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -524,7 +524,7 @@
(borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding)
values
(?,?,now(),?,?,'Res',?)");
- $usth->execute($borrnum,$nextacctno,$fee,'Reserve Charge - $title',$fee);
+ $usth->execute($borrnum,$nextacctno,$fee,'Reserve Charge -'.$title,$fee);
$usth->finish;
}
#if ($const eq 'a'){
Index: C4/Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.99.2.11.2.15
retrieving revision 1.99.2.11.2.16
diff -u -b -r1.99.2.11.2.15 -r1.99.2.11.2.16
--- C4/Search.pm 28 Jul 2006 14:22:27 -0000 1.99.2.11.2.15
+++ C4/Search.pm 3 Aug 2006 05:25:41 -0000 1.99.2.11.2.16
@@ -35,7 +35,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.99.2.11.2.15 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.99.2.11.2.16 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -4389,7 +4389,7 @@
# add spans to search term in results
foreach my $term (@span_terms) {
if (length($term) > 3) {
- $term =~ s/.*=//g;
+ $term =~ s/(.*=|\)|\))//g;
$oldbiblio->{'title'} =~ s/$term/<span class=term>$term<\/span>/gi;
$oldbiblio->{'subtitle'} =~ s/$term/<span class=term>$term<\/span>/gi;
$oldbiblio->{'author'} =~ s/$term/<span class=term>$term<\/span>/gi;
@@ -4494,6 +4494,7 @@
}
return @newresults;
}
+
END { } # module clean-up code here (global destructor)
1;
Index: C4/Circulation/Fines.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Fines.pm,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.2.2.1
diff -u -b -r1.9.2.2 -r1.9.2.2.2.1
--- C4/Circulation/Fines.pm 5 Oct 2005 09:46:36 -0000 1.9.2.2
+++ C4/Circulation/Fines.pm 3 Aug 2006 05:25:41 -0000 1.9.2.2.2.1
@@ -1,6 +1,6 @@
package C4::Circulation::Fines;
-# $Id: Fines.pm,v 1.9.2.2 2005/10/05 09:46:36 tipaul Exp $
+# $Id: Fines.pm,v 1.9.2.2.2.1 2006/08/03 05:25:41 kados Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -238,6 +238,24 @@
# account type has one of several values, but what does this _mean_?
# Does it look up existing fines for this item?
# FIXME - What are these various account types? ("FU", "O", "F", "M")
+ # + # L : Lost Item
+ # + # LR : Lost and Replaced ?
+ # + # F : Fine
+ # + # FU : Fine Updated
+ # + # FN :
+ # + # O : Overdue ?
+ # + # A : Account Management Fee
+ # + # N : New Card
+ # + # M : Sundry
+ # + # REF : Cash Refund
+ # + # Rep : Replaced ?
+ # + # Res :
+ # + # Rent : Rental
+ # + # C : Credit
+ # + # CR : Credit for Returned book ?
+ # + # F : Forgiven
+ # + # Pay : Payment
+ # + # W : Write Off
my $sth=$dbh->prepare("Select * from accountlines where itemnumber=? and
borrowernumber=? and (accounttype='FU' or accounttype='O' or
accounttype='F' or accounttype='M') and description like ?");
Index: koha-tmpl/intranet-tmpl/npl/en/authorities/auth_finder.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/auth_finder.tmpl,v
retrieving revision 1.1.2.4.2.1
retrieving revision 1.1.2.4.2.2
diff -u -b -r1.1.2.4.2.1 -r1.1.2.4.2.2
--- koha-tmpl/intranet-tmpl/npl/en/authorities/auth_finder.tmpl 28 May 2006 18:49:12 -0000 1.1.2.4.2.1
+++ koha-tmpl/intranet-tmpl/npl/en/authorities/auth_finder.tmpl 3 Aug 2006 05:25:42 -0000 1.1.2.4.2.2
@@ -1,53 +1,61 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
-
-
-<div id="main">
+<div id="main-compact">
<h1>Authority search</h1>
-<form name="f" method="post">
- <input type="hidden" name="nonav" value="<!-- TMPL_VAR NAME="nonav" -->">
- <input type="hidden" name="op" value="do_search">
- <input type="hidden" name="type" value="author">
- <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
- <div id="bloc25">
- <h2 class="authority">Search on</h2>
+<form name="f" action="/cgi-bin/koha/authorities/auth_finder.pl" method="post">
+ <input type="hidden" name="op" value="do_search" />
+ <input type="hidden" name="type" value="intranet" />
+ <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
+ <div class="details">
+ <h2>Search on</h2>
<p>
- <label class="label100">Authority type</label>
+ <label for="authtypecode">Authority type</label>
<!-- TMPL_VAR NAME="authtypecode" -->
- <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
+ <input type="hidden" id="authtypecode" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
</p>
<p>
- <label class="label100">Main heading(a)</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
- <input type="hidden" name="marclist" value="mainentry">
- <input type="hidden" name="and_or" value="and">
- <input type="hidden" name="excluding" value="">
- <select name="operator">
- <option value="all">All words</option>
- <option value="phrase">Phrase</option>
+ <label for="mainentryaoperator">Main entry ($a only)</label>
+ <select name="operator" id="mainentryaoperator">
+ <option value="contains">contains</option>
+ <option value="start">start by</option>
</select>
- <input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+ <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
+ <input type="hidden" name="marclist" value="$a" />
+ <input type="hidden" name="and_or" value="and" />
+ <input type="hidden" name="excluding" value="" />
</p>
<p>
- <label class="label100">Sub heading</label><input type="text" name="value">
- <input type="hidden" name="marclist" value="">
- <input type="hidden" name="and_or" value="and">
- <input type="hidden" name="excluding" value="">
- <select name="operator">
- <option value="all">All words</option>
- <option value="phrase">Phrase</option>
+ <label for="mainentryoperator">Main entry</label>
+ <select name="operator" id="mainentryoperator">
+ <option value="contains">contains</option>
+ <option value="start">start by</option>
</select>
- <input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+ <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
+ <input type="hidden" name="marclist" value="mainentry" />
+ <input type="hidden" name="and_or" value="and" />
+ <input type="hidden" name="excluding" value="" />
</p>
<p>
- <input type="submit" value="Start search" class="button authority">
+ <label for="anywhereoperator">Anywhere</label>
+ <select name="operator" id="">
+ <option value="contains">contains</option>
+ <option value="start">start by</option>
+ </select>
+ <input type="text" name="value">
+ <input type="hidden" name="marclist" value="" />
+ <input type="hidden" name="and_or" value="and" />
+ <input type="hidden" name="excluding" value="" />
+ <input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->" />
+ <input type="hidden" name="tagid" value="<!-- TMPL_VAR NAME="tagid" -->" />
+ </p>
+ <p>(add % at the end of your word if you want to use right-truncation : theor% will find theory & theories)</p>
+ <p>
+ <input type="submit" value="Start search" class="submit" />
</p>
</div>
</form>
</div>
-
-
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: koha-tmpl/intranet-tmpl/npl/en/authorities/authorities-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities-home.tmpl,v
retrieving revision 1.1.2.6.2.1
retrieving revision 1.1.2.6.2.2
diff -u -b -r1.1.2.6.2.1 -r1.1.2.6.2.2
--- koha-tmpl/intranet-tmpl/npl/en/authorities/authorities-home.tmpl 28 May 2006 18:49:12 -0000 1.1.2.6.2.1
+++ koha-tmpl/intranet-tmpl/npl/en/authorities/authorities-home.tmpl 3 Aug 2006 05:25:42 -0000 1.1.2.6.2.2
@@ -1,46 +1,82 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
+ <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities Home
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
<div id="main">
-<form name="f" method="post">
+<h1>Authority search</h1>
+
+<form name="f" action="/cgi-bin/koha/authorities/auth_finder.pl" method="post">
<input type="hidden" name="op" value="do_search" />
<input type="hidden" name="type" value="intranet" />
- <input type="hidden" name="stype" value="author" />
<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
-<div class="data"><table>
-<caption>Authority search</caption>
-<tr><th><label for="authtypecode">Authority type</label></th><td><select id="authtypecode" name="authtypecode" >
+ <div class="details">
+ <h2>Search For:
+ <select name="authtypecode">
<!-- TMPL_LOOP NAME="authtypesloop" -->
- <option value="<!-- TMPL_VAR NAME="value" -->" >
+ <option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected="selected"<!-- /TMPL_IF -->>
<!-- TMPL_VAR NAME="authtypetext" -->
</option>
<!-- /TMPL_LOOP -->
- </select></td></tr>
-<tr><th><label id="mainentry">Main entry</label></th><td><select name="operator" id="mainentry">
- <option value="all">All words</option>
- <option value="phrase">Phrase</option>
- </select> <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
+ </select>
+ </h2>
+ <p>
+ <label for="mainentryaoperator">Main entry ($a only)</label>
+ <select name="operator" id="mainentryaoperator">
+ <option value="contains">contains</option>
+ <option value="start">start by</option>
+ </select>
+ <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
+ <input type="hidden" name="marclist" value="$a" />
+ <input type="hidden" name="and_or" value="and" />
+ <input type="hidden" name="excluding" value="" />
+ </p>
+ <p>
+ <label for="mainentryoperator">Main entry</label>
+ <select name="operator" id="mainentryoperator">
+ <option value="contains">contains</option>
+ <option value="start">start by</option>
+ </select>
+ <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
<input type="hidden" name="marclist" value="mainentry" />
<input type="hidden" name="and_or" value="and" />
<input type="hidden" name="excluding" value="" />
- </td></tr>
-<tr><th><label for="anywhere">Anywhere</label></th><td><select name="operator" id="anywhere">
- <option value="all">All words</option>
- <option value="phrase">Phrase</option>
- </select> <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
- <input type="hidden" name="marclist" value="">
- <input type="hidden" name="and_or" value="and">
- <input type="hidden" name="excluding" value="">
- </td></tr></table></div>
+ </p>
<p>
- <input type="submit" value="Start search" class="submit">
+ <label for="anywhereoperator">Anywhere</label>
+ <select name="operator" id="">
+ <option value="contains">contains</option>
+ <option value="start">start by</option>
+ </select>
+ <input type="text" name="value">
+ <input type="hidden" name="marclist" value="" />
+ <input type="hidden" name="and_or" value="and" />
+ <input type="hidden" name="excluding" value="" />
+ <input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->" />
+ <input type="hidden" name="tagid" value="<!-- TMPL_VAR NAME="tagid" -->" />
+ </p>
+ <p>(add % at the end of your word if you want to use right-truncation : theor% will find theory & theories)</p>
+ <p>
+ <input type="submit" value="Start search" class="submit" />
+ </p>
+ </div>
+</form>
+<div class="details">
+<h2>Add authority</h2>
+<form name="f2" method="post" action="authorities.pl">
+ <p><label for="authtypecode">Authority type</label>
+ <select name="authtypecode" id="authtypecode">
+ <!-- TMPL_LOOP name="authtypesloop" -->
+ <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+ <!-- TMPL_VAR name="authtypetext" -->
+ </option>
+ <!-- /TMPL_LOOP -->
+ </select>
+ <input type="submit" value="Add" class="submit">
</p>
</form>
</div>
+</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: koha-tmpl/intranet-tmpl/npl/en/authorities/blinddetail-biblio-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/blinddetail-biblio-search.tmpl,v
retrieving revision 1.1.2.3.2.1
retrieving revision 1.1.2.3.2.2
diff -u -b -r1.1.2.3.2.1 -r1.1.2.3.2.2
--- koha-tmpl/intranet-tmpl/npl/en/authorities/blinddetail-biblio-search.tmpl 28 May 2006 18:49:12 -0000 1.1.2.3.2.1
+++ koha-tmpl/intranet-tmpl/npl/en/authorities/blinddetail-biblio-search.tmpl 3 Aug 2006 05:25:42 -0000 1.1.2.3.2.2
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<body>
<script language="JavaScript" type="text/javascript">
@@ -10,9 +9,9 @@
var whichfield = opener.opener.document.f.tag[index_start].value;
i=index_start
// go forward, until reaching the end of the field.
-while (i<=opener.opener.document.f.field_value.length) {
+while (i<opener.opener.document.f.field_value.length) {
if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '9') {
- opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="authid">";
+ opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="authid" -->";
}
<!-- TMPL_LOOP NAME="0XX" -->
<!-- TMPL_LOOP NAME="subfield" -->
Index: koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist-auth.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.1.2.6.2.1
retrieving revision 1.1.2.6.2.2
diff -u -b -r1.1.2.6.2.1 -r1.1.2.6.2.2
--- koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist-auth.tmpl 28 May 2006 18:49:12 -0000 1.1.2.6.2.1
+++ koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist-auth.tmpl 3 Aug 2006 05:25:42 -0000 1.1.2.6.2.2
@@ -1,27 +1,77 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
+<div id="main-compact">
+ <h1>Authority search results</h1>
+ <div class="details">
+ <form name="f" action="/cgi-bin/koha/authorities/auth_finder.pl" method="post">
+ <input type="hidden" name="op" value="do_search" />
+ <input type="hidden" name="type" value="intranet" />
+ <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
+ <div class="details">
+ <h2>Search on</h2>
+ <p>
+ <label for="authtypecode">Authority type</label>
+ <!-- TMPL_VAR NAME="authtypecode" -->
+ <input type="hidden" id="authtypecode" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+ </p>
+ <p>
+ <label for="mainentryaoperator">Main entry ($a only)</label>
+ <select name="operator" id="mainentryaoperator">
+ <option value="contains">contains</option>
+ <option value="start">start by</option>
+ </select>
+ <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
+ <input type="hidden" name="marclist" value="$a" />
+ <input type="hidden" name="and_or" value="and" />
+ <input type="hidden" name="excluding" value="" />
+ </p>
+ <p>
+ <label for="mainentryoperator">Main entry</label>
+ <select name="operator" id="mainentryoperator">
+ <option value="contains">contains</option>
+ <option value="start">start by</option>
+ </select>
+ <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
+ <input type="hidden" name="marclist" value="mainentry" />
+ <input type="hidden" name="and_or" value="and" />
+ <input type="hidden" name="excluding" value="" />
+ </p>
+ <p>
+ <label for="anywhereoperator">Anywhere</label>
+ <select name="operator" id="">
+ <option value="contains">contains</option>
+ <option value="start">start by</option>
+ </select>
+ <input type="text" name="value">
+ <input type="hidden" name="marclist" value="" />
+ <input type="hidden" name="and_or" value="and" />
+ <input type="hidden" name="excluding" value="" />
+ <input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->" />
+ <input type="hidden" name="tagid" value="<!-- TMPL_VAR NAME="tagid" -->" />
+ </p>
+ <p>(add % at the end of your word if you want to use right-truncation : theor% will find theory & theories)</p>
+ <p>
+ <input type="submit" value="Start search" class="submit" />
+ </p>
+ </div>
+</form>
+ </div>
-<div id="main">
- <h1 class="authority">Authority search results</h1>
- <div id="resultnumber">
+ <div class="results">
<p>
<!-- TMPL_IF name="displayprev" -->
- <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&&authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
- <img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
- </a>
+ <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&&authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->"><<Prev</a>
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="numbers" -->
<!-- TMPL_IF name="highlight" -->
- <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
+ <span class="highlight"><!-- TMPL_VAR NAME="number" --></span>
<!-- TMPL_ELSE -->
- <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
- <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
+ <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->"><!-- TMPL_VAR NAME="number" --></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF name="displaynext" -->
- <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&&authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
- <img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
+ <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&&authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
+ Next >></a>
<!-- /TMPL_IF -->
</p>
<p>
@@ -35,61 +85,48 @@
<div id="resultlist">
<table>
<tr>
- <th class="authority">Summary</th>
- <th class="authority">Used</th>
- <th class="authority">Get It!</th>
- <th class="authority">Edit It!</th>
+ <th width="80%">Authorized Headings</th>
+ <th width="10%"># of Records</th>
+ <th width="10%">Full Authorized Heading</th>
</tr>
<tr>
- <td>Clear any entry</td>
+ <td> </td>
<td> </td>
<td>
- <a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=0&index=<!-- TMPL_VAR NAME="index" -->')" class="button authority">
- Clear
- </a>
+ <a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=0&index=<!-- TMPL_VAR NAME="index" -->&tagid=<!-- TMPL_VAR NAME="tagid" -->')" class="button authority">Clear</a>
</td>
<!-- TMPL_LOOP NAME="result" -->
<tr>
<td><!-- TMPL_VAR NAME="summary" --></td>
- <td><!-- TMPL_VAR NAME="used" --> times</td>
<td>
- <a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=<!-- TMPL_VAR NAME="authid" -->&index=<!-- TMPL_VAR NAME="index" -->')"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/arrow.gif" width="16" height="16" hspace="0" vspace="0" border="0"></a>
+ <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR NAME=authid -->">View Full Heading</a>
</td>
- <td> <a href="/cgi-bin/koha/authorities/authorities.pl?nonav=<!-- TMPL_VAR NAME="nonav" -->&authid=<!-- TMPL_VAR NAME="authid" -->&index=<!-- TMPL_VAR NAME="index" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">Edit<a/></td>
</tr>
<!-- /TMPL_LOOP -->
</table>
</div>
- <div id="resultnumber">
- <p>
+ <div class="results">
<!-- TMPL_IF name="displayprev" -->
- <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&&authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
- <img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
- </a>
+ <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" -->&op=do_search&type=intranet"><< Prev</a>
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="numbers" -->
<!-- TMPL_IF name="highlight" -->
- <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
+ <span class="highlight"><!-- TMPL_VAR NAME="number" --></span>
<!-- TMPL_ELSE -->
- <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
- <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
+ <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" -->&op=do_search&type=intranet"><!-- TMPL_VAR NAME="number" --></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF name="displaynext" -->
- <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&&authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
- <img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
+ <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" -->&op=do_search&type=intranet">Next >></a>
<!-- /TMPL_IF -->
- </p>
- </div><a href="auth_finder.pl?index=<!-- TMPL_VAR NAME="index" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">Search again</a>
- </div>
</div>
<script language="JavaScript" type="text/javascript">
function jumpfull(page)
{
- window.open(page,'','');
+ window.open(page,'','width=10,height=10');
}
</script>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist.tmpl,v
retrieving revision 1.1.2.3.2.1
retrieving revision 1.1.2.3.2.2
diff -u -b -r1.1.2.3.2.1 -r1.1.2.3.2.2
--- koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist.tmpl 28 May 2006 18:49:12 -0000 1.1.2.3.2.1
+++ koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist.tmpl 3 Aug 2006 05:25:42 -0000 1.1.2.3.2.2
@@ -1,60 +1,61 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities Search Results
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
<div id="main">
- <h1 class="authority">Authority search results</h1>
- <div id="resultnumber">
- <p>
+ <h1>Authority search results</h1>
+ <div id="pages">
<!-- TMPL_IF name="displayprev" -->
- <a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&stype=author&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
- <img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
+ <a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
+ <<
</a>
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="numbers" -->
<!-- TMPL_IF name="highlight" -->
- <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
+ <span class="current"><!-- TMPL_VAR NAME="number" --></span>
<!-- TMPL_ELSE -->
- <a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&stype=author&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
- <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0">
- </a>
+ <a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->"><!-- TMPL_VAR NAME="number" --></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF name="displaynext" -->
- <a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&stype=author&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
- <img src="/intranet-tmpl/default/images/numbers/next.gif" border="0">
- </a>
+ <a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">>></a>
<!-- /TMPL_IF -->
- </p>
- <p>
+ </div>
+ <div id="results">
<!-- TMPL_IF name="total" -->
<b>Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --></b><br><br>
<!-- TMPL_ELSE -->
No results found.<br>
<!-- /TMPL_IF -->
- </p>
</div>
- <div id="resultlist">
+
+<div class="searchresults">
<table>
<tr>
- <th class="authority">Summary</th>
- <th class="authority">Used in</th>
- <th class="authority">Authid/Delete</th>
-
+ <th>Authorized Headings</th>
+ <!-- TMPL_UNLESS name="isEDITORS" -->
+ <th>Used in</th>
+ <!-- /TMPL_UNLESS -->
+ <th>View</th>
+ <th>Delete</th>
</tr>
<!-- TMPL_LOOP NAME="result" -->
<tr>
<td><!-- TMPL_VAR NAME="summary" --></td>
- <td><a href="/cgi-bin/koha/catalogue-home.pl?authtype=<!-- TMPL_VAR NAME="authtypecode" -->&authnumber=<!-- TMPL_VAR NAME="authid" --> <!-- TMPL_VAR NAME="linkid" -->&op=do_search&zoom=1&search_type=precise" class="button authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a></td>
-
- <td><!-- TMPL_VAR NAME="authid" -->
+ <!-- TMPL_UNLESS name="isEDITORS" -->
+ <td>
+ <a href="/cgi-bin/koha/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="><!-- TMPL_VAR NAME="used" --> biblio(s)</a>
+ </td>
+ <!-- /TMPL_UNLESS -->
+ <td>
+ <a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->">Edit Authority No. <!-- TMPL_VAR NAME="authid" --></a>
+ </td>
+ <td>
<!-- TMPL_UNLESS name="used" -->
- <a href="javascript:do_delete('authorities-home.pl?op=delete&authid=<!-- TMPL_VAR NAME="authid" -->')">Delete</a>
+ <a href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="authid" -->)">Delete</a>
<!-- /TMPL_UNLESS -->
</td>
-
</tr>
<!-- /TMPL_LOOP -->
</table>
@@ -62,48 +63,26 @@
<div id="resultnumber">
<p>
<!-- TMPL_IF name="displayprev" -->
- <a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&stype=author&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
- <img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
- </a>
+ <a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->"><<</a>
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="numbers" -->
- <!-- TMPL_IF name="highlight" -->
- <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
- <!-- TMPL_ELSE -->
- <a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&stype=author&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
- <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0">
- </a>
+ <!-- TMPL_IF name="highlight" --><span class="current"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE -->
+ <a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->"><!-- TMPL_VAR NAME="number" --></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF name="displaynext" -->
- <a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&stype=author&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
- <img src="/intranet-tmpl/default/images/numbers/next.gif" border="0">
- </a>
+ <a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">>></a>
<!-- /TMPL_IF -->
</p>
</div>
-<form name"m" id="m">
-
-From:<input type="text" size="10" name="mergefrom" id="mergefrom" value=""/> To:<input type="text" size="10" id="mergeto" name="mergeto" value=""/>
-<input type="button" class="submit" value="Merge" onclick="do_merge(); return false;" /></form>
-
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
<script language="JavaScript" type="text/javascript" >
-function do_delete(page)
-{
-window.location = page;
-}
-function do_merge(page)
-{
-
-X = document.forms['m'].elements['mergefrom'].value;
- Y = document.forms['m'].elements['mergeto'].value;
-var is_confirmed = confirm('Bu:'+X+' numaralı kayıtdan '+Y+' nolu kayda birleştirme yapacaksınız. Onaylıyor musunuz?');
+function confirm_deletion(id) {
+ var is_confirmed = confirm('Are you sure you want to delete this authority?');
if (is_confirmed) {
-window.location="authorities-home.pl?op=merge&mergefrom="+X+"&mergeto="+Y;
-}
+ window.location="authorities-home.pl?op=delete&authid="+id;
+ }
}
</script>
\ No newline at end of file
Index: opac/opac-addbookbybiblionumber.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-addbookbybiblionumber.pl,v
retrieving revision 1.1.2.6.2.1
retrieving revision 1.1.2.6.2.2
diff -u -b -r1.1.2.6.2.1 -r1.1.2.6.2.2
--- opac/opac-addbookbybiblionumber.pl 21 Jul 2006 17:46:48 -0000 1.1.2.6.2.1
+++ opac/opac-addbookbybiblionumber.pl 3 Aug 2006 05:25:42 -0000 1.1.2.6.2.2
@@ -2,7 +2,7 @@
#script to provide bookshelf management
# WARNING: This file uses 4-character tabs!
#
-# $Header: /sources/koha/koha/opac/opac-addbookbybiblionumber.pl,v 1.1.2.6.2.1 2006/07/21 17:46:48 kados Exp $
+# $Header: /sources/koha/koha/opac/opac-addbookbybiblionumber.pl,v 1.1.2.6.2.2 2006/08/03 05:25:42 kados Exp $
#
# Copyright 2000-2002 Katipo Communications
#
@@ -92,6 +92,9 @@
output_html_with_http_headers $query, $cookie, $template->output;
}
# $Log: opac-addbookbybiblionumber.pl,v $
+# Revision 1.1.2.6.2.2 2006/08/03 05:25:42 kados
+# sync with rel_2_2, the bugfixes I made today
+#
# Revision 1.1.2.6.2.1 2006/07/21 17:46:48 kados
# Major API cleanup. Now, for searching, we only use Search.pm, SearchMarc.pm
# is obsolete.
@@ -99,31 +102,3 @@
# Revision 1.1.2.7 2006/06/20 16:21:43 oleonard
# Adding "tabindex=''" to CGI:scrolling_lists to prevent incorrect tabbing. See Bug 1098
#
-# Revision 1.1.2.6 2006/04/27 16:23:34 oleonard
-# Hiding option to add to existing virtual shelves if there are no existing virtual shelves (thanks Chris!)
-#
-# Revision 1.1.2.5 2006/03/01 22:33:25 oleonard
-# Enabling several new system preferences: opacreadinghistory, opaccolorstylesheet, opaclanguagesdisplay, opaclayoutstylesheet, opacsmallimage
-#
-# Revision 1.1.2.4 2006/02/04 16:47:21 kados
-# Adding support for opaccredits to opac scripts
-#
-# Revision 1.1.2.3 2006/02/03 21:03:57 kados
-# Updating script for new system preference: OpacNav
-# ----------------------------------------------------------------------
-#
-# Revision 1.1.2.2 2005/03/25 17:04:27 tipaul
-# adding virtual shelves & suggestions button to the top
-#
-# Revision 1.1.2.1 2005/03/10 08:44:43 tipaul
-# bugfix in baskets :
-# * The user does not need to have to have librarian rights to use virtual shelves
-# * error when adding a biblio to an existing basket
-#
-# Revision 1.1 2005/01/03 11:09:59 tipaul
-# *** empty log message ***
-#
-
-# Local Variables:
-# tab-width: 4
-# End:
Index: opac/opac-authoritiesdetail.pl
===================================================================
RCS file: /sources/koha/koha/opac/Attic/opac-authoritiesdetail.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -u -b -r1.1.2.2 -r1.1.2.2.2.1
--- opac/opac-authoritiesdetail.pl 4 Mar 2006 06:55:13 -0000 1.1.2.2
+++ opac/opac-authoritiesdetail.pl 3 Aug 2006 05:25:42 -0000 1.1.2.2.2.1
@@ -61,7 +61,46 @@
my $authtypecode = &AUTHfind_authtypecode($dbh,$authid);
my $tagslib = &AUTHgettagslib($dbh,1,$authtypecode);
-my $record =AUTHgetauthority($dbh,$authid);
+# open template
+my ($template, $loggedinuser, $cookie)
+ = get_template_and_user({template_name => "opac-authoritiesdetail.tmpl",
+ query => $query,
+ type => "opac",
+ authnotrequired => 1,
+ debug => 1,
+ });
+
+my $record;
+if (C4::Context->preference("AuthDisplayHierarchy")){
+ my $trees=BuildUnimarcHierarchies($authid);
+# warn "trees :$trees";
+ my @trees = split /;/,$trees ;
+ push @trees,$trees unless (@trees);
+ my @loophierarchies;
+ foreach my $tree (@trees){
+# warn "tree :$tree";
+
+ my @tree=split /,/,$tree;
+ push @tree,$tree unless (@tree);
+ my $cnt=0;
+ my @loophierarchy;
+ foreach my $element (@tree){
+# warn "tree :$element";
+ my %cell;
+ my $elementdata = AUTHgetauthority($dbh,$element);
+ $record= $elementdata if ($authid==$element);
+ push @loophierarchy, BuildUnimarcHierarchy($elementdata,"child".$cnt, $authid);
+ $cnt++;
+ }
+ push @loophierarchies, { 'loopelement' =>\@loophierarchy};
+ $template->param(
+ 'displayhierarchy' =>C4::Context->preference("AuthDisplayHierarchy"),
+ 'loophierarchies' =>\@loophierarchies,
+ );
+ }
+} else {
+ $record=AUTHgetauthority($dbh,$authid);
+}
my $count = AUTHcount_usage($authid);
# find the marc field/subfield used in biblio by this authority
@@ -73,15 +112,6 @@
}
chop $biblio_fields;
-# open template
-my ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "opac-authoritiesdetail.tmpl",
- query => $query,
- type => "opac",
- authnotrequired => 1,
- debug => 1,
- });
-
# fill arrays
my @loop_data =();
my $tag;
Index: opac/opac-detail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.14.2.19.2.1
retrieving revision 1.14.2.19.2.2
diff -u -b -r1.14.2.19.2.1 -r1.14.2.19.2.2
--- opac/opac-detail.pl 21 Jul 2006 17:46:48 -0000 1.14.2.19.2.1
+++ opac/opac-detail.pl 3 Aug 2006 05:25:42 -0000 1.14.2.19.2.2
@@ -51,7 +51,7 @@
my $norequests = 1;
foreach my $itm (@items) {
- $norequests = 0 unless (($itm->{'wthdrawn'}) || ($itm->{'itemlost'}) || ($itm->{'notforloan'})|| ($itm->{'itemnotforloan'}) ||(!$itm->{'itemnumber'}));
+ $norequests = 0 unless (($itm->{'wthdrawn'}) || ($itm->{'itemlost'}) || ($itm->{'notforloan'} > 0)|| ($itm->{'itemnotforloan'} > 0) ||(!$itm->{'itemnumber'}));
$itm->{$itm->{'publictype'}} = 1;
}
Index: opac/opac-dictionary.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-dictionary.pl,v
retrieving revision 1.1.2.3.2.1
retrieving revision 1.1.2.3.2.2
diff -u -b -r1.1.2.3.2.1 -r1.1.2.3.2.2
--- opac/opac-dictionary.pl 21 Jul 2006 17:46:48 -0000 1.1.2.3.2.1
+++ opac/opac-dictionary.pl 3 Aug 2006 05:25:42 -0000 1.1.2.3.2.2
@@ -105,11 +105,11 @@
}
$listtags =~s/,$/)/;
$strsth .= $listtags." and marc_word.tagsubfield=concat(marc_subfield_table.tag,marc_subfield_table.subfieldcode) group by subfieldvalue ";
-# warn "search in biblio : ".$strsth;
+ warn "search in biblio : ".$strsth;
my $value = uc($search[0]);
$value=~s/\*/%/g;
- $value.= "%" if not($value=~m/%/);
-# warn " texte : ".$value;
+# $value.= "%" if not($value=~m/%/);
+ warn " texte : ".$value;
$sth=$dbh->prepare($strsth);
$sth->execute($value);
@@ -145,10 +145,12 @@
my @authresults;
my $authnbresults;
while ((my $authtypecode) = $sth->fetchrow) {
+ warn "AUTH search $authtypecode";
my ($curauthresults,$nbresults) = authoritysearch($dbh,[''],[''],[''],['contains'],
\@search,$startfrom*$resultsperpage, $resultsperpage,$authtypecode);
push @authresults, @$curauthresults;
$authnbresults+=$nbresults;
+ warn "AUTH SEARCH DONE";
# warn "auth : $authtypecode nbauthresults : $nbresults";
}
Index: opac/opac-userupdate.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-userupdate.pl,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.5.2.1
diff -u -b -r1.11.2.5 -r1.11.2.5.2.1
--- opac/opac-userupdate.pl 8 Mar 2006 13:46:55 -0000 1.11.2.5
+++ opac/opac-userupdate.pl 3 Aug 2006 05:25:42 -0000 1.11.2.5.2.1
@@ -29,7 +29,7 @@
# handle the new information....
# collect the form values and send an email.
-my @fields = ('title', 'surname', 'firstname', 'phone', 'faxnumber', 'streetaddress', 'emailaddress', 'city');
+my @fields = ('title', 'surname', 'firstname', 'phone', 'faxnumber', 'physstreet', 'streetaddress', 'emailaddress', 'city');
my $update;
my $updateemailaddress= C4::Context->preference('KohaAdminEmailAddress');
if ($updateemailaddress eq '') {
More information about the Koha-cvs
mailing list