--- loncom/interface/londocs.pm 2004/12/10 20:46:38 1.152 +++ loncom/interface/londocs.pm 2005/03/10 16:11:32 1.171 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.152 2004/12/10 20:46:38 albertel Exp $ +# $Id: londocs.pm,v 1.171 2005/03/10 16:11:32 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,6 +30,7 @@ package Apache::londocs; use strict; use Apache::Constants qw(:common :http); +use Apache::imsexport; use Apache::lonnet; use Apache::loncommon; use Apache::lonratedt; @@ -131,11 +132,17 @@ sub dumpbutton { } } +sub clean { + my ($title)=@_; + $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs; + return $title; +} # -------------------------------------------------------- Actually dump course sub dumpcourse { my $r=shift; - $r->print('Dump DOCS'. + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.'Dump DOCS'. &Apache::loncommon::bodytag('Dump Course DOCS to Construction Space'). '
'); my ($home,$other,%outhash)=&authorhosts(); @@ -148,7 +155,7 @@ sub dumpcourse { my ($ca,$cd)=split(/\@/,$ENV{'form.authorspace'}); $r->print('

'.&mt('Copying Files').'

'); my $title=$ENV{'form.authorfolder'}; - $title=~s/[^\w\/]+/\_/g; + $title=&clean($title); my %replacehash=(); foreach (keys %ENV) { if ($_=~/^form\.namefor\_(.+)/) { @@ -159,7 +166,7 @@ sub dumpcourse { $crs=~s/\_/\//g; foreach (keys %replacehash) { my $newfilename=$title.'/'.$replacehash{$_}; - $newfilename=~s/[^\w\/\.\/]+/\_/g; + $newfilename=&clean($newfilename); my @dirs=split(/\//,$newfilename); my $path='/home/'.$ca.'/public_html'; my $makepath=$path; @@ -213,7 +220,7 @@ sub dumpcourse { } my $title=$origcrsdata{'description'}; $title=~s/\s+/\_/gs; - $title=~s/\W//gs; + $title=&clean($title); $r->print('

'.&mt('Folder in Construction Space').'


'); &tiehash(); $r->print('

'.&mt('Filenames in Construction Space').'

