--- loncom/imspackages/imsprocessor.pm 2004/03/21 20:44:58 1.6
+++ loncom/imspackages/imsprocessor.pm 2004/12/23 18:38:45 1.13
@@ -1,3 +1,26 @@
+# 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;
@@ -18,7 +41,8 @@ sub ims_config {
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',
@@ -26,10 +50,7 @@ sub ims_config {
quiz => 'QUIZ',
survey => 'FORM',
);
-
@{$$cmsmap{angel}{doc}} = ('FILE','PAGE');
-
-
%{$areaname} = (
announce => 'Announcements',
board => 'Discussion Boards',
@@ -41,7 +62,6 @@ sub ims_config {
survey => 'Surveys',
users => 'Enrollment',
);
-
}
sub create_tempdir {
@@ -99,12 +119,18 @@ sub uploadzip {
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 (<OUTPUT>) {
- print "$_<br />";
- }
close(OUTPUT);
+ %ENV=%oldENV;
+ undef(%oldENV);
} else {
return 'nozip';
}
@@ -117,6 +143,7 @@ sub expand_zip {
sub process_manifest {
my ($cms,$tempdir,$resources,$items,$hrefs,$resinfo) = @_;
my %toc = (
+ bb6 => 'organization',
bb5 => 'tableofcontents',
angel => 'organization',
);
@@ -136,11 +163,10 @@ sub process_manifest {
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';
}
@@ -169,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;
@@ -211,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';
@@ -224,33 +252,33 @@ 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 "organization" && $state[-1] eq "title") {
- if ($cms eq 'angel') {
+ 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;
}
}
@@ -308,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);
}
@@ -326,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");
}
}
@@ -366,7 +394,7 @@ sub process_coursefile {
}
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';
@@ -402,12 +430,12 @@ sub process_resinfo {
%{$$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") {
unless ($$items{$$resources{$key}{revitm}}{filepath} eq 'Top') {
%{$$resinfo{$key}} = ();
- &process_content($key,$docroot,$destdir,\%{$$resinfo{$key}},$udom,$uname,$resrcfiles);
+ &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}} = ();
@@ -426,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}} = ();
@@ -463,7 +491,6 @@ sub process_resinfo {
}
if (@{$surveys}) {
$$items{'Top'}{'contentscount'} ++;
-
}
}
@@ -473,7 +500,7 @@ sub process_resinfo {
}
sub build_structure {
- 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 ($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 = ();
@@ -530,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} = "<map>\n";
}
if ($$items{$key}{contentscount} == 0) {
@@ -544,7 +571,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);
unless ($flag{$key}{page} == 1) {
$seqtext{$key} .= qq|<resource id="$curr_id" src="$src" title="$title" type="start"|;
unless ($flag{$key}{seq} || $flag{$key}{board} || $flag{$key}{file}) {
@@ -565,8 +596,12 @@ sub build_structure {
my $contitem = $$items{$key}{contents}[$i];
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 $title = $$items{$contitem}{title};
+ 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|></resource>
<link from="$curr_id" to="$next_id" index="$curr_id"></link>
@@ -587,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|></resource>
@@ -610,11 +648,11 @@ sub build_structure {
$curr_id ++;
$next_id ++;
$seqtext{$key} .= qq|></resource>
-<link from="$curr_id" to="$next_id index="$curr_id"></link>\n|;
+<link from="$curr_id" to="$next_id" index="$curr_id"></link>\n|;
}
}
}
- unless ($cms eq 'bb5' && $key eq 'Top') {
+ unless (($cms eq 'bb5') && $key eq 'Top') {
$seqtext{$key} .= "</map>\n";
open(LOCFILE,">$destdir/sequences/$key.sequence");
print LOCFILE $seqtext{$key};
@@ -628,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);
}
@@ -641,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'} .= "</map>\n";
open(TOPFILE,">$destdir/sequences/Top.sequence");
print TOPFILE $seqtext{'Top'};
@@ -659,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|<map>
-<resource src="$filestem/resfiles/$$items{$pagecontents{$key}[$i][0]}{resnum}.html" id="1" type="start" title="$$items{$pagecontents{$key}[$i][0]}{title}"></resource>
+<resource src="$resource" id="1" type="start" title="$$items{$pagecontents{$key}[$i][0]}{title}"></resource>
<link to="2" index="1" from="1">\n|;
if (@{$pagecontents{$key}[$i]} == 1) {
print PAGEFILE qq|<resource src="" id="2" type="finish"></resource>\n|;
} elsif (@{$pagecontents{$key}[$i]} == 2) {
- print PAGEFILE qq|<resource src="$filestem/resfiles/$$items{$pagecontents{$key}[$i][1]}{resnum}.html" id="2" type="finish" title="$$items{$pagecontents{$key}[$i][1]}{title}"></resource>\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'; # should be entry_point
+ }
+ print PAGEFILE qq|<resource src="$resource" id="2" type="finish" title="$$items{$pagecontents{$key}[$i][1]}{title}"></resource>\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|<resource src="$resource" id="$curr_id" title="$$items{$pagecontents{$key}[$i][$j]}{title}"></resource>
<link to="$next_id" index="$curr_id" from="$curr_id">\n|;
}
my $final_id = @{$pagecontents{$key}[$i]};
- print PAGEFILE qq|<resource src="$filestem/resfiles/$$items{$pagecontents{$key}[$i][-1]}{resnum}.html" id="$final_id" type="finish" title="$$items{$pagecontents{$key}[$i][-1]}{title}"></resource>\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|<resource src="$resource" id="$final_id" type="finish" title="$$items{$pagecontents{$key}[$i][-1]}{title}"></resource>\n|;
}
print PAGEFILE "</map>";
close(PAGEFILE);
@@ -686,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;
@@ -719,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;
}
}
@@ -846,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};
@@ -890,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;
@@ -927,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};
@@ -979,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};
@@ -1156,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};
@@ -1171,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 =>
@@ -1437,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 = ();
@@ -1493,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};
@@ -1595,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|<map>
-|;
- $$total{page} ++;
- print PAGEFILE qq|<resource id="1" src="/res/$udom/$uname/$resdir/problems/$dirtitle/$allids[0].problem" type="start"></resource>|;
- 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|<map>
+|;
+ 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|<resource id="1" src="$probsrc" type="start" title="question_0001"></resource>|;
+ if (@allids == 1) {
+ print $fh qq|
<link from="1" to="2" index="1"></link>
<resource id="2" src="" type="finish">\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|
<link from="$curr_id" to="$next_id" index="$curr_id"></link>
-<resource id="$next_id" src="/res/$udom/$uname/$resdir/problems/$dirtitle/$allids[$j].problem"|;
- if ($next_id == @allids) {
- print PAGEFILE qq| type="finish"></resource>\n|;
- } else {
- print PAGEFILE qq|></resource>|;
- }
+<resource id="$next_id" src="$probsrc" title="question_$qntitle"|;
+ if ($next_id == @allids) {
+ print $fh qq| type="finish"></resource>\n|;
+ } else {
+ print $fh qq|></resource>|;
}
}
- print PAGEFILE qq|</map>|;
- close(PAGEFILE);
}
+ print $fh qq|</map>|;
+ close($fh);
+ my $qnum = 0;
foreach my $id (@allids) {
- my $output = qq|<problem>
+ $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|<problem>
|;
+ }
$$total{prob} ++;
if ($$settings{$id}{class} eq "QUESTION_ESSAY") {
- $output .= qq|<startouttext />$$settings{$id}{text}<endouttext />
+ if ($context eq 'CSTR') {
+ $output .= qq|<startouttext />$$settings{$id}{text}<endouttext />
<essayresponse>
<textfield></textfield>
</essayresponse>
@@ -1642,112 +1758,194 @@ sub process_assessment {
$$settings{$id}{feedbackcorr}
</postanswerdate>
|;
+ } else {
+ $resourcedata{$symb.'questiontext'} = $$settings{$id}{text};
+ $resourcedata{$symb.'hiddenparts'} = '!essay';
+ $resourcedata{$symb.'questiontype'} = 'essay';
+ }
} else {
- $output .= qq|<startouttext />$$settings{$id}{text}\n|;
- if ( defined($$settings{$id}{image}) ) {
+ if ($context eq 'CSTR') {
+ $output .= qq|<startouttext />$$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|<br /><img src="$dirname/resfiles/$res/$$settings{$id}{image}" /><br />|;
+ $image = qq|<br /><img src="$dirname/resfiles/$res/$$settings{$id}{image}" /><br />|;
} else {
- $output .= qq|<br /><a href="$dirname/resfiles/$res/$$settings{$id}{image}">Link to file</a><br />|;
+ $imglink = qq|<br /><a href="$dirname/resfiles/$res/$$settings{$id}{image}">Link to file</a><br />|;
}
}
if ( defined($$settings{$id}{url}) ) {
- $output .= qq|<br /><a href="$$settings{$id}{url}">$$settings{$id}{name}</a><br />|;
+ $url = qq|<br /><a href="$$settings{$id}{url}">$$settings{$id}{name}</a><br />|;
+ }
+ if ($context eq 'CSTR') {
+ $output .= $image.$imglink.$url.'
+<endouttext />';
+ } else {
+ $resourcedata{$symb.'questiontext'} .= $image.$imglink.$url;
}
- $output .= qq|
-<endouttext />|;
if ($$settings{$id}{class} eq 'QUESTION_MULTIPLECHOICE') {
my $numfoils = @{$allanswers{$id}};
- $output .= qq|
+ if ($context eq 'CSTR') {
+ $output .= qq|
<radiobuttonresponse max="$numfoils" randomize="yes">
<foilgroup>
|;
+ } 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 .= " <foil name=\"foil".$k."\" value=\"";
if (grep/^$allanswers{$id}[$k]$/,@{$$settings{$id}{correctanswer}}) {
$output .= "true\" location=\"";
+ $resourcedata{$symb.'value'.$iter} = "true";
} else {
$output .= "false\" location=\"";
+ $resourcedata{$symb.'value'.$iter} = "false";
}
if (lc ($allanswers{$id}[$k]) =~ m/^\s?([Aa]ll)|([Nn]one)\sof\sthe\sabove\.?/) {
$output .= "bottom\"";
+ $resourcedata{$symb.'position'.$iter} = "bottom";
} else {
$output .= "random\"";
}
$output .= "\><startouttext />".$$settings{$id}{$allanswers{$id}[$k]}{text};
+ $resourcedata{$symb.'text'.$iter} = $$settings{$id}{$allanswers{$id}[$k]}{text};
+ my ($ans_image,$ans_link);
if ( defined($$settings{$id}{$allanswers{$id}[$k]}{image}) ) {
if ( $$settings{$id}{$allanswers{$id}[$k]}{style} eq 'embed' ) {
- $output .= qq|<br /><img src="$dirname/resfiles/$res/$$settings{$id}{$allanswers{$id}[$k]}{image}" /><br />|;
+ $ans_image .= qq|<br /><img src="$dirname/resfiles/$res/$$settings{$id}{$allanswers{$id}[$k]}{image}" /><br />|;
} else {
- $output .= qq|<br /><a href="$dirname/resfiles/$res/$$settings{$id}{$allanswers{$id}[$k]}{image}" />Link to file</a><br/>|;
+ $ans_link .= qq|<br /><a href="$dirname/resfiles/$res/$$settings{$id}{$allanswers{$id}[$k]}{image}" />Link to file</a><br/>|;
}
}
- $output .= qq|<endouttext /></foil>\n|;
+ $output .= $ans_image.$ans_link.'<endouttext /></foil>'."\n";
+ $resourcedata{$symb.'text'.$iter} .= $ans_image.$ans_link;
}
- chomp($output);
- $output .= qq|
+ if ($context eq 'CSTR') {
+ chomp($output);
+ $output .= qq|
</foilgroup>
</radiobuttonresponse>
|;
+ }
} elsif ($$settings{$id}{class} eq 'QUESTION_TRUEFALSE') {
my $numfoils = @{$allanswers{$id}};
- $output .= qq|
+ if ($context eq 'CSTR') {
+ $output .= qq|
<radiobuttonresponse max="$numfoils" randomize="yes">
<foilgroup>
|;
+ } 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 .= " <foil name=\"foil".$k."\" value=\"";
if (grep/^$allanswers{$id}[$k]$/,@{$$settings{$id}{correctanswer}}) {
$output .= "true\" location=\"random\"";
+ $resourcedata{$symb.'value'.$iter} = "true";
} else {
$output .= "false\" location=\"random\"";
+ $resourcedata{$symb.'value'.$iter} = "false";
}
$output .= "\><startouttext />".$$settings{$id}{$allanswers{$id}[$k]}{text}."<endouttext /></foil>\n";
+ $resourcedata{$symb.'text'.$iter} = $$settings{$id}{$allanswers{$id}[$k]}{text};
}
- chomp($output);
- $output .= qq|
+ if ($context eq 'CSTR') {
+ chomp($output);
+ $output .= qq|
</foilgroup>
</radiobuttonresponse>
|;
+ }
} elsif ($$settings{$id}{class} eq 'QUESTION_MULTIPLEANSWER') {
my $numfoils = @{$allanswers{$id}};
- $output .= qq|
+ if ($context eq 'CSTR') {
+ $output .= qq|
<optionresponse max="$numfoils" randomize="yes">
<foilgroup options="('True','False')">
|;
+ } 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 .= " <foil name=\"foil".$k."\" value=\"";
if (grep/^$allanswers{$id}[$k]$/,@{$$settings{$id}{correctanswer}}) {
$output .= "True\"";
+ $resourcedata{$symb.'value'.$iter} = "True";
} else {
$output .= "False\"";
+ $resourcedata{$symb.'value'.$iter} = "False";
}
$output .= "\><startouttext />".$$settings{$id}{$allanswers{$id}[$k]}{text}."<endouttext /></foil>\n";
+ $resourcedata{$symb.'text'.$iter} = $$settings{$id}{$allanswers{$id}[$k]}{text};
}
- chomp($output);
- $output .= qq|
+ if ($context eq 'CSTR') {
+ chomp($output);
+ $output .= qq|
</foilgroup>
</optionresponse>
|;
+ }
} elsif ($$settings{$id}{class} eq 'QUESTION_ORDER') {
my $numfoils = @{$allanswers{$id}};
- $output .= qq|
+ my @allorder = ();
+ if ($context eq 'CSTR') {
+ $output .= qq|
<rankresponse max="$numfoils" randomize="yes">
<foilgroup>
|;
+ } 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 .= " <foil location=\"random\" name=\"foil".$k."\" value=\"".$$settings{$id}{$allanswers{$id}[$k]}{order}."\"><startouttext />".$$settings{$id}{$allanswers{$id}[$k]}{text}."<endouttext /></foil>\n";
+ if ($context eq 'CSTR') {
+ $output .= " <foil location=\"random\" name=\"foil".$k."\" value=\"".$$settings{$id}{$allanswers{$id}[$k]}{order}."\"><startouttext />".$$settings{$id}{$allanswers{$id}[$k]}{text}."<endouttext /></foil>\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|
</foilgroup>
</rankresponse>
|;
+ } 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) {
@@ -1770,7 +1968,8 @@ sub process_assessment {
$numans = ($max + $min)/2;
$tol = 100*($max - $min)/($numans*2);
}
- $output .= qq|
+ if ($context eq 'CSTR') {
+ $output .= qq|
<numericalresponse answer="$numans">
<responseparam type="tolerance" default="$tol%" name="tol" description="Numerical Tolerance" />
<responseparam name="sig" type="int_range,0-16" default="0,15" description="Significant Figures"
@@ -1778,64 +1977,109 @@ sub process_assessment {
<textline />
</numericalresponse>
|;
+ }
} 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|
<stringresponse answer="$$settings{$id}{$allanswers{$id}[0]}{text}" type="ci">
<textline>
</textline>
</stringresponse>
|;
- } 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|
<stringresponse answer="$regexpans" type="re">
<textline>
</textline>
</stringresponse>
|;
- }
+ }
+ }
}
} elsif ($$settings{$id}{class} eq "QUESTION_MATCH") {
- $output .= qq|
+ my @allmatchers = ();
+ my %matchtext = ();
+ if ($context eq 'CSTR') {
+ $output .= qq|
<matchresponse max="10" randomize="yes">
<foilgroup>
<itemgroup>
|;
+ } 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|
<item name="$allchoices{$id}[$k]">
<startouttext />$$settings{$id}{$allchoices{$id}[$k]}{text}<endouttext />
</item>
|;
+ } 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|
</itemgroup>
|;
+ }
for (my $k=0; $k<@{$allanswers{$id}}; $k++) {
- $output .= qq|
+ if ($context eq 'CSTR') {
+ $output .= qq|
<foil location="random" value="$$settings{$id}{$allanswers{$id}[$k]}{choice_id}" name="$allanswers{$id}[$k]">
<startouttext />$$settings{$id}{$allanswers{$id}[$k]}{text}<endouttext />
</foil>
|;
+ } 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|
</foilgroup>
</matchresponse>
|;
+ } else {
+ $resourcedata{$symb.'options'} = "('".join("','",@allmatchers)."')";
+ }
}
}
- $output .= qq|</problem>
+ if ($context eq 'CSTR') {
+ $output .= qq|</problem>
|;
- 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);
+ }
}
}
@@ -1856,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};
@@ -1929,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;
@@ -1944,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};
}
@@ -1984,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;
@@ -2039,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}}) ) {
@@ -2055,8 +2314,28 @@ sub process_content {
}
$linktag .= qq|>$$settings{files}[$filecount]{linkname}</a><br/>\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} = '<a href="'.$newfilename.'">'.$filetitle.'</a><br /><br />'. $$settings{maindata}{text};
}
}
}
@@ -2064,36 +2343,48 @@ sub process_content {
$fontcol = qq|<font color="$$settings{maindata}{textcolor}">|;
}
if (defined($$settings{maindata}{text})) {
+ if ($$settings{maindata}{bodytype} eq "S") {
+ $$settings{maindata}{text} =~ s#\n#<br/>#g;
+ }
if ($$settings{maindata}{ishtml} eq "false") {
if ($$settings{maindata}{isnewline} eq "true") {
$$settings{maindata}{text} =~ s#\n#<br/>#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|<html>
+ 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|<html>
<head>
<title>$$settings{title}</title>
</head>
<body bgcolor='#ffffff'>
$fontcol
|;
+ }
unless ($$settings{title} eq '') {
print FILE qq|$$settings{title}<br/><br/>\n|;
}
print FILE qq|
$$settings{maindata}{text}
$linktag|;
- if (defined($$settings{maindata}{textcolor})) {
- print FILE qq|</font>|;
- }
- print FILE qq|
+ unless ($htmldoc) {
+ if (defined($$settings{maindata}{textcolor})) {
+ print FILE qq|</font>|;
+ }
+ print FILE qq|
</body>
</html>|;
+ }
close(FILE);
}
@@ -2139,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 ++;