Bugzilla – Attachment 3905 Details for
Bug 5791
Robust handling of deleted biblios/authorities
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Signed off: Consolidated, refactored patch [3.2.x]
0001-SIGNED-OFF-Robust-handling-of-deleted-non-existent-b.patch (text/plain), 22.44 KB, created by
Katrin Fischer
on 2011-04-12 21:42:31 UTC
(
hide
)
Description:
Signed off: Consolidated, refactored patch [3.2.x]
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2011-04-12 21:42:31 UTC
Size:
22.44 KB
patch
obsolete
>From 501da1418f4ab1414ef8d6d56f6cdea48f32121d Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@gmail.com> >Date: Fri, 8 Apr 2011 13:18:54 -0300 >Subject: [PATCH] [SIGNED-OFF] Robust handling of deleted/non-existent biblios and authority records >Content-Type: text/plain; charset="utf-8" > >This patch is a refactoring of the original patches, as those don't apply anymore. >The wording was suggested by oleonard. > >Basically what I do is check in > >authorities/detail.pl >catalogue/ISBDdetail.pl >catalogue/MARCdetail.pl >catalogue/detail.pl > >if the record retreived from GetMarcBiblio, GetAuthority and GetISBDView exists >and if not set several variables for the templates and call exit just after >output_html_with_http_headers is called. > >In the corresponding *.tmpl files I handle those 'error variables' properly to show the user >a consistent error message. > >Notes: >- I changed one line in C4/Biblio.pm. I was worried about it. But it's so simple it won't hurt :-) >- In authorities/detail.pl I deleted a few variables that wheren't actually used, plus changing the > order of some variable definition/calculation so the dropdown menus for auth search remain > pretty and consistent. >- I'm not sure this will catch an error in BuildUnimarcHierachies. I didn't want to touch anything > there, but there is an unused varible, and zero error catchig there. As I don't know anything > from UNIMARC, if someone helps me, I can work on it. At least provinding me some UNIMARC hierachies > for my dev install. >- Some code refactoring in ISBDdetail.pl is a mistake I made. I noticed late. > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >--- > C4/Biblio.pm | 1 + > authorities/detail.pl | 48 ++++++++++--------- > catalogue/ISBDdetail.pl | 20 +++++--- > catalogue/MARCdetail.pl | 18 ++++++-- > catalogue/detail.pl | 25 +++++----- > catalogue/labeledMARCdetail.pl | 16 +++++- > .../prog/en/modules/authorities/detail.tmpl | 29 ++++++------ > .../prog/en/modules/catalogue/ISBDdetail.tmpl | 37 ++++++++------- > .../prog/en/modules/catalogue/MARCdetail.tmpl | 9 +++- > .../prog/en/modules/catalogue/detail.tmpl | 10 +++- > .../en/modules/catalogue/labeledMARCdetail.tmpl | 19 +++++--- > 11 files changed, 139 insertions(+), 93 deletions(-) > >diff --git a/C4/Biblio.pm b/C4/Biblio.pm >index 7be1b3e..120592f 100755 >--- a/C4/Biblio.pm >+++ b/C4/Biblio.pm >@@ -761,6 +761,7 @@ Return the ISBD view which can be included in opac and intranet > sub GetISBDView { > my ( $biblionumber, $template ) = @_; > my $record = GetMarcBiblio($biblionumber); >+ return undef unless defined $record; > my $itemtype = &GetFrameworkCode($biblionumber); > my ( $holdingbrtagf, $holdingbrtagsubf ) = &GetMarcFromKohaField( "items.holdingbranch", $itemtype ); > my $tagslib = &GetMarcStructure( 1, $itemtype ); >diff --git a/authorities/detail.pl b/authorities/detail.pl >index 59273c1..57e0737 100755 >--- a/authorities/detail.pl >+++ b/authorities/detail.pl >@@ -172,13 +172,33 @@ my ($template, $loggedinuser, $cookie) > > my $authid = $query->param('authid'); > >- >- > # Using default authtypecode, so all fields are seen > my $authtypecode = ''; > $tagslib = &GetTagsLabels(1,$authtypecode); > >-my $record; >+# Build list of authtypes for showing them >+my $authtypes = getauthtypes; >+my @authtypesloop; >+ >+foreach my $thisauthtype (sort { $authtypes->{$b} cmp $authtypes->{$a} } keys %$authtypes) { >+ my %row =(value => $thisauthtype, >+ selected => $thisauthtype eq $authtypecode, >+ authtypetext => $authtypes->{$thisauthtype}{'authtypetext'}, >+ ); >+ push @authtypesloop, \%row; >+} >+ >+my $record=GetAuthority($authid); >+ >+if (not defined $record) { >+ # authid invalid >+ $template->param ( errauthid => $authid, >+ unknownauthid => 1, >+ authtypesloop => \@authtypesloop ); >+ output_html_with_http_headers $query, $cookie, $template->output; >+ exit; >+} >+ > if (C4::Context->preference("AuthDisplayHierarchy")){ > my $trees=BuildUnimarcHierarchies($authid); > my @trees = split /;/,$trees ; >@@ -201,9 +221,8 @@ if (C4::Context->preference("AuthDisplayHierarchy")){ > 'displayhierarchy' =>C4::Context->preference("AuthDisplayHierarchy"), > 'loophierarchies' =>\@loophierarchies, > ); >-} else { >- $record=GetAuthority($authid); > } >+ > my $count = CountUsage($authid); > > # find the marc field/subfield used in biblio by this authority >@@ -215,24 +234,7 @@ while (my ($tagfield) = $sth->fetchrow) { > } > chop $biblio_fields; > >- >-# fill arrays >-my @loop_data =(); >-my $tag; >-# loop through each tab 0 through 9 >-# for (my $tabloop = 0; $tabloop<=10;$tabloop++) { >-# loop through each tag >- build_tabs ($template, $record, $dbh,"",$query); >- >-my $authtypes = getauthtypes; >-my @authtypesloop; >-foreach my $thisauthtype (sort { $authtypes->{$b} cmp $authtypes->{$a} } keys %$authtypes) { >- my %row =(value => $thisauthtype, >- selected => $thisauthtype eq $authtypecode, >- authtypetext => $authtypes->{$thisauthtype}{'authtypetext'}, >- ); >- push @authtypesloop, \%row; >-} >+build_tabs ($template, $record, $dbh,"",$query); > > $template->param(authid => $authid, > count => $count, >diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl >index df84a3a..58a8d90 100755 >--- a/catalogue/ISBDdetail.pl >+++ b/catalogue/ISBDdetail.pl >@@ -67,6 +67,16 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > } > ); > >+my $res = GetISBDView($biblionumber, "intranet"); >+if ( not defined $res ) { >+ # biblionumber invalid -> report and exit >+ $template->param( unknownbiblionumber => 1, >+ biblionumber => $biblionumber >+ ); >+ output_html_with_http_headers $query, $cookie, $template->output; >+ exit; >+} >+ > if($query->cookie("holdfor")){ > my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor")); > $template->param( >@@ -77,10 +87,6 @@ if($query->cookie("holdfor")){ > ); > } > >-# my @blocs = split /\@/,$ISBD; >-# my @fields = $record->fields(); >-my $res = GetISBDView($biblionumber, "intranet"); >- > # count of item linked with biblio > my $itemcount = GetItemsCount($biblionumber); > $template->param( count => $itemcount); >@@ -98,9 +104,9 @@ if ($subscriptionsnumber) { > $template->param ( > ISBD => $res, > biblionumber => $biblionumber, >- isbdview => 1, >- z3950_search_params => C4::Search::z3950_search_args(GetBiblioData($biblionumber)), >- C4::Search::enabled_staff_search_views, >+ isbdview => 1, >+ z3950_search_params => C4::Search::z3950_search_args(GetBiblioData($biblionumber)), >+ C4::Search::enabled_staff_search_views > ); > > output_html_with_http_headers $query, $cookie, $template->output; >diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl >index c3cc5d4..0a2974b 100755 >--- a/catalogue/MARCdetail.pl >+++ b/catalogue/MARCdetail.pl >@@ -70,10 +70,6 @@ my $popup = > ; # if set to 1, then don't insert links, it's just to show the biblio > my $subscriptionid = $query->param('subscriptionid'); > >-my $tagslib = &GetMarcStructure(1,$frameworkcode); >- >-my $record = GetMarcBiblio($biblionumber); >-my $biblio = GetBiblioData($biblionumber); > # open template > my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > { >@@ -86,6 +82,20 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > } > ); > >+my $record = GetMarcBiblio($biblionumber); >+ >+if ( not defined $record ) { >+ # biblionumber invalid -> report and exit >+ $template->param( unknownbiblionumber => 1, >+ biblionumber => $biblionumber >+ ); >+ output_html_with_http_headers $query, $cookie, $template->output; >+ exit; >+} >+ >+my $tagslib = &GetMarcStructure(1,$frameworkcode); >+my $biblio = GetBiblioData($biblionumber); >+ > if($query->cookie("holdfor")){ > my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor")); > $template->param( >diff --git a/catalogue/detail.pl b/catalogue/detail.pl >index 21fcb1f..03271b4 100755 >--- a/catalogue/detail.pl >+++ b/catalogue/detail.pl >@@ -51,6 +51,17 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( > } > ); > >+my $biblionumber = $query->param('biblionumber'); >+my $record = GetMarcBiblio($biblionumber); >+ >+if ( not defined $record ) { >+ # biblionumber invalid -> report and exit >+ $template->param( unknownbiblionumber => 1, >+ biblionumber => $biblionumber ); >+ output_html_with_http_headers $query, $cookie, $template->output; >+ exit; >+} >+ > if($query->cookie("holdfor")){ > my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor")); > $template->param( >@@ -61,14 +72,9 @@ if($query->cookie("holdfor")){ > ); > } > >-my $biblionumber = $query->param('biblionumber'); >-my $fw = GetFrameworkCode($biblionumber); >- >+my $fw = GetFrameworkCode($biblionumber); > my $showallitems = $query->param('showallitems'); >- >-## get notes and subjects from MARC record >-my $marcflavour = C4::Context->preference("marcflavour"); >-my $record = GetMarcBiblio($biblionumber); >+my $marcflavour = C4::Context->preference("marcflavour"); > > # XSLT processing of some stuff > if (C4::Context->preference("XSLTDetailsDisplay") ) { >@@ -93,11 +99,6 @@ $template->param( > normalized_isbn => $isbn, > ); > >-unless (defined($record)) { >- print $query->redirect("/cgi-bin/koha/errors/404.pl"); >- exit; >-} >- > my $marcnotesarray = GetMarcNotes( $record, $marcflavour ); > my $marcisbnsarray = GetMarcISBN( $record, $marcflavour ); > my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour ); >diff --git a/catalogue/labeledMARCdetail.pl b/catalogue/labeledMARCdetail.pl >index 8faecfc..b8c7982 100755 >--- a/catalogue/labeledMARCdetail.pl >+++ b/catalogue/labeledMARCdetail.pl >@@ -38,9 +38,6 @@ my $popup = > $query->param('popup') > ; # if set to 1, then don't insert links, it's just to show the biblio > >-my $tagslib = GetMarcStructure(1,$frameworkcode); >-my $record = GetMarcBiblio($biblionumber); >-my $biblio = GetBiblioData($biblionumber); > # open template > my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > { >@@ -53,6 +50,19 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > } > ); > >+my $record = GetMarcBiblio($biblionumber); >+if ( not defined $record ) { >+ # biblionumber invalid -> report and exit >+ $template->param( unknownbiblionumber => 1, >+ biblionumber => $biblionumber >+ ); >+ output_html_with_http_headers $query, $cookie, $template->output; >+ exit; >+} >+ >+my $tagslib = GetMarcStructure(1,$frameworkcode); >+my $biblio = GetBiblioData($biblionumber); >+ > if($query->cookie("holdfor")){ > my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor")); > $template->param( >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl >index 417581c..f16298d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl >@@ -1,5 +1,5 @@ > <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --> >-<title>Koha › Authorities › Details for Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</title> >+<title>Koha › Authorities › <!-- TMPL_IF NAME="unknownauthid" --> Unknown authority record<!-- TMPL_ELSE -->Details for Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></title> > <!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> > <script type="text/javascript"> > >@@ -62,7 +62,7 @@ function searchauthority() { > <body> > <!-- TMPL_INCLUDE NAME="header.inc" --> > <!-- TMPL_INCLUDE NAME="authorities-search.inc" --> >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> › Details for Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->) </div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> › <!-- TMPL_IF NAME="unknownauthid" --> Unknown authority record<!-- TMPL_ELSE--> Details for Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></div> > > <div id="doc" class="yui-t7"> > >@@ -103,15 +103,15 @@ function searchauthority() { > </div> > <!-- /TMPL_IF --> > >-<h1>Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1> >- >-<div id="action"> >- >- >- Used in <a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&op=do_search&q=an=<!--TMPL_VAR Name="authid" -->"><!-- TMPL_VAR name="count" --> record(s)</a> >-</div> >+<!-- TMPL_IF NAME="unknownauthid" --> >+ <div class="dialog message">The authority record you requested does not exist (<!-- TMPL_VAR NAME="errauthid" -->).</div> >+<!-- TMPL_ELSE --> >+ <h1>Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1> >+ <div id="action"> >+ Used in <a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&op=do_search&q=an=<!--TMPL_VAR Name="authid" -->"><!-- TMPL_VAR name="count" --> record(s)</a> >+ </div> > >-<div id="authoritiestabs" class="toptabs numbered"> >+ <div id="authoritiestabs" class="toptabs numbered"> > <ul> > <!-- TMPL_LOOP name="BIG_LOOP" --> > <li> >@@ -120,7 +120,7 @@ function searchauthority() { > <!-- /TMPL_LOOP --> > </ul> > >-<!-- TMPL_LOOP name="BIG_LOOP" --> >+ <!-- TMPL_LOOP name="BIG_LOOP" --> > <div id="tab<!-- TMPL_VAR name="number" -->XX"> > <!-- TMPL_LOOP NAME="innerloop" --> > <!-- TMPL_IF name="tag" --> >@@ -146,12 +146,13 @@ function searchauthority() { > <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button">Auth</a> > <!-- /TMPL_IF --> > </p> >- <!-- /TMPL_LOOP --> >+ <!-- /TMPL_LOOP --> > </div> > <!-- /TMPL_LOOP --> > </div> >-<!-- /TMPL_LOOP --> >-</div> >+ <!-- /TMPL_LOOP --> >+ </div> >+<!-- /TMPL_IF --> > </div> > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl >index 1516268..685283d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl >@@ -1,5 +1,5 @@ > <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --> >-<title>Koha › Catalog › ISBD Details for <!-- TMPL_VAR NAME="title" --></title> >+<title>Koha › Catalog › <!-- TMPL_IF NAME="unknownbiblionumber" -->Unknown record<!-- TMPL_ELSE -->ISBD Details for <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></title> > <!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> > </head> > <body> >@@ -7,24 +7,25 @@ > <!-- TMPL_INCLUDE NAME="header.inc" --> > <!-- TMPL_INCLUDE NAME="cat-search.inc" --> > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › ISBD Details for <i><!-- TMPL_VAR NAME="biblionumber" --></i></div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › <!-- TMPL_IF NAME="unknownbiblionumber" -->Unknown record<!-- TMPL_ELSE --> ISBD Details for <i><!-- TMPL_VAR NAME="biblionumber" --></i><!-- /TMPL_IF --></div> > > <div id="doc3" class="yui-t2"> >- >- <div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> >-<!-- TMPL_INCLUDE NAME="cat-toolbar.inc" --> >- >- <div id="catalogue_ISBDdetail"> >- <!-- TMPL_VAR NAME="ISBD" --> >- </div> >- >- >-</div> >-</div> >-<div class="yui-b"> >-<!-- TMPL_INCLUDE NAME="biblio-view-menu.inc" --> >-</div> >+<!-- TMPL_IF NAME="unknownbiblionumber" --> >+ <div class="dialog message">The record you requested does not exist (<!-- TMPL_VAR NAME="biblionumber" -->).</div> >+<!-- TMPL_ELSE --> >+ <div id="bd"> >+ <div id="yui-main"> >+ <div class="yui-b"> >+ <!-- TMPL_INCLUDE NAME="cat-toolbar.inc" --> >+ <div id="catalogue_ISBDdetail"> >+ <!-- TMPL_VAR NAME="ISBD" --> >+ </div> >+ </div> >+ </div> >+ <div class="yui-b"> >+ <!-- TMPL_INCLUDE NAME="biblio-view-menu.inc" --> >+ </div> >+ </div> >+<!-- /TMPL_IF --> > </div> > <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl >index f9cc90d..b2d9e6e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl >@@ -1,5 +1,5 @@ > <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --> >-<title>Koha › Catalog › MARC Details for <!-- TMPL_VAR NAME="bibliotitle" --></title> >+<title>Koha › Catalog › <!-- TMPL_IF NAME="unknownbiblionumber" -->Unknown record<!-- TMPL_ELSE -->MARC Details for <!-- TMPL_VAR NAME="bibliotitle" --><!-- /TMPL_IF --></title> > <!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> > <script type="text/javascript"> > //<![CDATA[ >@@ -21,10 +21,12 @@ function Changefwk(FwkList) { > <!-- TMPL_INCLUDE NAME="header.inc" --> > <!-- TMPL_INCLUDE NAME="cat-search.inc" --> > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › MARC Details for <i><!-- TMPL_VAR NAME="bibliotitle" ESCAPE="html" --></i></div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › <!-- TMPL_IF NAME="unknownbiblionumber" -->Unknown record<!-- TMPL_ELSE -->MARC Details for <i><!-- TMPL_VAR NAME="bibliotitle" ESCAPE="html" --></i><!-- /TMPL_IF --></div> > > <div id="doc3" class="yui-t2"> >- >+<!-- TMPL_IF NAME="unknownbiblionumber" --> >+ <div class="dialog message">The record you requested does not exist (<!-- TMPL_VAR NAME="biblionumber" -->).</div> >+<!-- TMPL_ELSE --> > <div id="bd"> > <div id="yui-main"> > <div class="yui-b"> >@@ -404,5 +406,6 @@ function Changefwk(FwkList) { > <div class="yui-b"> > <!-- TMPL_INCLUDE NAME="biblio-view-menu.inc" --> > </div> >+<!-- /TMPL_IF --> > </div> > <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl >index 676fc88..831fc9c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl >@@ -1,5 +1,5 @@ > <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --> >-<title>Koha › Catalog › Details for <!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_LOOP NAME="subtitle" --> <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --></title> >+<title>Koha › Catalog › <!-- TMPL_IF NAME="unknownbiblionumber" -->Unknown record<!-- TMPL_ELSE -->Details for <!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_LOOP NAME="subtitle" --> <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></title> > <!-- TMPL_INCLUDE NAME="doc-head-close.inc" --><script type="text/JavaScript" language="JavaScript"> > //<![CDATA[ > // http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html >@@ -44,10 +44,13 @@ function verify_images() { > <!-- TMPL_INCLUDE NAME="header.inc" --> > <!-- TMPL_INCLUDE NAME="cat-search.inc" --> > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › Details for <i><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_LOOP NAME="subtitle" --> <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --></i></div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › <!-- TMPL_IF NAME="unknownbiblionumber" -->Unknown record<!-- TMPL_ELSE --> Details for <i><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_LOOP NAME="subtitle" --> <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></i></div> > > <div id="doc3" class="yui-t2"> >- >+ >+<!-- TMPL_IF NAME="unknownbiblionumber" --> >+ <div class="dialog message">The record you requested does not exist (<!-- TMPL_VAR NAME="biblionumber" -->).</div> >+<!-- TMPL_ELSE --> > <div id="bd"> > <div id="yui-main"> > <div class="yui-b"> >@@ -518,5 +521,6 @@ function verify_images() { > <div class="yui-b"> > <!-- TMPL_INCLUDE NAME="biblio-view-menu.inc" --> > </div> >+<!-- /TMPL_IF --> > </div> > <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tmpl >index ce26a71..bea3abc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tmpl >@@ -1,6 +1,10 @@ > <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --> > >- <title>Koha › Catalog › Labeled MARC Details for <!-- TMPL_VAR NAME="bibliotitle" --></title> >+ <title>Koha › Catalog › >+ <!-- TMPL_IF NAME="unknownbiblionumber" -->Unknown record >+ <!-- TMPL_ELSE -->Labeled MARC Details for <!-- TMPL_VAR NAME="bibliotitle" --> >+ <!-- /TMPL_IF --> >+ </title> > > <!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> > >@@ -21,11 +25,15 @@ > > <div id="breadcrumbs"> > <a href="/cgi-bin/koha/mainpage.pl">Home</a> >- › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >- › MARC Details for <i><!-- TMPL_VAR NAME="bibliotitle" --></i> >+ › <!-- TMPL_IF NAME="unknownbiblionumber" -->Unknown record >+ <!-- TMPL_ELSE -->MARC Details for <i><!-- TMPL_VAR NAME="bibliotitle" --></i> >+ <!-- /TMPL_IF --> > </div> > > <div id="doc3" class="yui-t2"> >+<!-- TMPL_IF NAME="unknownbiblionumber" --> >+ <div class="dialog message">The record you requested does not exist (<!-- TMPL_VAR NAME="biblionumber" -->).</div> >+<!-- TMPL_ELSE --> > <div id="bd"> > <div id="yui-main"> > <div class="yui-b"> >@@ -50,9 +58,8 @@ > </div> > </div> > <div class="yui-b"> >- >- <!-- TMPL_INCLUDE NAME="biblio-view-menu.inc" --> >- >+ <!-- TMPL_INCLUDE NAME="biblio-view-menu.inc" --> > </div> >+<!-- /TMPL_IF --> > </div> > <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" --> >-- >1.7.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 5791
:
3194
|
3272
|
3273
|
3844
| 3905 |
3938