[Logicampus-cvs] logicampus/src/logicreate/services/textbookmgr dup.lcp, 1.2, 1.3 estimates.lcp, 1.

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/logicampus/logicampus/src/logicreate/services/textbookmgr
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24452/textbookmgr

Modified Files:
	dup.lcp estimates.lcp main.lcp viewestimates.lcp 
Log Message:
Change function "next_record" to "nextRecord".

Index: viewestimates.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/textbookmgr/viewestimates.lcp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** viewestimates.lcp	21 Nov 2003 23:14:14 -0000	1.1.1.1
--- viewestimates.lcp	8 Oct 2007 14:31:27 -0000	1.2
***************
*** 82,86 ****
  	function editRun(&$db,&$u,&$lc,&$t) {
  		$db->queryOne("select * from textbook_estimates_data where textbook_estimates_data_key=".(int)$lc->getvars['key']);
! 		$t['books'][] = $db->Record;
  		$t['key'] = $lc->getvars['key'];
  		$lc->templateName = "viewestimates_edit";
--- 82,86 ----
  	function editRun(&$db,&$u,&$lc,&$t) {
  		$db->queryOne("select * from textbook_estimates_data where textbook_estimates_data_key=".(int)$lc->getvars['key']);
! 		$t['books'][] = $db->record;
  		$t['key'] = $lc->getvars['key'];
  		$lc->templateName = "viewestimates_edit";
***************
*** 104,109 ****

  		//$db->query("select * from textbook_estimates_data where textbook_estimates_key=".(int)$lc->getvars['key'] ." order by courseFamily, courseNumber");
! 		while($db->next_record()) {
! 			$t['books'][$db->Record['textbook_estimates_data_key']] = $db->Record;
  		}
  		// oops - mgk - 11/12/03 - forgot 'required' - look it up
--- 104,109 ----

  		//$db->query("select * from textbook_estimates_data where textbook_estimates_key=".(int)$lc->getvars['key'] ." order by courseFamily, courseNumber");
! 		while($db->nextRecord()) {
! 			$t['books'][$db->record['textbook_estimates_data_key']] = $db->record;
  		}
  		// oops - mgk - 11/12/03 - forgot 'required' - look it up
***************
*** 136,142 ****
  			and isbn='".$v['isbn']."' and title='".addslashes($v['title'])."' and 
  			author='".$v['author']."'");
! 			$v['required'] = $db->Record[0];
! 			$v['sectionNumbers'] = $db->Record['sectionNumbers'];
! 			$v['bundled_items'] = $db->Record['bundled_items'];
  			$t['books'][$k] = $v;

--- 136,142 ----
  			and isbn='".$v['isbn']."' and title='".addslashes($v['title'])."' and 
  			author='".$v['author']."'");
! 			$v['required'] = $db->record[0];
! 			$v['sectionNumbers'] = $db->record['sectionNumbers'];
! 			$v['bundled_items'] = $db->record['bundled_items'];
  			$t['books'][$k] = $v;

Index: dup.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/textbookmgr/dup.lcp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dup.lcp	12 May 2004 23:42:10 -0000	1.2
--- dup.lcp	8 Oct 2007 14:31:27 -0000	1.3
***************
*** 43,48 ****
  		$lc->templateName = 'dup_main';
  		$db->query("select * from semesters");
! 		while($db->next_record()) { 
! 			$s[$db->Record[0]] = $db->Record[2]." - ".$db->Record[1];
  		}
  		$t['sem'] = makeOptions($s);
--- 43,48 ----
  		$lc->templateName = 'dup_main';
  		$db->query("select * from semesters");
! 		while($db->nextRecord()) { 
! 			$s[$db->record[0]] = $db->record[2]." - ".$db->record[1];
  		}
  		$t['sem'] = makeOptions($s);
***************
*** 70,74 ****

  		}
! 		$t['fromsemester'] = $db->Record[2]." - ".$db->Record[1];

  		$db->queryOne("select * from semesters where id_semesters=$to");
--- 70,74 ----

  		}
