From 6e9debfbf19cfb158c03238eca391fb3fb346438 Mon Sep 17 00:00:00 2001 From: tjhunt Date: Thu, 24 May 2007 17:25:37 +0000 Subject: [PATCH] Removing remaining references to RQP in core code. I had not realised there were so many. By the way, I am committing this from a pub in York. Pub's with wireless, whatever next? --- lang/en_utf8/help/quiz/index.html | 1 - lib/questionlib.php | 1 - question/backuplib.php | 39 +++++-------------------------- question/restorelib.php | 21 ++++++----------- question/type/questiontype.php | 8 ------- 5 files changed, 13 insertions(+), 57 deletions(-) diff --git a/lang/en_utf8/help/quiz/index.html b/lang/en_utf8/help/quiz/index.html index e0971b5464..975ac0faa6 100644 --- a/lang/en_utf8/help/quiz/index.html +++ b/lang/en_utf8/help/quiz/index.html @@ -52,7 +52,6 @@
  • Responses Download
  • Responses Options
  • Allow review
    • -
  • Remote Questions (RQP)
  • Short Answer questions
  • Shuffle answers
  • Shuffle questions
    • diff --git a/lib/questionlib.php b/lib/questionlib.php index ebd60fd906..dffa7ea76c 100644 --- a/lib/questionlib.php +++ b/lib/questionlib.php @@ -48,7 +48,6 @@ define("DESCRIPTION", "description"); define("NUMERICAL", "numerical"); define("MULTIANSWER", "multianswer"); define("CALCULATED", "calculated"); -define("RQP", "rqp"); define("ESSAY", "essay"); /**#@-*/ diff --git a/question/backuplib.php b/question/backuplib.php index 51a49dbd85..3637f944f2 100644 --- a/question/backuplib.php +++ b/question/backuplib.php @@ -30,12 +30,12 @@ // (CL,pk->id,fk->category,files) | // | question_dataset_items // | (CL,pk->id,fk->definition) - // | question_rqp_type - // | (SL,pk->id) - // | | - // -------------------------------------------------------------------------------------------------------------- | - // | | | | | | | question_rqp - // | | | | | | |--(CL,pk->id,fk->question) + // | + // | + // | + // -------------------------------------------------------------------------------------------------------------- + // | | | | | | | + // | | | | | | | // | | | | question_calculated | | // question_truefalse | question_multichoice | (CL,pl->id,fk->question) | | // (CL,pk->id,fk->question) | (CL,pk->id,fk->question) | . | | question_randomsamatch @@ -64,9 +64,6 @@ // . // question_states // (UL,pk->id,fk->attempt,question) - // | - // question_rqp_states - // (UL,pk->id,fk->stateid) // // Meaning: pk->primary key field of the table // fk->foreign key to link with parent @@ -322,8 +319,6 @@ fwrite ($bf,full_tag("GRADE",$level + 2,false,$state->grade)); fwrite ($bf,full_tag("RAW_GRADE",$level + 2,false,$state->raw_grade)); fwrite ($bf,full_tag("PENALTY",$level + 2,false,$state->penalty)); - // now back up question type specific state information - $status = backup_question_rqp_state ($bf,$preferences,$state->id, $level + 2); //End state $status = fwrite ($bf,end_tag("STATE",$level + 1,true)); } @@ -363,28 +358,6 @@ return $status; } - //Backup question_rqp_state contents (executed from backup_question_states) - function backup_question_rqp_state ($bf,$preferences,$state, $level = 8) { - - global $CFG; - - $status = true; - - $rqp_state = get_record("question_rqp_states","stateid",$state); - //If there is a state - if ($rqp_state) { - //Write start tag - $status = fwrite ($bf,start_tag("RQP_STATE",$level,true)); - //Print state contents - fwrite ($bf,full_tag("RESPONSES",$level + 1,false,$rqp_state->responses)); - fwrite ($bf,full_tag("PERSISTENT_DATA",$level + 1,false,$rqp_state->persistent_data)); - fwrite ($bf,full_tag("TEMPLATE_VARS",$level + 1,false,$rqp_state->template_vars)); - //Write end tag - $status = fwrite ($bf,end_tag("RQP_STATE",$level,true)); - } - return $status; - } - //Returns an array of categories id function question_category_ids_by_backup ($backup_unique_code) { diff --git a/question/restorelib.php b/question/restorelib.php index 23a80b1883..2c00b47e18 100644 --- a/question/restorelib.php +++ b/question/restorelib.php @@ -38,12 +38,12 @@ // (CL,pk->id,fk->category,files) | // | question_dataset_items // | (CL,pk->id,fk->definition) - // | question_rqp_type - // | (SL,pk->id) - // | | - // -------------------------------------------------------------------------------------------------------------- | - // | | | | | | | question_rqp - // | | | | | | |--(CL,pk->id,fk->question) + // | + // | + // | + // -------------------------------------------------------------------------------------------------------------- + // | | | | | | | + // | | | | | | | // | | | | question_calculated | | // question_truefalse | question_multichoice | (CL,pl->id,fk->question) | | // (CL,pk->id,fk->question) | (CL,pk->id,fk->question) | . | | question_randomsamatch @@ -72,9 +72,6 @@ // . // question_states // (UL,pk->id,fk->attempt,question) - // | - // question_rqp_states - // (UL,pk->id,fk->stateid) // // Meaning: pk->primary key field of the table // fk->foreign key to link with parent @@ -678,11 +675,7 @@ if ($newid) { //We have the newid, update backup_ids - backup_putid($restore->backup_unique_code,"question_states",$oldid, - $newid); - //Now process question type specific state information - $qtype = get_field('question', 'qtype', 'id', $state->question); - $status = $QTYPES[$qtype]->restore_state($newid,$res_info,$restore); + backup_putid($restore->backup_unique_code, 'question_states', $oldid, $newid); } else { $status = false; } diff --git a/question/type/questiontype.php b/question/type/questiontype.php index 2c2fa6218e..9cbf081f07 100644 --- a/question/type/questiontype.php +++ b/question/type/questiontype.php @@ -1381,13 +1381,5 @@ class default_questiontype { // There is nothing to decode return $state->answer; } - - //This function restores the question_rqp_states - function restore_state($state_id,$info,$restore) { - // The default question type does not keep its own state information - return true; - } - } - ?> -- 2.39.5