# HG changeset patch
# User lopprecht@lao-mcpro
# Date 1298285110 -3600
# Node ID dc1e9fb09fd9560789d3abc6c297b942d3248800
# Parent  68324bac0a6205d65c2f450531979df5ba4b5244
#2854

diff --git a/php/autoloader.class.php b/php/autoloader.class.php
--- a/php/autoloader.class.php
+++ b/php/autoloader.class.php
@@ -7,6 +7,9 @@
 use common\libraries\Filesystem;
 
 /**
+ *
+ * @todo: create autoloader_base class and move utility functions there - such as check_directory ?
+ *
  * $Id: repository_autoloader.class.php 236 2009-11-16 12:56:59Z scaramanga $
  * @author vanpouckesven
  * @package repository
@@ -163,9 +166,6 @@
             'learning_path_scorm_export' => 'export/scorm/learning_path/learning_path_scorm_export',
             'ims_metadata_reader' => 'import/cp/metadata/ims_metadata_reader',
             'imscp_manifest_cp_import' => 'import/cp/object_import/import/dir/imscp_manifest_cp_import',
-            'qti_question_builder' => 'import/qti/object_import/qti_question_builder',
-            'qti_builder_base' => 'import/qti/object_import/qti_builder_base',
-            'qti_renderer_base' => 'import/qti/object_import/qti_builder_base',
             'cp_object_import_base' => 'import/cp/object_import/cp_object_import_base',
             'cp_object_export' => 'export/cp/object_export/cp_object_export',
             'cpe_object_export_base' => 'export/cp/object_export/cpe_object_export_base',
@@ -184,6 +184,12 @@
         return false;
     }
 
+    /**
+     *
+     * @param <type> $directory
+     * @param <type> $recursive
+     * @return <type>
+     */
     static function check_directory($directory, $recursive = true) {
         $files = scandir($directory);
         $files = array_diff($files, array('.', '..'));
@@ -204,8 +210,8 @@
     }
 
     static function check_for_qti_files() {
-        return self::check_directory(dirname(__FILE__) . '/export/qti');
-        return self::check_directory(dirname(__FILE__) . '/import/qti');
+        return self::check_directory(dirname(__FILE__) . '/lib/import/qti');
+        return self::check_directory(dirname(__FILE__) . '/lib/export/qti');
     }
 
 }
\ No newline at end of file
diff --git a/php/lib/export/qti/main.php b/php/lib/export/qti/main.php
deleted file mode 100644
--- a/php/lib/export/qti/main.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-//TODO remove these lines and replace by autoloading !
-use common\libraries\Path;
-
-require_once  Path::get_common_libraries_path() .'php/ims/main.php';
-
-require_once_all(dirname(__FILE__) .'/*.class.php');
-
-require_once dirname(__FILE__) . '/object_export/qti_serializer_base.class.php';
-
-require_once_all(dirname(__FILE__) .'/object_export/*.class.php');
-require_once_all(dirname(__FILE__) .'/object_export/serializer/*.class.php');
diff --git a/php/lib/export/qti/qti_export.class.php b/php/lib/export/qti/qti_export.class.php
--- a/php/lib/export/qti/qti_export.class.php
+++ b/php/lib/export/qti/qti_export.class.php
@@ -11,14 +11,6 @@
 use common\libraries\Filecompression;
 
 /**
- * $Id: qti_export.class.php 200 2009-11-13 12:30:04Z kariboe $
- * @package repository.lib.export.qti
- */
-//FIXME Do not require main as it causses a cyclic dependency
-//require_once dirname(__FILE__) . '/main.php';
-
-
-/**
  * Exports learning object to QTI format (xml)
  */
 class QtiExport extends ContentObjectExport
@@ -99,20 +91,6 @@
             {
                 $result = $exporter->export_content_object();
             }
-            /*
-            $questions = $item->get_questions();
-            while ($complex_question = $questions->next_result()) {
-                $directory = $this->get_temp_directory();
-                $manifest = $this->get_manifest();
-                $toc = $this->toc;
-                if ($exporter = self :: factory_qti($complex_question->get_ref_object(), $directory, $manifest, $toc)) {
-                    $result = $exporter->export_content_object();
-                } else {
-
-                }
-            }
-             */
-
         }
 
         $xml = $this->get_manifest()->saveXML();
diff --git a/php/lib/import/qti/main.php b/php/lib/import/qti/main.php
deleted file mode 100644
--- a/php/lib/import/qti/main.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-//FIXME do not use such a script because it requires unneeded files and
-// creates cyclic dependencies
-use common\libraries\Path;
-
-require_once Path :: get_repository_content_object_path() . 'assessment_multiple_choice_question/php/assessment_multiple_choice_question_option.class.php';
-require_once Path :: get_repository_content_object_path() . 'assessment_matching_question/php/assessment_matching_question_option.class.php';
-require_once  Path::get_common_libraries_path() .'php/ims/main.php';
-require_once dirname(__FILE__) . '/qti_import.class.php';
-
-require_once_all(dirname(__FILE__) .'/*.class.php');
-require_once_all(dirname(__FILE__) . '/object_import/*.class.php');