! 		$t['fromsemester'] = $db->record[2]." - ".$db->record[1];

  		$db->queryOne("select * from semesters where id_semesters=$to");
***************
*** 80,84 ****

  		}
! 		$t['tosemester'] = $db->Record[2]." - ".$db->Record[1];

--- 80,84 ----

  		}
! 		$t['tosemester'] = $db->record[2]." - ".$db->record[1];

***************
*** 90,125 ****
  		$sql ="select c.*, d.* from classes c, courses d where c.id_courses=d.id_courses and (c.id_semesters=$from) ORDER BY d.courseFamily, d.courseNumber";
  		$db->query($sql);
! 		while($db->next_record()){
! 			$num = $db->Record['courseFamilyNumber'];
! 			$name = $db->Record['courseName'];
! 			$first = $db->Record['firstname'];
! 			$last= $db->Record['lastname'];
! 			$id = $db->Record['facultyId'];
  			$id = ucwords(str_replace("."," ",$id));
  			$x = "$num - $name - $id";
! 			$arrayfrom[$db->Record['id_classes']] = $x;
  		}
  		$sql ="select c.*, d.* from classes c, courses d where c.id_courses=d.id_courses and (c.id_semesters=$to) ORDER BY d.courseFamily, d.courseNumber";
  		$db->query($sql);
  		if (strpos($button,"single")>0) { // copying a single to potential multiples - no restriction
! 			while($db->next_record()){
! 				$num = $db->Record['courseFamilyNumber'];
! 				$name = $db->Record['courseName'];
! 				$id = $db->Record['facultyId'];
  				$id = ucwords(str_replace("."," ",$id));
! 				$first = $db->Record['firstname'];
! 				$last= $db->Record['lastname'];
  				$x = "$num - $name - $id";
! 				$arrayto[$db->Record['id_classes']] = $x;
  			}
  		} else { // copying 'all' so we should only show classes that are the same both times
! 			while($db->next_record()){
! 				if ($arrayfrom[$db->Record[1]]!='') {
! 					$num = $db->Record['courseFamilyNumber'];
! 					$name = $db->Record['courseName'];
! 					$first = $db->Record['firstname'];
! 					$last= $db->Record['lastname'];
! 					$x = $db->Record['id_classes']." "."$num - $name - $first $last";
! 					$arrayto[$db->Record['id_classes']] = $x;
  				}
  			}
--- 90,125 ----
  		$sql ="select c.*, d.* from classes c, courses d where c.id_courses=d.id_courses and (c.id_semesters=$from) ORDER BY d.courseFamily, d.courseNumber";
  		$db->query($sql);
! 		while($db->nextRecord()){
! 			$num = $db->record['courseFamilyNumber'];
! 			$name = $db->record['courseName'];
! 			$first = $db->record['firstname'];
! 			$last= $db->record['lastname'];
! 			$id = $db->record['facultyId'];
  			$id = ucwords(str_replace("."," ",$id));
  			$x = "$num - $name - $id";
! 			$arrayfrom[$db->record['id_classes']] = $x;
  		}
  		$sql ="select c.*, d.* from classes c, courses d where c.id_courses=d.id_courses and (c.id_semesters=$to) ORDER BY d.courseFamily, d.courseNumber";
  		$db->query($sql);
  		if (strpos($button,"single")>0) { // copying a single to potential multiples - no restriction
! 			while($db->nextRecord()){
! 				$num = $db->record['courseFamilyNumber'];
! 				$name = $db->record['courseName'];
! 				$id = $db->record['facultyId'];
  				$id = ucwords(str_replace("."," ",$id));
! 				$first = $db->record['firstname'];
! 				$last= $db->record['lastname'];
  				$x = "$num - $name - $id";
! 				$arrayto[$db->record['id_classes']] = $x;
  			}
  		} else { // copying 'all' so we should only show classes that are the same both times
! 			while($db->nextRecord()){
! 				if ($arrayfrom[$db->record[1]]!='') {
! 					$num = $db->record['courseFamilyNumber'];
! 					$name = $db->record['courseName'];
! 					$first = $db->record['firstname'];
! 					$last= $db->record['lastname'];
! 					$x = $db->record['id_classes']." "."$num - $name - $first $last";
! 					$arrayto[$db->record['id_classes']] = $x;
  				}
  			}

Index: main.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/textbookmgr/main.lcp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** main.lcp	18 Nov 2006 00:09:35 -0000	1.4
--- main.lcp	8 Oct 2007 14:31:27 -0000	1.5
***************
*** 171,177 ****
  		$db->queryOne($sql);

! 		$this->sectionTitle .= ' - '. $db->Record['courseName'].'('.$db->Record['courseFamily'].$db->Record['courseNumber'].')';

! 		$t['facultyId'] = $db->Record['facultyId'];			

  	}
--- 171,177 ----
  		$db->queryOne($sql);

! 		$this->sectionTitle .= ' - '. $db->record['courseName'].'('.$db->record['courseFamily'].$db->record['courseNumber'].')';

! 		$t['facultyId'] = $db->record['facultyId'];			

  	}
