--- branches/paul/rqs.phtml	2004/03/18 19:58:18	68
+++ branches/paul_xx/rqs.phtml	2004/03/18 20:01:09	69
@@ -77,14 +77,14 @@
 	}
 
 	$sql .= " ORDER BY mi.masterinfotype, i.infotype";
-	$rs = mysql_tryquery($sql);
-	$rows = mysql_num_rows($rs);
+	$rs = xx_tryquery($sql);
+	$rows = xx_num_rows($rs);
 
 	// initialize
 	$last_masterinfotype_id = 0;
 	$rowcount = 0;
 
-	while ($row = mysql_fetch_array ($rs, MYSQL_ASSOC)) {
+	while ($row = xx_fetch_array ($rs, xx_ASSOC)) {
 
 		// Fetch information types for this subject
 		$infotype_id = $row["infotype_id"];
@@ -123,8 +123,8 @@
 $sql = "SELECT subject, subject_descr FROM subject WHERE subject_id = "
 	. $subject_id;
 	
-$rs = mysql_tryquery($sql);
-$row = mysql_fetch_array ($rs, MYSQL_ASSOC);
+$rs = xx_tryquery($sql);
+$row = xx_fetch_array ($rs, xx_ASSOC);
 $subject = $row["subject"];
 $subject_descr = $row["subject_descr"];	
 
@@ -200,9 +200,9 @@
 	rsi.resource_id = r.resource_id
 	ORDER BY m.masterinfotype, i.infotype, r.title";
 
-$rs = mysql_tryquery($sql);
+$rs = xx_tryquery($sql);
 
-while ($row = mysql_fetch_array ($rs, MYSQL_ASSOC)) {
+while ($row = xx_fetch_array ($rs, xx_ASSOC)) {
 
 	// Fetch information types for this subject
 	$masterinfotype = $row["masterinfotype"];
@@ -250,10 +250,10 @@
 		. $resource_id
 		. " AND rf.feature_id = f.feature_id";
 
-	$f_rs = mysql_tryquery($f_sql);		
+	$f_rs = xx_tryquery($f_sql);		
 
 
-	while ($f_row = mysql_fetch_array ($f_rs, MYSQL_ASSOC)) {
+	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);
@@ -304,8 +304,8 @@
 	subject.sublocation_id = location.location_id";
 
 // Fetch the values
-$rs = mysql_tryquery($sql);
-$row = mysql_fetch_array ($rs, MYSQL_ASSOC);
+$rs = xx_tryquery($sql);
+$row = xx_fetch_array ($rs, xx_ASSOC);
 $location_id = $row["location_id"];
 $location = $row["location"];
 $location_descr = $row["location_descr"];
@@ -353,12 +353,12 @@
 	sub_loc.location_id = location.location_id";
 
 // Fetch the values
-$rs = mysql_tryquery($sql);
+$rs = xx_tryquery($sql);
 
 // Initialize
 $rowcount = 0;
 
-while ($row = mysql_fetch_array ($rs, MYSQL_ASSOC)) {
+while ($row = xx_fetch_array ($rs, xx_ASSOC)) {
 
 	$location_id = $row["location_id"];
 	$location = $row["location"];