--- loncom/imspackages/imsprocessor.pm 2005/10/27 17:07:23 1.31 +++ loncom/imspackages/imsprocessor.pm 2006/03/24 17:36:27 1.34 @@ -64,7 +64,7 @@ sub ims_config { survey => 'FORM', ); @{$$cmsmap{angel}{doc}} = ('FILE','PAGE'); - %{$$cmsmap{webct4}} = ( + %{$$cmsmap{webctce4}} = ( quiz => 'webctquiz', survey => 'webctsurvey', doc => 'webcontent' @@ -158,7 +158,7 @@ sub process_manifest { bb6 => 'organization', bb5 => 'tableofcontents', angel => 'organization', - webct4 => 'organization', + webctce4 => 'organization', ); my %contents = (); my @state = (); @@ -202,7 +202,7 @@ sub process_manifest { %{$$items{$itm}} = (); $$items{$itm}{contentscount} = 0; @{$$items{$itm}{contents}} = (); - if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webct4') { + if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webctce4') { $$items{$itm}{resnum} = $attr->{identifierref}; if ($cms eq 'bb5') { $$items{$itm}{title} = $attr->{title}; @@ -256,7 +256,7 @@ sub process_manifest { $lastitem = $itm; } } - if ($cms eq 'webct4') { + if ($cms eq 'webctce4') { if (($state[-1] eq "webct:properties") && (@state > 4)) { $$items{$itm}{properties} = $attr->{identifierref}; } @@ -267,7 +267,7 @@ sub process_manifest { if ($cms eq 'bb5' || $cms eq 'bb6') { $$resources{$identifier}{file} = $attr->{file}; $$resources{$identifier}{type} = $attr->{type}; - } elsif ($cms eq 'webct4') { + } elsif ($cms eq 'webctce4') { $$resources{$identifier}{type} = $attr->{type}; $$resources{$identifier}{file} = $attr->{href}; } elsif ($cms eq 'angel') { @@ -280,7 +280,7 @@ sub process_manifest { } } elsif ("@state" eq "manifest resources resource file") { if ($$includedres{$identifier} || $phase ne 'build') { - if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webct4') { + if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webctce4') { push @{$$hrefs{$identifier}},$attr->{href}; } elsif ($cms eq 'angel') { if ($attr->{href} =~ m/^_assoc\\$identifier\\(.+)$/) { @@ -303,7 +303,7 @@ sub process_manifest { if ($cms eq 'angel' || $cms eq 'bb6') { $$items{$itm}{title} = $text; } - if ($cms eq 'webct4') { + if ($cms eq 'webctce4') { $$items{$itm}{title} = $text; $$items{$itm}{title} =~ s/(<[^>]*>)//g; } @@ -365,14 +365,14 @@ sub target_resources { } sub copy_resources { - my ($context,$cms,$hrefs,$tempdir,$targets,$url,$crs,$cdom,$chome,$destdir,$timenow) = @_; + my ($context,$cms,$hrefs,$tempdir,$targets,$url,$crs,$cdom,$destdir,$timenow) = @_; if ($context eq 'DOCS') { foreach my $key (sort keys %{$hrefs}) { if (grep/^$key$/,@{$targets}) { %{$$url{$key}} = (); foreach my $file (@{$$hrefs{$key}}) { my $source = $tempdir.'/'.$key.'/'.$file; - if ($cms eq 'webct4') { + if ($cms eq 'webctce4') { $source = $tempdir.'/'.$file; } my $filename = ''; @@ -384,12 +384,12 @@ sub copy_resources { } $file =~ s-\\-/-g; my $copyfile = $file; - if ($cms eq 'webct4') { + if ($cms eq 'webctce4') { if ($file =~ m-/my_files/(.+)$-) { $copyfile = $1; } } - unless (($cms eq 'webct4') && ($copyfile =~ m/questionDB\.xml$/ || $copyfile =~ m/quiz_QIZ_\d+\.xml$/ || $copyfile =~ m/properties_QIZ_\d+\.xml$/)) { + unless (($cms eq 'webctce4') && ($copyfile =~ m/questionDB\.xml$/ || $copyfile =~ m/quiz_QIZ_\d+\.xml$/ || $copyfile =~ m/properties_QIZ_\d+\.xml$/)) { $copyfile = $fpath.$copyfile; my $fileresult; if (-e $source) { @@ -427,7 +427,7 @@ sub copy_resources { } elsif ($cms eq 'bb5' || $cms eq 'bb6') { rename("$tempdir/$key/$file","$destdir/resfiles/$key/$file"); } - } elsif ($cms eq 'webct4') { + } elsif ($cms eq 'webctce4') { if ($file =~ m-/my_files/(.+)$-) { my $copyfile = $1; if ($copyfile =~ m-^[^/]+/[^/]+-) { @@ -511,10 +511,10 @@ sub process_resinfo { } } elsif ($$resources{$key}{type} eq "resource/x-bb-staffinfo") { %{$$resinfo{$key}} = (); - &process_staff($key,$docroot,$dirname,$destdir,\%{$$resinfo{$key}},$resrcfiles); + &process_staff($key,$docroot,$destdir,\%{$$resinfo{$key}},$resrcfiles); } elsif ($$resources{$key}{type} eq "resource/x-bb-externallink") { %{$$resinfo{$key}} = (); - &process_link($key,$docroot,$dirname,$destdir,\%{$$resinfo{$key}},$resrcfiles); + &process_link($key,$docroot,$destdir,\%{$$resinfo{$key}},$resrcfiles); } elsif ($$resources{$key}{type} eq "resource/x-bb-discussionboard") { %{$$resinfo{$key}} = (); unless ($db_handling eq 'ignore') { @@ -569,7 +569,7 @@ sub process_resinfo { if (@{$pools}) { $$items{'Top'}{'contentscount'} ++; } - } elsif ($cms eq 'webct4') { + } elsif ($cms eq 'webctce4') { foreach my $key (sort keys %{$resources}) { if (grep/^$key$/,@{$targets}) { if ($$resources{$key}{type} eq "webcontent") { @@ -649,7 +649,7 @@ sub build_structure { 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 'webct4' && $contentscount > 0)) { + 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)) { unless (($cms eq 'bb5') && $key eq 'Top') { $seqtext{$key} = "\n"; } @@ -887,12 +887,12 @@ 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 $src =''; - if (($cms eq 'angel' && $type eq 'FOLDER') || (($cms eq 'bb5' || $cms eq 'bb6') && (($$resinfo{$res}{'isfolder'} eq 'true') || $key eq 'Top')) || ($cms eq 'webct4' && $contitemcount > 0)) { + 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)) { $src = $srcstem.'/sequences/'.$contitem.'.sequence'; $$flag{$key}{page} = 0; $$flag{$key}{seq} = 1; $$count{$key}{seq} ++; - } elsif ($cms eq 'webct4' && $randompick) { + } elsif ($cms eq 'webctce4' && $randompick) { $src = $srcstem.'/sequences/'.$res.'.sequence'; $$flag{$key}{page} = 0; $$flag{$key}{seq} = 1; @@ -940,7 +940,7 @@ sub make_structure { } $$flag{$key}{seq} = 0; } - } elsif ($cms eq 'webct4') { + } elsif ($cms eq 'webctce4') { if ($type eq 'webctquiz') { $src = $srcstem.'/pages/'.$res.'.page'; $$count{$key}{page} ++; @@ -1205,12 +1205,12 @@ sub process_group { # ---------------------------------------------------------------- Process Blackboard Staff sub process_staff { - my ($res,$docroot,$dirname,$destdir,$settings,$resrcfiles) = @_; + my ($res,$docroot,$destdir,$settings,$resrcfiles) = @_; my $xmlfile = $docroot.'/'.$res.".dat"; my $filecount = 0; my @state; %{$$settings{name}} = (); - %{$$settings{office}} = (); + %{$$settings{office}} = (); my $p = HTML::Parser->new ( @@ -1363,7 +1363,7 @@ sub process_staff { |; if ( defined($$settings{image}) ) { $staffentry .= qq| - + |; } $staffentry .= qq| @@ -1386,7 +1386,7 @@ $staffentry # ---------------------------------------------------------------- Process Blackboard Links sub process_link { - my ($res,$docroot,$dirname,$destdir,$settings,$resrcfiles) = @_; + my ($res,$docroot,$destdir,$settings,$resrcfiles) = @_; my $xmlfile = $docroot.'/'.$res.".dat"; my @state = (); my $p = HTML::Parser->new @@ -2540,7 +2540,7 @@ sub process_assessment { &parse_bb5_assessment($res,$docroot,$container,$settings,\%allanswers,\%allchoices,\@allids); } elsif ($cms eq 'bb6') { &parse_bb6_assessment($res,$docroot,$container,$settings,\@allids); - } elsif ($cms eq 'webct4') { + } elsif ($cms eq 'webctce4') { unless($$dbparse) { &parse_webct4_questionDB($docroot,$$resources{$res}{file},$catinfo,$qzdbsettings,\%alldbanswers,\%alldbchoices,\@alldbquestids); if (!-e "$destdir/sequences") { @@ -2603,7 +2603,7 @@ sub process_assessment { } } my $dirtitle; - unless ($cms eq 'webct4') { + unless ($cms eq 'webctce4') { $dirtitle = $$settings{'title'}; $dirtitle =~ s/\W//g; $dirtitle .= '_'.$res; @@ -2616,7 +2616,7 @@ sub process_assessment { $newdir = "$destdir/problems/$dirtitle"; } - if ($cms eq 'webct4') { + if ($cms eq 'webctce4') { &build_problem_container($cms,$dirtitle,$destdir,$container,$res,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,\@allids,$udom,$uname,$dirname,\$containerdir,$cid,$cdom,$cnum,$catinfo,$qzdbsettings); } else { &build_problem_container($cms,$dirtitle,$destdir,$container,$res,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,\@allids,$udom,$uname,$dirname,\$containerdir,$cid,$cdom,$cnum,$catinfo,$settings); @@ -2658,7 +2658,7 @@ sub build_problem_container { my $probsrc = "/res/lib/templates/simpleproblem.problem"; if ($context eq 'CSTR') { foreach my $id (@{$allids}) { - if ($cms eq 'webct4') { + if ($cms eq 'webctce4') { $probtitle{$id} = $$settings{$id}{title}; } else { $probtitle{$id} = $$settings{title}; @@ -2667,7 +2667,7 @@ sub build_problem_container { $probtitle{$id} =~ s/\W//g; $probtitle{$id} .= '_'.$id; } - if ($cms eq 'webct4' && $container ne 'database') { + if ($cms eq 'webctce4' && $container ne 'database') { my $catid = $$settings{$$allids[0]}{category}; my $probdir = $$catinfo{$catid}{title}.'_'.$catid; $probdir =~ s/\s/_/g; @@ -2691,7 +2691,7 @@ sub build_problem_container { $curr_id = $j; $next_id = $curr_id + 1; if ($context eq 'CSTR') { - if ($cms eq 'webct4' && $container ne 'database') { + if ($cms eq 'webctce4' && $container ne 'database') { my $catid = $$settings{$$allids[$j]}{category}; my $probdir = $$catinfo{$catid}{title}.'_'.$catid; $probdir =~ s/\s/_/g; @@ -2718,13 +2718,19 @@ sub build_problem_container { sub write_bb5_questions { my ($allids,$containerdir,$context,$settings,$dirname,$destdir,$res,$allanswers,$allchoices,$total,$newdir,$cid,$cdom,$cnum,$docroot) = @_; my $qnum = 0; + my $pathstart; + if ($context eq 'CSTR') { + $pathstart = '../..'; + } else { + $pathstart = $dirname; + } foreach my $id (@{$allids}) { if ($$settings{$id}{ishtml} eq 'true') { $$settings{$id}{text} = &HTML::Entities::decode($$settings{$id}{text}); } if ($$settings{$id}{text} =~ m#]*>#) { if (&retrieve_image($context,$res,$dirname,$cdom,$cnum,$docroot,$destdir,$1,$2) eq 'ok') { - $$settings{$id}{text} =~ s#(]*>)#$1../../resfiles/$res/webimages/$3$4#g; + $$settings{$id}{text} =~ s#(]*>)#$1$pathstart/resfiles/$res/webimages/$3$4#g; } } $$settings{$id}{text} =~ s#(]+)/*>#$1 />#gi; @@ -2772,9 +2778,9 @@ sub write_bb5_questions { my ($image,$imglink,$url); if ( defined($$settings{$id}{image}) ) { if ( $$settings{$id}{style} eq 'embed' ) { - $image = qq|

|; + $image = qq|

|; } else { - $imglink = qq|
Link to file
|; + $imglink = qq|
Link to file
|; } } if ( defined($$settings{$id}{url}) ) { @@ -2819,9 +2825,9 @@ sub write_bb5_questions { my ($ans_image,$ans_link); if ( defined($$settings{$id}{$$allanswers{$id}[$k]}{image}) ) { if ( $$settings{$id}{$$allanswers{$id}[$k]}{style} eq 'embed' ) { - $ans_image .= qq|

|; + $ans_image .= qq|

|; } else { - $ans_link .= qq|
Link to file
|; + $ans_link .= qq|
Link to file
|; } } $output .= $ans_image.$ans_link.''."\n"; @@ -3642,7 +3648,7 @@ sub write_bb6_questions { |; } $$total{prob} ++; - $questiontext .= &add_images_links('question',$settings,$id,$dirname,$res); + $questiontext .= &add_images_links('question',$context,$settings,$id,$dirname,$res); if ($$settings{$id}{class} eq "Essay") { if ($context eq 'CSTR') { $output .= qq|$questiontext @@ -3680,7 +3686,7 @@ sub write_bb6_questions { my $answer_text = $$settings{$id}{$answer_id}{text}; my $texttype = $$settings{$id}{$answer_id}{texttype}; &process_html(\$answer_text,'bb6',$texttype,$context,$res,$dirname,$cdom,$cnum,$docroot,$destdir); - $answer_text .= &add_images_links('response',$settings,$id,$dirname,$res); + $answer_text .= &add_images_links('response',$context,$settings,$id,$dirname,$res); $output .= " ".$answer_text."\n"; @@ -3920,7 +3926,7 @@ sub write_bb6_questions { my $texttype = $$settings{$id}{$choice_id}{texttype}; my $choice_plaintext = &remove_html($choice_text); &process_html(\$choice_text,'bb6',$texttype,$context,$res,$dirname,$cdom,$cnum,$docroot,$destdir); - $choice_text .= &add_images_links($choice_id,$settings,$id,$dirname,$res); + $choice_text .= &add_images_links($choice_id,$context,$settings,$id,$dirname,$res); push(@allmatchers,$choice_plaintext); if ($context eq 'CSTR') { $output .= qq| @@ -3940,7 +3946,7 @@ sub write_bb6_questions { my $answer_text = $$settings{$id}{$answer_id}{text}; my $texttype = $$settings{$id}{$answer_id}{texttype}; &process_html(\$answer_text,'bb6',$texttype,$context,$res,$dirname,$cdom,$cnum,$docroot,$destdir); - $answer_text .= &add_images_links($answer_id,$settings,$id,$dirname,$res); + $answer_text .= &add_images_links($answer_id,$context,$settings,$id,$dirname,$res); if ($context eq 'CSTR') { $output .= ' @@ -4005,7 +4011,6 @@ sub retrieve_image { print $fh $contents; close($fh); if ($context eq 'DOCS') { - my $chome = &Apache::lonnet::homeserver($cname,$cdom); my $copyfile = $dirname.'/'.$filename; my $source = "$docroot/$res/webimages/$filename"; my $fileresult; @@ -4572,7 +4577,12 @@ $linktag sub process_html { my ($text,$caller,$html_cond,$context,$res,$dirname,$cdom,$cnum,$docroot,$destdir) = @_; - + my $pathstart; + if ($context eq 'CSTR') { + $pathstart = '../..'; + } else { + $pathstart = $dirname; + } if ($caller eq 'bb5') { if ($html_cond eq 'true') { $$text = &HTML::Entities::decode($$text); @@ -4584,7 +4594,7 @@ sub process_html { } if ($$text =~ m#]*>#) { if (&retrieve_image($context,$res,$dirname,$cdom,$cnum,$docroot,$destdir,$1,$2) eq 'ok') { - $$text =~ s#(]*>)#$1../../resfiles/$res/webimages/$3$4#g; + $$text =~ s#(]*>)#$1$pathstart/resfiles/$res/webimages/$3$4#g; } } $$text =~ s#(]+)/*>#$1 />#gi; @@ -4593,13 +4603,18 @@ sub process_html { } sub add_images_links { - my ($type,$settings,$id,$dirname,$res) = @_; - my ($image,$imglink,$url); + my ($type,$context,$settings,$id,$dirname,$res) = @_; + my ($image,$imglink,$url,$pathstart); + if ($context eq 'CSTR') { + $pathstart = '../..'; + } else { + $pathstart = $dirname; + } if ((defined($$settings{$id}{$type}{image})) && ($$settings{$id}{$type}{image} ne '')) { if ( $$settings{$id}{$type}{style} eq 'Inline' ) { - $image = qq|
$$settings{$id}{$type}{label}
|; + $image = qq|
$$settings{$id}{$type}{label}
|; } else { - $imglink = qq|
$$settings{$id}{$type}{label}
|; + $imglink = qq|
$$settings{$id}{$type}{label}
|; } } if ((defined($$settings{$id}{$type}{link})) && ($$settings{$id}{$type}{link} ne '' )) {