'); @@ -222,12 +229,13 @@ sub dumpcourse { my ($ext)=($_=~/\.(\w+)$/); my $title=$hash{'title_'.$hash{ 'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}}; + $title=~s/:/:/g; $r->print(''); unless ($title) { $title=$_; } $title=~s/\.(\w+)$//; - $title=~s/[^\w\/]+/\_/gs; + $title=&clean($title); $title.='.'.$ext; $r->print("\n\n"); } @@ -241,6 +249,7 @@ sub dumpcourse { # ------------------------------------------------------ Generate "export" button sub exportbutton { + return ''; return ''; - if ($discussiontime{$symb} > 0) { + if ($discussiontime{$ressymb} > 0) { $boards ++; $currelem = $count+$boards+$startcount; $display .= ''."\n"; @@ -403,13 +417,23 @@ sub exportcourse { |; - $r->print('Export Course'.$scripttag.''. - &Apache::loncommon::bodytag('Export course to IMS or SCORM content package' + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.'Export Course'.$scripttag.''. + &Apache::loncommon::bodytag('Export course to IMS content package' )); $r->print($display.'
'.&mt('Internal Filename').''.&mt('Title').''.&mt('Save as ...').'
'.($title?$title:' ').'
'. ''. @@ -283,7 +292,6 @@ sub exportcourse { $outcome = '
As you did not select any content items or discussions for export, an IMS package has not been created. Please go back to select either content items or discussions for export'; } else { my $now = time; - my $count = 0; my %symbs; my $manifestok = 0; my $imsresources; @@ -291,7 +299,7 @@ sub exportcourse { my $copyresult; my $ims_manifest = &create_ims_store($now,\$manifestok,\$outcome,\$tempexport); if ($manifestok) { - &build_package($now,$navmap,\@exportitems,\@discussions,\$outcome,\$tempexport,\$copyresult,$ims_manifest); + &build_package($now,$navmap,\@exportitems,\@discussions,\$outcome,$tempexport,\$copyresult,$ims_manifest); close($ims_manifest); #Create zip file in prtspool @@ -318,9 +326,9 @@ sub exportcourse { $outcome = '
Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.
'; } } - - $r->print('Export Course'. - &Apache::loncommon::bodytag('Export course to IMS or SCORM content package')); + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.'Export Course'. + &Apache::loncommon::bodytag('Export course to IMS content package')); $r->print($outcome); $r->print(''); } else { @@ -369,6 +377,12 @@ sub exportcourse { } if (ref($curRes)) { my $symb = $curRes->symb(); + my $ressymb = $symb; + if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) { + unless ($ressymb =~ m|adm/wrapper/adm|) { + $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard'; + } + } my $color = $count%2; $display .='
'."\n". 'title().'  
'. @@ -470,6 +495,9 @@ sub create_ims_store { if (!-e $$tempexport) { mkdir($$tempexport,0700); } + if (!-e "$$tempexport/resources") { + mkdir("$$tempexport/resources",0700); + } # open manifest file my $manifest = '/imsmanifest.xml'; my $manifestfilename = $$tempexport.$manifest; @@ -483,7 +511,7 @@ 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". -' '."\n". +' '."\n". ' '."\n". ' '.$ENV{'request.'.$ENV{'request.course.id'}.'.description'}.'' @@ -504,8 +532,8 @@ sub build_package { my $lastcontainer = 0; my %parent = (); my @dependencies = (); - my $cnum = $ENV{'request.'.$ENV{'request.course.id'}.'.num'}; - my $cdom = $ENV{'request.'.$ENV{'request.course.id'}.'.domain'}; + my $cnum = $ENV{'course.'.$ENV{'request.course.id'}.'.num'}; + my $cdom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; while ($curRes = $it->next()) { if (ref($curRes)) { $count ++; @@ -534,57 +562,80 @@ sub build_package { $count = 0; my $imsresources; my $pkgdepth; - if ($curRes == $it->BEGIN_MAP()) { - $prevdepth = $depth; - $depth++; - } - if ($curRes == $it->END_MAP()) { - $prevdepth = $depth; - $depth--; - } - - if (ref($curRes)) { - if ((grep/^$count$/,@$exportitems) || (grep/^$count$/,@dependencies)) { - my $symb = $curRes->symb(); - my $isvisible = 'true'; - my $resourceref; - if ($curRes->randomout()) { - $isvisible = 'false'; - } - unless ($curRes->is_sequence()) { - $resourceref = 'identifierref="RES-'.$ENV{'request.course.id'}.'-'.$count.'"'; - } - if (($depth <= $prevdepth) && ($count > 1)) { - print $ims_manifest ' '."\n"; - } + my $included = 0; + while ($curRes = $it->next()) { + if ($curRes == $it->BEGIN_MAP()) { + $prevdepth = $depth; + $depth++; + } + if ($curRes == $it->END_MAP()) { $prevdepth = $depth; + $depth--; + } + + if (ref($curRes)) { + $count ++; + if ((grep/^$count$/,@$exportitems) || (grep/^$count$/,@dependencies)) { + my $symb = $curRes->symb(); + my $isvisible = 'true'; + my $resourceref; + if ($curRes->randomout()) { + $isvisible = 'false'; + } + unless ($curRes->is_sequence()) { + $resourceref = 'identifierref="RES-'.$ENV{'request.course.id'}.'-'.$count.'"'; + } + if (($depth <= $prevdepth) && ($count > 1) && ($included)) { + print $ims_manifest "\n".' '."\n"; + } + $included = 1; + $prevdepth = $depth; - my $itementry = + my $itementry = ''. ''.$curRes->title().''; - print $ims_manifest "\n".$itementry; + print $ims_manifest "\n".$itementry; - unless ($curRes->is_sequence()) { - my $content_file; - my @hrefs = (); - &process_content($count,$curRes,$cdom,$cnum,$symb,$content_file,\@hrefs,$copyresult,$tempexport); - if ($content_file) { - $imsresources .= "\n". + unless ($curRes->is_sequence()) { + my $content_file; + my @hrefs = (); + &process_content($count,$curRes,$cdom,$cnum,$symb,\$content_file,\@hrefs,$copyresult,$tempexport); + if ($content_file) { + $imsresources .= "\n". ' '."\n". ' '."\n"; - foreach (@hrefs) { - $imsresources .= + foreach (@hrefs) { + $imsresources .= ' '."\n"; + } + if (grep/^$count$/,@$discussions) { + my $ressymb = $symb; + my $mode; + if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) { + unless ($ressymb =~ m|adm/wrapper/adm|) { + $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard'; + } + $mode = 'board'; + } + my %extras = ( + caller => 'imsexport', + tempexport => $tempexport.'/resources', + count => $count + ); + my $discresult = &Apache::lonfeedback::list_discussion($mode,undef,$ressymb,\%extras); + } + $imsresources .= ' '."\n"; } - $imsresources .= ' '."\n"; } + $pkgdepth = $depth; + } else { + $included = 0; } - $pkgdepth = $depth; } } - while ($pkgdepth > -1) { + while ($pkgdepth > 0) { print $ims_manifest " \n"; $pkgdepth --; } @@ -602,7 +653,7 @@ sub build_package { sub get_dependencies { my ($exportitems,$parent,$depth,$dependencies) = @_; if ($depth > 1) { - unless (grep/^$$parent{$depth}$/,@$exportitems || grep/^$$parent{$depth}$/,@$dependencies) { + if ((!grep/^$$parent{$depth}$/,@$exportitems) && (!grep/^$$parent{$depth}$/,@$dependencies)) { push @$dependencies, $$parent{$depth}; if ($depth > 2) { &get_dependencies($exportitems,$parent,$depth-1,$dependencies); @@ -616,81 +667,128 @@ sub process_content { my $content_type; my $message; # find where user is author or co-author - my %roleshash = &Appache::lonnet::get_my_roles(); - if ($curRes->is_page()) { - $content_type = 'page'; + my @uploads = (); + if ($curRes->is_sequence()) { + $content_type = 'sequence'; + } elsif ($curRes->is_page()) { + $content_type = 'page'; # need to handle individual items in pages. } elsif ($symb =~ m-public/$cdom/$cnum/syllabus$-) { $content_type = 'syllabus'; - } elsif ($symb =~ m-\.sequence____\d+____ext-) { + my $contents = &Apache::imsexport::templatedpage($content_type); + if ($contents) { + $$content_file = &store_template($contents,$tempexport,$count,$content_type); + } + } elsif ($symb =~ m-\.sequence___\d+___ext-) { $content_type = 'external'; + my $title = $curRes->title; + my $contents = &Apache::imsexport::external($symb,$title); + if ($contents) { + $$content_file = &store_template($contents,$tempexport,$count,$content_type); + } } elsif ($symb =~ m-adm/navmaps$-) { $content_type = 'navmap'; - } elsif ($symb =~ m-adm/$cdom/$cnum/\d+/smppg$-) { + } elsif ($symb =~ m-adm/[^/]+/[^/]+/(\d+)/smppg$-) { $content_type = 'simplepage'; - } elsif ($symb =~ m-$-) { + my $contents = &Apache::imsexport::templatedpage($content_type,$1,$count,\@uploads); + if ($contents) { + $$content_file = &store_template($contents,$tempexport,$count,$content_type); + } + } elsif ($symb =~ m-lib/templates/simpleproblem\.problem$-) { $content_type = 'simpleproblem'; - } elsif ($symb =~ m-adm/$cdom/$cnum/\d+/bulletinboard$-) { + my $contents = &Apache::imsexport::simpleproblem($symb); + if ($contents) { + $$content_file = &store_template($contents,$tempexport,$count,$content_type); + } + } elsif ($symb =~ m-lib/templates/examupload\.problem-m) { + $content_type = 'examupload'; + } elsif ($symb =~ m-adm/(\w+)/(\w+)/(\d+)/bulletinboard$-) { $content_type = 'bulletinboard'; - } elsif ($symb =~ m-adm/$cdom/$cnum/\d+/aboutme$-) { + my $contents = &Apache::imsexport::templatedpage($content_type,$3,$count,\@uploads,$1,$2); + if ($contents) { + $$content_file = &store_template($contents,$tempexport,$count,$content_type); + } + } elsif ($symb =~ m-adm/([^/]+)/([^/]+)/aboutme$-) { $content_type = 'aboutme'; - } elsif ($symb =~ m-uploaded/$cdom/$cnum-) { - &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,'uploaded'); - } elsif ($symb =~ m-\.sequence____\d+____([^/])/([^/])-) { - my $coauth = $2.':'.$1.':ca'; + my $contents = &Apache::imsexport::templatedpage($content_type,undef,$count,\@uploads,$1,$2); + if ($contents) { + $$content_file = &store_template($contents,$tempexport,$count,$content_type); + } + } elsif ($symb =~ m-\.(sequence|page)___\d+___uploaded/$cdom/$cnum/-) { + $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded'); + } elsif ($symb =~ m-\.(sequence|page)___\d+___([^/]+)/([^/]+)-) { my $canedit = 0; - if ($1 eq $ENV{'user.domain'} && $2 eq $ENV{'user.name'}) { + if ($2 eq $ENV{'user.domain'} && $3 eq $ENV{'user.name'}) { $canedit= 1; - } elsif (defined($roleshash{$coauth})) { - if ($roleshash{$coauth} =~ /(\d+):(\d+)/) { - if (($1 < time || $1 == 0) && ($2 == 0 || $2 >= time)) { - $canedit = 1; - } - } elsif ($roleshash{$coauth} eq ':') { - $canedit = 1; - } } if ($canedit) { - &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,'resource'); + $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'resource'); } else { - &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,'noedit'); + $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'noedit'); } + } elsif ($symb =~ m-uploaded/$cdom/$cnum-) { + $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded'); + } + if (@uploads > 0) { + foreach my $item (@uploads) { + my $uploadmsg = ''; + &replicate_content($cdom,$cnum,$tempexport,$item,$count,\$uploadmsg,$href,'templateupload'); + if ($uploadmsg) { + $$copyresult .= $uploadmsg."\n"; + } + } + } + if ($message) { + $$copyresult .= $message."\n"; } - $$copyresult .= $message."\n"; } sub replicate_content { - my ($cdom,$cnum,$tempexport,$symb,$count,$message,$caller) = @_; - my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb); - my $feedurl = &Apache::lonnet::clutter($url); - + my ($cdom,$cnum,$tempexport,$symb,$count,$message,$href,$caller) = @_; + my ($map,$ind,$url); + if ($caller eq 'templateupload') { + $url = $symb; + $url =~ s#//#/#g; + } else { + ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb); + } my $content; my $filename; my $repstatus; - if ($url =~ m-[^/]/(.+)$-) { + my $content_name; + if ($url =~ m-/([^/]+)$-) { $filename = $1; if (!-e $tempexport.'/resources') { mkdir($tempexport.'/resources',0700); } - if (!-e $tempexport.'/resources') { + if (!-e $tempexport.'/resources/'.$count) { mkdir($tempexport.'/resources/'.$count,0700); } - my $destination = $$tempexport.'/resources/'.$count.'/'.$filename; + my $destination = $tempexport.'/resources/'.$count.'/'.$filename; my $copiedfile; if ($copiedfile = Apache::File->new('>'.$destination)) { my $content; - if ($caller eq 'uploaded' || $caller eq 'resource') { - $content = &Apache::lonnet::getfile($url); + if ($caller eq 'resource') { + $content = &Apache::lonnet::getfile('/home/httpd/html/res/'.$url); if ($content eq -1) { $$message = 'Could not copy file '.$filename; } else { + &extract_media($content,$count,$tempexport,$href,'resource'); $repstatus = 'ok'; } - } elsif ($caller eq 'noedit') { + } elsif ($caller eq 'uploaded' || $caller eq 'templateupload') { my $rtncode; - $repstatus = &getuploaded('GET',$url,$cdom,$cnum,$content,$rtncode); - unless ($repstatus eq 'ok') { + $repstatus = &Apache::lonnet::getuploaded('GET',$url,$cdom,$cnum,\$content,$rtncode); + if ($repstatus eq 'ok') { + if ($url =~ /\.html?$/i) { + &extract_media(\$content,$count,$tempexport,$href,'uploaded'); + } + } else { $$message = 'Could not render '.$url.' server message - '.$rtncode; } + } elsif ($caller eq 'noedit') { +# Need to render the resource without the LON-CAPA Internal header and the Post discussion footer, and then set $content equal to this. + $repstatus = 'ok'; + $content = 'Not the owner of this resource'; } if ($repstatus eq 'ok') { print $copiedfile $content; @@ -700,9 +798,46 @@ sub replicate_content { $$message = 'Could not open destination file for '.$filename."\n"; } } else { - $$message = 'Could not determine name of file for '; + $$message = 'Could not determine name of file for '.$symb."\n"; + } + if ($repstatus eq 'ok') { + $content_name = $count.'/'.$filename; + } + return $content_name; +} + +sub extract_media { + my ($content,$count,$tempexport,$href,$caller) = @_; +# @$href will contain path to any embedded resources in the content. +# For LON-CAPA problems this would be images. applets etc. +# For uploaded HTML files this would be images etc. +# paths will be in the form $count/res/$file, and urls in the $content will be rewritten with the new paths. + return; +} + +sub store_template { + my ($contents,$tempexport,$count,$content_type) = @_; + if ($contents) { + if ($tempexport) { + if (!-e $tempexport.'/resources') { + mkdir($tempexport.'/resources',0700); + } + if (!-e $tempexport.'/resources/'.$count) { + mkdir($tempexport.'/resources/'.$count,0700); + } + my $destination = $tempexport.'/resources/'.$count.'/'.$content_type.'.xml'; + my $storetemplate; + if ($storetemplate = Apache::File->new('>'.$destination)) { + print $storetemplate $contents; + close($storetemplate); + } + if ($content_type eq 'external') { + return $count.'/'.$content_type.'.html'; + } else { + return $count.'/'.$content_type.'.xml'; + } + } } - return $repstatus; } # Imports the given (name, url) resources into the course @@ -760,6 +895,14 @@ sub breadcrumbs { @folders=split('&',$ENV{'form.folderpath'}); } my $folderpath; + my $cpinfo=''; + if ($ENV{'form.markedcopy_url'}) { + &Apache::lonnet::logthis('Found '.$ENV{'form.markedcopy_url'}); + $cpinfo='&markedcopy_url='. + &Apache::lonnet::escape($ENV{'form.markedcopy_url'}). + '&markedcopy_title='. + &Apache::lonnet::escape($ENV{'form.markedcopy_title'}); + } while (@folders) { my $folder=shift(@folders); my $foldername=shift(@folders); @@ -768,7 +911,7 @@ sub breadcrumbs { my $url='/adm/coursedocs?folderpath='. &Apache::lonnet::escape($folderpath); &Apache::lonhtmlcommon::add_breadcrumb( - {'href'=>$url, + {'href'=>$url.$cpinfo, 'title'=>&Apache::lonnet::unescape($foldername), 'text'=>''. &Apache::lonnet::unescape($foldername).'' @@ -782,8 +925,6 @@ sub breadcrumbs { sub editor { my ($r,$coursenum,$coursedom,$folder,$allowed)=@_; - - $r->print(&breadcrumbs($folder)); my $errtext=''; my $fatal=0; my $container='sequence'; @@ -796,6 +937,13 @@ sub editor { $Apache::lonratedt::order[0]=1; $Apache::lonratedt::resources[1]=''; } + if (defined($ENV{'form.markcopy'})) { +# Mark for copying + my ($title,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$ENV{'form.markcopy'}]]); + $ENV{'form.markedcopy_title'}=$title; + $ENV{'form.markedcopy_url'}=$url; + } + $r->print(&breadcrumbs($folder)); if ($fatal) { $r->print('

'.$errtext.'

'); } else { @@ -866,14 +1014,50 @@ sub editor { } } + if ($ENV{'form.pastemarked'}) { +# paste resource to end of list + my $url=$ENV{'form.markedcopy_url'}; + my $title=$ENV{'form.markedcopy_title'}; +# Maps need to be copied first + if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) { + $title=&mt('Copy of').' '.$title; + my $newid=$$.time; + $url=~/^(.+)\.(\w+)$/; + my $newurl=$1.$newid.'.'.$2; + my $storefn=$newurl; + $storefn=~s/^\/\w+\/\w+\/\w+\///; + &Apache::loncreatecourse::writefile + ($ENV{'request.course.id'},$storefn, + &Apache::lonnet::getfile($url)); + $url=$newurl; + } + $title=~s/\/\>\;/g; + $title=~s/\:/\:/g; + my $ext='false'; + if ($url=~/^http\:\/\//) { $ext='true'; } + $url=~s/\:/\:/g; +# Now insert the URL at the bottom + my $newidx=1+$#Apache::lonratedt::resources; + $Apache::lonratedt::resources[$newidx]= + $title.':'.$url.':'.$ext.':normal:res'; + $Apache::lonratedt::order[1+$#Apache::lonratedt::order]=$newidx; +# Store the result + ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); + if ($fatal) { + $r->print('

'.$errtext.'

'); + return; + } + } # upload a file, if present if (($ENV{'form.uploaddoc.filename'}) && ($ENV{'form.cmd'}=~/^upload_(\w+)/)) { if ( ($folder=~/^$1/) || ($1 eq 'default') ) { # this is for a course, not a user, so set coursedoc flag # probably the only place in the system where this should be "1" - my $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs'); + my $newidx=$#Apache::lonratedt::resources+1; + my $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs/'.$newidx); my $ext='false'; if ($url=~/^http\:\/\//) { $ext='true'; } $url=~s/\:/\:/g; @@ -885,7 +1069,6 @@ sub editor { $comment=time.'___&&&___'.$ENV{'user.name'}.'___&&&___'. $ENV{'user.domain'}.'___&&&___'.$comment; } - my $newidx=$#Apache::lonratedt::resources+1; $Apache::lonratedt::resources[$newidx]= $comment.':'.$url.':'.$ext.':normal:res'; $Apache::lonratedt::order[$#Apache::lonratedt::order+1]= @@ -910,6 +1093,13 @@ sub editor { $Apache::lonratedt::order[$i+1]; } $#Apache::lonratedt::order--; + } elsif ($cmd eq 'cut') { + my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]); + for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) { + $Apache::lonratedt::order[$i]= + $Apache::lonratedt::order[$i+1]; + } + $#Apache::lonratedt::order--; } elsif ($cmd eq 'up') { if (($idx) && (defined($Apache::lonratedt::order[$idx-1]))) { my $i=$Apache::lonratedt::order[$idx-1]; @@ -1002,7 +1192,30 @@ sub editor { unless ($shown) { $r->print(''.&mt('Currently no documents.').''); } - $r->print(''); + $r->print("\n\n"); + if ($ENV{'form.markedcopy_url'}) { + $r->print(< + + +ENDPASTE + $r->print( + ' '.&Apache::loncommon::filedescription( + (split(/\./,$ENV{'form.markedcopy_url'}))[-1]).': '. + $ENV{'form.markedcopy_title'}); + if ($container eq 'page') { + $r->print(< + +PAGEINFO + } else { + $r->print(< +FOLDERINFO + } + $r->print('

'); + } } } @@ -1034,15 +1247,30 @@ sub entryline { $folderpath=&Apache::lonnet::escape($ENV{'form.folderpath'}); # $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"'); } - my $pagepath; + my ($pagepath,$pagesymb); if ($ENV{'form.pagepath'}) { $container = 'page'; $pagepath=&Apache::lonnet::escape($ENV{'form.pagepath'}); + $pagesymb=&Apache::lonnet::escape($ENV{'form.pagesymb'}); + } + my $cpinfo=''; + if ($ENV{'form.markedcopy_url'}) { + $cpinfo='&markedcopy_url='. + &Apache::lonnet::escape($ENV{'form.markedcopy_url'}). + '&markedcopy_title='. + &Apache::lonnet::escape($ENV{'form.markedcopy_title'}); } if ($allowed) { my $incindex=$index+1; my $selectbox=''; - if ($folder!~/^supplemental/) { + if (($folder!~/^supplemental/) && + ($#Apache::lonratedt::order>0) && + ((split(/\:/, + $Apache::lonratedt::resources[$Apache::lonratedt::order[0]]))[1] + ne '') && + ((split(/\:/, + $Apache::lonratedt::resources[$Apache::lonratedt::order[1]]))[1] + ne '')) { $selectbox= ''. ' + + +
- + $lt{
- + $lt{
$selectbox - + $lt{'rm'} - -$lt{'rn'} + +$lt{'ct'} + +$lt{'rn'} + +$lt{'cp'} END } else { $line.=(< + +
- + $lt{
- + $lt{
$selectbox $lt{'rm'} + +$lt{'ct'} -$lt{'rn'} +$lt{'rn'} + +$lt{'cp'} END } } @@ -1166,16 +1409,16 @@ END my $folderpath=$ENV{'form.folderpath'}; if ($folderpath) { $folderpath.='&' }; $folderpath.=$folderarg.'&'.$foldername; - $url.='folderpath='.&Apache::lonnet::escape($folderpath); + $url.='folderpath='.&Apache::lonnet::escape($folderpath).$cpinfo; $parameterset=''; + '" />'. +''.&mt('Store').''; } if ($ispage) { - &Apache::lonnet::logthis(" in ispage "); my $pagename=&Apache::lonnet::escape($pagetitle); my $pagepath; my $folderpath=$ENV{'form.folderpath'}; @@ -1190,32 +1433,26 @@ END $residx, $path.$pagearg.'.page'); } - #(undef,undef,$url)=&Apache::lonnet::decode_symb($symb); $url.='pagepath='.&Apache::lonnet::escape($pagepath). - '&pagesymb='.&Apache::lonnet::escape($symb); + '&pagesymb='.&Apache::lonnet::escape($symb).$cpinfo; } - &Apache::lonnet::logthis(" link \n$url"); $line.=''. "$title"; if (($allowed) && ($folder!~/^supplemental/)) { my %lt=&Apache::lonlocal::texthash( 'hd' => 'Hidden', - 'ec' => 'URL hidden', - 'sp' => 'Store Parameters'); + 'ec' => 'URL hidden'); my $enctext= ((&Apache::lonratedt::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':''); my $hidtext= ((&Apache::lonratedt::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':''); $line.=(< - + - + $parameterset - - - ENDPARMS } $line.=""; @@ -1264,7 +1501,7 @@ sub checkonthis { if ($url=~/^\/res\//) { my $result=&Apache::lonnet::repcopy( &Apache::lonnet::filelocation('',$url)); - if ($result==OK) { + if ($result eq 'OK') { $r->print(''.&mt('ok').''); $r->rflush(); &Apache::lonnet::countacc($url); @@ -1276,23 +1513,19 @@ sub checkonthis { $r->print(' '); } $r->print('- '.&mt('Rendering').': '); - my $oldpath=$ENV{'request.filename'}; - $ENV{'request.filename'}=&Apache::lonnet::filelocation('',$url); - &Apache::lonxml::xmlparse($r,'web', - &Apache::lonnet::getfile( - &Apache::lonnet::filelocation('',$url))); - undef($Apache::lonhomework::parsing_a_problem); - $ENV{'request.filename'}=$oldpath; - if (($Apache::lonxml::errorcount) || - ($Apache::lonxml::warningcount)) { - if ($Apache::lonxml::errorcount) { + my ($errorcount,$warningcount)=split(/:/, + &Apache::lonnet::ssi_body($url, + ('return_only_error_and_warning_counts' => 1))); + if (($errorcount) || + ($warningcount)) { + if ($errorcount) { $r->print(''. - $Apache::lonxml::errorcount.' '. + $errorcount.' '. &mt('error(s)').' '); } - if ($Apache::lonxml::warningcount) { + if ($warningcount) { $r->print(''. - $Apache::lonxml::warningcount.' '. + $warningcount.' '. &mt('warning(s)').''); } } else { @@ -1307,9 +1540,9 @@ sub checkonthis { &checkonthis($r,$_,$level+1); } } - } elsif ($result==HTTP_SERVICE_UNAVAILABLE) { + } elsif ($result eq 'HTTP_SERVICE_UNAVAILABLE') { $r->print(''.&mt('connection down').''); - } elsif ($result==HTTP_NOT_FOUND) { + } elsif ($result eq 'HTTP_NOT_FOUND') { unless ($url=~/\$/) { $r->print(''.&mt('not found').''); } else { @@ -1330,8 +1563,8 @@ sub verifycontent { my $r=shift; my $loaderror=&Apache::lonnet::overloaderror($r); if ($loaderror) { return $loaderror; } - - $r->print('Verify Content'. + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.'Verify Content'. &Apache::loncommon::bodytag('Verify Course Documents')); $hashtied=0; undef %alreadyseen; @@ -1359,7 +1592,8 @@ sub verifycontent { sub checkversions { my $r=shift; - $r->print('Check Versions'. + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.'Check Versions'. &Apache::loncommon::bodytag('Check Course Document Versions')); my $header=''; my $startsel=''; @@ -1629,6 +1863,7 @@ sub changewarning { if (defined($ENV{'form.pagepath'})) { $pathvar='pagepath'; $path=&Apache::lonnet::escape($ENV{'form.pagepath'}); + $path.='&symb='.&Apache::lonnet::escape($ENV{'form.pagesymb'}); } $r->print( ''. @@ -1684,7 +1919,7 @@ sub handler { # is this a standard course? my $standard=($ENV{'request.course.uri'}=~/^\/uploaded\//); - my $forcestandard; + my $forcestandard = 0; my $forcesupplement; my $script=''; my $allowed; @@ -1693,7 +1928,7 @@ sub handler { my $containertag; my $uploadtag; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['folderpath','pagepath','pagesymb']); + ['folderpath','pagepath','pagesymb','markedcopy_url','markedcopy_title']); if ($ENV{'form.folderpath'}) { my (@folderpath)=split('&',$ENV{'form.folderpath'}); $ENV{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath)); @@ -1703,14 +1938,19 @@ sub handler { my (@pagepath)=split('&',$ENV{'form.pagepath'}); $ENV{'form.pagename'}=&Apache::lonnet::unescape(pop(@pagepath)); $ENV{'form.folder'}=pop(@pagepath); - $containertag = ''; - $uploadtag = ''; + $containertag = ''. + ''; + $uploadtag = ''. + ''; } if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) { $showdoc='/'.$1; } unless ($showdoc) { # got called from remote - $forcestandard=($ENV{'form.folder'}=~/^default_/); + if (($ENV{'form.folder'}=~/^default_/) || + ($ENV{'form.folder'} =~ m#^\d+/(pages|sequences)/#)) { + $forcestandard = 1; + } $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/); # does this user have privileges to post, etc? @@ -1744,8 +1984,9 @@ sub handler { my $now=time; # print screen + my $html=&Apache::lonxml::xmlbegin(); $r->print(< +$html The LearningOnline Network with CAPA ENDNEWSCRIPT @@ -1886,7 +2160,9 @@ ENDNEWSCRIPT my %lt=&Apache::lonlocal::texthash( 'uplm' => 'Upload a new main course document', 'upls' => 'Upload a new supplemental course document', - 'impp' => 'Import a published document', + 'impp' => 'Import a document', + 'pubd' => 'Published documents', + 'copm' => 'All documents out of a published map', 'spec' => 'Special documents', 'upld' => 'Upload Document', 'srch' => 'Search', @@ -1935,6 +2211,7 @@ ENDNEWSCRIPT
+ $containertag
@@ -2006,6 +2283,7 @@ $uploadtag +$lt{'pubd'}
$uploadtag @@ -2014,6 +2292,7 @@ $help{'Importing_LON-CAPA_Resource'}

+$lt{'copm'}
ENDFORM unless ($ENV{'form.pagepath'}) { + $r->print(< + +$uploadtag + + + $help{'Adding_External_Resource'} + +
+
+ + + +
+ENDFORM + } + $r->print(''); + unless ($ENV{'form.pagepath'}) { $r->print(< @@ -2044,14 +2340,6 @@ onClick="javascript:makenewpage(this.for value="$lt{'newp'}" />$help{'Adding_Pages'} -
-$uploadtag - - - $help{'Adding_External_Resource'} - -
$uploadtag $help{'Score_Upload_Form'} -
ENDBLOCK - } else { - $r->print(< -
- - - -
-ENDFORM + $r->print(''); } $r->print(''."\n". '');