--- loncom/interface/londocs.pm	2005/07/26 16:41:43	1.198
+++ loncom/interface/londocs.pm	2005/09/20 07:52:03	1.206
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.198 2005/07/26 16:41:43 raeburn Exp $
+# $Id: londocs.pm,v 1.206 2005/09/20 07:52:03 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -166,7 +166,10 @@ sub dumpcourse {
 	$crs=~s/\_/\//g;
 	foreach (keys %replacehash) {
 	    my $newfilename=$title.'/'.$replacehash{$_};
+	    $newfilename=~s/\.(\w+)$//;
+	    my $ext=$1;
 	    $newfilename=&clean($newfilename);
+	    $newfilename.='.'.$ext;
 	    my @dirs=split(/\//,$newfilename);
 	    my $path='/home/'.$ca.'/public_html';
 	    my $makepath=$path;
@@ -252,7 +255,7 @@ sub exportbutton {
     return '</td><td bgcolor="#DDDDCC">'.
             '<input type="submit" name="exportcourse" value="'.
             &mt('Export Course to IMS').'" />'.
-            &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs');
+    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs');
 }
 
 sub exportcourse {
@@ -490,10 +493,21 @@ sub create_ims_store {
 ' identifier="MANIFEST-'.$env{'request.course.id'}.'-'.$now.'"'.
 '  xsi:schemaLocation="http://www.imsglobal.org/xsd/imscp_v1p1imscp_v1p1.xsd'.
 '  http://www.imsglobal.org/xsd/imsmd_v1p2 imsmd_v1p2p2.xsd">'."\n".
+'  <metadata>
+    <schema></schema>
+    <imsmd:lom>
+      <imsmd:general>
+        <imsmd:identifier>'.$env{'request.course.id'}.'</imsmd:identifier>
+        <imsmd:title>
+          <imsmd:langstring xml:lang="en">'.$env{'course.'.$env{'request.course.id'}.'.description'}.'</imsmd:langstring>
+        </imsmd:title>
+      </imsmd:general>
+    </imsmd:lom>
+  </metadata>'."\n".
 '  <organizations default="ORG-'.$env{'request.course.id'}.'-'.$now.'">'."\n".
 '    <organization identifier="ORG-'.$env{'request.course.id'}.'-'.$now.'"'.
 ' structure="hierarchical">'."\n".
-'      <title>'.$env{'request.'.$env{'request.course.id'}.'.description'}.'</title>'
+'      <title>'.$env{'course.'.$env{'request.course.id'}.'.description'}.'</title>'
     } else {
         $$outcome .= 'An error occurred opening the IMS manifest file.<br />'
 ;
@@ -541,7 +555,6 @@ sub build_package {
     $count = 0;
     my $imsresources;
     my $pkgdepth;
-    my $included = 0;
     while ($curRes = $it->next()) {
         if ($curRes == $it->BEGIN_MAP()) {
             $prevdepth = $depth;
@@ -564,10 +577,13 @@ sub build_package {
                 unless ($curRes->is_sequence()) {
                     $resourceref = 'identifierref="RES-'.$env{'request.course.id'}.'-'.$count.'"';
                 }
-                if (($depth <= $prevdepth) && ($count > 1) && ($included)) {
-                    print $ims_manifest "\n".'  </item>'."\n";
+                my $step = $prevdepth - $depth;
+                if (($step >= 0) && ($count > 1)) {
+                    while ($step >= 0) {
+                        print $ims_manifest "\n".'  </item>'."\n";
+                        $step --;
+                    }
                 }
-                $included = 1;
                 $prevdepth = $depth;
 
                 my $itementry =
@@ -609,8 +625,6 @@ sub build_package {
                     }
                 }
                 $pkgdepth = $depth;
-            } else {
-                $included = 0;
             }
         }
     }
@@ -645,7 +659,6 @@ sub process_content {
     my ($count,$curRes,$cdom,$cnum,$symb,$content_file,$href,$copyresult,$tempexport) = @_;
     my $content_type;
     my $message;
-# find where user is author or co-author
     my @uploads = ();
     if ($curRes->is_sequence()) {
         $content_type = 'sequence';
@@ -699,6 +712,7 @@ sub process_content {
         if ($2 eq $env{'user.domain'} && $3 eq $env{'user.name'})  {
             $canedit= 1;
         }
+# only include problem code where current user is author
         if ($canedit) {
             $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'resource');
         } else {
@@ -1100,7 +1114,7 @@ sub editor {
                 if ($cmd eq 'del') {
 		    my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
 		    if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
-			($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library)$/)) {
+			($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {
 			&Apache::lonnet::removeuploadedurl($url);
 		    } else {
 			&Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);