From 5dd3f0229a1872d730a7477db093707bf5595edf Mon Sep 17 00:00:00 2001 From: tipaul Date: Wed, 6 Jun 2007 13:08:35 +0000 Subject: [PATCH] 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- --- C4/Auth.pm | 2 +- C4/AuthoritiesMarc.pm | 11 ++- cataloguing/addbooks.pl | 32 +------- cataloguing/value_builder/unimarc_leader.pl | 5 +- .../prog/en/authorities/authorities.tmpl | 3 +- .../prog/en/catalogue/results.tmpl | 12 +-- .../prog/en/cataloguing/addbooks.tmpl | 49 ++++++++++-- .../value_builder/unimarc_field_100.tmpl | 74 +++++++++---------- .../prog/en/includes/intranet2.css | 12 ++- .../intranet-tmpl/prog/en/includes/menus.inc | 11 ++- misc/migration_tools/rebuild_zebra.pl | 14 +++- misc/zebra/sort-string-utf_french.chr | 20 ++--- 12 files changed, 141 insertions(+), 104 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 23f7e087bf..8a250b148f 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -260,7 +260,7 @@ sub get_template_and_user { OpacTopissue => C4::Context->preference("OpacTopissue"), OpacAuthorities => C4::Context->preference("OpacAuthorities"), OpacBrowser => C4::Context->preference("OpacBrowser"), - RequestOnOpac => C4::Context->preference("RequestOnOpac"), + RequestOnOpac => C4::Context->preference("RequestOnOpac"), reviewson => C4::Context->preference("reviewson"), hide_marc => C4::Context->preference("hide_marc"), patronimages => C4::Context->preference("patronimages"), diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm index bbde916956..3bc3fad5e1 100644 --- a/C4/AuthoritiesMarc.pm +++ b/C4/AuthoritiesMarc.pm @@ -502,16 +502,16 @@ sub AddAuthority { $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"); @@ -1157,6 +1157,9 @@ Paul POULAIN paul.poulain@free.fr # $Id$ # $Log$ +# 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 diff --git a/cataloguing/addbooks.pl b/cataloguing/addbooks.pl index 44d96c079e..1559609a31 100755 --- a/cataloguing/addbooks.pl +++ b/cataloguing/addbooks.pl @@ -71,6 +71,7 @@ foreach my $thisframeworkcode (keys %$frameworks) { # Searching the catalog. if($query) { + # find results my ($error, $marcresults) = SimpleSearch($query); if (defined $error) { @@ -79,38 +80,13 @@ if($query) { 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>/gi; - $biblio->{'subtitle'} =~ s/$query/$&<\/span>/gi; - $biblio->{'biblionumber'} =~ s/$query/$&<\/span>/gi; - $biblio->{'author'} =~ s/$query/$&<\/span>/gi; - $biblio->{'publishercode'} =~ s/$query/$&<\/span>/gi; - $biblio->{'publicationyear'} =~ s/$query/$&<\/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 => \@results, + resultsloop => \@newresults, ); } diff --git a/cataloguing/value_builder/unimarc_leader.pl b/cataloguing/value_builder/unimarc_leader.pl index 2bc93f5082..8fcb35fe79 100755 --- a/cataloguing/value_builder/unimarc_leader.pl +++ b/cataloguing/value_builder/unimarc_leader.pl @@ -47,7 +47,10 @@ return 1; } function Blur$function_name(subfield_managed) { - return 1; + 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; } function Clic$function_name(i) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl index e473b598b8..4ff89b1db9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl @@ -55,13 +55,14 @@
+

" onclick="unHideSubfield('subfield','label')"> -

+

"> - - + + "> - - + + "> - - + +

diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl index 5b2d8fb0a6..d4765a0dc6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl @@ -49,15 +49,21 @@ Results found in catalogue.
- - - - + + + + + + + + + + + + + +
Title
TitleLocation 
- "> +

- +

@@ -76,7 +82,36 @@ (modified on )

-
+ + + + + + + + + "> + + + + +
+ + + + + On loan (),
+ Withdrawn (),
+ Lost ()
+ On order () + + 		+ ">Edit biblio +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl index 206b2ec60e..1e5028fb23 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl @@ -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
[?]