[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha C4/Auth.pm C4/AuthoritiesMarc.pm catalogui...
|
From: |
paul poulain |
|
Subject: |
[Koha-cvs] koha C4/Auth.pm C4/AuthoritiesMarc.pm catalogui... |
|
Date: |
Wed, 06 Jun 2007 13:08:36 +0000 |
CVSROOT: /sources/koha
Module name: koha
Changes by: paul poulain <tipaul> 07/06/06 13:08:36
Modified files:
C4 : Auth.pm AuthoritiesMarc.pm
cataloguing : addbooks.pl
cataloguing/value_builder: unimarc_leader.pl
koha-tmpl/intranet-tmpl/prog/en/authorities: authorities.tmpl
koha-tmpl/intranet-tmpl/prog/en/catalogue: results.tmpl
koha-tmpl/intranet-tmpl/prog/en/cataloguing: addbooks.tmpl
koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder:
unimarc_field_100.tmpl
koha-tmpl/intranet-tmpl/prog/en/includes: intranet2.css
menus.inc
misc/migration_tools: rebuild_zebra.pl
misc/zebra : sort-string-utf_french.chr
Log message:
bugfixes (various), handling utf-8 without guessencoding (as suggested
by joshua, fixing some zebra config files -for french but should be interesting
for other languages-
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth.pm?cvsroot=koha&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/koha/C4/AuthoritiesMarc.pm?cvsroot=koha&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbooks.pl?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/value_builder/unimarc_leader.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc?cvsroot=koha&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/koha/misc/migration_tools/rebuild_zebra.pl?cvsroot=koha&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/koha/misc/zebra/sort-string-utf_french.chr?cvsroot=koha&r1=1.3&r2=1.4
Patches:
Index: C4/Auth.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth.pm,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- C4/Auth.pm 5 Jun 2007 08:53:19 -0000 1.62
+++ C4/Auth.pm 6 Jun 2007 13:08:35 -0000 1.63
@@ -36,7 +36,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.62 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.63 $' =~ /\d+/g;
shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
};
Index: C4/AuthoritiesMarc.pm
===================================================================
RCS file: /sources/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- C4/AuthoritiesMarc.pm 10 May 2007 14:45:15 -0000 1.46
+++ C4/AuthoritiesMarc.pm 6 Jun 2007 13:08:35 -0000 1.47
@@ -502,16 +502,16 @@
$record->add_fields('152','','','b'=>$authtypecode) unless
$record->field('152');
# 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=$dbh->prepare("insert into auth_header
(authid,datecreated,authtypecode,marc,marcxml) values (?,now(),?,?,?)");
+ $sth->execute($authid,$authtypecode,$record->as_usmarc,$record->as_xml);
$sth->finish;
}else{
$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'));
$dbh->do("lock tables auth_header WRITE");
- my $sth=$dbh->prepare("update auth_header set marc=? where authid=?");
- $sth->execute($record->as_usmarc,$authid);
+ my $sth=$dbh->prepare("update auth_header set marc=?,marcxml=? where
authid=?");
+ $sth->execute($record->as_usmarc,$record->as_xml,$authid);
$sth->finish;
}
$dbh->do("unlock tables");
@@ -1155,8 +1155,11 @@
=cut
-# $Id: AuthoritiesMarc.pm,v 1.46 2007/05/10 14:45:15 tipaul Exp $
+# $Id: AuthoritiesMarc.pm,v 1.47 2007/06/06 13:08:35 tipaul Exp $
# $Log: AuthoritiesMarc.pm,v $
+# Revision 1.47 2007/06/06 13:08:35 tipaul
+# bugfixes (various), handling utf-8 without guessencoding (as suggested by
joshua, fixing some zebra config files -for french but should be interesting
for other languages-
+#
# Revision 1.46 2007/05/10 14:45:15 tipaul
# Koha NoZebra :
# - support for authorities
Index: cataloguing/addbooks.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/addbooks.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- cataloguing/addbooks.pl 22 May 2007 13:39:26 -0000 1.11
+++ cataloguing/addbooks.pl 6 Jun 2007 13:08:35 -0000 1.12
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: addbooks.pl,v 1.11 2007/05/22 13:39:26 btoumi Exp $
+# $Id: addbooks.pl,v 1.12 2007/06/06 13:08:35 tipaul Exp $
#
# Modified address@hidden 12:00 01 April 2001
@@ -71,6 +71,7 @@
# Searching the catalog.
if($query) {
+ # find results
my ($error, $marcresults) = SimpleSearch($query);
if (defined $error) {
@@ -79,38 +80,13 @@
output_html_with_http_headers $input, $cookie, $template->output;
exit;
}
-
+ # format output
my $total = scalar @$marcresults;
- my @results;
-
- for(my $i=0;$i<$total;$i++) {
- my %resultsloop;
- my $marcrecord = MARC::File::USMARC::decode($marcresults->[$i]);
- my $biblio = TransformMarcToKoha(C4::Context->dbh,$marcrecord,'');
-
- #hilight the result
- $biblio->{'title'} =~ s/$query/<span class=term>$&<\/span>/gi;
- $biblio->{'subtitle'} =~ s/$query/<span class=term>$&<\/span>/gi;
- $biblio->{'biblionumber'} =~ s/$query/<span class=term>$&<\/span>/gi;
- $biblio->{'author'} =~ s/$query/<span class=term>$&<\/span>/gi;
- $biblio->{'publishercode'} =~ s/$query/<span class=term>$&<\/span>/gi;
- $biblio->{'publicationyear'} =~ s/$query/<span
class=term>$&<\/span>/gi;
-
- #build the hash for the template.
- $resultsloop{highlight} = ($i % 2)?(1):(0);
- $resultsloop{title} = $biblio->{'title'};
- $resultsloop{subtitle} = $biblio->{'subtitle'};
- $resultsloop{biblionumber} = $biblio->{'biblionumber'};
- $resultsloop{author} = $biblio->{'author'};
- $resultsloop{publishercode} = $biblio->{'publishercode'};
- $resultsloop{publicationyear} = $biblio->{'publicationyear'};
-
- push @results, \%resultsloop;
- }
+ my @newresults = searchResults($query, $total, $total , 0, @$marcresults);
$template->param(
total => $total,
query => $query,
- resultsloop => address@hidden,
+ resultsloop => address@hidden,
);
}
Index: cataloguing/value_builder/unimarc_leader.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/value_builder/unimarc_leader.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- cataloguing/value_builder/unimarc_leader.pl 5 Jun 2007 08:38:41 -0000
1.4
+++ cataloguing/value_builder/unimarc_leader.pl 6 Jun 2007 13:08:35 -0000
1.5
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: unimarc_leader.pl,v 1.4 2007/06/05 08:38:41 tipaul Exp $
+# $Id: unimarc_leader.pl,v 1.5 2007/06/06 13:08:35 tipaul Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -47,6 +47,9 @@
}
function Blur$function_name(subfield_managed) {
+ if (document.forms['f'].field_value[subfield_managed].value.length != 24) {
+ alert('leader has an incorrect size: ' +
document.forms['f'].field_value[subfield_managed].value.length + ' instead of
24 chars');
+ }
return 1;
}
Index: koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl 29 May
2007 16:36:12 -0000 1.6
+++ koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl 6 Jun
2007 13:08:35 -0000 1.7
@@ -55,13 +55,14 @@
<!-- /TMPL_IF -->
<div>
<!-- TMPL_LOOP NAME="subfield_loop" -->
+ <p class="subfield">
<!-- TMPL_IF NAME="visibility" -->
<a tabindex="1" style="color: grey; font-size: 80%; cursor:
se-resize;" id="label<!-- TMPL_VAR name="index" -->"
onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR
name="index" -->','label<!-- TMPL_VAR name="index" -->')">
<!-- TMPL_VAR NAME="subfield" -->
</a>
<!-- /TMPL_IF -->
- <p class="subfield">
<div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!--
TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->">
+ <p>
<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
<label <!-- TMPL_IF NAME="fixedfield" -->
style="display:none;" <!-- /TMPL_IF --> class="labelsubfield">
<!-- /TMPL_UNLESS -->
Index: koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl 29 May 2007
16:36:12 -0000 1.7
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl 6 Jun 2007
13:08:35 -0000 1.8
@@ -220,17 +220,17 @@
<p>
<!-- TMPL_IF name="BiblioDefaultViewmarc"
-->
<a class="title"
href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->">
- <!-- TMPL_VAR NAME="title" -->
<!-- TMPL_VAR NAME="subtitle" -->
- </a>
+ <!-- TMPL_VAR NAME="title" -->
+ </a> <!-- TMPL_VAR NAME="subtitle" -->
<!-- TMPL_ELSE -->
<!-- TMPL_IF
name="BiblioDefaultViewisbd" -->
<a class="title"
href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->">
- <!-- TMPL_VAR NAME="title" -->
<!-- TMPL_VAR NAME="subtitle" -->
- </a>
+ <!-- TMPL_VAR NAME="title" -->
+ </a> <!-- TMPL_VAR NAME="subtitle"
-->
<!-- TMPL_ELSE -->
<a class="title"
href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->">
- <!-- TMPL_VAR NAME="title" -->
<!-- TMPL_VAR NAME="subtitle" -->
- </a>
+ <!-- TMPL_VAR NAME="title" -->
+ </a> <!-- TMPL_VAR NAME="subtitle"
-->
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
</p>
Index: koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl 29 Mar 2007
13:30:32 -0000 1.6
+++ koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl 6 Jun 2007
13:08:36 -0000 1.7
@@ -51,13 +51,19 @@
<table>
<tr>
<th>Title</th>
+ <th>Location</th>
+ <th> </th>
</tr>
<!-- TMPL_LOOP NAME="resultsloop" -->
+ <!-- TMPL_IF name="even" -->
+ <tr class="highlight">
+ <!-- TMPL_ELSE -->
<tr>
+ <!-- /TMPL_IF -->
<td>
- <a
href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->">
+ <p>
<!-- TMPL_VAR NAME="title" -->
- </a>
+ <!-- TMPL_VAR NAME="subtitle" -->
<!-- TMPL_IF name="summary" -->
<p><!-- TMPL_VAR name="summary" --></p>
<!-- TMPL_ELSE -->
@@ -76,7 +82,36 @@
<!-- TMPL_IF name="timestamp" --> <i>(modified on <!--
TMPL_VAR name="timestamp" -->)</i><!-- /TMPL_IF -->
</p>
<!-- /TMPL_IF -->
-</tr>
+ </td>
+ <td>
+ <!-- TMPL_IF NAME="items_loop" -->
+ <span class="available">
+ <!-- TMPL_LOOP NAME="items_loop" -->
+ <!-- TMPL_VAR NAME="count" --> <!-- TMPL_VAR
NAME="branchname" -->
+ <i>
+ <!-- TMPL_IF name="location" --><!-- TMPL_VAR
name="location" --><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="itemcallnumber" --><!-- TMPL_VAR
name="itemcallnumber" --><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="classification" -->
+ <a
href="/cgi-bin/koha/catalogue/search.pl?q=callnum:<!-- TMPL_VAR
NAME="classification" ESCAPE="URL" -->">
+ <!-- TMPL_VAR NAME="classification" -->
+ </a>
+ <!-- /TMPL_IF -->
+ </i>
+ <br />
+ <!-- /TMPL_LOOP -->
+ </span>
+ <!-- /TMPL_IF -->
+ <span class="unavailable">
+ <!-- TMPL_IF NAME="onloancount" --> On loan (<!--
TMPL_VAR NAME="onloancount" -->),<br /> <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="wthdrawncount" --> Withdrawn (<!--
TMPL_VAR NAME="wthdrawncount" -->),<br /> <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="itemlostcount" --> Lost (<!--
TMPL_VAR NAME="itemlostcount" -->)<br /><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="orderedcount" --> On order (<!--
TMPL_VAR NAME="orderedcount" -->)<!-- /TMPL_IF -->
+ </span>
+ </td>
+ <td>
+ <a
href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->">Edit biblio</a>
+ </td>
+ </tr>
<!-- /TMPL_LOOP -->
</table>
</div>
Index:
koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
---
koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl
5 Jun 2007 08:38:42 -0000 1.4
+++
koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl
6 Jun 2007 13:08:36 -0000 1.5
@@ -700,42 +700,42 @@
var fields = doc.f.field_value;
var NbFields = fields.length;
- GetPublicationDate(); // running directly.
-
- /**
- * GetPublicationDate.
- * This function get the publication date if it's writen on 210d
- */
- function GetPublicationDate() {
- var PublicationDate = null;
-
- for (i=0 ; i<NbFields ; i++) {
- if (doc.f.tag[i].value == '210' && doc.f.subfield[i].value == 'd')
{
- if (doc.f.field_value[i].value != ""){
- PublicationDate = doc.f.field_value[i].value;
- document.getElementById('pubdate1').value =
PublicationDate;
- }
- return;
- }
- }
- }
-
- /**
- * SetPublicationDate.
- * This function set the publication date here
- */
- function SetPublicationDate() {
- var PublicationDate = document.getElementById('pubdate1').value;
- if (PublicationDate == " " || !PublicationDate){
- return ;
- }
- for (i=0 ; i<NbFields ; i++) {
- if (doc.f.tag[i].value == '210' && doc.f.subfield[i].value == 'd')
{
- doc.f.field_value[i].value = PublicationDate;
- break;
- }
- }
- }
+// GetPublicationDate(); // running directly.
+//
+// /**
+// * GetPublicationDate.
+// * This function get the publication date if it's writen on 210d
+// */
+// function GetPublicationDate() {
+// var PublicationDate = null;
+//
+// for (i=0 ; i<NbFields ; i++) {
+// if (doc.f.tag[i].value == '210' && doc.f.subfield[i].value ==
'd') {
+// if (doc.f.field_value[i].value != ""){
+// PublicationDate = doc.f.field_value[i].value;
+// document.getElementById('pubdate1').value =
PublicationDate;
+// }
+// return;
+// }
+// }
+// }
+//
+// /**
+// * SetPublicationDate.
+// * This function set the publication date here
+// */
+// function SetPublicationDate() {
+// var PublicationDate = document.getElementById('pubdate1').value;
+// if (PublicationDate == " " || !PublicationDate){
+// return ;
+// }
+// for (i=0 ; i<NbFields ; i++) {
+// if (doc.f.tag[i].value == '210' && doc.f.subfield[i].value ==
'd') {
+// doc.f.field_value[i].value = PublicationDate;
+// break;
+// }
+// }
+// }
function report() {
@@ -756,7 +756,7 @@
document.f_pop.f2.value +document.f_pop.f3.value
+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value+document.f_pop.f12.value+document.f_pop.f13.value+document.f_pop.f14.value+document.f_pop.f15.value;
- SetPublicationDate();
+// SetPublicationDate();
self.close();
return false;
}
Index: koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css 29 May 2007
16:36:12 -0000 1.3
+++ koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css 6 Jun 2007
13:08:36 -0000 1.4
@@ -190,14 +190,22 @@
#kohalogo {
position:fixed;
left:20px;
- top:20px;
+ top:10px;
+}
+
+#kohalogo h3 {
+ padding-top:5px;
+ margin-left:0px;
+}
+#kohalogo h3 a {
+ color:white;
}
/* MAIN MENU STYLES */
#mainmenu {
display:block;
position:fixed;
font-weight : normal;
- margin-top:20px;
+ margin-top:30px;
margin-right: 5px;
padding-right: 5px;
font-size:0.9em;
Index: koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc 23 May 2007 09:55:26
-0000 1.13
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc 6 Jun 2007 13:08:36
-0000 1.14
@@ -1,11 +1,12 @@
<div id="kohalogo">
<img src="/intranet-tmpl/prog/images/koha-logo.png" height="60px"/>
+ <h3><a href="/cgi-bin/koha/mainpage.pl">Koha Staff Client</a></h3>
</div>
<div id="onlinehelp">
<a href="#"
onclick="javascript:window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes');">[?]</a>
</div>
<div id="mainmenu">
-<h3><a href="/cgi-bin/koha/mainpage.pl">Koha Staff Client</a></h3>
+
<!-- TMPL_IF NAME="CAN_user_circulate" -->
<a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
<ul>
@@ -56,13 +57,11 @@
<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
<li><a
href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
<li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
- <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
</ul>
+ <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
<!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="CAN_user_catalogue" -->
- <ul>
- <li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
- </ul>
+ <!-- TMPL_IF NAME="CAN_user_reports" -->
+ <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="CAN_user_parameters" -->
<a href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a>
Index: misc/migration_tools/rebuild_zebra.pl
===================================================================
RCS file: /sources/koha/koha/misc/migration_tools/rebuild_zebra.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- misc/migration_tools/rebuild_zebra.pl 25 May 2007 09:34:30 -0000
1.10
+++ misc/migration_tools/rebuild_zebra.pl 6 Jun 2007 13:08:36 -0000
1.11
@@ -293,6 +293,12 @@
my $record = GetAuthority($authid);
print ".";
print "\r$i" unless ($i++ %100);
+ # remove leader length, that could be wrong, it will be calculated
automatically by as_usmarc
+ # otherwise, if it's wron, zebra will fail miserabily (and never
index what is after the failing record)
+ my $leader=$record->leader;
+ substr($leader,0,5)=' ';
+ substr($leader,10,7)='22 ';
+ $record->leader(substr($leader,0,24));
print OUT $record->as_usmarc();
}
close(OUT);
@@ -475,7 +481,7 @@
open(OUT,">:utf8 ","$directory/biblios/export") or die $!;
my $dbh=C4::Context->dbh;
my $sth;
- $sth=$dbh->prepare("select biblionumber from biblioitems order by
biblionumber $limit");
+ $sth=$dbh->prepare("select biblionumber from biblioitems where
biblionumber >54000 order by biblionumber $limit");
$sth->execute();
my $i=0;
while (my ($biblionumber) = $sth->fetchrow) {
@@ -546,6 +552,12 @@
}
print ".";
print "\r$i" unless ($i++ %100);
+ # remove leader length, that could be wrong, it will be calculated
automatically by as_usmarc
+ # otherwise, if it's wron, zebra will fail miserabily (and never
index what is after the failing record)
+ my $leader=$record->leader;
+ substr($leader,0,5)=' ';
+ substr($leader,10,7)='22 ';
+ $record->leader(substr($leader,0,24));
print OUT $record->as_usmarc();
}
close(OUT);
Index: misc/zebra/sort-string-utf_french.chr
===================================================================
RCS file: /sources/koha/koha/misc/zebra/sort-string-utf_french.chr,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- misc/zebra/sort-string-utf_french.chr 25 May 2007 16:27:59 -0000
1.3
+++ misc/zebra/sort-string-utf_french.chr 6 Jun 2007 13:08:36 -0000
1.4
@@ -1,17 +1,17 @@
# Generic character map.
#
-# $Id: sort-string-utf_french.chr,v 1.3 2007/05/25 16:27:59 tipaul Exp $
+# $Id: sort-string-utf_french.chr,v 1.4 2007/06/06 13:08:36 tipaul Exp $
encoding utf-8
# Define the basic value-set. *Beware* of changing this without re-indexing
# your databases.
-lowercase {0-9}aæäåâà bcdeéêèëfghiîïjklmnoôöpqrstuüûùvwxyŷÿzø
-uppercase {0-9}AÃÃÃÃÃ
BCDEÃÃÃÃFGHIÃÃJKLMNOÃÃPQRSTUÃÃVWXYŶŸZÃ
+lowercase {0-9}aæbcdefghijklmnopqrstuvwxyzø
+uppercase {0-9}AÃBCDEFGHIJKLMNOPQRSTUVWXYZÃ
# Breaking characters
-space {\001-\040}!"#$%&'\()*+,-./:;<=>address@hidden|}~
+space {\001-\040}!"#$%&'\()*+,-/:;<=>address@hidden|}~
# Characters to be considered equivalent for searching purposes.
equivalent æä(ae)
@@ -22,16 +22,16 @@
# Supplemental mappings
-map (ä) ä
+map (ä) a
map (æ) æ
map (ø) ø
-map (å) Ã¥
-map (ö) ö
-map (Ä) Ã
+map (å) a
+map (ö) o
+map (Ä) A
map (&Aelig;) Ã
map (Ø) Ã
-map (Å) Ã
-map (Ö) Ã
+map (Å) A
+map (Ö) O
map âà áäÃÃà a
map êèéëÃÃÃà e
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha C4/Auth.pm C4/AuthoritiesMarc.pm catalogui...,
paul poulain <=