--- loncom/imspackages/imsprocessor.pm 2004/03/09 16:44:01 1.2 +++ loncom/imspackages/imsprocessor.pm 2004/12/23 18:38:45 1.13 @@ -1,14 +1,74 @@ +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# + 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{bb6}} = %{$$cmsmap{bb5}}; + $$cmsmap{bb6}{conference} = 'resource/x-bb-conference'; + %{$$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 +77,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 +86,51 @@ 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 (!-e "$zipfile") { + return 'no zip'; + } 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'; } @@ -47,6 +143,7 @@ sub expand_zip { sub process_manifest { my ($cms,$tempdir,$resources,$items,$hrefs,$resinfo) = @_; my %toc = ( + bb6 => 'organization', bb5 => 'tableofcontents', angel => 'organization', ); @@ -60,15 +157,16 @@ sub process_manifest { contentscount => 0, resnum => 'toplevel', ); - %{$$resources{'toplevel'}} = (); + %{$$resources{'toplevel'}} = ( + revitm => 'Top' + ); if ($cms eq 'angel') { $$resources{'toplevel'}{type} = "FOLDER"; - } elsif ($cms eq 'bb5') { + } elsif ($cms eq 'bb5' || $cms eq 'bb6') { $$resources{'toplevel'}{type} = 'resource/x-bb-document'; } - unless (-e "$tempdir/imsmanifest.xml") { return 'nomanifest'; } @@ -97,9 +195,11 @@ sub process_manifest { $itm = $attr->{identifier}; %{$$items{$itm}} = (); $$items{$itm}{contentscount} = 0; - if ($cms eq 'bb5') { + if ($cms eq 'bb5' || $cms eq 'bb6') { $$items{$itm}{resnum} = $attr->{identifierref}; - $$items{$itm}{title} = $attr->{title}; + if ($cms eq 'bb5') { + $$items{$itm}{title} = $attr->{title}; + } } elsif ($cms eq 'angel') { if ($attr->{identifierref} =~ m/^res(.+)$/) { $$items{$itm}{resnum} = $1; @@ -139,7 +239,7 @@ sub process_manifest { $path = $seq[0]; } $$items{$itm}{filepath} = $path; - if ($cms eq 'bb5') { + if ($cms eq 'bb5' || $cms eq 'bb6') { if ($$items{$itm}{filepath} eq 'Top') { $$items{$itm}{resnum} = $itm; $$resources{$$items{$itm}{resnum}}{type} = 'resource/x-bb-document'; @@ -152,31 +252,36 @@ sub process_manifest { } } elsif ("@state" eq "manifest resources resource" ) { $identifier = $attr->{identifier}; - if ($cms eq 'bb5') { + if ($cms eq 'bb5' || $cms eq 'bb6') { $$resources{$identifier}{file} = $attr->{file}; $$resources{$identifier}{type} = $attr->{type}; } elsif ($cms eq 'angel') { $identifier = substr($identifier,3); if ($attr->{href} =~ m-^_assoc/$identifier/(.+)$-) { $$resources{$identifier}{file} = $1; - } + } } @{$$hrefs{$identifier}} = (); } elsif ("@state" eq "manifest resources resource file") { - if ($cms eq 'bb5') { + if ($cms eq 'bb5' || $cms eq 'bb6') { push @{$$hrefs{$identifier}},$attr->{href}; } elsif ($cms eq 'angel') { if ($attr->{href} =~ m/^_assoc\\$identifier\\(.+)$/) { push @{$$hrefs{$identifier}},$1; } elsif ($attr->{href} =~ m/^Icons\\icon(\w+)\.gif/) { $$resources{$identifier}{type} = $1; - } + } } } }, "tagname, attr"], text_h => [sub { my ($text) = @_; + if ($state[0] eq "manifest" && $state[1] eq "organizations" && $state[2] eq $toc{$cms} && $state[-1] eq "title") { + if ($cms eq 'angel' || $cms eq 'bb6') { + $$items{$itm}{title} = $text; + } + } }, "dtext"], end_h => [sub { @@ -212,31 +317,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); } } } @@ -247,7 +336,7 @@ sub copy_resources { foreach my $key (sort keys %{$hrefs}) { foreach my $file (@{$$hrefs{$key}}) { $file =~ s-\\-/-g; - if ( ($cms eq 'angel' && $file ne 'pg'.$key.'.htm') || ($cms eq 'bb5') ) { + if ( ($cms eq 'angel' && $file ne 'pg'.$key.'.htm') || ($cms eq 'bb5') || ($cms eq 'bb6') ) { if (!-e "$destdir/resfiles/$key") { mkdir("$destdir/resfiles/$key",0770); } @@ -265,7 +354,7 @@ sub copy_resources { } if ($cms eq 'angel') { rename("$tempdir/_assoc/$key/$file","$destdir/resfiles/$key/$file"); - } elsif ($cms eq 'bb5') { + } elsif ($cms eq 'bb5' || $cms eq 'bb6') { rename("$tempdir/$key/$file","$destdir/resfiles/$key/$file"); } } @@ -274,8 +363,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,$packages,$hrefs,$pagesfiles,$sequencesfiles) = @_; my $board_id = time; my $board_count = 0; my $announce_handling = 'include'; @@ -301,20 +420,22 @@ 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}} = (); } } - } elsif ($cms eq 'bb5') { + } elsif ($cms eq 'bb5' || $cms eq 'bb6') { 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($cms,$key,$context,$docroot,$destdir,\%{$$resinfo{$key}},$udom,$uname,$resrcfiles,$packages,$hrefs); } } elsif ($$resources{$key}{type} eq "resource/x-bb-staffinfo") { %{$$resinfo{$key}} = (); @@ -333,14 +454,14 @@ sub process_resinfo { } } elsif ($$resources{$key}{type} eq "assessment/x-bb-pool") { %{$$resinfo{$key}} = (); - &process_assessment($key,$docroot,'pool',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname); + &process_assessment($context,$key,$docroot,'pool',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles); } elsif ($$resources{$key}{type} eq "assessment/x-bb-quiz") { %{$$resinfo{$key}} = (); - &process_assessment($key,$docroot,'quiz',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname); + &process_assessment($context,$key,$docroot,'quiz',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles); push @{$quizzes}, $key; } elsif ($$resources{$key}{type} eq "assessment/x-bb-survey") { %{$$resinfo{$key}} = (); - &process_assessment($key,$docroot,'survey',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname); + &process_assessment($context,$key,$docroot,'survey',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles); push @{$surveys}, $key; } elsif ($$resources{$key}{type} eq "assessment/x-bb-group") { %{$$resinfo{$key}} = (); @@ -355,32 +476,31 @@ 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,$packages) = @_; my %flag = (); my %count = (); my %pagecontents = (); @@ -437,8 +557,8 @@ sub build_structure { my $curr_id = 1; my $resnum = $$items{$key}{resnum}; my $type = $$resources{$resnum}{type}; - if (($cms eq 'angel' && $type eq "FOLDER") || ($cms eq 'bb5' && $$resinfo{$resnum}{'isfolder'} eq "true") && (($type eq "resource/x-bb-document") || ($type eq "resource/x-bb-staffinfo") || ($type eq "resource/x-bb-externallink")) ) { - unless ($cms eq 'bb5' && $key eq 'Top') { + if (($cms eq 'angel' && $type eq "FOLDER") || (($cms eq 'bb5' || $cms eq 'bb6') && $$resinfo{$resnum}{'isfolder'} eq "true") && (($type eq "resource/x-bb-document") || ($type eq "resource/x-bb-staffinfo") || ($type eq "resource/x-bb-externallink")) ) { + unless (($cms eq 'bb5') && $key eq 'Top') { $seqtext{$key} = "\n"; } if ($$items{$key}{contentscount} == 0) { @@ -451,12 +571,13 @@ sub build_structure { my $res = $$items{$contitem}{resnum}; my $type = $$resources{$res}{type}; my $title = $$items{$contitem}{title}; - $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$resinfo,$contitem,$uname,$cdom); + my $packageflag = 0; + if (grep/^$res$/,@{$packages}) { + $packageflag = 1; + } + $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag); unless ($flag{$key}{page} == 1) { - $seqtext{$key} .= qq| @@ -497,8 +622,11 @@ sub build_structure { my $res = $$items{$contitem}{resnum}; my $type = $$resources{$res}{type}; my $title = $$items{$contitem}{title}; - - $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$resinfo,$contitem,$uname,$cdom); + my $packageflag = 0; + if (grep/^$res$/,@{$packages}) { + $packageflag = 1; + } + $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag); if ($flag{$key}{page}) { if ($count{$key}{seq} + $count{$key}{page} + $count{$key}{board} + $count{$key}{file} +1 == 1) { $seqtext{$key} .= qq|> @@ -520,11 +648,11 @@ sub build_structure { $curr_id ++; $next_id ++; $seqtext{$key} .= qq|> -\n|; +\n|; } } } - unless ($cms eq 'bb5' && $key eq 'Top') { + unless (($cms eq 'bb5') && $key eq 'Top') { $seqtext{$key} .= "\n"; open(LOCFILE,">$destdir/sequences/$key.sequence"); print LOCFILE $seqtext{$key}; @@ -538,7 +666,7 @@ sub build_structure { } $topnum += ($count{'Top'}{page} + $count{'Top'}{seq}); - if ($cms eq 'bb5') { + if ($cms eq 'bb5' || $cms eq 'bb6') { if (@{$announcements} > 0) { &process_specials($context,'announcements',$announcements,\$topnum,$$items{'Top'}{contentscount},$destdir,$udom,$uname,$cdom,$crs,$timenow,$newdir,$timestamp,$resinfo,\$seqtext{'Top'},$pagesfiles,$seqfiles,$topurls,$topnames); } @@ -551,7 +679,6 @@ sub build_structure { if (@{$surveys} > 0) { &process_specials($context,'surveys',$surveys,\$topnum,$$items{'Top'}{contentscount},$destdir,$udom,$uname,$cdom,$crs,$timenow,$newdir,$timestamp,$resinfo,\$seqtext{'Top'},$pagesfiles,$seqfiles,$topurls,$topnames); } - $seqtext{'Top'} .= "\n"; open(TOPFILE,">$destdir/sequences/Top.sequence"); print TOPFILE $seqtext{'Top'}; @@ -561,7 +688,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"; } @@ -569,24 +696,44 @@ sub build_structure { foreach my $key (sort keys %pagecontents) { for (my $i=0; $i<@{$pagecontents{$key}}; $i++) { my $filename = $destdir.'/pages/'.$key.'_'.$i.'.page'; + my $resource = "$filestem/resfiles/$$items{$pagecontents{$key}[$i][0]}{resnum}.html"; + my $res = $$items{$pagecontents{$key}[$i][0]}{resnum}; + my $resource = $filestem.'/resfiles/'.$res.'.html'; + if (grep/^$res$/,@{$packages}) { + $resource = $filestem.'/resfiles/'.$res.'./index.html'; # should be entry_point + } 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||; + my $res = $$items{$pagecontents{$key}[$i][1]}{resnum}; + my $resource = $filestem.'/resfiles/'.$res.'.html'; + if (grep/^$res$/,@{$packages}) { + $resource = $filestem.'/resfiles/'.$res.'./index.html'; # should be entry_point + } + print PAGEFILE qq|\n|; } else { for (my $j=1; $j<@{$pagecontents{$key}[$i]}-1; $j++) { my $curr_id = $j+1; my $next_id = $j+2; - my $resource = $filestem.'/resfiles/'.$$items{$pagecontents{$key}[$i][$j]}{resnum}.'.html'; + my $res = $$items{$pagecontents{$key}[$i][$j]}{resnum}; + my $resource = $filestem.'/resfiles/'.$res.'.html'; + if (grep/^$res$/,@{$packages}) { + $resource = $filestem.'/resfiles/'.$res.'./index.html'; # entry_point + } print PAGEFILE qq| \n|; } my $final_id = @{$pagecontents{$key}[$i]}; - print PAGEFILE qq|\n|; + my $res = $$items{$pagecontents{$key}[$i][-1]}{resnum}; + my $resource = $filestem.'/resfiles/'.$res.'.html'; + if (grep/^$res$/,@{$packages}) { + $resource = $filestem.'/resfiles/'.$res.'./index.html'; # entry_point + } + print PAGEFILE qq|\n|; } print PAGEFILE ""; close(PAGEFILE); @@ -596,9 +743,9 @@ sub build_structure { } sub make_structure { - my ($cms,$key,$srcstem,$flag,$count,$timestamp,$boardnum,$hrefs,$pagecontents,$res,$type,$resinfo,$contitem,$uname,$cdom) = @_; + my ($cms,$key,$srcstem,$flag,$count,$timestamp,$boardnum,$hrefs,$pagecontents,$res,$type,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag) = @_; my $src =''; - if (($cms eq 'angel' && $type eq 'FOLDER') || ($cms eq 'bb5' && ($$resinfo{$res}{'isfolder'} eq 'true') || ($key eq 'Top')) ) { + if (($cms eq 'angel' && $type eq 'FOLDER') || (($cms eq 'bb5' || $cms eq 'bb6') && ($$resinfo{$res}{'isfolder'} eq 'true') || ($key eq 'Top')) ) { $src = $srcstem.'/sequences/'.$contitem.'.sequence'; $$flag{$key}{page} = 0; $$flag{$key}{seq} = 1; @@ -618,8 +765,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; } @@ -629,13 +776,21 @@ sub make_structure { @{$$pagecontents{$key}[$$count{$key}{page}]} = ("$contitem"); $$flag{$key}{seq} = 0; } - } elsif ($cms eq 'bb5') { + } elsif ($cms eq 'bb5' || $cms eq 'bb6') { if ($$flag{$key}{page}) { push @{$$pagecontents{$key}[$$count{$key}{page}]},$contitem; } else { - $$count{$key}{page} ++; - $src = $srcstem.'/pages/'.$key.'_'.$$count{$key}{page}.'.page'; - @{$$pagecontents{$key}[$$count{$key}{page}]} = ("$contitem"); + if ($contcount == 1) { + if ($packageflag) { + $src = $srcstem.'/resfiles/'.$res.'/index.html'; # Needs to be entry point + } else { + $src = $srcstem.'/resfiles/'.$res.'.html'; + } + } else { + $$count{$key}{page} ++; + $src = $srcstem.'/pages/'.$key.'_'.$$count{$key}{page}.'.page'; + @{$$pagecontents{$key}[$$count{$key}{page}]} = ("$contitem"); + } $$flag{$key}{seq} = 0; } } @@ -651,7 +806,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 +911,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 +955,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 +992,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 +1044,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 +1221,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 +1236,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 => @@ -1347,7 +1502,7 @@ sub addposting { } # ---------------------------------------------------------------- Process Blackboard Assessments - pools, quizzes, surveys sub process_assessment { - my ($res,$docroot,$container,$dirname,$destdir,$settings,$total,$udom,$uname) = @_; + my ($context,$res,$docroot,$container,$dirname,$destdir,$settings,$total,$udom,$uname,$pagesfiles,$sequencesfiles) = @_; my $xmlfile = $docroot.'/'.$res.".dat"; # print "XML file is $xmlfile\n"; my @state = (); @@ -1403,9 +1558,7 @@ sub process_assessment { } if ("@state" eq "$toptag{$container} QUESTIONLIST QUESTION") { $id = $attr->{id}; - unless ($container eq 'pool') { - push @allids, $id; - } + push @allids, $id; %{$$settings{$id}} = (); @{$allanswers{$id}} = (); $$settings{$id}{class} = $attr->{class}; @@ -1505,46 +1658,99 @@ sub process_assessment { my $dirtitle = $$settings{'title'}; $dirtitle =~ s/\W//g; $dirtitle .= '_'.$res; + if (!-e "$destdir/problems") { + mkdir("$destdir/problems",0755); + } if (!-e "$destdir/problems/$dirtitle") { mkdir("$destdir/problems/$dirtitle",0755); } my $newdir = "$destdir/problems/$dirtitle"; + my $seqdir = "$destdir/sequences"; my $pagedir = "$destdir/pages"; my $curr_id = 0; my $next_id = 1; - unless ($container eq 'pool') { - open(PAGEFILE,">$pagedir/$res.page"); - print PAGEFILE qq| -|; - $$total{page} ++; - print PAGEFILE qq||; - if (@allids == 1) { - print PAGEFILE qq| + my $fh; + my $containerdir; + if ($container eq 'pool') { + $containerdir = $seqdir.'/'.$res.'.sequence'; + if (!-e "$seqdir") { + mkdir("$seqdir",0770); + } + open($fh,">$containerdir"); + $$total{seq} ++; + push @{$sequencesfiles},$res.'.sequence'; + } else { + $containerdir = $pagedir.'/'.$res.'.page'; + if (!-e "$destdir/pages") { + mkdir("$destdir/pages",0770); + } + open($fh,">$containerdir"); + $$total{page} ++; + push @{$pagesfiles},$res.'.page'; + } + print $fh qq| +|; + my $probsrc = "/res/lib/templates/simpleproblem.problem"; + my ($cid,$cdom,$cnum); + if ($context eq 'DOCS') { + $cid = $ENV{'request.course.id'}; + ($cdom,$cnum) = split/_/,$cid; + } + if ($context eq 'CSTR') { + $probsrc="/res/$udom/$uname/$resdir/problems/$dirtitle/$allids[0].problem"; + } + print $fh qq||; + if (@allids == 1) { + print $fh qq| \n|; - } else { - for (my $j=1; $j<@allids; $j++) { - $curr_id = $j; - $next_id = $curr_id + 1; - print PAGEFILE qq| + } else { + for (my $j=1; $j<@allids; $j++) { + my $qntitle = $j; + while (length($qntitle) <4) { + $qntitle = '0'.$qntitle; + } + $curr_id = $j; + $next_id = $curr_id + 1; + if ($context eq 'CSTR') { + $probsrc = "/res/$udom/$uname/$resdir/problems/$dirtitle/$allids[$j].problem"; + } + print $fh qq| -\n|; - } else { - print PAGEFILE qq|>|; - } +\n|; + } else { + print $fh qq|>|; } } - print PAGEFILE qq||; - close(PAGEFILE); } + print $fh qq||; + close($fh); + my $qnum = 0; foreach my $id (@allids) { - my $output = qq| + $qnum ++; + my $output; + my $permcontainer = $containerdir; + $permcontainer =~ s#/home/httpd/html/userfiles#uploaded#; + my $symb = $cid.'.'.$permcontainer.'___'.$qnum.'___lib/templates/simpleproblem.problem.0.'; + my %resourcedata = (); + for (my $i=0; $i<10; $i++) { + my $iter = $i+1; + $resourcedata{$symb.'text'.$iter} = ""; + $resourcedata{$symb.'value'.$iter} = "unused"; + $resourcedata{$symb.'position'.$iter} = "random"; + } + $resourcedata{$symb.'randomize'} = 'yes'; + $resourcedata{$symb.'maxfoils'} = 10; + if ($context eq 'CSTR') { + $output = qq| |; - $$total{problem} ++; + } + $$total{prob} ++; if ($$settings{$id}{class} eq "QUESTION_ESSAY") { - $output .= qq|$$settings{$id}{text} + if ($context eq 'CSTR') { + $output .= qq|$$settings{$id}{text} @@ -1552,112 +1758,194 @@ sub process_assessment { $$settings{$id}{feedbackcorr} |; + } else { + $resourcedata{$symb.'questiontext'} = $$settings{$id}{text}; + $resourcedata{$symb.'hiddenparts'} = '!essay'; + $resourcedata{$symb.'questiontype'} = 'essay'; + } } else { - $output .= qq|$$settings{$id}{text}\n|; - if ( defined($$settings{$id}{image}) ) { + if ($context eq 'CSTR') { + $output .= qq|$$settings{$id}{text}\n|; + } else { + $resourcedata{$symb.'questiontext'} = $$settings{$id}{text}; + } + my ($image,$imglink,$url); + if ( defined($$settings{$id}{image}) ) { if ( $$settings{$id}{style} eq 'embed' ) { - $output .= qq|

