]> git.mjollnir.org Git - moodle.git/commitdiff
Now restoring workshops are working too !!
authorstronk7 <stronk7>
Mon, 25 Aug 2003 22:40:38 +0000 (22:40 +0000)
committerstronk7 <stronk7>
Mon, 25 Aug 2003 22:40:38 +0000 (22:40 +0000)
Now all is ready to be 1.1 Beta 1.
Congratulations everybody !!
Anyway, some polish must be done, friends...

backup/STATUS.txt
backup/db/mysql.php
backup/version.php
mod/workshop/restorelib.php [new file with mode: 0644]

index e07c41ae51918d5d6925911bab59e96f08d00476..3046470407e4e8e2336ef4e39d31f6dd2801a456 100644 (file)
@@ -5,7 +5,7 @@ This documment shows the current status of the backup/restore option.
 
 Backup:  WORKING. COMPLETED !!
 
-Restore: WORKING. COMPLETED except workshops and logs.
+Restore: WORKING. COMPLETED except logs.
                   
 
 ========== ========== ========== ========== ========== ==========
@@ -129,7 +129,7 @@ Restore Details:
            - About existing users...............................DONE
         - Launch Restore........................................DONE
         - Show progress.........................................DONE
-   - Restore Items:.............................................IN PROGRESS
+   - Restore Items:.............................................DONE
         - Course................................................DONE
            - Course Summary Data................................DONE
               - Course Table....................................DONE
@@ -194,10 +194,10 @@ Restore Details:
                  + course data..................................DONE
                  + user data....................................DONE
                  + files.(NOT EXISTS)...........................DONE
-              x workshops.......................................IN PROGRESS
-                 + course data..................................IN PROGRESS
-                 + user data....................................IN PROGRESS
-                 + files........................................IN PROGRESS
+              x workshops.......................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files........................................DONE
    - User files from temp.......................................DONE
    - Course files from temp.....................................DONE
    - Log entries................................................NO EXISTS
index c9ab8cabbeb5372115e0a6a1627acf5a68b9afa3..386bf092525ce4b0bec0903a92ac2a8a6c731bc7 100644 (file)
@@ -66,6 +66,10 @@ function backup_upgrade($oldversion=0) {
                          MODIFY `info` MEDIUMTEXT");
     } 
 
+    if ($oldversion < 2003082600 and $result) {
+        print_simple_box("This is the first non-alpha release of the Backup/Restore module.<p>Thanks for upgrading!","center", "50%", "$THEME->cellheading", "20", "noticebox");
+    } 
+
     //Finally, return result
     return $result;
 
index b4397bf826cfadfe6d09b50208b6ff676a854d4f..c89523808435899c68dfe88fe1a1161e3ed63087 100644 (file)
@@ -5,6 +5,6 @@
 // database (backup_version) to determine whether upgrades should
 // be performed (see db/backup_*.php)
 
-$backup_version = 2003082500;   // The current version is a date (YYYYMMDDXX)
+$backup_version = 2003082600;   // The current version is a date (YYYYMMDDXX)
 
