--- trunk/admin/subject_builder.phtml	2004/03/18 20:21:08	71
+++ trunk/admin/subject_builder.phtml	2004/03/18 20:33:37	72
@@ -17,6 +17,16 @@
 printf("</HEAD>\n");
 
 
+// Default access settings
+$sess_time_human = "";
+$sess_staff_account = "";
+$sess_staff_id = 0;
+$sess_access_level = 0;
+$sess_access = "";
+$sess_last_name = "";
+$sess_first_name = "";
+
+
 // Page header
 require_once ($GLOBAL_ADMIN_HEADER);
 
@@ -45,7 +55,7 @@
 
 
 // Flag to make sure that the current user has sufficient access for this subject
-$auth_subject = authSubject($con, $sess_access_level, $sess_staff_id, $subject_id);
+$auth_subject = authSubject($sess_access_level, $sess_staff_id, $subject_id);
 
 
 // If the cookie is set and access level is appropriate
@@ -61,7 +71,7 @@
 	** Display user's subject choice **
 	**********************************/
 
-	$subject = lookupField($con, "subject", "subject_id", $subject_id, "subject");
+	$subject = lookupField("subject", "subject_id", $subject_id, "subject");
 	printf("<h2>Research QuickStart: %s</h2>", $subject);
 	printf("</td></tr>\n");
 
@@ -101,8 +111,8 @@
 		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);	
 	$rqs_date_modified = $row["rqs_date_modified"];
 	$rqs_date_created = $row["rqs_date_created"];
 	$rqs_account_created = $row["rqs_account_created"];
@@ -169,13 +179,13 @@
 
 	// User limited by masterinfotype, display it
 	if ($masterinfotype_id > 0) {
-		$masterinfotype = lookupField($con, "masterinfotype", "masterinfotype_id", $masterinfotype_id, "masterinfotype");
+		$masterinfotype = lookupField("masterinfotype", "masterinfotype_id", $masterinfotype_id, "masterinfotype");
 		printf(" within <b>%s</b>\n", $masterinfotype);
 	}
 
 	// User limited by feature, display it
 	if ($feature_id > 0) {
-		$feature = lookupField($con, "feature", "feature_id", $feature_id, "feature");
+		$feature = lookupField("feature", "feature_id", $feature_id, "feature");
 		printf(" involving <b>%s</b>\n", $feature);
 	}
 
@@ -215,7 +225,7 @@
 	printf("<tr><td class = \"cellPlain\">Master Info Type:</td><td>\n");
 	printf("<select name = \"masterinfotype_id\">\n");
 	printf("<option value=\"0\">All</option>\n");
-	dropDownFieldSelected($con, "masterinfotype", "masterinfotype", "masterinfotype_id", " WHERE masterinfotype_id > 1 ", $masterinfotype_id);
+	dropDownFieldSelected("masterinfotype", "masterinfotype", "masterinfotype_id", " WHERE masterinfotype_id > 1 ", $masterinfotype_id);
 	printf("</select>\n");
 	printf(" and/or</td></tr>\n");
 
@@ -226,7 +236,7 @@
 	printf("<tr><td class = \"cellPlain\" >Feature:</td><td>\n");
 	printf("<select name = \"feature_id\">\n");
 	printf("<option value=\"0\">All</option>\n");
-	dropDownFieldSelected($con, "feature", "feature", "feature_id", " WHERE feature_id > 1 ", $feature_id);
+	dropDownFieldSelected("feature", "feature", "feature_id", " WHERE feature_id > 1 ", $feature_id);
 	printf("</select>\n");
 
 	printf("<input type=\"submit\" value =\"Limit\"></form>\n");
@@ -245,7 +255,7 @@
 	// Determine any limits and draw the box
 	if (strlen($letter) > 0 && $letter != "All") $limit = $letter;
 	if (strlen($limitstring) > 0) $limit = $limitstring;
-	dropDownResource($con, 0, $limit, $masterinfotype_id, $feature_id);
+	dropDownResource(0, $limit, $masterinfotype_id, $feature_id);
 	printf("</select><br>\n");
 
 	printf("<input type =\"hidden\" name=\"subject_id\" value =\"%d\">\n", $subject_id);
@@ -266,10 +276,10 @@
 	*************************/
 	
 	printf("<td width=\"50%%\" valign=\"top\" align=\"right\">\n");
-	formAssignSubOtherSub($con, $subject_id);
+	formAssignSubOtherSub($subject_id);
 	
 	printf("<br>\n");
-	formAssignSubPage($con, $subject_id);
+	formAssignSubPage($subject_id);
 	
 	// Close outer cell, row, and table
 	printf("</td></tr></table>\n");
@@ -301,7 +311,7 @@
 			rsi.infotype_id = i.infotype_id
 			ORDER BY mi.masterinfotype, i.infotype";
 
-	$rs = xx_query($sql, $con);
+	$rs = xx_tryquery($sql);
 
 	$rows = xx_num_rows($rs);
 
@@ -309,7 +319,7 @@
 	$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"];
@@ -369,11 +379,11 @@
 		rsi.resource_id = r.resource_id
 		ORDER BY m.masterinfotype, i.infotype, r.title";
 
-	$rs = xx_query($sql, $con);
+	$rs = xx_tryquery($sql);
 
 	// printf("sql was: %s<BR><BR>", $sql);
 
