Changes to work with data from fs instead of db.

Show progress info
Output data to the browser to avoid timeouts.

diff --git a/backup/mod/assignment/restorelib.php b/backup/mod/assignment/restorelib.php
index 14d82d5d4929cbf4ef024b0302af9bf44ff6bb49..25a3d4b3719237b65bb0fdc9ce47c73bff8b9123 100644 (file)
--- a/backup/mod/assignment/restorelib.php
+++ b/backup/mod/assignment/restorelib.php
@@ -32,11 +32,8 @@
         $data = backup_getid($restore->backup_unique_code,$mod->modtype,$mod->id);
 
         if ($data) {
-            //We have info, get and unserialize info
-            //First strip slashes
-            $temp = stripslashes($data->info);     
             //Now get completed xmlized object   
-            $info = unserialize($temp);
+            $info = $data->info;
             //traverse_xmlize($info);                                                                     //Debug
             //print_object ($GLOBALS['traverse_array']);                                                  //Debug
             //$GLOBALS['traverse_array']="";                                                              //Debug
@@ -57,7 +54,7 @@
             $newid = insert_record ("assignment",$assignment);
 
             //Do some output     
-            echo "<ul><li>Assignment ".$assignment->name."<br>";
+            echo "<ul><li>Assignment \"".$assignment->name."\"<br>";
             backup_flush(300);
 
             if ($newid) {
@@ -132,9 +129,9 @@
             $newid = insert_record ("assignment_submissions",$submission);
 
             //Do some output
-            if ($newid % 50 == 0) {
+            if (($i+1) % 50 == 0) {
                 echo ".";
-                if ($newid % 1000 == 0) {
+                if (($i+1) % 1000 == 0) {
                     echo "<br>";
                 }
                 backup_flush(300);

diff --git a/backup/mod/choice/restorelib.php b/backup/mod/choice/restorelib.php
index b49492c1f4edee0437e02e84c05dd2dce5899f63..bbdff4fc2e780293573681cb342f4b06ba5d5a7e 100644 (file)
--- a/backup/mod/choice/restorelib.php
+++ b/backup/mod/choice/restorelib.php
@@ -32,11 +32,8 @@
         $data = backup_getid($restore->backup_unique_code,$mod->modtype,$mod->id);
 
         if ($data) {
-            //We have info, get and unserialize info
-            //First strip slashes
-            $temp = stripslashes($data->info);
             //Now get completed xmlized object
-            $info = unserialize($temp);
+            $info = $data->info;
             //traverse_xmlize($info);                                                                     //Debug
             //print_object ($GLOBALS['traverse_array']);                                                  //Debug
             //$GLOBALS['traverse_array']="";                                                              //Debug
@@ -59,7 +56,7 @@
             $newid = insert_record ("choice",$choice);
 
             //Do some output     
-            echo "<ul><li>Choice ".$choice->name."<br>";
+            echo "<ul><li>Choice \"".$choice->name."\"<br>";
             backup_flush(300);
 
             if ($newid) {
@@ -122,9 +119,9 @@
             $newid = insert_record ("choice_answers",$answer);
 
             //Do some output
-            if ($newid % 50 == 0) {
+            if (($i+1) % 50 == 0) {
                 echo ".";
-                if ($newid % 1000 == 0) {
+                if (($i+1) % 1000 == 0) {
                     echo "<br>";
                 }
                 backup_flush(300);

diff --git a/backup/mod/resource/restorelib.php b/backup/mod/resource/restorelib.php
index 37779e356b334137a8a9fcca77524eb04673c502..66334cab02429acc19e6616b83bd36c7b5d888cb 100644 (file)
--- a/backup/mod/resource/restorelib.php
+++ b/backup/mod/resource/restorelib.php
@@ -27,11 +27,8 @@
         $data = backup_getid($restore->backup_unique_code,$mod->modtype,$mod->id);
 
         if ($data) {
-            //We have info, get and unserialize info
-            //First strip slashes
-            $temp = stripslashes($data->info);
             //Now get completed xmlized object
-            $info = unserialize($temp);
+            $info = $data->info;
             //traverse_xmlize($info);                                                                     //Debug
             //print_object ($GLOBALS['traverse_array']);                                                  //Debug
             //$GLOBALS['traverse_array']="";                                                              //Debug
@@ -49,7 +46,7 @@
             $newid = insert_record ("resource",$resource);
 
             //Do some output     
-            echo "<ul><li>Resource ".$resource->name."<br>";
+            echo "<ul><li>Resource \"".$resource->name."\"<br>";
             backup_flush(300);
 
             if ($newid) {

diff --git a/backup/mod/survey/restorelib.php b/backup/mod/survey/restorelib.php
index 8f5a547feeef3fefbbb93234137dcaf39f5744c5..c17f1674524ded131c953454012cabc678d797e8 100644 (file)
--- a/backup/mod/survey/restorelib.php
+++ b/backup/mod/survey/restorelib.php
@@ -33,11 +33,8 @@
         $data = backup_getid($restore->backup_unique_code,$mod->modtype,$mod->id);
 
         if ($data) {
-            //We have info, get and unserialize info
-            //First strip slashes
-            $temp = stripslashes($data->info);     
             //Now get completed xmlized object   
-            $info = unserialize($temp);
+            $info = $data->info;
             //traverse_xmlize($info);                                                                     //Debug
             //print_object ($GLOBALS['traverse_array']);                                                  //Debug
             //$GLOBALS['traverse_array']="";                                                              //Debug
@@ -56,7 +53,7 @@
             $newid = insert_record ("survey",$survey);
 
             //Do some output
-            echo "<ul><li>Survey ".$survey->name."<br>";
+            echo "<ul><li>Survey \"".$survey->name."\"<br>";
             backup_flush(300);
 
             if ($newid) {
@@ -125,9 +122,9 @@
             $newid = insert_record ("survey_answers",$answer);
 
             //Do some output
-            if ($newid % 50 == 0) {
+            if (($i+1) % 50 == 0) {
                 echo ".";
-                if ($newid % 1000 == 0) {
+                if (($i+1) % 1000 == 0) {
                     echo "<br>";
                 }
                 backup_flush(300);
@@ -181,9 +178,9 @@
             $newid = insert_record ("survey_analysis",$analys);
 
             //Do some output
-            if ($newid % 50 == 0) {
+            if (($i+1) % 50 == 0) {
                 echo ".";       
-                if ($newid % 1000 == 0) {
+                if (($i+1) % 1000 == 0) {
                     echo "<br>";
                 }
                 backup_flush(300);