--- trunk/rqs.phtml	2004/03/18 20:21:08	71
+++ trunk/rqs.phtml	2004/03/18 20:33:37	72
@@ -37,10 +37,10 @@
 // Initialize
 $subject_id = (int) $subject_id;
 $exists = 0;
-$exists = existsRow($con, "subject", "subject_id", $subject_id);
+$exists = existsRow("subject", "subject_id", $subject_id);
 
 // If this subject is valid, increment stats
-if ($subject_id > 1 && $exists == 1) subLoadStats($con, $subject_id);
+if ($subject_id > 1 && $exists == 1) subLoadStats($subject_id);
 
 
 /***********************************
@@ -48,8 +48,8 @@
 ***********************************/
 
 // Determine if there are related PageScribe or RQS pages
-$other_ps = existsRow($con, "sub_page", "subject_id", $subject_id);
-$other_rqs = existsRow($con, "sub_othersub", "subject_id", $subject_id);
+$other_ps = existsRow("sub_page", "subject_id", $subject_id);
+$other_rqs = existsRow("sub_othersub", "subject_id", $subject_id);
 
 
 // if printer friendly version don't print the TOC
@@ -77,14 +77,14 @@
 	}
 
 	$sql .= " ORDER BY mi.masterinfotype, i.infotype";
-	$rs = xx_query($sql, $con);
+	$rs = xx_tryquery($sql);
 	$rows = xx_num_rows($rs);
 
 	// initialize
 	$last_masterinfotype_id = 0;
 	$rowcount = 0;
 
