--- loncom/imspackages/imsprocessor.pm 2007/09/30 13:20:08 1.41 +++ loncom/imspackages/imsprocessor.pm 2009/08/17 03:52:09 1.48 @@ -1,3 +1,8 @@ +# The LearningOnline Network with CAPA +# Processor for IMS Packages +# +# $Id: imsprocessor.pm,v 1.48 2009/08/17 03:52:09 raeburn Exp $ +# # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). @@ -25,6 +30,7 @@ package Apache::imsprocessor; use Apache::lonnet; use Apache::loncleanup; +use Apache::lonlocal; use LWP::UserAgent; use HTTP::Request::Common; use LONCAPA::Configuration; @@ -56,14 +62,14 @@ sub ims_config { users => 'course/x-bb-user', ); $$cmsmap{bb6}{conference} = 'resource/x-bb-conference'; - %{$$cmsmap{angel}} = ( + %{$$cmsmap{angel5}} = ( board => 'BOARD', extlink => 'LINK', msg => 'MESSAGE', quiz => 'QUIZ', survey => 'FORM', ); - @{$$cmsmap{angel}{doc}} = ('FILE','PAGE'); + @{$$cmsmap{angel5}{doc}} = ('FILE','PAGE'); %{$$cmsmap{webctce4}} = ( quiz => 'webctquiz', survey => 'webctsurvey', @@ -75,7 +81,7 @@ sub ims_config { survey => 'webctsurvey', doc => 'webcontent' ); - %{$areaname} = ( + %{$areaname} = &Apache::lonlocal::texthash ( announce => 'Announcements', board => 'Discussion Boards', doc => 'Documents, pages, and folders', @@ -164,7 +170,7 @@ sub process_manifest { my %toc = ( bb6 => 'organization', bb5 => 'tableofcontents', - angel => 'organization', + angel5 => 'organization', webctce4 => 'organization', webctvista4 => 'organization' ); @@ -177,7 +183,7 @@ sub process_manifest { revitm => 'Top' ); - if ($cms eq 'angel') { + if ($cms eq 'angel5') { $$resources{'toplevel'}{type} = "FOLDER"; } elsif ($cms eq 'bb5' || $cms eq 'bb6') { $$resources{'toplevel'}{type} = 'resource/x-bb-document'; @@ -224,7 +230,7 @@ sub parse_manifest { if ($cms eq 'bb5') { $$items{$itm}{title} = $attr->{title}; } - } elsif ($cms eq 'angel') { + } elsif ($cms eq 'angel5') { if ($attr->{identifierref} =~ m/^res(.+)$/) { $$items{$itm}{resnum} = $1; } @@ -292,7 +298,7 @@ sub parse_manifest { } elsif ($cms eq 'webctvista4') { $$resources{$identifier}{type} = $attr->{type}; $$resources{$identifier}{'webct:coType'} = $attr->{'webct:coType'}; - } elsif ($cms eq 'angel') { + } elsif ($cms eq 'angel5') { $identifier = substr($identifier,3); if ($attr->{href} =~ m-^_assoc/$identifier/(.+)$-) { $$resources{$identifier}{file} = $1; @@ -308,7 +314,6 @@ sub parse_manifest { if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webctce4' || $cms eq 'webctvista4') { push @{$$hrefs{$identifier}},$attr->{href}; - if ($$resources{$identifier}{type} eq 'webct.manifest') { my $manifestfile = $tempdir.'/'.$attr->{href}; @@ -322,7 +327,7 @@ sub parse_manifest { $items,$resources,$resinfo, $hrefs,$currseqref); } - } elsif ($cms eq 'angel') { + } elsif ($cms eq 'angel5') { if ($attr->{href} =~ m/^_assoc\\$identifier\\(.+)$/) { push @{$$hrefs{$identifier}},$1; } elsif ($attr->{href} =~ m/^Icons\\icon(\w+)\.gif/) { @@ -346,7 +351,7 @@ sub parse_manifest { } if ($state[0] eq "manifest" && $state[1] eq "organizations" && $state[2] eq $$toc{$cms} && $state[-1] eq "title") { if ($$includeditems{$itm} || $phase ne 'build') { - if ($cms eq 'angel' || $cms eq 'bb6' || $cms eq 'webctvista4') { + if ($cms eq 'angel5' || $cms eq 'bb6' || $cms eq 'webctvista4') { $$items{$itm}{title} = $text; } if ($cms eq 'webctce4') { @@ -409,7 +414,7 @@ sub target_resources { } sub copy_resources { - my ($context,$cms,$hrefs,$tempdir,$targets,$url,$crs,$cdom,$destdir,$timenow,$assessmentfiles) = @_; + my ($context,$cms,$hrefs,$tempdir,$targets,$url,$crs,$cdom,$destdir,$timenow,$assessmentfiles,$total) = @_; if ($context eq 'DOCS') { foreach my $key (sort keys %{$hrefs}) { if (grep/^$key$/,@{$targets}) { @@ -421,7 +426,7 @@ sub copy_resources { } my $filename = ''; my $fpath = $timenow.'/resfiles/'.$key.'/'; - if ($cms eq 'angel') { + if ($cms eq 'angel5') { if ($file eq 'pg'.$key.'.htm') { next; } @@ -451,7 +456,7 @@ sub copy_resources { if (grep/^$key$/,@{$targets}) { foreach my $file (@{$$hrefs{$key}}) { $file =~ s-\\-/-g; - if ( ($cms eq 'angel' && $file ne 'pg'.$key.'.htm') || ($cms eq 'bb5') || ($cms eq 'bb6')) { + if ( ($cms eq 'angel5' && $file ne 'pg'.$key.'.htm') || ($cms eq 'bb5') || ($cms eq 'bb6')) { if (!-e "$destdir/resfiles/$key") { mkdir("$destdir/resfiles/$key",0770); } @@ -466,10 +471,18 @@ sub copy_resources { mkdir("$fulldir",0770); } } - if ($cms eq 'angel') { - rename("$tempdir/_assoc/$key/$file","$destdir/resfiles/$key/$file"); + my $renameres; + if ($cms eq 'angel5') { + $renameres = rename("$tempdir/_assoc/$key/$file","$destdir/resfiles/$key/$file"); } elsif ($cms eq 'bb5' || $cms eq 'bb6') { - rename("$tempdir/$key/$file","$destdir/resfiles/$key/$file"); + $renameres = rename("$tempdir/$key/$file","$destdir/resfiles/$key/$file"); + } + if ($renameres) { + if (ref($total) eq 'HASH') { + $$total{'file'} ++; + } + } else { + &Apache::lonnet::logthis("IMS import error: $cms - renaming failed for file $file"); } } elsif ($cms eq 'webctce4') { if ($file =~ m-/my_files/(.+)$-) { @@ -486,7 +499,14 @@ sub copy_resources { } } if (-e "$tempdir/$file") { - rename("$tempdir/$file","$destdir/resfiles/$copyfile"); + my $renameres = rename("$tempdir/$file","$destdir/resfiles/$copyfile"); + if ($renameres) { + if (ref($total) eq 'HASH') { + $$total{'file'} ++; + } + } else { + &Apache::lonnet::logthis("IMS import error: WebCT4 - renaming failed for file $file"); + } } } elsif ($file !~ m-/data/(.+)$-) { &Apache::lonnet::logthis("IMS import error: WebCT4 - file $file is in unexpected location"); @@ -517,7 +537,7 @@ sub process_resinfo { mkdir("$destdir/resfiles",0770); } } - if ($cms eq 'angel') { + if ($cms eq 'angel5') { my $currboard = ''; foreach my $key (sort keys %{$resources}) { if (grep/^$key$/,@{$targets}) { @@ -620,7 +640,11 @@ sub process_resinfo { if (grep/^$key$/,@{$targets}) { if ($$resources{$key}{type} eq "webcontent") { %{$$resinfo{$key}} = (); - &webct4_content($key,$docroot,$destdir,\%{$$resinfo{$key}},$udom,$uname,$$resources{$key}{type},$$items{$$resources{$key}{revitm}}{title},$resrcfiles); + if ($$resources{$key}{file} eq 'questiondb.xml') { + &process_assessment($cms,$context,$key,$docroot,'quiz',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse,$resources,$items,\%catinfo,\%qzdbsettings,$hrefs,\%allquestions); + } else { + &webct4_content($key,$docroot,$destdir,\%{$$resinfo{$key}},$udom,$uname,$$resources{$key}{type},$$items{$$resources{$key}{revitm}}{title},$resrcfiles); + } } elsif ($$resources{$key}{type} eq "webctquiz") { &process_assessment($cms,$context,$key,$docroot,'quiz',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse,$resources,$items,\%catinfo,\%qzdbsettings,$hrefs,\%allquestions); } @@ -735,8 +759,12 @@ sub build_structure { my $curr_id = 1; my $resnum = $$items{$key}{resnum}; my $type = $$resources{$resnum}{type}; - my $contentscount = $$items{$key}{'contentscount'}; - 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")) || ($cms eq 'webctce4' && $contentscount > 0)) { + my $contentscount = $$items{$key}{'contentscount'}; + my $seqtitle = $$items{$key}{'title'}; + $seqtitle =~ s|/+|_|g; + $seqtitle =~ s/\s+/_/g; + $seqtitle .= '_'.$key; + if (($cms eq 'angel5' && $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")) || ($cms eq 'webctce4' && $contentscount > 0)) { unless (($cms eq 'bb5') && $key eq 'Top') { $seqtext{$key} = "\n"; - open(LOCFILE,">$destdir/sequences/$key.sequence"); + if ($cms eq 'webctce4' && $key ne 'Top') { + push @{$seqfiles}, "$seqtitle.sequence"; + open(LOCFILE,">$destdir/sequences/$seqtitle.sequence"); + } else { + push @{$seqfiles}, "$key.sequence"; + open(LOCFILE,">$destdir/sequences/$key.sequence"); + } print LOCFILE $seqtext{$key}; close(LOCFILE); - push @{$seqfiles}, "$key.sequence"; } $count{$key}{page} ++; $$total{page} += $count{$key}{page}; @@ -972,10 +1005,16 @@ sub build_structure { } sub make_structure { - my ($cms,$key,$srcstem,$flag,$count,$timestamp,$boardnum,$hrefs,$pagecontents,$res,$type,$file,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount,$randompick) = @_; + my ($cms,$key,$srcstem,$flag,$count,$timestamp,$boardnum,$hrefs,$pagecontents,$res,$type,$file,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount,$randompick,$title) = @_; my $src =''; - if (($cms eq 'angel' && $type eq 'FOLDER') || (($cms eq 'bb5' || $cms eq 'bb6') && (($$resinfo{$res}{'isfolder'} eq 'true') || $key eq 'Top')) || ($cms eq 'webctce4' && $contitemcount > 0)) { + if (($cms eq 'angel5' && $type eq 'FOLDER') || (($cms eq 'bb5' || $cms eq 'bb6') && (($$resinfo{$res}{'isfolder'} eq 'true') || $key eq 'Top')) || ($cms eq 'webctce4' && $contitemcount > 0)) { $src = $srcstem.'/sequences/'.$contitem.'.sequence'; + if ($cms eq 'webctce4') { + $title =~ s|/+|_|g; + $title =~ s/\s+/_/g; + $title .= '_'.$contitem; + $src = $srcstem.'/sequences/'.$title.'.sequence'; + } $$flag{$key}{page} = 0; $$flag{$key}{seq} = 1; $$count{$key}{seq} ++; @@ -984,12 +1023,12 @@ sub make_structure { $$flag{$key}{page} = 0; $$flag{$key}{seq} = 1; $$count{$key}{seq} ++; - } elsif ($cms eq 'angel' && $type eq 'BOARD') { + } elsif ($cms eq 'angel5' && $type eq 'BOARD') { $src = '/adm/'.$cdom.'/'.$uname.'/'.$$timestamp[$$boardnum{$res}].'/bulletinboard'; $$flag{$key}{page} = 0; $$flag{$key}{board} = 1; $$count{$key}{board} ++; - } elsif ($cms eq 'angel' && $type eq "FILE") { + } elsif ($cms eq 'angel5' && $type eq "FILE") { foreach my $file (@{$$hrefs{$res}}) { unless ($file eq 'pg'.$res.'.htm') { $src = $srcstem.'/resfiles/'.$res.'/'.$file; @@ -997,7 +1036,7 @@ sub make_structure { } $$flag{$key}{page} = 0; $$flag{$key}{file} = 1; - } elsif ($cms eq 'angel' && (($type eq "PAGE") || ($type eq "LINK")) ) { + } elsif ($cms eq 'angel5' && (($type eq "PAGE") || ($type eq "LINK")) ) { if ($$flag{$key}{page}) { if ($$count{$key}{page} == -1) { &Apache::lonnet::logthis("IMS Angel import error in array index for page: value = -1, resource is $key, type is $type."); @@ -1038,14 +1077,16 @@ sub make_structure { if ($file =~ m-/([^/]+)$-) { $filename = $1; } - $src = $srcstem.'/resfiles/'.$res.'/'.$filename; + $src = $srcstem.'/resfiles/'.$filename; } else { foreach my $file (@{$$hrefs{$res}}) { my $filename; - if ($file =~ m-/([^/]+)$-) { + if ($file =~ m-/my_files/(.+)$-) { + $filename = $1; + } elsif ($file =~ m-/([^/]+)$-) { $filename = $1; } - $src = $srcstem.'/resfiles/'.$res.'/'.$filename; + $src = $srcstem.'/resfiles/'.$filename; } } $$flag{$key}{page} = 0; @@ -1076,7 +1117,7 @@ sub process_specials { pools => 'pools' ); my %seqtitles = ( - boards => 'Course Bulletin Boards', + boards => 'Course Discussion Boards', quizzes => 'Course Quizzes', surveys => 'Course Surveys', announcements => 'Course Announcements', @@ -1417,7 +1458,7 @@ sub process_staff { Office Hours:
'.$$settings{$id}{text}.'
'.$questionimage; @@ -4331,11 +4422,19 @@ $$settings{$id}{$list}{jumbledtext}[$k] if (!-e "$destdir/problems/$probdir") { mkdir("$destdir/problems/$probdir",0755); } + if ($allfeedback ne '') { + $output .= qq| +