-$backup_release = "0.8.11 alpha";  // User-friendly version number
+$backup_release = "1.1 Beta 1";  // User-friendly version number
diff --git a/mod/workshop/restorelib.php b/mod/workshop/restorelib.php
new file mode 100644 (file)
index 0000000..ba341b9
--- /dev/null
@@ -0,0 +1,500 @@
+<?PHP //$Id$
+    //This php script contains all the stuff to backup/restore
+    //workshop mods
+
+    //This is the "graphical" structure of the workshop mod:
+    //
+    //                                          workshop
+    //                                         (CL,pk->id)
+    //                                             |
+    //                                             |
+    //                                             |
+    //              |------------------------------|-----------------------------------------------------|
+    //              |                                                                                    |
+    //              |                                                                                    |
+    //              |                                                                                    |
+    //              |                                                                            workshop_submissions
+    //              |                                                                        (UL,pk->id,fk->workshopid,files)
+    //              |                                                                                    |
+    //              |        |---------------------------|      |--------------------------------|       |
+    //              |        |                           |      |                                |       |
+    //        workshop_elements                      workshop_grades                            workshop_assessments
+    //    (CL,pk->id,fk->workshopid)           (UL,pk->id,fk->assessmentid)                 (UL,pk->id,fk->submissionid)
+    //              |                          (          fk->elementno   )                              |
+    //              |                                                                                    |
+    //              |                                                                                    |
+    //          workshop_rubrics                                                                 workshop_comments
+    //    (CL,pk->id,fk->elementno)                                                        (UL,pk->id,fk->assessmentid)
+    //
+    // Meaning: pk->primary key field of the table
+    //          fk->foreign key to link with parent
+    //          nt->nested field (recursive data)
+    //          CL->course level info
+    //          UL->user level info
+    //          files->table may have files)
+    //
+    //-----------------------------------------------------------
+
+    //This function executes all the restore procedure about this mod
+    function workshop_restore_mods($mod,$restore) {
+
+        global $CFG;
+
+        $status = true;
+
+        //Get record from backup_ids
+        $data = backup_getid($restore->backup_unique_code,$mod->modtype,$mod->id);
+
+        if ($data) {
+            //Now get completed xmlized object   
+            $info = $data->info;
+            //traverse_xmlize($info);                                                                     //Debug
+            //print_object ($GLOBALS['traverse_array']);                                                  //Debug
+            //$GLOBALS['traverse_array']="";                                                              //Debug
+
+            //Now, build the WORKSHOP record structure
+            $workshop->course = $restore->course_id;
+            $workshop->name = backup_todb($info['MOD']['#']['NAME']['0']['#']);
+            $workshop->description = backup_todb($info['MOD']['#']['DESCRIPTION']['0']['#']);
+            $workshop->nelements = backup_todb($info['MOD']['#']['NELEMENTS']['0']['#']);
+            $workshop->phase = backup_todb($info['MOD']['#']['PHASE']['0']['#']);
+            $workshop->format = backup_todb($info['MOD']['#']['FORMAT']['0']['#']);
+            $workshop->gradingstrategy = backup_todb($info['MOD']['#']['GRADINGSTRATEGY']['0']['#']);
+            $workshop->resubmit = backup_todb($info['MOD']['#']['RESUBMIT']['0']['#']);
+            $workshop->agreeassessments = backup_todb($info['MOD']['#']['AGREEASSESSMENTS']['0']['#']);
+            $workshop->hidegrades = backup_todb($info['MOD']['#']['HIDEGRADES']['0']['#']);
+            $workshop->anonymous = backup_todb($info['MOD']['#']['ANONYMOUS']['0']['#']);
+            $workshop->includeself = backup_todb($info['MOD']['#']['INCLUDESELF']['0']['#']);
+            $workshop->maxbytes = backup_todb($info['MOD']['#']['MAXBYTES']['0']['#']);
+            $workshop->deadline = backup_todb($info['MOD']['#']['DEADLINE']['0']['#']);
+            $workshop->grade = backup_todb($info['MOD']['#']['GRADE']['0']['#']);
+            $workshop->ntassessments = backup_todb($info['MOD']['#']['NTASSESSMENTS']['0']['#']);
+            $workshop->nsassessments = backup_todb($info['MOD']['#']['NSASSESSMENTS']['0']['#']);
+            $workshop->timemodified = backup_todb($info['MOD']['#']['TIMEMODIFIED']['0']['#']);
+            $workshop->mergegrades = backup_todb($info['MOD']['#']['MERGEGRADES']['0']['#']);
+            $workshop->teacherweight = backup_todb($info['MOD']['#']['TEACHERWEIGHT']['0']['#']);
+            $workshop->peerweight = backup_todb($info['MOD']['#']['PEERWEIGHT']['0']['#']);
+            $workshop->includeteachersgrade = backup_todb($info['MOD']['#']['INCLUDETEACHERSGRADE']['0']['#']);
+            $workshop->biasweight = backup_todb($info['MOD']['#']['BIASWEIGHT']['0']['#']);
+            $workshop->reliabilityweight = backup_todb($info['MOD']['#']['RELIABILITYWEIGHT']['0']['#']);
+            $workshop->gradingweight = backup_todb($info['MOD']['#']['GRADINGWEIGHT']['0']['#']);
+            $workshop->showleaguetable = backup_todb($info['MOD']['#']['SHOWLEAGUETABLE']['0']['#']);
+
+            //The structure is equal to the db, so insert the workshop
+            $newid = insert_record ("workshop",$workshop);
+
+            //Do some output     
+            echo "<ul><li>".get_string("modulename","workshop")." \"".$workshop->name."\"<br>";
+            backup_flush(300);
+
+            if ($newid) {
+                //We have the newid, update backup_ids
+                backup_putid($restore->backup_unique_code,$mod->modtype,
+                             $mod->id, $newid);
+                //We have to restore the workshop_elements table now (course level table)
+                $status = workshop_elements_restore_mods($newid,$info,$restore);
+                //Now check if want to restore user data and do it.
+                if ($restore->mods['workshop']->userinfo) {
+                    //Restore workshop_submissions
+                    $status = workshop_submissions_restore_mods ($mod->id, $newid,$info,$restore);
+                }
+            } else {
+                $status = false;
+            }
+
+            //Finalize ul        
+            echo "</ul>";
+        
+        } else {
+            $status = false;
+        }
+
+        return $status;
+    }
+
+    //This function restores the workshop_elements
+    function workshop_elements_restore_mods($workshop_id,$info,$restore) {
+
+        global $CFG;
+
+        $status = true;
+
+        //Get the workshop_elements array
+        $elements = $info['MOD']['#']['ELEMENTS']['0']['#']['ELEMENT'];
+
+        //Iterate over workshop_elements
+        for($i = 0; $i < sizeof($elements); $i++) {
+            $ele_info = $elements[$i];
+            //traverse_xmlize($ele_info);                                                                 //Debug
+            //print_object ($GLOBALS['traverse_array']);                                                  //Debug
+            //$GLOBALS['traverse_array']="";                                                              //Debug
+
+            //Now, build the WORKSHOP_ELEMENTS record structure
+            $element->workshopid = $workshop_id;
+            $element->elementno = backup_todb($ele_info['#']['ELEMENTNO']['0']['#']);
+            $element->description = backup_todb($ele_info['#']['DESCRIPTION']['0']['#']);
+            $element->scale = backup_todb($ele_info['#']['SCALE']['0']['#']);
+            $element->maxscore = backup_todb($ele_info['#']['MAXSCORE']['0']['#']);
+            $element->weight = backup_todb($ele_info['#']['WEIGHT']['0']['#']);
+
+            //The structure is equal to the db, so insert the workshop_elements
+            $newid = insert_record ("workshop_elements",$element);
+
+            //Do some output
+            if (($i+1) % 10 == 0) {
+                echo ".";
+                if (($i+1) % 200 == 0) {
+                    echo "<br>";
+                }
+                backup_flush(300);
+            }
+
+            if ($newid) {
+                //We have to restore the workshop_rubrics table now (course level table)
+                $status = workshop_rubrics_restore_mods($workshop_id,$element->elementno,$ele_info,$restore);
+            } else {
+                $status = false;
+            }
+        }
+
+        return $status;
+    }
+
+
+    //This function restores the workshop_rubrics
+    function workshop_rubrics_restore_mods($workshop_id,$elementno,$info,$restore) {
+
+        global $CFG;
+
+        $status = true;
+
+        //Get the workshop_rubrics array
+        $rubrics = $info['#']['RUBRICS']['0']['#']['RUBRIC'];
+
+        //Iterate over workshop_rubrics
+        for($i = 0; $i < sizeof($rubrics); $i++) {
+            $rub_info = $rubrics[$i];
+            //traverse_xmlize($rub_info);                                                                 //Debug
+            //print_object ($GLOBALS['traverse_array']);                                                  //Debug
+            //$GLOBALS['traverse_array']="";                                                              //Debug
+
+            //Now, build the WORKSHOP_RUBRICS record structure
+            $rubric->workshopid = $workshop_id;
+            $rubric->elementno = $elementno;
+            $rubric->rubricno = backup_todb($rub_info['#']['RUBRICNO']['0']['#']);
+            $rubric->description = backup_todb($rub_info['#']['DESCRIPTION']['0']['#']);
+
+            //The structure is equal to the db, so insert the workshop_rubrics
+            $newid = insert_record ("workshop_rubrics",$rubric);
+
+            //Do some output
+            if (($i+1) % 10 == 0) {
+                echo ".";
+                if (($i+1) % 200 == 0) {
+                    echo "<br>";
+                }
+                backup_flush(300);
+            }
+
+            if (!$newid) {
+                $status = false;
+            }
+        }
+        return $status;
+    }
+
+
+    //This function restores the workshop_submissions
+    function workshop_submissions_restore_mods($old_workshop_id, $new_workshop_id,$info,$restore) {
+
+        global $CFG;
+
+        $status = true;
+
+        //Get the submissions array 
+        $submissions = $info['MOD']['#']['SUBMISSIONS']['0']['#']['SUBMISSION'];
+
+        //Iterate over submissions
+        for($i = 0; $i < sizeof($submissions); $i++) {
+            $sub_info = $submissions[$i];
+            //traverse_xmlize($sub_info);                                                                 //Debug
+            //print_object ($GLOBALS['traverse_array']);                                                  //Debug
+            //$GLOBALS['traverse_array']="";                                                              //Debug
+
+            //We'll need this later!!
+            $oldid = backup_todb($sub_info['#']['ID']['0']['#']);
+            $olduserid = backup_todb($sub_info['#']['USERID']['0']['#']);
+
+            //Now, build the WORKSHOP_SUBMISSIONS record structure
+            $submission->workshopid = $new_workshop_id;
+            $submission->userid = backup_todb($sub_info['#']['USERID']['0']['#']);
+            $submission->title = backup_todb($sub_info['#']['TITLE']['0']['#']);
+            $submission->timecreated = backup_todb($sub_info['#']['TIMECREATED']['0']['#']);
+            $submission->mailed = backup_todb($sub_info['#']['MAILED']['0']['#']);
+            $submission->teachergrade = backup_todb($sub_info['#']['TEACHERGRADE']['0']['#']);
+            $submission->peergrade = backup_todb($sub_info['#']['PEERGRADE']['0']['#']);
+            $submission->biasgrade = backup_todb($sub_info['#']['BIASGRADE']['0']['#']);
+            $submission->reliabilitygrade = backup_todb($sub_info['#']['RELIABILITYGRADE']['0']['#']);
+            $submission->gradinggrade = backup_todb($sub_info['#']['GRADINGGRADE']['0']['#']);
+            $submission->finalgrade = backup_todb($sub_info['#']['FINALGRADE']['0']['#']);
+
+            //We have to recode the userid field
+            $user = backup_getid($restore->backup_unique_code,"user",$olduserid);
+            if ($user) {
+                $submission->userid = $user->new_id;
+            }
+
+            //The structure is equal to the db, so insert the workshop_submission
+            $newid = insert_record ("workshop_submissions",$submission);
+
+            //Do some output
+            if (($i+1) % 50 == 0) {
+                echo ".";
+                if (($i+1) % 1000 == 0) {
+                    echo "<br>";
+                }
+                backup_flush(300);
+            }
+
+            if ($newid) {
+                //We have the newid, update backup_ids
+                backup_putid($restore->backup_unique_code,"workshop_submissions",$oldid,
+                             $newid);
+
+                //Now copy moddata associated files
+                $status = workshop_restore_files ($oldid, $newid,$restore); 
+                //Now we need to restore workshop_assessments (user level table)
+                if ($status) {
+                    $status = workshop_assessments_restore_mods ($new_workshop_id, $newid,$sub_info,$restore);
+                }
+            } else {
+                $status = false;
+            }
+        }
+
+        return $status;
+    }
+
+    //This function restores the workshop_assessments       
+    function workshop_assessments_restore_mods($new_workshop_id, $new_submission_id,$info,$restore) {
+
+        global $CFG;
+
+        $status = true;
+
+        //Get the assessments array
+        $assessments = $info['#']['ASSESSMENTS']['0']['#']['ASSESSMENT'];
+
+        //Iterate over assessments
+        for($i = 0; $i < sizeof($assessments); $i++) {
+            $ass_info = $assessments[$i];
+            //traverse_xmlize($ass_info);                                                                 //Debug
+            //print_object ($GLOBALS['traverse_array']);                                                  //Debug
+            //$GLOBALS['traverse_array']="";                                                              //Debug
+
+            //We'll need this later!!
+            $oldid = backup_todb($ass_info['#']['ID']['0']['#']);
+            $olduserid = backup_todb($ass_info['#']['USERID']['0']['#']);
+
+            //Now, build the WORKSHOP_ASSESSMENTS record structure
+            $assessment->workshopid = $new_workshop_id;
+            $assessment->submissionid = $new_submission_id;
+            $assessment->userid = backup_todb($ass_info['#']['USERID']['0']['#']);
+            $assessment->timecreated = backup_todb($ass_info['#']['TIMECREATED']['0']['#']);
+            $assessment->timegraded = backup_todb($ass_info['#']['TIMEGRADED']['0']['#']);
+            $assessment->timeagreed = backup_todb($ass_info['#']['TIMEAGREED']['0']['#']);
+            $assessment->grade = backup_todb($ass_info['#']['GRADE']['0']['#']);
+            $assessment->gradinggrade = backup_todb($ass_info['#']['GRADINGGRADE']['0']['#']);
+            $assessment->mailed = backup_todb($ass_info['#']['MAILED']['0']['#']);
+            $assessment->generalcomment = backup_todb($ass_info['#']['GENERALCOMMENT']['0']['#']);
+            $assessment->teachercomment = backup_todb($ass_info['#']['TEACHERCOMMENT']['0']['#']);
+
+            //We have to recode the userid field
+            $user = backup_getid($restore->backup_unique_code,"user",$olduserid);
+            if ($user) {
+                $assessment->userid = $user->new_id;
+            }
+
+            //The structure is equal to the db, so insert the workshop_assessment
+            $newid = insert_record ("workshop_assessments",$assessment);
+
+            //Do some output
+            if (($i+1) % 50 == 0) {
+                echo ".";
+                if (($i+1) % 1000 == 0) {
+                    echo "<br>";
+                }
+                backup_flush(300);
+            }
+
+            if ($newid) {
+                //We have the newid, update backup_ids
+                backup_putid($restore->backup_unique_code,"workshop_assessments",$oldid,
+                             $newid);
+
+                //Now we need to restore workshop_comments (user level table)
+                if ($status) {
+                    $status = workshop_comments_restore_mods ($new_workshop_id, $newid,$ass_info,$restore);
+                }
+                //Now we need to restore workshop_grades (user level table)   
+                if ($status) {
+                    $status = workshop_grades_restore_mods ($new_workshop_id, $newid,$ass_info,$restore);   
+                }
+            } else {
+                $status = false;
+            }
+        }
+
+        return $status;
+    }
+
+    //This function restores the workshop_comments
+    function workshop_comments_restore_mods($new_workshop_id, $new_assessment_id,$info,$restore) {
+
+        global $CFG;
+
+        $status = true;
+
+        //Get the comments array
+        $comments = $info['#']['COMMENTS']['0']['#']['COMMENT'];
+
+        //Iterate over comments
+        for($i = 0; $i < sizeof($comments); $i++) {
+            $com_info = $comments[$i];
+            //traverse_xmlize($com_info);                                                                 //Debug
+            //print_object ($GLOBALS['traverse_array']);                                                  //Debug
+            //$GLOBALS['traverse_array']="";                                                              //Debug
+
+            //We'll need this later!!
+            $olduserid = backup_todb($com_info['#']['USERID']['0']['#']);
+
+            //Now, build the WORKSHOP_COMMENTS record structure
+            $comment->workshopid = $new_workshop_id;
+            $comment->assessmentid = $new_assessment_id;
+            $comment->userid = backup_todb($com_info['#']['USERID']['0']['#']);
+            $comment->timecreated = backup_todb($com_info['#']['TIMECREATED']['0']['#']);
+            $comment->mailed = backup_todb($com_info['#']['MAILED']['0']['#']);
+            $comment->comments = backup_todb($com_info['#']['COMMENT_TEXT']['0']['#']);
+
+            //We have to recode the userid field
+            $user = backup_getid($restore->backup_unique_code,"user",$olduserid);
+            if ($user) {
+                $comment->userid = $user->new_id;
+            }
+
+            //The structure is equal to the db, so insert the workshop_comment
+            $newid = insert_record ("workshop_comments",$comment);
+
+            //Do some output
+            if (($i+1) % 50 == 0) {
+                echo ".";
+                if (($i+1) % 1000 == 0) {
+                    echo "<br>";
+                }
+                backup_flush(300);
+            }
+
+            if (!$newid) {
+                $status = false;
+            }
+        }
+
+        return $status;
+    }
+
+    //This function restores the workshop_grades
+    function workshop_grades_restore_mods($new_workshop_id, $new_assessment_id,$info,$restore) {
+
+        global $CFG;
+
+        $status = true;
+
+        //Get the grades array
+        $grades = $info['#']['GRADES']['0']['#']['GRADE'];
+
+        //Iterate over grades
+        for($i = 0; $i < sizeof($grades); $i++) {
+            $gra_info = $grades[$i];
+            //traverse_xmlize($gra_info);                                                                 //Debug
+            //print_object ($GLOBALS['traverse_array']);                                                  //Debug
+            //$GLOBALS['traverse_array']="";                                                              //Debug
+
+            //Now, build the WORKSHOP_GRADES record structure
+            $grade->workshopid = $new_workshop_id;
+            $grade->assessmentid = $new_assessment_id;
+            $grade->elementno = backup_todb($gra_info['#']['ELEMENTNO']['0']['#']);
+            $grade->feedback = backup_todb($gra_info['#']['FEEDBACK']['0']['#']);
+            $grade->grade = backup_todb($gra_info['#']['GRADE_VALUE']['0']['#']);
+
+            //The structure is equal to the db, so insert the workshop_grade
+            $newid = insert_record ("workshop_grades",$grade);
+
+            //Do some output
+            if (($i+1) % 50 == 0) {
+                echo ".";
+                if (($i+1) % 1000 == 0) {
+                    echo "<br>";
+                }
+                backup_flush(300);
+            }
+
+            if (!$newid) {
+                $status = false;
+            }
+        }
+
+        return $status;
+    }
+
+    //This function copies the workshop related info from backup temp dir to course moddata folder,
+    //creating it if needed and recoding everything (submission_id) 
+    function workshop_restore_files ($oldsubmiss, $newsubmiss, $restore) {
+
+        global $CFG;
+
+        $status = true;
+        $todo = false;
+        $moddata_path = "";
+        $workshop_path = "";
+        $temp_path = "";
+
+        //First, we check to "course_id" exists and create is as necessary
+        //in CFG->dataroot
+        $dest_dir = $CFG->dataroot."/".$restore->course_id;
+        $status = check_dir_exists($dest_dir,true);
+
+        //Now, locate course's moddata directory
+        $moddata_path = $CFG->dataroot."/".$restore->course_id."/".$CFG->moddata;
+   
+        //Check it exists and create it
+        $status = check_dir_exists($moddata_path,true);
+
+        //Now, locate workshop directory
+        if ($status) {
+            $workshop_path = $moddata_path."/workshop";
+            //Check it exists and create it
+            $status = check_dir_exists($workshop_path,true);
+        }
+
+        //Now locate the temp dir we are gong to restore
+        if ($status) {
+            $temp_path = $CFG->dataroot."/temp/backup/".$restore->backup_unique_code.
+                         "/moddata/workshop/".$oldsubmiss;
+            //Check it exists
+            if (is_dir($temp_path)) {
+                $todo = true;
+            }
+        }
+
+        //If todo, we create the neccesary dirs in course moddata/workshop
+        if ($status and $todo) {
+            //First this workshop id
+            $this_workshop_path = $workshop_path."/".$newsubmiss;
+            $status = check_dir_exists($this_workshop_path,true);
+            //And now, copy temp_path to this_workshop_path
+            $status = backup_copy_file($temp_path, $this_workshop_path); 
+        }
+       
+        return $status;
+    }
+?>