[Stack-cvs] stack-dev/lib/database StackDBReporting.php,1.32,1.33

[Ben H. <bdv...@us...>]

Update of /cvsroot/stack/stack-dev/lib/database
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv31054/lib/database

Modified Files:
	StackDBReporting.php 
Log Message:
Some improvements. Getting errors with unserialising a question item.

Index: StackDBReporting.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lib/database/StackDBReporting.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** StackDBReporting.php	1 Dec 2010 12:09:57 -0000	1.32
--- StackDBReporting.php	8 Dec 2010 16:53:21 -0000	1.33
***************
*** 47,59 ****
  	* @return array the questions produced
  	*/
! 	public function questionList($ids = null) {
  
  		$sql = 'SELECT questionID, questionName, questionDescription
! 		        FROM   stackquestion, question_lines
! 				WHERE questionID = latestVersion';
! 
! 		if (isset($ids)) $sql .= " AND questionID IN ($ids)";
  
! 		//$sql .= ' GROUP BY line';
  
  		$this->connect();
--- 47,56 ----
  	* @return array the questions produced
  	*/
! 	public function questionList($onlyLatest = True) {
  
  		$sql = 'SELECT questionID, questionName, questionDescription
! 		        FROM   stackquestion, question_lines';
  
! 		if ($onlyLatest) $sql .= " WHERE questionID = latestVersion";
  
  		$this->connect();
***************
*** 109,113 ****
  
  		$sql = "SELECT AttemptID, qID, UserID, question_attempts.TimeStamp, RawAns, Status, ModMark, currentTotalMark, totalPossibleMarks
! 		FROM display_cache, display_cache_sequence, attempt_meta_answer, question_attempts, attempt_meta_PRT
  		WHERE display_cache_sequence.nextNode = display_cache.id
  		AND display_cache_sequence.id = question_attempts.TransitionID
--- 106,110 ----
  
  		$sql = "SELECT AttemptID, qID, UserID, question_attempts.TimeStamp, RawAns, Status, ModMark, currentTotalMark, totalPossibleMarks
! 		FROM display_cache, display_cache_sequence, attempt_meta_answer, question_attempts, attempt_meta_PRT, question_lines
  		WHERE display_cache_sequence.nextNode = display_cache.id
  		AND display_cache_sequence.id = question_attempts.TransitionID
***************
*** 115,119 ****
  		AND attempt_meta_PRT.CacheID = display_cache.id \n";
  
! 		if (isset($question)) 	$sql .= "AND display_cache.qID = $question \n";
  		if (isset($student))	$sql .= "AND question_attempts.UserID = $student \n";
  
--- 112,118 ----
  		AND attempt_meta_PRT.CacheID = display_cache.id \n";
  
! 		if (isset($question))   $sql .= "AND display_cache.qID = $question \n";
! 		else 				    $sql .= "AND display_cache.qID = latestVersion \n";
! 		
  		if (isset($student))	$sql .= "AND question_attempts.UserID = $student \n";
  
***************
*** 327,337 ****
  		$sql = "SELECT dc1.qID, dc1.currentTotalMark, (
  				SELECT COUNT(qID)
! 				FROM question_attempts, display_cache dc2, display_cache_sequence
  				WHERE question_attempts.UserID = $studentID
  				AND question_attempts.TransitionID = display_cache_sequence.id
  				AND nextNode = dc2.id
  				AND dc2.qID = dc1.qID
  			) as attempts
! 			FROM question_attempts, display_cache_sequence, display_cache dc1
  			WHERE question_attempts.TimeStamp = (
  					SELECT MAX(question_attempts.TimeStamp)
--- 326,337 ----
  		$sql = "SELECT dc1.qID, dc1.currentTotalMark, (
  				SELECT COUNT(qID)
! 				FROM question_attempts, display_cache dc2, display_cache_sequence, question_lines
  				WHERE question_attempts.UserID = $studentID
+ 				AND qID = latestVersion
  				AND question_attempts.TransitionID = display_cache_sequence.id
  				AND nextNode = dc2.id
  				AND dc2.qID = dc1.qID
  			) as attempts
! 			FROM question_attempts, display_cache_sequence, display_cache dc1, question_lines
  			WHERE question_attempts.TimeStamp = (
  					SELECT MAX(question_attempts.TimeStamp)
***************
*** 339,342 ****
--- 339,343 ----
  					WHERE question_attempts.UserID = $studentID
  					AND TransitionID = display_cache_sequence.id
+ 					AND dc1.qID = latestVersion
  					AND nextNode = dc2.id
  					AND dc2.qID = dc1.qID