--- loncom/interface/londocs.pm 2013/12/31 15:20:31 1.484.2.48
+++ loncom/interface/londocs.pm 2013/08/21 15:42:23 1.562
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.484.2.48 2013/12/31 15:20:31 raeburn Exp $
+# $Id: londocs.pm,v 1.562 2013/08/21 15:42:23 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -41,8 +41,6 @@ use Apache::lonclonecourse;
use Apache::lonnavmaps;
use Apache::lonnavdisplay();
use Apache::lonextresedit();
-use Apache::lontemplate();
-use Apache::lonsimplepage();
use HTML::Entities;
use HTML::TokeParser;
use GDBM_File;
@@ -143,28 +141,8 @@ sub clean {
sub dumpcourse {
my ($r) = @_;
my $crstype = &Apache::loncommon::course_type();
- my ($starthash,$js);
- unless (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) {
- $js = <<"ENDJS";
-
-ENDJS
- $starthash = {
- add_entries => {'onload' => "hide_searching();"},
- };
- }
- $r->print(&Apache::loncommon::start_page('Copy '.$crstype.' Content to Authoring Space',$js,$starthash)."\n".
- &Apache::lonhtmlcommon::breadcrumbs('Copy '.$crstype.' Content to Authoring Space')."\n");
+ $r->print(&Apache::loncommon::start_page('Dump '.$crstype.' Content to Authoring Space')."\n".
+ &Apache::lonhtmlcommon::breadcrumbs('Dump '.$crstype.' Content to Authoring Space')."\n");
$r->print(&startContentScreen('tools'));
my ($home,$other,%outhash)=&authorhosts();
unless ($home) {
@@ -183,407 +161,118 @@ ENDJS
$r->print(''.&mt('Copying Files').'
');
my $title=$env{'form.authorfolder'};
$title=&clean($title);
- my ($navmap,$errormsg) =
- &Apache::loncourserespicker::get_navmap_object($crstype,'dumpdocs');
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my (%maps,%resources,%titles);
- if (!ref($navmap)) {
- $r->print($errormsg.
- &endContentScreen());
- return '';
- } else {
- &Apache::loncourserespicker::enumerate_course_contents($navmap,\%maps,\%resources,\%titles,
- 'dumpdocs',$cdom,$cnum);
- }
- my @todump = &Apache::loncommon::get_env_multiple('form.archive');
- my (%tocopy,%replacehash,%lookup,%deps,%display,%result,%depresult,%simpleproblems,%simplepages,
- %newcontent,%has_simpleprobs);
- foreach my $item (sort {$a <=> $b} (@todump)) {
- my $name = $env{'form.namefor_'.$item};
- if ($resources{$item}) {
- my ($map,$id,$res) = &Apache::lonnet::decode_symb($resources{$item});
- if ($res =~ m{^uploaded/$cdom/$cnum/\E((?:docs|supplemental)/.+)$}) {
- $tocopy{$1} = $name;
- $display{$item} = $1;
- $lookup{$1} = $item;
- } elsif ($res eq 'lib/templates/simpleproblem.problem') {
- $simpleproblems{$item} = {
- symb => $resources{$item},
- name => $name,
- };
- $display{$item} = 'simpleproblem_'.$name;
- if ($map =~ m{^\Quploaded/$cdom/$cnum/\E(.+)$}) {
- $has_simpleprobs{$1}{$id} = $item;
- }
- } elsif ($res =~ m{^adm/$match_domain/$match_username/(\d+)/smppg}) {
- my $marker = $1;
- my $db_name = &Apache::lonsimplepage::get_db_name($res,$marker,$cdom,$cnum);
- $simplepages{$item} = {
- res => $res,
- title => $titles{$item},
- db => $db_name,
- marker => $marker,
- symb => $resources{$item},
- name => $name,
- };
- $display{$item} = '/'.$res;
- }
- } elsif ($maps{$item}) {
- if ($maps{$item} =~ m{^\Quploaded/$cdom/$cnum/\E((?:default|supplemental)_\d+\.(?:sequence|page))$}) {
- $tocopy{$1} = $name;
- $display{$item} = $1;
- $lookup{$1} = $item;
- }
- } else {
- next;
- }
- }
+ my %replacehash=();
+ foreach my $key (keys(%env)) {
+ if ($key=~/^form\.namefor\_(.+)/) {
+ $replacehash{$1}=$env{$key};
+ }
+ }
my $crs='/uploaded/'.$env{'request.course.id'}.'/';
$crs=~s/\_/\//g;
- my $mm = new File::MMagic;
- my $prefix = "/uploaded/$cdom/$cnum/";
- %replacehash = %tocopy;
- foreach my $item (sort(keys(%simpleproblems))) {
- my $content = &Apache::imsexport::simpleproblem($simpleproblems{$item}{'symb'});
- $newcontent{$display{$item}} = $content;
- }
- my $gateway = Apache::lonhtmlgateway->new('web');
- foreach my $item (sort(keys(%simplepages))) {
- if (ref($simplepages{$item}) eq 'HASH') {
- my $pagetitle = $simplepages{$item}{'title'};
- my %fields = &Apache::lonnet::dump($simplepages{$item}{'db'},$cdom,$cnum);
- my %contents;
- foreach my $field (keys(%fields)) {
- if ($field =~ /^(?:aaa|bbb|ccc)_(\w+)$/) {
- my $name = $1;
- my $msg = $fields{$field};
- if ($name eq 'webreferences') {
- if ($msg =~ m{^https?://}) {
- $contents{$name} = ''.$msg.'';
- }
- } else {
- $msg = &Encode::decode('utf8',$msg);
- $msg = $gateway->process_outgoing_html($msg,1);
- $contents{$name} = $msg;
- }
- } elsif ($field eq 'uploaded.photourl') {
- my $marker = $simplepages{$item}{marker};
- if ($fields{$field} =~ m{^\Q$prefix\E(simplepage/$marker/.+)$}) {
- my $filepath = $1;
- my ($relpath,$fname) = ($filepath =~ m{^(.+/)([^/]+)$});
- if ($fname ne '') {
- $fname=~s/\.(\w+)$//;
- my $ext=$1;
- $fname = &clean($fname);
- $fname.='.'.$ext;
- $contents{image} = '
';
- $replacehash{$filepath} = $relpath.$fname;
- $deps{$item}{$filepath} = 1;
- }
- }
- }
- }
- $replacehash{'/'.$simplepages{$item}{'res'}} = $simplepages{$item}{'name'};
- $lookup{'/'.$simplepages{$item}{'res'}} = $item;
- my $content = '
-
-
-'.$pagetitle.'
-
-';
- if ($contents{title}) {
- $content .= "\n".''.$contents{title}.'
';
- }
- if ($contents{image}) {
- $content .= "\n".$contents{image};
- }
- if ($contents{content}) {
- $content .= '
-
-
Content
'.
-$contents{content}.'
-';
- }
- if ($contents{webreferences}) {
- $content .= '
-
-
Web References
'.
-$contents{webreferences}.'
-';
- }
- $content .= '
-
-
-';
- $newcontent{'/'.$simplepages{$item}{res}} = $content;
- }
- }
- foreach my $item (keys(%tocopy)) {
- unless ($item=~/\.(sequence|page)$/) {
- my $currurlpath = $prefix.$item;
- my $currdirpath = &Apache::lonnet::filelocation('',$currurlpath);
- &recurse_html($mm,$prefix,$currdirpath,$currurlpath,$item,$lookup{$item},\%replacehash,\%deps);
- }
- }
- foreach my $num (sort {$a <=> $b} (@todump)) {
- my $src = $display{$num};
- next if ($src eq '');
- my @needcopy = ();
- if ($replacehash{$src}) {
- push(@needcopy,$src);
- if (ref($deps{$num}) eq 'HASH') {
- foreach my $dep (sort(keys(%{$deps{$num}}))) {
- if ($replacehash{$dep}) {
- push(@needcopy,$dep);
- }
- }
- }
- } elsif ($src =~ /^simpleproblem_/) {
- push(@needcopy,$src);
- }
- next if (@needcopy == 0);
- my ($result,$depresult);
- for (my $i=0; $i<@needcopy; $i++) {
- my $item = $needcopy[$i];
- my $newfilename;
- if ($simpleproblems{$num}) {
- $newfilename=$title.'/'.$simpleproblems{$num}{'name'};
- } else {
- $newfilename=$title.'/'.$replacehash{$item};
- }
- $newfilename=~s/\.(\w+)$//;
- my $ext=$1;
- $newfilename=&clean($newfilename);
- $newfilename.='.'.$ext;
- my ($newrelpath) = ($newfilename =~ m{^\Q$title/\E(.+)$});
- if ($newrelpath ne $replacehash{$item}) {
- $replacehash{$item} = $newrelpath;
- }
- my @dirs=split(/\//,$newfilename);
- my $path=$r->dir_config('lonDocRoot')."/priv/$cd/$ca";
- my $makepath=$path;
- my $fail;
- my $origin;
- for (my $i=0;$i<$#dirs;$i++) {
- $makepath.='/'.$dirs[$i];
- unless (-e $makepath) {
- unless(mkdir($makepath,0755)) {
- $fail = &mt('Directory creation failed.');
- }
- }
- }
- if ($i == 0) {
- $result = '
'.$item.' => '.$newfilename.': ';
- } else {
- $depresult .= ''.$item.' => '.$newfilename.' '.
- ''.
- &mt('(dependency)').': ';
- }
- if (-e $path.'/'.$newfilename) {
- $fail = &mt('Destination already exists -- not overwriting.');
- } else {
- if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) {
- if (($item =~ m{^/adm/$match_domain/$match_username/\d+/smppg}) ||
- ($item =~ /^simpleproblem_/)) {
- print $fh $newcontent{$item};
- } else {
- my $fileloc = &Apache::lonnet::filelocation('',$prefix.$item);
- if (-e $fileloc) {
- if ($item=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
- if ((($1 eq 'sequence') || ($1 eq 'page')) &&
- (ref($has_simpleprobs{$item}) eq 'HASH')) {
- my %changes = %{$has_simpleprobs{$item}};
- my $content = &Apache::lonclonecourse::rewritefile(
- &Apache::lonclonecourse::readfile($env{'request.course.id'},$item),
- (%replacehash,$crs => '')
- );
- my $updatedcontent = '';
- my $parser = HTML::TokeParser->new(\$content);
- $parser->attr_encoded(1);
- while (my $token = $parser->get_token) {
- if ($token->[0] eq 'S') {
- if (($token->[1] eq 'resource') &&
- ($token->[2]->{'src'} eq '/res/lib/templates/simpleproblem.problem') &&
- ($changes{$token->[2]->{'id'}})) {
- my $id = $token->[2]->{'id'};
- $updatedcontent .= '<'.$token->[1];
- foreach my $attrib (@{$token->[3]}) {
- next unless ($attrib =~ /^(src|type|title|id)$/);
- if ($attrib eq 'src') {
- my ($file) = ($display{$changes{$id}} =~ /^\Qsimpleproblem_\E(.+)$/);
- if ($file) {
- $updatedcontent .= ' '.$attrib.'="'.$file.'"';
- } else {
- $updatedcontent .= ' '.$attrib.'="'.$token->[2]->{$attrib}.'"';
- }
- } else {
- $updatedcontent .= ' '.$attrib.'="'.$token->[2]->{$attrib}.'"';
- }
- }
- $updatedcontent .= ' />'."\n";
- } else {
- $updatedcontent .= $token->[4]."\n";
- }
- } else {
- $updatedcontent .= $token->[2];
- }
- }
- print $fh $updatedcontent;
- } else {
- print $fh &Apache::lonclonecourse::rewritefile(
- &Apache::lonclonecourse::readfile($env{'request.course.id'},$item),
- (%replacehash,$crs => '')
- );
- }
- } else {
- print $fh
- &Apache::lonclonecourse::readfile($env{'request.course.id'},$item);
- }
- } else {
- $fail = &mt('Source does not exist.');
- }
- }
- $fh->close();
- } else {
- $fail = &mt('Could not write to destination.');
- }
- }
- my $text;
- if ($fail) {
- $text = ''.&mt('fail').(' 'x3).$fail.'';
- } else {
- $text = ''.&mt('ok').'';
- }
- if ($i == 0) {
- $result .= $text;
- } else {
- $depresult .= $text.'';
- }
- }
- $r->print($result);
- if ($depresult) {
- $r->print('');
- }
- }
+ foreach my $item (keys(%replacehash)) {
+ my $newfilename=$title.'/'.$replacehash{$item};
+ $newfilename=~s/\.(\w+)$//;
+ my $ext=$1;
+ $newfilename=&clean($newfilename);
+ $newfilename.='.'.$ext;
+ my @dirs=split(/\//,$newfilename);
+ my $path=$r->dir_config('lonDocRoot')."/priv/$cd/$ca";
+ my $makepath=$path;
+ my $fail=0;
+ for (my $i=0;$i<$#dirs;$i++) {
+ $makepath.='/'.$dirs[$i];
+ unless (-e $makepath) {
+ unless(mkdir($makepath,0777)) { $fail=1; }
+ }
+ }
+ $r->print('
'.$item.' => '.$newfilename.': ');
+ if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) {
+ if ($item=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
+ print $fh &Apache::lonclonecourse::rewritefile(
+ &Apache::lonclonecourse::readfile($env{'request.course.id'},$item),
+ (%replacehash,$crs => '')
+ );
+ } else {
+ print $fh
+ &Apache::lonclonecourse::readfile($env{'request.course.id'},$item);
+ }
+ $fh->close();
+ } else {
+ $fail=1;
+ }
+ if ($fail) {
+ $r->print(''.&mt('fail').'');
+ } else {
+ $r->print(''.&mt('ok').'');
+ }
+ }
} else {
- my ($navmap,$errormsg) =
- &Apache::loncourserespicker::get_navmap_object($crstype,'dumpdocs');
- if (!ref($navmap)) {
- $r->print($errormsg);
- } else {
- $r->print(''.&mt('Searching ...').'
');
- $r->rflush();
- my ($preamble,$formname);
- $formname = 'dumpdoc';
- unless ($home==1) {
- $preamble = ''.
- '
'."\n";
- }
- my $title=$origcrsdata{'description'};
- $title=~s/[\/\s]+/\_/gs;
- $title=&clean($title);
- $preamble .= ''.
- '
'."\n";
- my %uploadedfiles;
- &tiehash();
- foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
- my ($ext)=($file=~/\.(\w+)$/);
-# FIXME Check supplemental here
- my $title=$hash{'title_'.$hash{
- 'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$file}};
- if (!$title) {
- $title=$file;
- } else {
- $title=~s|/|_|g;
- }
- $title=~s/\.(\w+)$//;
- $title=&clean($title);
- $title.='.'.$ext;
-# $r->print("\n | "
- $uploadedfiles{$file} = $title;
- }
- &untiehash();
- $r->print(&Apache::loncourserespicker::create_picker($navmap,'dumpdocs',$formname,$crstype,undef,
- undef,undef,$preamble,$home,\%uploadedfiles));
- }
+ $r->print(&mt('Searching ...').'
');
+ $r->rflush();
+# Input form
+ $r->print('');
}
$r->print(&endContentScreen());
}
-sub recurse_html {
- my ($mm,$prefix,$currdirpath,$currurlpath,$container,$item,$replacehash,$deps) = @_;
- return unless ((ref($replacehash) eq 'HASH') && (ref($deps) eq 'HASH'));
- my (%allfiles,%codebase);
- if (&Apache::lonnet::extract_embedded_items($currdirpath,\%allfiles,\%codebase) eq 'ok') {
- if (keys(%allfiles)) {
- foreach my $dependency (keys(%allfiles)) {
- next if (($dependency =~ m{^/(res|adm)/}) || ($dependency =~ m{^https?://}));
- my ($depurl,$relfile,$newcontainer);
- if ($dependency =~ m{^/}) {
- if ($dependency =~ m{^\Q$currurlpath/\E(.+)$}) {
- $relfile = $1;
- if ($dependency =~ m{^\Q$prefix\E(.+)$}) {
- $newcontainer = $1;
- next if ($replacehash->{$newcontainer});
- }
- $depurl = $dependency;
- } else {
- next;
- }
- } else {
- $relfile = $dependency;
- $depurl = $currurlpath;
- $depurl =~ s{[^/]+$}{};
- $depurl .= $dependency;
- ($newcontainer) = ($depurl =~ m{^\Q$prefix\E(.+)$});
- }
- next if ($relfile eq '');
- my $newname = $replacehash->{$container};
- $newname =~ s{[^/]+$}{};
- $replacehash->{$newcontainer} = $newname.$relfile;
- $deps->{$item}{$newcontainer} = 1;
- my ($newurlpath) = ($depurl =~ m{^(.*)/[^/]+$});
- my $depfile = &Apache::lonnet::filelocation('',$depurl);
- my $type = $mm->checktype_filename($depfile);
- if ($type eq 'text/html') {
- &recurse_html($mm,$prefix,$depfile,$newurlpath,$newcontainer,$item,$replacehash,$deps);
- }
- }
- }
- }
- return;
-}
-
sub group_import {
my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap,
@@ -666,7 +355,7 @@ $initialtext