-	while ($row = xx_fetch_array ($rs)) {
+	while ($row = xx_fetch_array ($rs, xx_ASSOC)) {
 
 		// Fetch information types for this subject
 		$description = $row["description"];
@@ -396,7 +406,7 @@
 
 
 		// Edit mode
-		if ($selected_resource_id == $resource_id && $selected_infotype_id == $infotype_id) {
+		if ($selected_resource_id == $resource_id && $selected_infotype_id == $infotype_id && $operation == "editSubjectBuilder") {
 
 			// Build an anchor
 			printf("<a name = \"%d\" > </a>\n", $resource_id);
@@ -413,7 +423,7 @@
 			// Change information type
 			printf("<br><b>Information Type:</b><br>\n");
 			printf("<select name =\"infotype_id\">\n");
-			dropDownInfotype($con, $infotype_id, $subject_id);
+			dropDownInfotype($infotype_id, $subject_id);
 			printf("</select><BR><BR>\n");
 
 			// Set to highlighted status
@@ -474,10 +484,53 @@
 
 		}
 
+		// Prompt for removal
+		else if ($selected_resource_id == $resource_id && $selected_infotype_id == $infotype_id && $operation == "deleteSubjectBuilder") {
+
+			printf("<table border =\"1\" class=\"backLight\">\n");
+			printf("<tr><td class=\"cellPlain\"><a name=\"r%d\">Remove This Resource?</a></td></tr>\n", $resource_id);
+			printf("<td class=\"backLight\">\n");
+
+			printf("<b>Title:</b> %s<br>\n", $title);
+			if (strlen($url) > 0 ) printf ("<b>URL:</b> <a href=\"%s\">%s</a><BR>\n", $url, $url);
+			printf("<b>Description:</b> ");
+			if (strlen($description) > 0) printf("<i>%s</i> ", $description);
+			else printf("<i>%s</i> ", $annotation);
+			printf("<br><br>\n");
+			
+			// Remove
+			printf("<table><tr>\n");
+			printf("<form method =\"POST\" action=\"subject_transaction.phtml\" >\n");
+			printf("<td>\n");
+			printf("<input type=\"hidden\" name=\"transaction\" value=\"deleteSubjectBuilder\">\n");
+			printf("<input type=\"hidden\" name =\"resource_id\" value =\"%d\">\n", $selected_resource_id);
+			printf("<input type=\"hidden\" name =\"subject_id\" value =\"%d\">\n", $subject_id);
+			printf("<input type=\"hidden\" name =\"infotype_id\" value =\"%d\">\n", $selected_infotype_id);			
+			printf("<input type = \"submit\" value =\"Remove\">\n");
+			printf("</td></form>\n");
+			
+			// Cancel
+			printf("<form method=\"POST\" action=\"subject_builder.phtml?subject_id=%d#r%d\">", $subject_id, $resource_id);
+			printf("<td>\n");
+			printf("<input type =\"submit\" value =\"Cancel\">\n");
+			printf("</td></form></tr>\n");
+			
+			// Close things
+			printf("</table></table><br>\n");
+
+		}
 
 		// Display mode
 		else {  
 
+			if ($masterinfotype_id == 1 && $infotype_id == 1) {
+
+				printf("<b>System Message: ");
+				if (existsResSubNOTNA($resource_id, $subject_id)) printf("The following resource appears elsewhere on this page.  Multiple instances must belong to unique information types.  Please assign to a new information type or remove it.");
+				else printf("The following resource lacked a default information type when it was added to this page.  Please assign this instance to an information type.  Also consider assigning a default information type to the base resource if it is still blank.");
+				printf("</b><br><br>\n");
+			}
+
 			printf("<a name=\"r%d\">Title:</a> %s<br>\n", $resource_id, $title);
 			if (strlen($url) > 0 ) printf ("URL: <a href=\"%s\">%s</a><BR>\n", $url, $url);
 			printf("Description: ");
@@ -506,12 +559,12 @@
 			printf("</td></form>\n");
 			
 			// Remove this entry
-			printf("<form method =\"POST\" action=\"subject_transaction.phtml\" >\n");
+			printf("<form method=\"POST\" action=\"subject_builder.phtml?subject_id=%d#r%d\">", $subject_id, $resource_id);			
 			printf("<td>\n");
-			printf("<input type=\"hidden\" name=\"transaction\" value=\"deleteSubjectBuilder\">\n");
-			printf("<input type=\"hidden\" name =\"resource_id\" value =\"%d\">\n", $resource_id);
+			printf("<input type=\"hidden\" name=\"operation\" value=\"deleteSubjectBuilder\">\n");
+			printf("<input type=\"hidden\" name =\"selected_resource_id\" value =\"%d\">\n", $resource_id);
 			printf("<input type=\"hidden\" name =\"subject_id\" value =\"%d\">\n", $subject_id);
-			printf("<input type=\"hidden\" name =\"infotype_id\" value =\"%d\">\n", $infotype_id);			
+			printf("<input type=\"hidden\" name =\"selected_infotype_id\" value =\"%d\">\n", $infotype_id);			
 			printf("<input type = \"submit\" value =\"Remove\">\n");
 			printf("</td></form></tr></table><br><br>\n");