From 2498992447ba36f4af2aea5df2c2b2130cbe95f0 Mon Sep 17 00:00:00 2001 From: Matthias Meusburger Date: Tue, 22 Mar 2011 10:13:12 +0100 Subject: [PATCH 1/4] Bug 5907 : MT 2538 : Using default authtypecode for authority display Signed-off-by: Julian Maurice Signed-off-by: Chris Cormack --- authorities/detail.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/authorities/detail.pl b/authorities/detail.pl index f92e04b8b3..59273c1498 100755 --- a/authorities/detail.pl +++ b/authorities/detail.pl @@ -174,7 +174,8 @@ my $authid = $query->param('authid'); -my $authtypecode = &GetAuthTypeCode($authid); +# Using default authtypecode, so all fields are seen +my $authtypecode = ''; $tagslib = &GetTagsLabels(1,$authtypecode); my $record; From 6b4512d5c40b552a45fced0f48635af355d55efa Mon Sep 17 00:00:00 2001 From: Henri-Damien LAURENT Date: Tue, 22 Mar 2011 10:59:52 +0100 Subject: [PATCH 2/4] Bug 5909 : SetUTF8Flag on any incoming data This prompts NFC normalization on adding record Therefore, any saved record will be NFC normalized Signed-off-by: Julian Maurice Signed-off-by: Chris Cormack --- C4/AuthoritiesMarc.pm | 3 ++- C4/Biblio.pm | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm index f3cc948d89..3e6ca182ae 100644 --- a/C4/AuthoritiesMarc.pm +++ b/C4/AuthoritiesMarc.pm @@ -624,6 +624,7 @@ sub AddAuthority { $f5->update($time.".0"); } + SetUTF8Flag($record); if ($format eq "MARC21") { if (!$record->leader) { $record->leader($leader); @@ -650,7 +651,7 @@ sub AddAuthority { } if (($format eq "UNIMARCAUTH") && (!$record->subfield('100','a'))){ - $record->leader(" nx j22 "); + $record->leader(" nx j22 ") unless ($record->leader()); my $date=POSIX::strftime("%Y%m%d",localtime); if ($record->field('100')){ $record->field('100')->update('a'=>$date."afrey50 ba0"); diff --git a/C4/Biblio.pm b/C4/Biblio.pm index 0914d3534d..8143ee1095 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -250,6 +250,7 @@ sub AddBiblio { my $dbh = C4::Context->dbh; # transform the data into koha-table style data + SetUTF8Flag($record); my $olddata = TransformMarcToKoha( $dbh, $record, $frameworkcode ); ( $biblionumber, $error ) = _koha_add_biblio( $dbh, $olddata, $frameworkcode ); $olddata->{'biblionumber'} = $biblionumber; @@ -294,6 +295,7 @@ sub ModBiblio { logaction( "CATALOGUING", "MODIFY", $biblionumber, "BEFORE=>" . $newrecord->as_formatted ); } + SetUTF8Flag($record); my $dbh = C4::Context->dbh; $frameworkcode = "" unless $frameworkcode; From c098c164edb70d6f55a9b6c39624a625d348968e Mon Sep 17 00:00:00 2001 From: Matthias Meusburger Date: Tue, 22 Mar 2011 11:49:50 +0100 Subject: [PATCH 3/4] Bug 5913 : Remove broken link from authorities search results BibLibre bug #2949 Signed-off-by: Henri-Damien LAURENT Signed-off-by: Julian Maurice Signed-off-by: Chris Cormack --- C4/AuthoritiesMarc.pm | 2 +- .../prog/en/modules/opac-authoritiessearchresultlist.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm index 3e6ca182ae..3c3f6bcbad 100644 --- a/C4/AuthoritiesMarc.pm +++ b/C4/AuthoritiesMarc.pm @@ -1043,7 +1043,7 @@ sub BuildSummary{ $narrowerterms =~s/-- \n$//; $seealso =~s/-- \n$//; $see =~s/-- \n$//; - $summary = "".$heading."
".($notes?"$notes
":""); + $summary = "".$heading."
".($notes?"$notes
":""); $summary.= '

TG : '.$broaderterms.'

' if ($broaderterms); $summary.= '

TS : '.$narrowerterms.'

' if ($narrowerterms); $summary.= '

TA : '.$seealso.'

' if ($seealso); diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl index e0c75646bb..05ca2e53b9 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl @@ -48,7 +48,7 @@ - "> + From eeaf2e7c9e461b77bc18fd1883cdb250642ab1bd Mon Sep 17 00:00:00 2001 From: Jared Camins-Esakov Date: Thu, 17 Mar 2011 20:54:15 -0400 Subject: [PATCH 4/4] Bug 3382: Add CSS classes to OPAC XSLT tags This patch adds materialtype, format, and natureofcontents CSS classes to the tags produced by the OPAC XSLT stylesheets for use with CSS and jQuery. Signed-off-by: Nicole C. Engard Signed-off-by: Chris Cormack --- .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 2 +- .../prog/en/xslt/MARC21slim2OPACResults.xsl | 76 +++++++++---------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl index b5e60b99c8..24a6440d89 100755 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl @@ -186,7 +186,7 @@ Type: - /opac-tmpl/prog/famfamfam/.png + /opac-tmpl/prog/famfamfam/.pngmaterialTypeLabelmaterialtype diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl index 39eddd7321..0b53e222d6 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl @@ -160,7 +160,7 @@ chip cartridge - computer optical disc cartridge + computer optical disc cartridge magnetic disc @@ -169,11 +169,11 @@ magneto-optical disc - optical disc + optical disc available online - remote + remote tape cartridge @@ -186,16 +186,16 @@ - celestial globe + celestial globe - earth moon globe + earth moon globe - planetary or lunar globe + planetary or lunar globe - terrestrial globe + terrestrial globe @@ -258,19 +258,19 @@ film reel - chart + chart collage - drawing + drawing - flash card + flash card - painting + painting photomechanical print @@ -282,7 +282,7 @@ photoprint - picture + picture print @@ -291,7 +291,7 @@ technical drawing - notated music + notated music filmslip @@ -306,7 +306,7 @@ other filmstrip type - slide + slide transparency @@ -327,7 +327,7 @@ sound cassette - sound disc + sound disc sound-tape reel @@ -354,7 +354,7 @@ braille - large print + large print regular print @@ -369,7 +369,7 @@ videocassette - videodisc + videodisc videoreel @@ -517,23 +517,23 @@ Type: - book Set + book Set - book Book - serial Continuing Resource - article Article + book Book + serial Continuing Resource + article Article - book Book - kit Kit - mixed materialsMixed Materials - computer file Computer File - map Map - visual material Visual Material - score Score - sound Sound - music Music + book Book + kit Kit + mixed materialsMixed Materials + computer file Computer File + map Map + visual material Visual Material + score Score + sound Sound + music Music @@ -548,7 +548,7 @@ - database + database loose-leaf @@ -563,7 +563,7 @@ periodical - web site + web site @@ -577,7 +577,7 @@ bibliography - bibliography + bibliography catalog @@ -625,7 +625,7 @@ statistics - technical report + technical report legal case and case notes @@ -652,13 +652,13 @@ numeric data - database + database - font + font - game + game @@ -673,7 +673,7 @@ festschrift - biography + biography