From: moodler <moodler>
Date: Sat, 3 May 2003 04:31:49 +0000 (+0000)
Subject: Changed some function names, making room for export functions later
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=005103e0bc02197b67169ce9f372de0b2e5faf2c;p=moodle.git

Changed some function names, making room for export functions later
---

diff --git a/mod/quiz/format/aon.php b/mod/quiz/format/aon.php
index b6aa66018c..2f29092312 100644
--- a/mod/quiz/format/aon.php
+++ b/mod/quiz/format/aon.php
@@ -110,7 +110,7 @@ class quiz_file_format extends quiz_default_format {
         }
     }
 
-    function postprocess() {
+    function importpostprocess() {
     /// Goes through the questionids, looking for shortanswer questions
     /// and converting random groups of 4 into matching questions.
 
diff --git a/mod/quiz/format/default.php b/mod/quiz/format/default.php
index 357e345f65..153329c386 100644
--- a/mod/quiz/format/default.php
+++ b/mod/quiz/format/default.php
@@ -15,7 +15,7 @@ class quiz_default_format {
 
 /// Importing functions
 
-    function preprocess($category) {
+    function importpreprocess($category) {
     /// Does any pre-processing that may be desired
 
         $this->category = $category;  // Important
@@ -23,7 +23,7 @@ class quiz_default_format {
         return true;
     }
 
-    function process($filename) {
+    function importprocess($filename) {
     /// Processes a given file.  There's probably little need to change this
 
         if (! $lines = $this->readdata($filename)) {
@@ -119,7 +119,7 @@ class quiz_default_format {
     }
 
 
-    function postprocess() {
+    function importpostprocess() {
     /// Does any post-processing that may be desired
     /// Argument is a simple array of question ids that 
     /// have just been added.
diff --git a/mod/quiz/import.php b/mod/quiz/import.php
index fad020fba3..43d70926e2 100644
--- a/mod/quiz/import.php
+++ b/mod/quiz/import.php
@@ -51,15 +51,15 @@
 
             $format = new quiz_file_format();
 
-            if (! $format->preprocess($category)) {             // Do anything before that we need to
+            if (! $format->importpreprocess($category)) {             // Do anything before that we need to
                 error("Error occurred during pre-processing!");
             }
 
-            if (! $format->process($newfile['tmp_name'])) {     // Process the uploaded file
+            if (! $format->importprocess($newfile['tmp_name'])) {     // Process the uploaded file
                 error("Error occurred during processing!");
             }
 
-            if (! $format->postprocess()) {                     // In case anything needs to be done after
+            if (! $format->importpostprocess()) {                     // In case anything needs to be done after
                 error("Error occurred during post-processing!");
             }