|; + $image = qq|

|; } else { - $output .= qq|
Link to file
|; + $imglink = qq|
Link to file
|; } } if ( defined($$settings{$id}{url}) ) { - $output .= qq|
$$settings{$id}{name}
|; + $url = qq|
$$settings{$id}{name}
|; + } + if ($context eq 'CSTR') { + $output .= $image.$imglink.$url.' +'; + } else { + $resourcedata{$symb.'questiontext'} .= $image.$imglink.$url; } - $output .= qq| -|; if ($$settings{$id}{class} eq 'QUESTION_MULTIPLECHOICE') { my $numfoils = @{$allanswers{$id}}; - $output .= qq| + if ($context eq 'CSTR') { + $output .= qq| |; + } else { + $resourcedata{$symb.'hiddenparts'} = '!radio'; + $resourcedata{$symb.'questiontype'} = 'radio'; + $resourcedata{$symb.'maxfoils'} = $numfoils; + } for (my $k=0; $k<@{$allanswers{$id}}; $k++) { + my $iter = $k+1; $output .= "
|; + $ans_image .= qq|

|; } else { - $output .= qq|
Link to file
|; + $ans_link .= qq|
Link to file
|; } } - $output .= qq|\n|; + $output .= $ans_image.$ans_link.''."\n"; + $resourcedata{$symb.'text'.$iter} .= $ans_image.$ans_link; } - chomp($output); - $output .= qq| + if ($context eq 'CSTR') { + chomp($output); + $output .= qq| |; + } } elsif ($$settings{$id}{class} eq 'QUESTION_TRUEFALSE') { my $numfoils = @{$allanswers{$id}}; - $output .= qq| + if ($context eq 'CSTR') { + $output .= qq| |; + } else { + $resourcedata{$symb.'maxfoils'} = $numfoils; + $resourcedata{$symb.'hiddenparts'} = '!radio'; + $resourcedata{$symb.'questiontype'} = 'radio'; + } for (my $k=0; $k<@{$allanswers{$id}}; $k++) { + my $iter = $k+1; $output .= " \n"; + $resourcedata{$symb.'text'.$iter} = $$settings{$id}{$allanswers{$id}[$k]}{text}; } - chomp($output); - $output .= qq| + if ($context eq 'CSTR') { + chomp($output); + $output .= qq| |; + } } elsif ($$settings{$id}{class} eq 'QUESTION_MULTIPLEANSWER') { my $numfoils = @{$allanswers{$id}}; - $output .= qq| + if ($context eq 'CSTR') { + $output .= qq| |; + } else { + $resourcedata{$symb.'newopt'} = ''; + $resourcedata{$symb.'delopt'} = ''; + $resourcedata{$symb.'options'} = "('True','False')"; + $resourcedata{$symb.'hiddenparts'} = '!option'; + $resourcedata{$symb.'questiontype'} = 'option'; + $resourcedata{$symb.'maxfoils'} = $numfoils; + } for (my $k=0; $k<@{$allanswers{$id}}; $k++) { + my $iter = $k+1; $output .= " \n"; + $resourcedata{$symb.'text'.$iter} = $$settings{$id}{$allanswers{$id}[$k]}{text}; } - chomp($output); - $output .= qq| + if ($context eq 'CSTR') { + chomp($output); + $output .= qq| |; + } } elsif ($$settings{$id}{class} eq 'QUESTION_ORDER') { my $numfoils = @{$allanswers{$id}}; - $output .= qq| + my @allorder = (); + if ($context eq 'CSTR') { + $output .= qq| |; + } else { + $resourcedata{$symb.'newopt'} = ''; + $resourcedata{$symb.'delopt'} = ''; + $resourcedata{$symb.'hiddenparts'} = '!option'; + $resourcedata{$symb.'questiontype'} = 'option'; + $resourcedata{$symb.'maxfoils'} = $numfoils; + } for (my $k=0; $k<@{$allanswers{$id}}; $k++) { - $output .= " ".$$settings{$id}{$allanswers{$id}[$k]}{text}."\n"; + if ($context eq 'CSTR') { + $output .= " ".$$settings{$id}{$allanswers{$id}[$k]}{text}."\n"; + } else { + my $iter = $k+1; + $resourcedata{$symb.'text'.$iter} = $$settings{$id}{$allanswers{$id}[$k]}{text}; + if (!grep/^$$settings{$id}{$allanswers{$id}[$k]}{order}$/,@allorder) { + push @allorder, $$settings{$id}{$allanswers{$id}[$k]}{order}; + } + } } - chomp($output); - $output .= qq| + if ($context eq 'CSTR') { + chomp($output); + $output .= qq| |; + } else { + @allorder = sort {$a <=> $b} @allorder; + $resourcedata{$symb.'options'} = "('".join("','",@allorder)."')"; + } } elsif ($$settings{$id}{class} eq 'QUESTION_FILLINBLANK') { my $numerical = 1; - for (my $k=0; $k<@{$allanswers{$id}}; $k++) { - if ($$settings{$id}{$allanswers{$id}[$k]}{text} =~ m/([^\d\.]|\.\.)/) { - $numerical = 0; + if ($context eq 'DOCS') { + $numerical = 0; + } else { + for (my $k=0; $k<@{$allanswers{$id}}; $k++) { + if ($$settings{$id}{$allanswers{$id}[$k]}{text} =~ m/([^\d\.]|\.\.)/) { + $numerical = 0; + } } } if ($numerical) { @@ -1680,7 +1968,8 @@ sub process_assessment { $numans = ($max + $min)/2; $tol = 100*($max - $min)/($numans*2); } - $output .= qq| + if ($context eq 'CSTR') { + $output .= qq| |; + } } else { - if (@{$allanswers{$id}} == 1) { - $output .= qq| + if ($context eq 'DOCS') { + $resourcedata{$symb.'hiddenparts'} = '!string'; + $resourcedata{$symb.'questiontype'} = 'string'; + $resourcedata{$symb.'maxfoils'} = @{$allanswers{$id}}; + $resourcedata{$symb.'hiddenparts'} = '!string'; + $resourcedata{$symb.'stringtype'} = 'ci'; + $resourcedata{$symb.'stringanswer'} = $$settings{$id}{$allanswers{$id}[0]}{text}; + } else { + if (@{$allanswers{$id}} == 1) { + $output .= qq| |; - } else { - my @answertext = (); - for (my $k=0; $k<@{$allanswers{$id}}; $k++) { - $$settings{$id}{$allanswers{$id}[$k]}{text} =~ s/\|/\|/g; - push @answertext, $$settings{$id}{$allanswers{$id}[$k]}{text}; - } - my $regexpans = join('|',@answertext); - $regexpans = '/^('.$regexpans.')\b/'; - $output .= qq| + } else { + my @answertext = (); + for (my $k=0; $k<@{$allanswers{$id}}; $k++) { + $$settings{$id}{$allanswers{$id}[$k]}{text} =~ s/\|/\|/g; + push @answertext, $$settings{$id}{$allanswers{$id}[$k]}{text}; + } + my $regexpans = join('|',@answertext); + $regexpans = '/^('.$regexpans.')\b/'; + $output .= qq| |; - } + } + } } } elsif ($$settings{$id}{class} eq "QUESTION_MATCH") { - $output .= qq| + my @allmatchers = (); + my %matchtext = (); + if ($context eq 'CSTR') { + $output .= qq| |; + } else { + $resourcedata{$symb.'newopt'} = ''; + $resourcedata{$symb.'delopt'} = ''; + $resourcedata{$symb.'hiddenparts'} = '!option'; + $resourcedata{$symb.'questiontype'} = 'option'; + $resourcedata{$symb.'maxfoils'} = @{$allanswers{$id}}; + } for (my $k=0; $k<@{$allchoices{$id}}; $k++) { - $output .= qq| + if ($context eq 'CSTR') { + $output .= qq| $$settings{$id}{$allchoices{$id}[$k]}{text} |; + } else { + if (!grep/^$$settings{$id}{$allchoices{$id}[$k]}{text}$/,@allmatchers) { + push @allmatchers, $$settings{$id}{$allchoices{$id}[$k]}{text}; + $matchtext{$allchoices{$id}[$k]} = $$settings{$id}{$allchoices{$id}[$k]}{text}; + } + } } - $output .= qq| + if ($context eq 'CSTR') { + $output .= qq| |; + } for (my $k=0; $k<@{$allanswers{$id}}; $k++) { - $output .= qq| + if ($context eq 'CSTR') { + $output .= qq| $$settings{$id}{$allanswers{$id}[$k]}{text} |; + } else { + my $iter = $k+1; + $resourcedata{$symb.'value'.$iter} = $matchtext{$$settings{$id}{$allanswers{$id}[$k]}{choice_id}}; + $resourcedata{$symb.'text'.$iter} = $$settings{$id}{$allanswers{$id}[$k]}{text}; + } } - $output .= qq| + if ($context eq 'CSTR') { + $output .= qq| |; + } else { + $resourcedata{$symb.'options'} = "('".join("','",@allmatchers)."')"; + } } } - $output .= qq| + if ($context eq 'CSTR') { + $output .= qq| |; - open(PROB,">$newdir/$id.problem"); - print PROB $output; - close PROB; + open(PROB,">$newdir/$id.problem"); + print PROB $output; + close PROB; + } else { +# put %resourcedata; + my $reply=&Apache::lonnet::cput + ('resourcedata',\%resourcedata,$cdom,$cnum); + } } } # ---------------------------------------------------------------- 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 +2100,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 +2146,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 +2159,7 @@ sub process_announce { - +
$$settings{title} - announcement date: $$settings{date}$$settings{title} - announcement date: $$settings{dates}

@@ -1839,10 +2173,20 @@ $$settings{text} # ---------------------------------------------------------------- Process Blackboard Content sub process_content { - my ($res,$docroot,$destdir,$settings,$dom,$user,$resrcfiles) = @_; + my ($cms,$res,$context,$docroot,$destdir,$settings,$dom,$user,$resrcfiles,$packages,$hrefs) = @_; 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 $filetag = ''; + if ($cms eq 'bb5') { + $filetag = 'FILEREF'; + } elsif ($cms eq 'bb6') { + $filetag = 'FILE'; + } my $filecount = 0; my @allrelfiles = (); my @state; @@ -1854,37 +2198,41 @@ sub process_content { [sub { my ($tagname, $attr) = @_; push @state, $tagname; - if (@state eq "CONTENT MAINDATA") { + if ("@state" eq "CONTENT ") { %{$$settings{maindata}} = (); - } elsif (@state eq "CONTENT MAINDATA TEXTCOLOR") { + } elsif ("@state" eq "CONTENT TITLECOLOR") { + $$settings{titlecolor} = $attr->{value}; + } 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 BODY TYPE") { + $$settings{maindata}{bodytype} = $attr->{value}; } elsif ("@state" eq "CONTENT FLAGS ISAVAILABLE" ) { $$settings{isavailable} = $attr->{value}; } elsif ("@state" eq "CONTENT FLAGS ISFOLDER" ) { $$settings{isfolder} = $attr->{value}; } elsif ("@state" eq "CONTENT FLAGS LAUNCHINNEWWINDOW" ) { $$settings{newwindow} = $attr->{value}; - } elsif ("@state" eq "CONTENT FILES FILEREF") { + } elsif ("@state" eq "CONTENT FILES $filetag") { %{$$settings{files}[$filecount]} = (); %{$$settings{files}[$filecount]{registry}} = (); } elsif ("@state" eq "CONTENT FILES FILEREF RELFILE" ) { $$settings{files}[$filecount]{'relfile'} = $attr->{value}; push @allrelfiles, $attr->{value}; - } elsif ("@state" eq "CONTENT FILES FILEREF MIMETYPE") { + } elsif ("@state" eq "CONTENT FILES $filetag MIMETYPE") { $$settings{files}[$filecount]{mimetype} = $attr->{value}; - } elsif ("@state" eq "CONTENT FILES FILEREF CONTENTTYPE") { + } elsif ("@state" eq "CONTENT FILES $filetag CONTENTTYPE") { $$settings{files}[$filecount]{contenttype} = $attr->{value}; - } elsif ("@state" eq "CONTENT FILES FILEREF FILEACTION") { + } elsif ("@state" eq "CONTENT FILES $filetag FILEACTION") { $$settings{files}[$filecount]{fileaction} = $attr->{value}; - } elsif ("@state" eq "CONTENT FILES FILEREF PACKAGEPARENT") { + } elsif ("@state" eq "CONTENT FILES $filetag PACKAGEPARENT") { $$settings{files}[$filecount]{packageparent} = $attr->{value}; - } elsif ("@state" eq "CONTENT FILES FILEREF LINKNAME") { + } elsif ("@state" eq "CONTENT FILES $filetag LINKNAME") { $$settings{files}[$filecount]{linkname} = $attr->{value}; - } elsif ("@state" eq "CONTENT FILES FILEREF REGISTRY REGISTRYENTRY") { + } elsif ("@state" eq "CONTENT FILES $filetag REGISTRY REGISTRYENTRY") { my $key = $attr->{key}; $$settings{files}[$filecount]{registry}{$key} = $attr->{value}; } @@ -1894,16 +2242,19 @@ sub process_content { my ($text) = @_; if ("@state" eq "CONTENT TITLE") { $$settings{title} = $text; - } elsif ("@state" eq "CONTENT MAINDATA TEXT") { + } elsif ( ("@state" eq "CONTENT MAINDATA TEXT") || ("@state" eq "CONTENT BODY TEXT") ) { $$settings{maindata}{text} = $text; - } elsif ("@state" eq "CONTENT FILES FILEREF REFTEXT") { + } elsif ("@state" eq "CONTENT FILES $filetag REFTEXT") { $$settings{files}[$filecount]{reftext} = $text; + } elsif ("@state" eq "CONTENT FILES FILE NAME" ) { + $$settings{files}[$filecount]{'relfile'} = $text; + push @allrelfiles, $text; } }, "dtext"], end_h => [sub { my ($tagname) = @_; - if ("@state" eq "CONTENT FILES FILEREF") { + if ("@state" eq "CONTENT FILES $filetag") { $filecount ++; } pop @state; @@ -1949,10 +2300,8 @@ sub process_content { } } else { my $filename=$$settings{files}[$filecount]{'relfile'}; -# print "File is $filename\n"; my $newfilename="$destresdir/resfiles/$res/$$settings{files}[$filecount]{relfile}"; -# print "New filename is $newfilename\n"; - $$settings{maindata}{text} =~ s#(src|SRC|value)="$filename"#$1="$newfilename"#g; + $$settings{maindata}{text} =~ s#(src|SRC|value)=("|")$filename("|")#$1="$newfilename"#g; } } elsif ($$settings{files}[$filecount]{fileaction} eq 'link') { unless (($$settings{files}[$filecount]{packageparent} ne '') && (grep/^$$settings{files}[$filecount]{packageparent}$/,@{$$settings{files}}) ) { @@ -1965,8 +2314,28 @@ sub process_content { } $linktag .= qq|>$$settings{files}[$filecount]{linkname}
\n|; } - } elsif ($$settings{files}[$filecount]{fileaction} eq 'package') { -# print "Found a package\n"; + } elsif ( ($$settings{files}[$filecount]{fileaction} eq 'PACKAGE') || ($$settings{files}[$filecount]{fileaction} eq 'package') ) { + my $open_package = ''; + if ($$settings{files}[$filecount]{'relfile'} =~ m|\.zip$|i) { + $open_package = &expand_zip("$docroot/$res",$$settings{files}[$filecount]{'relfile'}); + } + if ($open_package eq 'ok') { + opendir(DIR,"$docroot/$res"); + my @dircontents = grep(!/^\./,readdir(DIR)); + closedir(DIR); + push @{$resrcfiles}, @dircontents; + @{$$hrefs{$res}} = @dircontents; + push @{$packages}, $res; + } + } elsif ( ($$settings{files}[$filecount]{fileaction} eq 'BROKEN_IMAGE') && ($cms eq 'bb6') ) { + my $filename=$$settings{files}[$filecount]{'relfile'}; + my $newfilename="$destresdir/resfiles/$res/$$settings{files}[$filecount]{relfile}"; + $$settings{maindata}{text} =~ s#(src|SRC|value)=("|")$filename("|")#$1="$newfilename"#g; + } elsif ( ($$settings{files}[$filecount]{fileaction} eq 'LINK') && ($cms eq 'bb6') ) { + my $filename=$$settings{files}[$filecount]{'relfile'}; + my $newfilename="$destresdir/resfiles/$res/$$settings{files}[$filecount]{relfile}"; + my $filetitle = $$settings{files}[$filecount]{'linkname'}; + $$settings{maindata}{text} = ''.$filetitle.'

'. $$settings{maindata}{text}; } } } @@ -1974,36 +2343,48 @@ sub process_content { $fontcol = qq||; } if (defined($$settings{maindata}{text})) { + if ($$settings{maindata}{bodytype} eq "S") { + $$settings{maindata}{text} =~ s#\n#
#g; + } if ($$settings{maindata}{ishtml} eq "false") { if ($$settings{maindata}{isnewline} eq "true") { $$settings{maindata}{text} =~ s#\n#
#g; } } else { - $$settings{maindata}{text} = &HTML::Entities::decode($$settings{maindata}{text}); +# $$settings{maindata}{text} = &HTML::Entities::decode($$settings{maindata}{text}); } } open(FILE,">$destdir/resfiles/$res.html"); push @{$resrcfiles}, "$res.html"; - print FILE qq| + my $htmldoc = 0; +# if ($$settings{maindata}{text} =~ m-<(html|HTML)>.+<\\(html|HTML)-) { + if ($$settings{maindata}{text} =~ m-<(html|HTML)>-) { + $htmldoc = 1; + } + unless ($htmldoc) { + print FILE qq| $$settings{title} $fontcol |; + } unless ($$settings{title} eq '') { print FILE qq|$$settings{title}

\n|; } print FILE qq| $$settings{maindata}{text} $linktag|; - if (defined($$settings{maindata}{textcolor})) { - print FILE qq||; - } - print FILE qq| + unless ($htmldoc) { + if (defined($$settings{maindata}{textcolor})) { + print FILE qq||; + } + print FILE qq| |; + } close(FILE); } @@ -2049,7 +2430,6 @@ sub process_angelboards { my $msgcount = 0; my $putresult = &Apache::lonnet::put($boardname,\%boardinfo,$cdom,$crs); -# print STDERR "putresult is $putresult for $boardname $cdom $crs\n"; if ($db_handling eq 'importall') { foreach my $msg_id (@{$$messages{$$boards[$i]}}) { $msgcount ++;