From 53f2ddd5aca181a362c9a2669ed26eb8a99c7e20 Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 29 Dec 2005 21:06:21 +0000
Subject: [PATCH] improper added content info is now ignored / not displayed
 fixed bug in myopac so checked out info is not re-drawn

removed some unused lines from container.pl


git-svn-id: svn://svn.open-ils.org/ILS/trunk@2554 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../Search/AddedContent/ContentCafe.pm        | 19 ++++++++++++++++---
 .../support-scripts/test-scripts/container.pl |  5 -----
 Open-ILS/web/opac/skin/default/js/myopac.js   |  1 +
 Open-ILS/web/opac/skin/default/js/rdetail.js  |  1 +
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Evergreen/src/perlmods/Evergreen/Application/Search/AddedContent/ContentCafe.pm b/Evergreen/src/perlmods/Evergreen/Application/Search/AddedContent/ContentCafe.pm
index b1373d5f0c..545117bdae 100644
--- a/Evergreen/src/perlmods/Evergreen/Application/Search/AddedContent/ContentCafe.pm
+++ b/Evergreen/src/perlmods/Evergreen/Application/Search/AddedContent/ContentCafe.pm
@@ -96,7 +96,11 @@ sub summary {
 
 	my $data = retrieve_added_content( "member", $isbn, 1 );
 	return {} unless $data;
-	my $doc = XML::LibXML->new->parse_string($data);
+	my $doc;
+	try {
+		$doc = XML::LibXML->new->parse_string($data);
+	} catch Error with { $doc = undef };
+
 	my $summary = {};
 	return $summary unless $doc;
 
@@ -135,7 +139,11 @@ sub reviews {
 	return $ret unless $enabled;
 	my $data = retrieve_added_content( "review", $isbn );
 	return $ret unless $data;
-	my $doc = XML::LibXML->new->parse_string($data);
+
+	my $doc;
+	try {
+		$doc = XML::LibXML->new->parse_string($data);
+	} catch Error with { $doc = undef };
 
 
 	if(!$doc) {
@@ -181,7 +189,12 @@ sub toc {
 
 	my $data = retrieve_added_content( "toc", $isbn );
 	return undef unless $data;
-	my $doc = XML::LibXML->new->parse_string($data);
+
+	my $doc;
+	try {
+		$doc = XML::LibXML->new->parse_string($data);
+	} catch Error with { $doc = undef };
+
 
 	my @nodes =  $doc->findnodes("//*[local-name()='TOCText']")->get_nodelist();
 		
diff --git a/Open-ILS/src/support-scripts/test-scripts/container.pl b/Open-ILS/src/support-scripts/test-scripts/container.pl
index 1af72ee515..929d3cb02b 100755
--- a/Open-ILS/src/support-scripts/test-scripts/container.pl
+++ b/Open-ILS/src/support-scripts/test-scripts/container.pl
@@ -29,11 +29,6 @@ $ttest{'callnumber'}		= 1;
 $ttest{'copy'}				= 420795;
 $ttest{'user'}				= 3;
 
-my $testcopy = 420795;
-my $testrec = 40791;
-my $testcn = 1;
-my $testuser = 3;
-
 my %containers;
 my %items;
 
diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js
index 6d3cebc01a..6b326f1b5a 100644
--- a/Open-ILS/web/opac/skin/default/js/myopac.js
+++ b/Open-ILS/web/opac/skin/default/js/myopac.js
@@ -103,6 +103,7 @@ function myOPACDrawCheckedOutSlim(r) {
 	var none				= $("myopac_checked_none");
 
 	if(checkedDrawn) return;
+	checkedDrawn = true;
 	if(!checkedRowTemplate) 
 		checkedRowTemplate = tbody.removeChild($("myopac_checked_row"));
 
diff --git a/Open-ILS/web/opac/skin/default/js/rdetail.js b/Open-ILS/web/opac/skin/default/js/rdetail.js
index 7010dce245..c23a79896c 100644
--- a/Open-ILS/web/opac/skin/default/js/rdetail.js
+++ b/Open-ILS/web/opac/skin/default/js/rdetail.js
@@ -233,6 +233,7 @@ function _rdetailBuildInfoRows(r) {
 	_rdetailRows();
 
 	var summary = r.getResultObject();
+	if(!summary) return;
 
 	G.ui.rdetail.cp_info_loading.parentNode.removeChild(
 		G.ui.rdetail.cp_info_loading);
-- 
2.43.2