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 b6aa66018cec8d8acd56700f3f8dbe5a91726787..2f290923120b45892cdec3241de5236967fb4a35 100644 (file)
--- 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 357e345f6572999bb3da2b16049fb13fccc93870..153329c386b4db38869d68f037a38d901b81629c 100644 (file)
--- 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 fad020fba3b1655020be12e8af210fb039db36f3..43d70926e295809710a47dbc26a1d0456b171384 100644 (file)
--- 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!");
             }