***************
*** 190,196 ****
  			$db->queryOne($sql);
  			$this->sectionTitle = 'Adding Class Material ';
! 			$this->sectionTitle .= ' - '. $db->Record['courseName'].'('.$db->Record['courseFamily'].$db->Record['courseNumber'].')';

! 			$t['facultyId'] = $db->Record['facultyId'];		
  		} else {
  			$t['message'] = '<h3>Error</h3>Only text book admins or adminstrators can add books to the system.';
--- 190,196 ----
  			$db->queryOne($sql);
  			$this->sectionTitle = 'Adding Class Material ';
! 			$this->sectionTitle .= ' - '. $db->record['courseName'].'('.$db->record['courseFamily'].$db->record['courseNumber'].')';

! 			$t['facultyId'] = $db->record['facultyId'];		
  		} else {
  			$t['message'] = '<h3>Error</h3>Only text book admins or adminstrators can add books to the system.';
***************
*** 259,263 ****
  		$db->RESULT_TYPE = MYSQL_ASSOC;
  		$db->queryOne($sql);
! 		if (is_array($db->Record))
  		{
  			$sql = '
--- 259,263 ----
  		$db->RESULT_TYPE = MYSQL_ASSOC;
  		$db->queryOne($sql);
! 		if (is_array($db->record))
  		{
  			$sql = '
***************
*** 266,276 ****
  			id_textbook_classes='.$id_textbook_classes.',
  			textbook_estimates_key='.$lc->postvars['estimationlist'].',
! 			instructor=\''.$db->Record['facultyId'].'\',
  			bundled=\''.(int)$lc->postvars['bundled'].'\',
  			isbn=\''.$lc->postvars['isbn'].'\',
  			edition=\''.$lc->postvars['edition'].'\',
  			title=\''.addslashes($lc->postvars['title']).'\',
! 			courseFamily=\''.$db->Record['courseFamily'].'\',
! 			courseNumber=\''.$db->Record['courseNumber'].'\',
  			author=\''.addslashes($lc->postvars['author']).'\',
  			note=\''.addslashes($lc->postvars['note']).'\',
--- 266,276 ----
  			id_textbook_classes='.$id_textbook_classes.',
  			textbook_estimates_key='.$lc->postvars['estimationlist'].',
! 			instructor=\''.$db->record['facultyId'].'\',
  			bundled=\''.(int)$lc->postvars['bundled'].'\',
  			isbn=\''.$lc->postvars['isbn'].'\',
  			edition=\''.$lc->postvars['edition'].'\',
  			title=\''.addslashes($lc->postvars['title']).'\',
! 			courseFamily=\''.$db->record['courseFamily'].'\',
! 			courseNumber=\''.$db->record['courseNumber'].'\',
  			author=\''.addslashes($lc->postvars['author']).'\',
  			note=\''.addslashes($lc->postvars['note']).'\',
***************
*** 300,304 ****
  			$db->RESULT_TYPE = MYSQL_ASSOC;
  			$db->queryOne($sql);
! 			$semester_label = $db->Record['semesterLabel'];

  			$sql = "SELECT a.courseFamily, a.courseNumber, a.facultyId, b.courseName FROM classes AS a INNER JOIN courses as b ON a.id_courses=b.id_courses WHERE a.id_classes='".$book->idClasses."'";
--- 300,304 ----
  			$db->RESULT_TYPE = MYSQL_ASSOC;
  			$db->queryOne($sql);
! 			$semester_label = $db->record['semesterLabel'];

  			$sql = "SELECT a.courseFamily, a.courseNumber, a.facultyId, b.courseName FROM classes AS a INNER JOIN courses as b ON a.id_courses=b.id_courses WHERE a.id_classes='".$book->idClasses."'";
***************
*** 307,312 ****
  			include_once(SERVICE_PATH."pm/privmess.php");
  			$mess = new privMess();
! 			$mess->subject = $semester_label. ': Textbook status changed to '.getStatus($lc->postvars['status']).' on class '.$db->Record['courseFamily'].$db->Record['courseNumber'];
! 			$mess->message = $semester_label.': '.$u->profile->get('firstname').' '.$u->profile->get('lastname'). ' has reviewed your submission and the status of the material listed below has changed to "'.getStatus($lc->postvars['status']).'" in your '.$db->Record['courseName'].' - '.$db->Record['courseFamily'].$db->Record['courseNumber'];
  			$mess->message .= "\n\nMaterial:\n".$book->title. ' - '. $book->author;

--- 307,312 ----
  			include_once(SERVICE_PATH."pm/privmess.php");
  			$mess = new privMess();
! 			$mess->subject = $semester_label. ': Textbook status changed to '.getStatus($lc->postvars['status']).' on class '.$db->record['courseFamily'].$db->record['courseNumber'];
! 			$mess->message = $semester_label.': '.$u->profile->get('firstname').' '.$u->profile->get('lastname'). ' has reviewed your submission and the status of the material listed below has changed to "'.getStatus($lc->postvars['status']).'" in your '.$db->record['courseName'].' - '.$db->record['courseFamily'].$db->record['courseNumber'];
  			$mess->message .= "\n\nMaterial:\n".$book->title. ' - '. $book->author;

***************
*** 320,324 ****
  			$mess->messageFrom = $u->username;

! 			$mess->messageTo = $db->Record['facultyId'];
  			$mess->add();

--- 320,324 ----
  			$mess->messageFrom = $u->username;

! 			$mess->messageTo = $db->record['facultyId'];
  			$mess->add();

***************
*** 355,359 ****
  		$db->RESULT_TYPE = MYSQL_ASSOC;
  		$db->queryOne($sql);
! 		$this->sectionTitle .= ' - '. $db->Record['courseName'].'('.$db->Record['courseFamily'].$db->Record['courseNumber'].')';
  		$t['id_classes'] = $lc->getvars['id'];
  		if (in_array('tbadmin', $u->groups) || in_array('admin', $u->groups)) 
--- 355,359 ----
  		$db->RESULT_TYPE = MYSQL_ASSOC;
  		$db->queryOne($sql);
! 		$this->sectionTitle .= ' - '. $db->record['courseName'].'('.$db->record['courseFamily'].$db->record['courseNumber'].')';
  		$t['id_classes'] = $lc->getvars['id'];
  		if (in_array('tbadmin', $u->groups) || in_array('admin', $u->groups)) 

Index: estimates.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/textbookmgr/estimates.lcp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** estimates.lcp	2 Jun 2005 02:06:36 -0000	1.2
--- estimates.lcp	8 Oct 2007 14:31:27 -0000	1.3
***************
*** 54,58 ****
  		$books = $u->sessionvars['textbooks'];
  		$db->queryOne("Select * from textbook_estimates where textbook_estimates_name ='$name'");
! 		$key = $db->Record['textbook_estimates_key'];
  		if ($key) {
  			$db->query("delete from textbook_estimates_data where textbook_estimates_key=$key");
--- 54,58 ----
  		$books = $u->sessionvars['textbooks'];
  		$db->queryOne("Select * from textbook_estimates where textbook_estimates_name ='$name'");
! 		$key = $db->record['textbook_estimates_key'];
  		if ($key) {
  			$db->query("delete from textbook_estimates_data where textbook_estimates_key=$key");
***************
*** 110,115 ****
  		$db->RESULT_TYPE = MYSQL_ASSOC;
  		$db->query($sql);
! 		while($db->next_record()){ 
! 			$temp[$db->Record['id_semesters']] = $db->Record['semesterTerm']." ".$db->Record['semesterYear'];
  		}
  		$t['semester1'] = makeOptions($temp);
--- 110,115 ----
  		$db->RESULT_TYPE = MYSQL_ASSOC;
  		$db->query($sql);
! 		while($db->nextRecord()){ 
! 			$temp[$db->record['id_semesters']] = $db->record['semesterTerm']." ".$db->record['semesterYear'];
  		}
  		$t['semester1'] = makeOptions($temp);
***************
*** 126,130 ****
  		$db->queryOne($sql);

! 		$t['semester_label'] = $db->Record['semesterYear'].' '.$db->Record['semesterTerm'];

  		$sql = '
--- 126,130 ----
  		$db->queryOne($sql);

! 		$t['semester_label'] = $db->record['semesterYear'].' '.$db->record['semesterTerm'];

  		$sql = '
***************
*** 137,141 ****
  		$db->queryOne($sql);

! 		$t['semester1_label'] = $db->Record['semesterYear'].' '.$db->Record['semesterTerm'];

  		$sql = '
--- 137,141 ----
  		$db->queryOne($sql);

! 		$t['semester1_label'] = $db->record['semesterYear'].' '.$db->record['semesterTerm'];

  		$sql = '
***************
*** 148,152 ****
  		$db->queryOne($sql);

! 		$t['semester2_label'] = $db->Record['semesterYear'].' '.$db->Record['semesterTerm'];

--- 148,152 ----
  		$db->queryOne($sql);

! 		$t['semester2_label'] = $db->record['semesterYear'].' '.$db->record['semesterTerm'];

***************
*** 204,209 ****
  		$a_books = array();
  		// at most, 1000 records, first semester of this program there are only 200+
! 		while($db->next_record())
! 		{	$a_books[] = $db->Record;
  		}

--- 204,209 ----
  		$a_books = array();
  		// at most, 1000 records, first semester of this program there are only 200+
! 		while($db->nextRecord())
! 		{	$a_books[] = $db->record;
  		}

***************
*** 236,244 ****

  #			$db->queryOne("select facultyId, courseFamilyNumber from classes where id_classes='".$book['id_classes']."'");
! #			$temp= $db->Record;
  // now get me the info for that class (matching instructor and class name) for the selected 
  // previous semester
  #			$db->queryOne("select * from classes where facultyId='".$temp['facultyId']."' and courseFamilyNumber='".$temp['courseFamilyNumber']."' and id_semesters='".$sem1."'");
! #			$info = $db->Record;

  // now we have a list of section numbers for the same class taught by the same instructor 
--- 236,244 ----

  #			$db->queryOne("select facultyId, courseFamilyNumber from classes where id_classes='".$book['id_classes']."'");
! #			$temp= $db->record;
  // now get me the info for that class (matching instructor and class name) for the selected 
  // previous semester
  #			$db->queryOne("select * from classes where facultyId='".$temp['facultyId']."' and courseFamilyNumber='".$temp['courseFamilyNumber']."' and id_semesters='".$sem1."'");
! #			$info = $db->record;

  // now we have a list of section numbers for the same class taught by the same instructor 

[Logicampus-cvs] logicampus/src/logicreate/services/textbookmgr dup.lcp, 1.2, 1.3 estimates.lcp, 1.

[Logicampus-cvs] logicampus/src/logicreate/services/textbookmgr dup.lcp, 1.2, 1.3 estimates.lcp, 1.2, 1.3 main.lcp, 1.4, 1.5 viewestimates.lcp, 1.1.1.1, 1.2