-	while ($row = xx_fetch_array ($rs)) {
+	while ($row = xx_fetch_array ($rs, xx_ASSOC)) {
 
 		// Fetch information types for this subject
 		$infotype_id = $row["infotype_id"];
@@ -93,11 +93,11 @@
 		$masterinfotype = $row["masterinfotype"];
 
 		if ($last_masterinfotype_id == 0 || ($last_masterinfotype_id != $masterinfotype_id)) {
-			printf("</ul><span class=\"small\"><b><a href=\"rqs.phtml?subject_id=%d#m%d\">%s</a></b></span><br>\n", $subject_id, $masterinfotype_id, $masterinfotype);
+			printf("</ul><b><span class=\"small\"><a href=\"rqs.phtml?subject_id=%d#m%d\">%s</a></b></span><br>\n", $subject_id, $masterinfotype_id, $masterinfotype);
 			printf("<ul>\n");
 		}
 	
-		printf("<li><b class=\"small\"><a href=\"#i%d\">%s</a></b></li>\n", $infotype_id, $infotype);
+		printf("<li><span class=\"small\"><b><a href=\"#i%d\">%s</a></b></span></li>\n", $infotype_id, $infotype);
 
 		// Swap & increment
 		$last_masterinfotype_id = $masterinfotype_id;
@@ -123,8 +123,8 @@
 $sql = "SELECT subject, subject_descr FROM subject WHERE subject_id = "
 	. $subject_id;
 	
-$rs = xx_query($sql, $con);
-$row = xx_fetch_array ($rs);
+$rs = xx_tryquery($sql);
+$row = xx_fetch_array ($rs, xx_ASSOC);
 $subject = $row["subject"];
 $subject_descr = $row["subject_descr"];	
 
@@ -178,9 +178,15 @@
 	r.url,
 	r.call_no,
 	r.coverage_detail,
-	r.cat_num
+	r.cat_num,
+	r.guide_url,
+	r.resource_status,
+	r.resource_message,
+	v.vendor_status,
+	v.vendor_message	
 	FROM res_sub_infotype rsi,
 	infotype i, masterinfotype m, resource r
+	LEFT JOIN vendor v on r.vendor_id = v.vendor_id
 	WHERE
 	rsi.subject_id = "
 	. $subject_id
@@ -194,9 +200,9 @@
 	rsi.resource_id = r.resource_id
 	ORDER BY m.masterinfotype, i.infotype, r.title";
 
-$rs = xx_query($sql, $con);
+$rs = xx_tryquery($sql);
 
-while ($row = xx_fetch_array ($rs)) {
+while ($row = xx_fetch_array ($rs, xx_ASSOC)) {
 
 	// Fetch information types for this subject
 	$masterinfotype = $row["masterinfotype"];
@@ -212,6 +218,12 @@
 	$call_no = $row["call_no"];
 	$coverage = $row["coverage_detail"];
 	$description = $row["description"];
+	
+	$guide_url = $row["guide_url"];
+	$resource_message = $row["resource_message"];
+	$resource_status = $row["resource_status"];
+	$vendor_message = $row["vendor_message"];
+	$vendor_status = $row["vendor_status"];	
 
 	if (strlen($description) > 0) $annotation = $description;
 
@@ -221,7 +233,7 @@
 
 	printf("<table><tr><td width=\"20\">&nbsp;</td>\n");
 	printf("<td valign=\"top\"><img src=\"images/bullet.gif\" alt=\"\"></td>\n");
-	printf("<td class=\"small\">\n");
+	printf("<td>\n");
 
 	// Display the resource
 	if (strlen($url) > 0 ) {
@@ -238,10 +250,10 @@
 		. $resource_id
 		. " AND rf.feature_id = f.feature_id";
 
-	$f_rs = xx_query($f_sql, $con);		
+	$f_rs = xx_tryquery($f_sql);		
 
 
-	while ($f_row = xx_fetch_array ($f_rs)) {
+	while ($f_row = xx_fetch_array ($f_rs, xx_ASSOC)) {
 		$image_path = $f_row["image_path"];
 		$image_alt = $f_row["image_alt"];
 		printf("<img src=\"%s\" alt=\"%s\">&nbsp;", $image_path, $image_alt);
@@ -252,6 +264,16 @@
 			printf("<br>%s\n", $url);
 	}
 
+	// Handle down/alert messages
+	if ($vendor_status > 0 || $resource_status > 0) {
+	
+		printf("<br><img src =\"images/chain.jpg\" alt=\"Resource Temporarily Unavailable\">\n");
+		printf("<span class=\"error\">\n");
+		if (strlen($vendor_message) > 1) printf("%s<br>\n", $vendor_message);
+		else if (strlen($resource_message) > 1) printf("%s<br>\n", $resource_message);
+		printf("</span>\n");
+	}
+
 	// Display other items		
 	if (strlen($coverage) > 0) printf("<br>&nbsp;&nbsp;&nbsp;&nbsp;<i>%s</i>", $coverage);
 	if (strlen($annotation) > 0) printf("<br>%s", $annotation);
@@ -259,7 +281,7 @@
 
 	// Link to library holdings if something was supplied for catalog number
 	if (strlen($cat_num) > 0)
-	printf("<BR><a href=\"libdata.knjiznice.ffzg.hr\">Check Catalog</a>", $cat_num);
+	printf("<BR><a href=\"yourlibrarycatalog.here.edu\">Check Catalog</a>", $cat_num);
 
 	// Swap variables
 	$last_m = $masterinfotype;
@@ -282,8 +304,8 @@
 	subject.sublocation_id = location.location_id";
 
 // Fetch the values
-$rs = xx_query($sql, $con);
-$row = xx_fetch_array ($rs);
+$rs = xx_tryquery($sql);
+$row = xx_fetch_array ($rs, xx_ASSOC);
 $location_id = $row["location_id"];
 $location = $row["location"];
 $location_descr = $row["location_descr"];
@@ -331,12 +353,12 @@
 	sub_loc.location_id = location.location_id";
 
 // Fetch the values
-$rs = xx_query($sql, $con);
+$rs = xx_tryquery($sql);
 
 // Initialize
 $rowcount = 0;
 
-while ($row = xx_fetch_array ($rs)) {
+while ($row = xx_fetch_array ($rs, xx_ASSOC)) {
 
 	$location_id = $row["location_id"];
 	$location = $row["location"];
@@ -387,11 +409,11 @@
 /****************************************************************
 ** Hunt for related subject pages & display them if they exist **
 ****************************************************************/
-$othersubs = existsRow($con, "sub_othersub", "subject_id", $subject_id);
+$othersubs = existsRow("sub_othersub", "subject_id", $subject_id);
 
 if ($othersubs > 0) {
 	printf("<table cellpadding=\"10\"><tr><td bgcolor=\"#dcdcdc\" class=\"small\"><h4>Related RQS Pages</h4>\n");
-	displayRelatedSubjects($con, $subject_id);
+	displayRelatedSubjects($subject_id);
 	print "</td></tr></table><br>\n";
 }
 
@@ -399,11 +421,11 @@
 /*******************************************************************
 ** Hunt for related PageScribe pages & display them if they exist **
 *******************************************************************/
-$pages = existsRow($con, "sub_page", "subject_id", $subject_id);
+$pages = existsRow("sub_page", "subject_id", $subject_id);
 
 if ($pages > 0) {
 	printf("<table cellpadding=\"10\"><tr><td bgcolor=\"#dcdcdc\" class=\"small\"><h4>Related PageScribe Pages</h4>\n");
-	displayRelatedPages($con, $subject_id);
+	displayRelatedPages($subject_id);
 	print "</td></tr></table>\n";
 }