Attachment 3194 Details for Bug 5791 – Initial patch

[patch] Initial patch

0001-Bug-5791-Robust-handling-of-deleted-biblios-authorit.patch (text/plain), 14.27 KB, created by Tomás Cohen Arazi (tcohen) on 2011-02-22 19:50:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2011-02-22 19:50:45 UTC

Size: 14.27 KB

patch

obsolete

>From 6b23243360cfb1fb28aff82e06d035ebfbacb993 Mon Sep 17 00:00:00 2001
>From: Tomas Cohen Arazi <tomascohen@gmail.com>
>Date: Tue, 22 Feb 2011 16:46:46 -0300
>Subject: [PATCH] [Bug 5791] Robust handling of deleted biblios/authorities
>Content-Type: text/plain; charset="utf-8"
>
>---
> authorities/detail.pl                              |  110 +++++++++++---------
> catalogue/detail.pl                                |   21 +++--
> .../prog/en/modules/authorities/detail.tmpl        |   98 +++++++++---------
> .../prog/en/modules/catalogue/detail.tmpl          |   11 ++-
> 4 files changed, 131 insertions(+), 109 deletions(-)
>
>diff --git a/authorities/detail.pl b/authorities/detail.pl
>index f92e04b..9849f31 100755
>--- a/authorities/detail.pl
>+++ b/authorities/detail.pl
>@@ -175,53 +175,65 @@ my $authid = $query->param('authid');
> 
> 
> my $authtypecode = &GetAuthTypeCode($authid);
>-$tagslib = &GetTagsLabels(1,$authtypecode);
>-
>-my $record;
>-if (C4::Context->preference("AuthDisplayHierarchy")){
>-  my $trees=BuildUnimarcHierarchies($authid);
>-  my @trees = split /;/,$trees ;
>-  push @trees,$trees unless (@trees);
>-  my @loophierarchies;
>-  foreach my $tree (@trees){
>-    my @tree=split /,/,$tree;
>-    push @tree,$tree unless (@tree);
>-    my $cnt=0;
>-    my @loophierarchy;
>-    foreach my $element (@tree){
>-      my $elementdata = GetAuthority($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=GetAuthority($authid);
>-}
>-my $count = CountUsage($authid);
>-
>-# find the marc field/subfield used in biblio by this authority
>-my $sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure where authtypecode=?");
>-$sth->execute($authtypecode);
>-my $biblio_fields;
>-while (my ($tagfield) = $sth->fetchrow) {
>-	$biblio_fields.= $tagfield."9,";
>-}
>-chop $biblio_fields;
> 
>+if ( defined $authtypecode ) {
>+	# authid is valid
>+	$tagslib = &GetTagsLabels(1,$authtypecode);
>+
>+	my $record;
>+	if (C4::Context->preference("AuthDisplayHierarchy")){
>+		my $trees=BuildUnimarcHierarchies($authid);
>+		my @trees = split /;/,$trees ;
>+		push @trees,$trees unless (@trees);
>+		my @loophierarchies;
>+		foreach my $tree (@trees){
>+			my @tree=split /,/,$tree;
>+			push @tree,$tree unless (@tree);
>+			my $cnt=0;
>+			my @loophierarchy;
>+			foreach my $element (@tree){
>+			my $elementdata = GetAuthority($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=GetAuthority($authid);
>+	}
>+
>+	my $count = CountUsage($authid);
>+
>+	# find the marc field/subfield used in biblio by this authority
>+	my $sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure where authtypecode=?");
>+	$sth->execute($authtypecode);
>+	my $biblio_fields;
>+	while (my ($tagfield) = $sth->fetchrow) {
>+		$biblio_fields.= $tagfield."9,";
>+	}
>+	chop $biblio_fields;
>+
>+	# loop through each tab 0 through 9
>+	# for (my $tabloop = 0; $tabloop<=10;$tabloop++) {
>+	# loop through each tag
>+	build_tabs ($template, $record, $dbh,"",$query);
>+
>+	$template->param(authid => $authid,
>+		count => $count,
>+		biblio_fields => $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);
>+} else {
>+	# authid invalid
>+	# set default $authtypecode
>+	$authtypecode = '';
>+    $template->param ( errauthid => $authid,unknownauthid => 1 );
>+}
> 
> my $authtypes = getauthtypes;
> my @authtypesloop;
>@@ -233,11 +245,9 @@ foreach my $thisauthtype (sort { $authtypes->{$b} cmp $authtypes->{$a} } keys %$
> 	push @authtypesloop, \%row;
> }
> 
>-$template->param(authid => $authid,
>-		count => $count,
>-		biblio_fields => $biblio_fields,
>+$template->param (
> 		authtypetext => $authtypes->{$authtypecode}{'authtypetext'},
> 		authtypesloop => \@authtypesloop,
>-		);
>-output_html_with_http_headers $query, $cookie, $template->output;
>+);
> 
>+output_html_with_http_headers $query, $cookie, $template->output;
>\ No newline at end of file
>diff --git a/catalogue/detail.pl b/catalogue/detail.pl
>index 6ee79e6..6682482 100755
>--- a/catalogue/detail.pl
>+++ b/catalogue/detail.pl
>@@ -52,11 +52,21 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
> );
> 
> my $biblionumber = $query->param('biblionumber');
>-my $fw = GetFrameworkCode($biblionumber);
> 
> ## get notes and subjects from MARC record
>-my $marcflavour      = C4::Context->preference("marcflavour");
>-my $record           = GetMarcBiblio($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;
>+}
>+
>+my $fw 				= GetFrameworkCode($biblionumber);
>+my $marcflavour		= C4::Context->preference("marcflavour");
> 
> # XSLT processing of some stuff
> if (C4::Context->preference("XSLTDetailsDisplay") ) {
>@@ -81,11 +91,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/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl
>index 417581c..c51e697 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 @@
> 
>-<title>Koha &rsaquo; Authorities &rsaquo; Details for Authority # ()</title>
>+<title>Koha &rsaquo; Authorities &rsaquo;  Unknown authorityDetails for Authority # ()</title>
> 
> <script type="text/javascript">
> 
>@@ -62,7 +62,7 @@ function searchauthority() {
> <body>
> 
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> &rsaquo; Details for Authority # () </div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> &rsaquo;  Unknown authority Details for Authority # ()</div>
> 
> <div id="doc" class="yui-t7">
> 
>@@ -103,55 +103,57 @@ function searchauthority() {
> </div>
> 
> 
>-<h1>Authority # ()</h1>
>+
>+   <div class="dialog message">The authority you requested does not exist ().</div>
>+
> 
>-<div id="action">
>-    
>-    
>-    Used in <a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&amp;op=do_search&amp;q=an="> record(s)</a>
>-</div>
>+	<h1>Authority # ()</h1>
>+	<div id="action">
>+		Used in <a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&amp;op=do_search&amp;q=an="> record(s)</a>
>+	</div>
> 
>-<div id="authoritiestabs" class="toptabs numbered">
>-    <ul>
>-        
>-            <li>
>-                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl#tabXX"></a>
>-            </li>
>-        
>-    </ul>
>+	<div id="authoritiestabs" class="toptabs numbered">
>+		<ul>
>+			
>+				<li>
>+					<a href="/cgi-bin/koha/cataloguing/addbiblio.pl#tabXX"></a>
>+				</li>
>+			
>+		</ul>
> 
>-
>-    <div id="tabXX">
>-    
>-        
>-            <div class="tag">
>-            <div class="tag_title">
>-                
>-            </div>
>-        
>-            <div class="tag">
>-        
>-        
>-            <p>
>-                <label class="labelsubfield">&nbsp;
>-                <b></b>
>-                <span title=""></span></label>
>-                
>-                
>-                    <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=&amp;operator==&amp;type=intranet&amp;value=">
>-                        <img border="0" src="//images/filefind.png" height="15" title="Search on ">
>-                    </a>
>-                
>-                
>-                    <a href="/cgi-bin/koha/authorities/detail.pl?authid=" class="button">Auth</a>
>-                
>-            </p>
>-        
>-        </div>
>-    
>-    </div>
>-
>-</div>
>+	
>+		<div id="tabXX">
>+		
>+			
>+				<div class="tag">
>+				<div class="tag_title">
>+					
>+				</div>
>+			
>+				<div class="tag">
>+			
>+			
>+				<p>
>+					<label class="labelsubfield">&nbsp;
>+					<b></b>
>+					<span title=""></span></label>
>+					
>+					
>+						<a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=&amp;operator==&amp;type=intranet&amp;value=">
>+							<img border="0" src="//images/filefind.png" height="15" title="Search on ">
>+						</a>
>+					
>+					
>+						<a href="/cgi-bin/koha/authorities/detail.pl?authid=" class="button">Auth</a>
>+					
>+				</p>
>+			
>+			</div>
>+		
>+		</div>
>+	
>+	</div>
>+
> </div>
> </div>
> </div>
>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 8f53e80..dfe483b 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 @@
> 
>-<title>Koha &rsaquo; Catalog &rsaquo; Details for   </title>
>+<title>Koha &rsaquo; Catalog &rsaquo; Unknown biblioDetails for   </title>
> <script type="text/JavaScript" language="JavaScript">
> //<![CDATA[
> // http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html
>@@ -44,10 +44,14 @@ function verify_images() {
> 
> 
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Details for <i>   </i></div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Unknown biblio Details for <i>   </i></div>
> 
> <div id="doc3" class="yui-t2">
>-   
>+
>+
>+	<div class="dialog message">The biblio you requested does not exist ().</div>
>+
>+
>    <div id="bd">
>     <div id="yui-main">
>     <div class="yui-b">
>@@ -506,5 +510,6 @@ function verify_images() {
> <div class="yui-b">
> 
> </div>
>+
> </div>
> 
>-- 
>1.7.1
>

Actions: View | Diff | Splinter Review

Attachments on bug 5791: 3194 | 3272 | 3273 | 3844 | 3905 | 3938