--- loncom/imspackages/imsprocessor.pm 2004/03/09 16:44:01 1.2 +++ loncom/imspackages/imsprocessor.pm 2004/08/04 17:34:29 1.9 @@ -3,12 +3,52 @@ package Apache::imsprocessor; use Apache::lonnet; use LONCAPA::Configuration; use strict; + +sub ims_config { + my ($areas,$cmsmap,$areaname) = @_; + @{$areas} = ("doc","extlink","announce","staff","board","quiz","survey","pool","users"); + %{$$cmsmap{bb5}} = ( + announce => 'resource/x-bb-announcement', + board => 'resource/x-bb-discussionboard', + doc => 'resource/x-bb-document', + extlink => 'resource/x-bb-externallink', + pool => 'assessment/x-bb-pool', + quiz => 'assessment/x-bb-quiz', + staff => 'resource/x-bb-staffinfo', + survey => 'assessment/x-bb-survey', + users => 'course/x-bb-user', + ); + + %{$$cmsmap{angel}} = ( + board => 'BOARD', + extlink => 'LINK', + msg => 'MESSAGE', + quiz => 'QUIZ', + survey => 'FORM', + ); + + @{$$cmsmap{angel}{doc}} = ('FILE','PAGE'); + + + %{$areaname} = ( + announce => 'Announcements', + board => 'Discussion Boards', + doc => 'Documents, pages, and folders', + extlink => 'Links to external sites', + pool => 'Question pools', + quiz => 'Quizzes', + staff => 'Staff information', + survey => 'Surveys', + users => 'Enrollment', + ); + +} sub create_tempdir { - my ($caller,$pathinfo,$timenow) = @_; + my ($context,$pathinfo,$timenow) = @_; my $configvars = &LONCAPA::Configuration::read_conf('loncapa.conf'); my $tempdir; - if ($caller eq 'DOCS') { + if ($context eq 'DOCS') { $tempdir = $$configvars{'lonDaemons'}.'/tmp/'.$pathinfo; if (!-e "$tempdir") { mkdir("$tempdir",0770); @@ -17,7 +57,7 @@ sub create_tempdir { if (!-e "$tempdir") { mkdir("$tempdir",0770); } - } elsif ($caller eq "CSTR") { + } elsif ($context eq "CSTR") { if (!-e "$pathinfo/temp") { mkdir("$pathinfo/temp",0770); } @@ -26,15 +66,48 @@ sub create_tempdir { return $tempdir; } +sub uploadzip { + my ($context,$tempdir,$source) = @_; + my $fname; + if ($context eq 'DOCS') { + $fname=$ENV{'form.uploadname.filename'}; +# Replace Windows backslashes by forward slashes + $fname=~s/\\/\//g; +# Get rid of everything but the actual filename + $fname=~s/^.*\/([^\/]+)$/$1/; +# Replace spaces by underscores + $fname=~s/\s+/\_/g; +# Replace all other weird characters by nothing + $fname=~s/[^\w\.\-]//g; +# See if there is anything left + unless ($fname) { return 'error: no uploaded file'; } +# Save the file + chomp($ENV{'form.uploadname'}); + open(my $fh,'>'.$tempdir.'/'.$fname); + print $fh $ENV{'form.uploadname'}; + close($fh); + } elsif ($context eq 'CSTR') { + if ($source =~ m/\/([^\/]+)$/) { + $fname = $1; + my $destination = $tempdir.'/'.$fname; + rename($source,$destination); + } + } + return $fname; +} + sub expand_zip { my ($tempdir,$filename) = @_; my $zipfile = "$tempdir/$filename"; if ($filename =~ m|\.zip$|i) { + # unzip can cause an sh launch which can pass along all of %ENV + # which can be too large for /bin/sh to handle + my %oldENV=%ENV; + undef(%ENV); open(OUTPUT, "unzip -o $zipfile -d $tempdir 2> /dev/null |"); - while () { - print "$_
"; - } close(OUTPUT); + %ENV=%oldENV; + undef(%oldENV); } else { return 'nozip'; } @@ -60,7 +133,9 @@ sub process_manifest { contentscount => 0, resnum => 'toplevel', ); - %{$$resources{'toplevel'}} = (); + %{$$resources{'toplevel'}} = ( + revitm => 'Top' + ); if ($cms eq 'angel') { $$resources{'toplevel'}{type} = "FOLDER"; @@ -177,6 +252,11 @@ sub process_manifest { text_h => [sub { my ($text) = @_; + if ($state[0] eq "manifest" && $state[1] eq "organizations" && $state[2] eq "organization" && $state[-1] eq "title") { + if ($cms eq 'angel') { + $$items{$itm}{title} = $text; + } + } }, "dtext"], end_h => [sub { @@ -212,31 +292,15 @@ sub copy_resources { foreach my $file (@{$$hrefs{$key}}) { my $source = $tempdir.'/'.$key.'/'.$file; my $filename = ''; - my $fpath = $timenow.'/resfiles/'.$key.'/'; - if ($cms eq 'bb5') { - if ($file =~ m-/-) { - my @items = split/\//,$file; - $filename = pop @items; - $fpath .= join('/',@items); - $fpath .= '/'; - } else { - $filename = $file; - } - &Apache::lonnet::userfileupload(undef,'1',$filename,$fpath,$source); - } elsif ($cms eq 'angel') { - $file =~ s-\\-/-g; - unless ($file eq 'pg'.$key.'.htm') { - if ($file =~ m-/-) { - my @items = split/\//,$file; - $filename = pop @items; - $fpath = join('/',@items); - $fpath .= '/'; - } else { - $filename = $file; - } - &Apache::lonnet::userfileupload(undef,'1',$filename,$fpath,$source); + my $fpath = $timenow.'/resfiles/'.$key.'/'; + if ($cms eq 'angel') { + if ($file eq 'pg'.$key.'.htm') { + next; } } + $file =~ s-\\-/-g; + $file = $fpath.$file; + my $fileresult = &Apache::lonnet::process_coursefile('copy',$crs,$cdom,$chome,$file,$source); } } } @@ -274,8 +338,38 @@ sub copy_resources { } } +sub process_coursefile { + my ($crs,$cdom,$chome,$file,$source)=@_; + my $fetchresult = ''; + my $fpath = ''; + my $fname = $file; + ($fpath,$fname) = ($file =~ m/^(.*)\/([^\/])$/); + $fpath=$cdom.'/'.$crs.'/'.$fpath; + my $filepath=$Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles'; + unless ($fpath eq '') { + my @parts=split(/\//,$fpath); + foreach my $part (@parts) { + $filepath.= '/'.$part; + if ((-e $filepath)!=1) { + mkdir($filepath,0777); + } + } + } + if ($source eq '') { + $fetchresult eq 'no source file provided'; + } else { + my $destination = $filepath.'/'.$fname; + rename($source,$destination); + $fetchresult= &Apache::lonnet::reply('fetchuserfile:'.$cdom.'/'.$crs.'/'.$file,$chome); + unless ($fetchresult eq 'ok') { + &Apache::lonnet::logthis('Failed to transfer '.$cdom.'/'.$crs.'/'.$fname.' to host '.$chome.': '.$fetchresult); + } + } + return $fetchresult; +} + sub process_resinfo { - my ($cms,$docroot,$destdir,$items,$resources,$boards,$announcements,$quizzes,$surveys,$groups,$messages,$timestamp,$boardnum,$resinfo,$udom,$uname,$cdom,$crs,$db_handling,$user_handling,$total,$dirname,$seqstem,$resrcfiles) = @_; + my ($cms,$context,$docroot,$destdir,$items,$resources,$boards,$announcements,$quizzes,$surveys,$groups,$messages,$timestamp,$boardnum,$resinfo,$udom,$uname,$cdom,$crs,$db_handling,$user_handling,$total,$dirname,$seqstem,$resrcfiles) = @_; my $board_id = time; my $board_count = 0; my $announce_handling = 'include'; @@ -301,9 +395,11 @@ sub process_resinfo { &angel_content($key,$docroot,$destdir,\%{$$resinfo{$key}},$udom,$uname,$$resources{$key}{type},$$items{$$resources{$key}{revitm}}{title},$resrcfiles); } elsif ($$resources{$key}{type} eq "QUIZ") { %{$$resinfo{$key}} = (); + push @{$quizzes}, $key; # &angel_assessment($key,$docroot,$dirname,$destdir,\%{$$resinfo{$key}},$resrcfiles); } elsif ($$resources{$key}{type} eq "FORM") { %{$$resinfo{$key}} = (); + push @{$surveys}, $key; # &angel_assessment($key,$docroot,$dirname,$destdir,\%{$$resinfo{$key}},$resrcfiles); } elsif ($$resources{$key}{type} eq "DROPBOX") { %{$$resinfo{$key}} = (); @@ -312,9 +408,9 @@ sub process_resinfo { } elsif ($cms eq 'bb5') { foreach my $key (sort keys %{$resources}) { if ($$resources{$key}{type} eq "resource/x-bb-document") { - %{$$resinfo{$key}} = (); unless ($$items{$$resources{$key}{revitm}}{filepath} eq 'Top') { - &process_content($key,$docroot,$destdir,\%{$$resinfo{$key}},$udom,$uname,$resrcfiles); + %{$$resinfo{$key}} = (); + &process_content($key,$context,$docroot,$destdir,\%{$$resinfo{$key}},$udom,$uname,$resrcfiles); } } elsif ($$resources{$key}{type} eq "resource/x-bb-staffinfo") { %{$$resinfo{$key}} = (); @@ -355,32 +451,32 @@ sub process_resinfo { unless ($announce_handling eq 'ignore') { push @{$announcements}, $key; %{$$resinfo{$key}} = (); - &process_announce($key,$docroot,$destdir,\%{$$resinfo{$key}},$items,$resinfo,$seqstem,$resrcfiles); + &process_announce($key,$docroot,$destdir,\%{$$resinfo{$key}},$resinfo,$seqstem,$resrcfiles); } } } + if (@{$announcements}) { + $$items{'Top'}{'contentscount'} ++; + } + if (@{$boards}) { + $$items{'Top'}{'contentscount'} ++; + } + if (@{$quizzes}) { + $$items{'Top'}{'contentscount'} ++; + } + if (@{$surveys}) { + $$items{'Top'}{'contentscount'} ++; + + } } - $$total{'board'} = $board_count; - if (@{$announcements}) { - $$items{'Top'}{'contentscount'} ++; - } - if (@{$boards}) { - $$items{'Top'}{'contentscount'} ++; - } - if (@{$quizzes}) { - $$items{'Top'}{'contentscount'} ++; - $$total{'quiz'} = @{$quizzes}; - } - if (@{$surveys}) { - $$items{'Top'}{'contentscount'} ++; - $$total{'surv'} = @{$surveys}; - } + $$total{'board'} = $board_count; + $$total{'quiz'} = @{$quizzes}; + $$total{'surv'} = @{$surveys}; } sub build_structure { - my ($cms,$context,$destdir,$resinfo,$items,$resources,$hrefs,$udom,$uname,$newdir,$timenow,$cdom,$crs,$timestamp,$total,$boards,$announcements,$quizzes,$surveys,$boardnum,$pagesfiles,$seqfiles,$topurls,$topnames) = @_; - + my ($cms,$context,$destdir,$items,$resinfo,$resources,$hrefs,$udom,$uname,$newdir,$timenow,$cdom,$crs,$timestamp,$total,$boards,$announcements,$quizzes,$surveys,$boardnum,$pagesfiles,$seqfiles,$topurls,$topnames) = @_; my %flag = (); my %count = (); my %pagecontents = (); @@ -453,10 +549,7 @@ sub build_structure { my $title = $$items{$contitem}{title}; $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$resinfo,$contitem,$uname,$cdom); unless ($flag{$key}{page} == 1) { - $seqtext{$key} .= qq| -\n|; +\n|; } } } @@ -561,7 +654,7 @@ sub build_structure { my $filestem; if ($context eq 'DOCS') { - $filestem = "/uploaded/$cdom/$crs"; + $filestem = "/uploaded/$cdom/$crs/$timenow"; } elsif ($context eq 'CSTR') { $filestem = "/res/$udom/$uname/$newdir"; } @@ -571,12 +664,12 @@ sub build_structure { my $filename = $destdir.'/pages/'.$key.'_'.$i.'.page'; open(PAGEFILE,">$filename"); print PAGEFILE qq| - + \n|; if (@{$pagecontents{$key}[$i]} == 1) { - print PAGEFILE qq||; + print PAGEFILE qq|\n|; } elsif (@{$pagecontents{$key}[$i]} == 2) { - print PAGEFILE qq||; + print PAGEFILE qq|\n|; } else { for (my $j=1; $j<@{$pagecontents{$key}[$i]}-1; $j++) { my $curr_id = $j+1; @@ -586,7 +679,7 @@ sub build_structure { \n|; } my $final_id = @{$pagecontents{$key}[$i]}; - print PAGEFILE qq|\n|; + print PAGEFILE qq|\n|; } print PAGEFILE ""; close(PAGEFILE); @@ -618,8 +711,8 @@ sub make_structure { $$flag{$key}{file} = 1; } elsif ($cms eq 'angel' && (($type eq "PAGE") || ($type eq "LINK")) ) { if ($$flag{$key}{page}) { - if ($$count{key}{page} == -1) { - print STDERR "Array index is -1, we shouldnt be here\n"; + if ($$count{$key}{page} == -1) { + print STDERR "Array index is -1, we shouldnt be here, key is $key, type is $type\n"; } else { push @{$$pagecontents{$key}[$$count{$key}{page}]},$contitem; } @@ -651,7 +744,7 @@ sub process_specials { my $nextnum = 0; my $seqstem = ''; if ($context eq 'CSTR') { - $seqstem = '/res/'.$udom.'/'.$uname.'/'.$newdir; + $seqstem = "/res/$udom/$uname/$newdir"; } elsif ($context eq 'DOCS') { $seqstem = '/uploaded/'.$cdom.'/'.$crs.'/'.$timenow; } @@ -756,13 +849,13 @@ sub process_user { [sub { my ($tagname, $attr) = @_; push @state, $tagname; - if (@state eq "USERS USER") { + if ("@state" eq "USERS USER") { $userid = $attr->{value}; %{$$settings{$userid}} = (); @{$$settings{$userid}{links}} = (); - } elsif (@state eq "USERS USER LOGINID") { + } elsif ("@state" eq "USERS USER LOGINID") { $$settings{$userid}{loginid} = $attr->{value}; - } elsif (@state eq "USERS USER PASSPHRASE") { + } elsif ("@state" eq "USERS USER PASSPHRASE") { $$settings{$userid}{passphrase} = $attr->{value}; } elsif ("@state" eq "USERS USER STUDENTID" ) { $$settings{$userid}{studentid} = $attr->{value}; @@ -800,7 +893,7 @@ sub process_user { end_h => [sub { my ($tagname) = @_; - if (@state eq "USERS USER") { + if ("@state" eq "USERS USER") { $linknum = 0; } pop @state; @@ -837,14 +930,14 @@ sub process_group { [sub { my ($tagname, $attr) = @_; push @state, $tagname; - if (@state eq "GROUPS GROUP") { + if ("@state" eq "GROUPS GROUP") { $grp = $attr->{id}; } - if (@state eq "GROUPS GROUP TITLE") { + if ("@state" eq "GROUPS GROUP TITLE") { $$settings{$grp}{title} = $attr->{value}; - } elsif (@state eq "GROUPS GROUP FLAGS ISAVAILABLE") { + } elsif ("@state" eq "GROUPS GROUP FLAGS ISAVAILABLE") { $$settings{$grp}{isavailable} = $attr->{value}; - } elsif (@state eq "GROUPS GROUP FLAGS HASCHATROOM") { + } elsif ("@state" eq "GROUPS GROUP FLAGS HASCHATROOM") { $$settings{$grp}{chat} = $attr->{value}; } elsif ("@state" eq "GROUPS GROUP FLAGS HASDISCUSSIONBOARD") { $$settings{$grp}{discussion} = $attr->{value}; @@ -889,11 +982,11 @@ sub process_staff { [sub { my ($tagname, $attr) = @_; push @state, $tagname; - if (@state eq "STAFFINFO TITLE") { + if ("@state" eq "STAFFINFO TITLE") { $$settings{title} = $attr->{value}; - } elsif (@state eq "STAFFINFO BIOGRAPHY TEXTCOLOR") { + } elsif ("@state" eq "STAFFINFO BIOGRAPHY TEXTCOLOR") { $$settings{textcolor} = $attr->{value}; - } elsif (@state eq "STAFFINFO BIOGRAPHY FLAGS ISHTML") { + } elsif ("@state" eq "STAFFINFO BIOGRAPHY FLAGS ISHTML") { $$settings{ishtml} = $attr->{value}; } elsif ("@state" eq "STAFFINFO FLAGS ISAVAILABLE" ) { $$settings{isavailable} = $attr->{value}; @@ -1066,11 +1159,11 @@ sub process_link { [sub { my ($tagname, $attr) = @_; push @state, $tagname; - if (@state eq "EXTERNALLINK TITLE") { + if ("@state" eq "EXTERNALLINK TITLE") { $$settings{title} = $attr->{value}; - } elsif (@state eq "EXTERNALLINK TEXTCOLOR") { + } elsif ("@state" eq "EXTERNALLINK TEXTCOLOR") { $$settings{textcolor} = $attr->{value}; - } elsif (@state eq "EXTERNALLINK DESCRIPTION FLAGS ISHTML") { + } elsif ("@state" eq "EXTERNALLINK DESCRIPTION FLAGS ISHTML") { $$settings{ishtml} = $attr->{value}; } elsif ("@state" eq "EXTERNALLINK FLAGS ISAVAILABLE" ) { $$settings{isavailable} = $attr->{value}; @@ -1081,7 +1174,7 @@ sub process_link { } elsif ("@state" eq "EXTERNALLINK POSITION" ) { $$settings{position} = $attr->{value}; } elsif ("@state" eq "EXTERNALLINK URL" ) { - $$settings{url} = $attr->{value}; + $$settings{url} = $attr->{value}; } }, "tagname, attr"], text_h => @@ -1542,7 +1635,7 @@ sub process_assessment { foreach my $id (@allids) { my $output = qq| |; - $$total{problem} ++; + $$total{prob} ++; if ($$settings{$id}{class} eq "QUESTION_ESSAY") { $output .= qq|$$settings{$id}{text} @@ -1751,7 +1844,7 @@ sub process_assessment { # ---------------------------------------------------------------- Process Blackboard Announcements sub process_announce { - my ($res,$docroot,$destdir,$settings,$items,$globalresref,$seqstem,$resrcfiles) = @_; + my ($res,$docroot,$destdir,$settings,$globalresref,$seqstem,$resrcfiles) = @_; my $xmlfile = $docroot.'/'.$res.".dat"; my @state = (); my @assess = (); @@ -1766,7 +1859,7 @@ sub process_announce { if ("@state" eq "ANNOUNCEMENT TITLE") { $$settings{title} = $attr->{value}; $$settings{startassessment} = (); - } elsif (@state eq "ANNOUNCEMENT DESCRIPTION FLAGS ISHTML") { + } elsif ("@state" eq "ANNOUNCEMENT DESCRIPTION FLAGS ISHTML") { $$settings{ishtml} = $attr->{value}; } elsif ("@state" eq "ANNOUNCEMENT DESCRIPTION FLAGS ISNEWLINELITERAL" ) { $$settings{isnewline} = $attr->{value}; @@ -1812,7 +1905,7 @@ sub process_announce { if (@assess > 0) { foreach my $id (@assess) { - $$settings{text} = "A $$settings{startassessment}{$id}{assessment_type}, entitled $$globalresref{$$settings{startassessment}{$id}{assessment_id}}{title} is available. Click here to enter the folder the contains the problems in this assessment."; + $$settings{text} = "A $$settings{startassessment}{$id}{assessment_type}, entitled $$globalresref{$$settings{startassessment}{$id}{assessment_id}}{title} is available. Click here to enter the page that contains the problems in this assessment."; } } @@ -1825,7 +1918,7 @@ sub process_announce { - +
$$settings{title} - announcement date: $$settings{date}$$settings{title} - announcement date: $$settings{dates}

@@ -1839,10 +1932,14 @@ $$settings{text} # ---------------------------------------------------------------- Process Blackboard Content sub process_content { - my ($res,$docroot,$destdir,$settings,$dom,$user,$resrcfiles) = @_; + my ($res,$context,$docroot,$destdir,$settings,$dom,$user,$resrcfiles) = @_; my $xmlfile = $docroot.'/'.$res.".dat"; my $destresdir = $destdir; - $destresdir =~ s|/home/$user/public_html/|/res/$dom/$user/|; + if ($context eq 'CSTR') { + $destresdir =~ s|/home/$user/public_html/|/res/$dom/$user/|; + } elsif ($context eq 'DOCS') { + $destresdir =~ s|^/home/httpd/html/userfiles|/uploaded|; + } my $filecount = 0; my @allrelfiles = (); my @state; @@ -1854,13 +1951,13 @@ sub process_content { [sub { my ($tagname, $attr) = @_; push @state, $tagname; - if (@state eq "CONTENT MAINDATA") { + if ("@state" eq "CONTENT MAINDATA") { %{$$settings{maindata}} = (); - } elsif (@state eq "CONTENT MAINDATA TEXTCOLOR") { + } elsif ("@state" eq "CONTENT MAINDATA TEXTCOLOR") { $$settings{maindata}{color} = $attr->{value}; - } elsif (@state eq "CONTENT MAINDATA FLAGS ISHTML") { + } elsif ("@state" eq "CONTENT MAINDATA FLAGS ISHTML") { $$settings{maindata}{ishtml} = $attr->{value}; - } elsif (@state eq "CONTENT MAINDATA FLAGS ISNEWLINELITERAL") { + } elsif ("@state" eq "CONTENT MAINDATA FLAGS ISNEWLINELITERAL") { $$settings{maindata}{isnewline} = $attr->{value}; } elsif ("@state" eq "CONTENT FLAGS ISAVAILABLE" ) { $$settings{isavailable} = $attr->{value};