//generate a file tree
$data = rscandir($import_path);
-
//check if every file is presented in the manifest
foreach($data as $filepath){
- $filepath = substr($filepath, strlen($import_path));
-
+// debug(preg_match('/(.*)\.xml/', substr($filepath, strlen($import_path))));
//validate xml via its xsd/dtds
- if (preg_match('/(.*)\.xml/', $filepath)){
+ if (preg_match('/(.*)\.xml/', substr($filepath, strlen($import_path)))){
libxml_use_internal_errors(true);
$dom = new DOMDocument();
- $dom->load(realpath($import_path.$filepath));
- if (!@$dom->schemaValidate('main.xsd')){
+ $dom->load(realpath($filepath));
+// debug(realpath($filepath), 'filepath');
+ if (!$dom->schemaValidate('main.xsd')){
$errors = libxml_get_errors();
+// debug($errors);exit;
foreach ($errors as $error) {
//suppress warnings
if ($error->level==LIBXML_ERR_WARNING){
}
libxml_clear_errors();
}
+
//if this is the manifest file, we do not have to check for its existance.
// if (preg_match('/(.*)imsmanifest\.xml/', $filepath)){
// continue;
if($ext=='xml'){
continue;
}
-
//if common path is empty, assign the first path to it.
if ($common_path=='' && $quit==false){
$common_path = $path;
$intersect_array = array_intersect($common_array, $path_array);
$common_path = implode('/', $intersect_array);
}
+ // If this path (including file extension) is in the filearray,
+ // then this means there is only 1 file in the array, implies there
+ // wasn't any intersection at all. In this case, use the base root.
+ if(in_array($common_path, $filearray)) {
+ $common_path = '';
+ }
return $common_path;
}
}
$temp_path = pathinfo($attrs['href']);
- $temp_path = explode('/', $temp_path['dirname']);
- if (empty($package_base_path)){
- $package_base_path = $temp_path;
- }
- if ($all_package_base_path!='' && empty($all_package_base_path)){
- $all_package_base_path = $temp_path;
+// if (!strpos($temp_path['dirname'], 'Share')) {
+ if ($temp_path['extension'] == 'html') {
+ $temp_path = explode('/', $temp_path['dirname']);
+ if (empty($package_base_path)){
+ $package_base_path = $temp_path;
+ }
+ if ($all_package_base_path!='' && empty($all_package_base_path)){
+ $all_package_base_path = $temp_path;
+ }
+ $package_base_path = array_intersect_assoc($package_base_path, $temp_path);
}
- $package_base_path = array_intersect_assoc($package_base_path, $temp_path);
-
+
//calculate the depths of relative paths
if ($all_package_base_path!=''){
$no_relative_temp_path = $temp_path;
if (in_array('..', $temp_path)){
$sizeofrp = array_count_values($temp_path);
}
-
- //for IMSCC, assume that all resources lies in the same folder, except styles.css
+ //for IMSCC, assume that all resources lies in the same folder, except styles.css
if ($items[$current_identifier]['type']=='webcontent' || $items[$current_identifier]['type']=='imsdt_xmlv1p0'){
//find the intersection of each item's related files, then that intersection is the content_path
if (isset($items[$current_identifier]['file'])){
foreach ($items[$current_identifier]['file'] as $resource_path){
- $temp_path = pathinfo($resource_path);
- $temp_path = explode('/', $temp_path['dirname']);
- $package_base_path = array_intersect_assoc($package_base_path, $temp_path);
+ if (!strpos($resource_path, 'Share')) {
+ $temp_path = pathinfo($resource_path);
+ $temp_path = explode('/', $temp_path['dirname']);
+
+ $package_base_path = array_intersect_assoc($package_base_path, $temp_path);
+ }
}
}
}
array_pop($all_package_base_path);
}
}
-
- if (count($package_base_path) > 0) {
+ if (!empty($package_base_path)) {
$items[$current_identifier]['new_path'] = implode('/', $package_base_path);
}
-/*
- * @harris, reworked the package_base_path
- if ($package_base_path=="") {
- $package_base_path = $temp_path;
- }
- elseif (is_array($package_base_path) && $content_type != 'IMS Common Cartridge') {
- //if this is a content package, we want only intersection
- $package_base_path = array_intersect($package_base_path, $temp_path);
- $temp_path = $package_base_path;
- }
- //added these 2 lines in so that pictures would load. making the elseif above redundant.
- //if there is a bug for pictures not load, then it's the next 2 lines.
- $package_base_path = array_intersect($package_base_path, $temp_path);
- $temp_path = $package_base_path;
- }
- $items[$current_identifier]['new_path'] = implode('/', $temp_path);
-*/
- if ( isset($_POST['allow_test_import']) && isset($items[$current_identifier])
+ if (isset($_POST['allow_test_import']) && isset($items[$current_identifier])
&& preg_match('/((.*)\/)*tests\_[0-9]+\.xml$/', $attrs['href'])) {
$items[$current_identifier]['tests'][] = $attrs['href'];
}
- if ( isset($_POST['allow_a4a_import']) && isset($items[$current_identifier])) {
+ if (isset($_POST['allow_a4a_import']) && isset($items[$current_identifier])) {
$items[$current_identifier]['a4a_import_enabled'] = true;
}
} else if (($name == 'item') && ($attrs['identifierref'] != '')) {
} elseif (empty($package_base_path)){
$package_base_path = '';
}
-
if ($xml_base_path) {
$package_base_path = $xml_base_path . $package_base_path;
if(is_array($all_package_base_path)){
$all_package_base_path = implode('/', $all_package_base_path);
}
- if ($common_path != '') {
+
+ // The following condition checks if there is a common path, if so, remove it from the content base_href.
+ // This prevents the path to grow longer.
+ if ($common_path != ''
+ && ($content_info['new_path'] === $common_path
+ || substr($content_info['new_path'], strlen($common_path)))) {
$content_info['new_path'] = $package_base_name . substr($content_info['new_path'], strlen($common_path));
} else {
$content_info['new_path'] = $package_base_name . '/' . $content_info['new_path'];
}
-
+
//handles weblinks
if ($content_info['type']=='imswl_xmlv1p0'){
$weblinks_parser = new WeblinksParser();
$dt_import->associateForum($items[$item_id]['real_content_id'], $added_dt[$item_id]);
}
}
-//exit;//harris
+
if ($package_base_path == '.') {
$package_base_path = '';
}
}
}
}
-
+//exit;//harris
//check if there are still resources missing
/*
foreach($items as $idetails){
projects / atutor.git / blobdiff