@@ -183,10 +351,11 @@ Please choose a destination LON-CAPA dir
@@ -200,1455 +369,436 @@ Please choose a destination LON-CAPA dir
END_OF_ONE
}
-# ---------------------------------------------------------------- Display One
-
-sub expand_bb5 {
- my ($r,$uname,$udom,$fn,$page) = @_;
- my @state = ();
- my @seq = "Top";
- my $lastitem;
- my %resnum = ();
- my %title = ();
- my %filepath = ();
- my %contentscount = ('Top' => 0);
- my %contents = ();
- my %parentseq = ();
- my %base = ();
- my %file = ();
- my %type = ();
- my %href = ();
- my $identifier = '';
+# ---------------------------------------------------------------- Display Two
+sub display_two {
+ my ($r,$zipupload,$areas,$areaname,$cmsmap,$uname,$newdir,$numcrs,$fullpath) = @_;
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folder','source']);
+ my $cms = $env{'form.source'};
+ my $dirname = $env{'form.newdir'};
+ my $tempdir = &Apache::imsprocessor::create_tempdir('CSTR',$dirname,'');
+ my $fname = &Apache::imsprocessor::uploadzip('CSTR',$tempdir,$zipupload);
+ my $unzip_result = '';
+ my $manifest_result = '';
+ unless ($tempdir eq '') {
+ $unzip_result = &Apache::imsprocessor::expand_zip($tempdir,$fname);
+ }
+ my %resources = ();
+ my %includedres = ();
+ my %includeditems = ();
+ my %items = ();
+ my %hrefs = ();
my %resinfo = ();
- my $numfolders = 0;
- my $numpages = 0;
- my $docroot = $ENV{'form.newdir'};
- if (!-e "$docroot/temp") {
- mkdir "$docroot/temp";
- }
- my $newdir = '';
- if ($docroot =~ m|public_html/(.+)$|) {
- $newdir = $1;
- }
- my $dirname = "/res/$udom/$uname/$newdir";
- my $zipfile = '/home/'.$uname.'/public_html'.$fn;
- if ($fn =~ m|\.zip$|i) {
- open(OUTPUT, "unzip -o $zipfile -d $docroot/temp 2> /dev/null |");
- while () {
- print "$_\n";
-
- foreach my $key (sort keys %href) {
- foreach my $file (@{$href{$key}}) {
- my $filepath = $file;
- if (!-e "$destdir/resfiles/$key") {
- mkdir("$destdir/resfiles/$key",0755);
- }
- while ($filepath =~ m-(\w+)/(.+)-) {
- $filepath = $2;
- if (!-e "$destdir/resfiles/$key/$1") {
- mkdir("$destdir/resfiles/$key/$1",0755);
}
}
- system("cp $docroot/temp/$key/$file $destdir/resfiles/$key/$file");
- }
- }
-
- foreach my $key (sort keys %type) {
- if ($type{$key} eq "resource/x-bb-document") {
- %{$resinfo{$key}} = ();
- &process_content($key,$docroot,$destdir,\%{$resinfo{$key}},$udom,$uname);
- } elsif ($type{$key} eq "resource/x-bb-staffinfo") {
- %{$resinfo{$key}} = ();
- &process_staff($key,$docroot,$destdir,\%{$resinfo{$key}});
- } elsif ($type{$key} eq "resource/x-bb-externallink") {
- %{$resinfo{$key}} = ();
- &process_link($key,$docroot,$destdir,\%{$resinfo{$key}});
- } elsif ($type{$key} eq "resource/x-bb-discussionboard") {
- %{$resinfo{$key}} = ();
- &process_db($key,$docroot,$destdir,\%{$resinfo{$key}});
- } elsif ($type{$key} eq "resource/x-bb-announcement") {
- %{$resinfo{$key}} = ();
- &process_announce($key,$docroot,$destdir,\%{$resinfo{$key}});
- } elsif ($type{$key} eq "assessment/x-bb-pool") {
- %{$resinfo{$key}} = ();
- &process_assessment($key,$docroot,'pool',$dirname,$destdir,\%{$resinfo{$key}});
- } elsif ($type{$key} eq "assessment/x-bb-quiz") {
- %{$resinfo{$key}} = ();
- &process_assessment($key,$docroot,'quiz',$dirname,$destdir,\%{$resinfo{$key}});
- } elsif ($type{$key} eq "assessment/x-bb-survey") {
- %{$resinfo{$key}} = ();
- &process_assessment($key,$docroot,'survey',$dirname,$destdir,\%{$resinfo{$key}});
- } elsif ($type{$key} eq "assessment/x-bb-group") {
- %{$resinfo{$key}} = ();
- &process_group($key,$docroot,$destdir,\%{$resinfo{$key}});
- } elsif ($type{$key} eq "resource/x-bb-user") {
- %{$resinfo{$key}} = ();
- &process_user($key,$docroot,$destdir,\%{$resinfo{$key}});
- }
- }
-
- my $nextnum = 0;
- open(TOPFILE,">$destdir/sequences/ims_import.sequence");
- print TOPFILE "\n";
- my $fileopen = 0;
- my $areakey;
- my $areacount = 0;
- my $lastentry = '';
- my $notlastentry = '';
- my %pagecount = ();
- my %pagecontents = ();
- my %pageflag = ();
- my %seqflag = ();
- my %seqcount = ();
-
- foreach my $key (sort keys %resnum) {
-# print STDERR "$key $filepath{$key} $resnum{$key} $title{$key}\n";
- $pageflag{$key} = 0;
- $seqflag{$key} = 0;
- $seqcount{$key} = 0;
- $pagecount{$key} = -1;
- if ($filepath{$key} eq 'Top') {
- $topnum ++;
- $nextnum = $topnum +1;
- print TOPFILE qq|
-\n|;
- } elsif ($areacount == 1) {
- print AREAFILE qq|\n|;
+ if ($count{board} > 0) {
+ if ($count{users} > 0) {
+ $conditions = 'both';
} else {
- print AREAFILE qq|$lastentry\n|;
+ $conditions = 'board';
}
- print AREAFILE " \n";
- close(AREAFILE);
- $fileopen = 0;
+ } elsif ($count{users} > 0) {
+ $conditions = 'users';
+ } else {
+ $conditions = 'none';
}
- $areakey = $key;
- @{$pagecontents{$areakey}} = ();
- open(AREAFILE,">$destdir/sequences/$key.sequence");
- print AREAFILE "\n";
- $fileopen = 1;
- $areacount = 0;
- } else {
- if ($filepath{$key} eq "Top,$areakey") {
-# print STDERR "$key $filepath{$key} $resnum{$key} $title{$key}\n";
- my $src = '';
- if ($areacount == 0) {
- if ($resinfo{$resnum{$key}}{'isfolder'} eq "true") {
- $src = 'sequences/'.$key.".sequence";
- $pageflag{$areakey} = 0;
- $seqflag{$areakey} = 1;
- } else {
- if ($pageflag{$areakey}) {
- push @{$pagecontents{$areakey}[$pagecount{$areakey}]},$key;
- } else {
- $pagecount{$areakey} ++;
- $src = 'pages/'.$areakey.'_'.$pagecount{$areakey}.'.page';
- @{$pagecontents{$areakey}[$pagecount{$areakey}]} = ("$key");
- $seqflag{$areakey} = 0;
- }
- }
- unless ($pageflag{$areakey}) {
- print AREAFILE qq|
-
+
+
+
+
+
+
+
+
+
+
+ Choose which content types you wish to import
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ENDBLOCKTWO
+ if ($count{board} + $count{users} > 0) {
+ $r->print("
+
+
+ Choose a course to receive bulletin boards and user enrollment.
+
+
+
+
+ ");
+ if ($$numcrs > 0) {
+ $r->print("
+
+ A listing of possible course targets will be displayed if import of bulletin boards and/or enrollment is checked above (step 3). If you do not plan to import either of these content types, there is no need to specify a course.
+
+ Not required
+
+
+");
} else {
- if ($resinfo{$resnum{$contents{$key}[0]}}{'isfolder'} eq "true") {
- $src = 'sequences/'.$contents{$key}[0].".sequence";
- $pageflag{$key} = 0;
- $seqflag{$key} = 1;
- $seqcount{$key} ++;
- } else {
- if ($pageflag{$key}) {
- push @{$pagecontents{$key}[$pagecount{$key}]},$contents{$key}[0];
- } else {
- $pagecount{$key} ++;
- $src = 'pages/'.$key.'_'.$pagecount{$key}.'.page';
- @{$pagecontents{$key}[$pagecount{$key}]} = ("$contents{$key}[0]");
- $seqflag{$key} = 0;
- }
- }
- unless ($pageflag{$key}) {
- print LOCFILE qq|
+
+You do not have active course coordinator status in any LON-CAPA courses currently, so bulletin boards and enrollment information included in your IMS package will be discarded, regardless of your import choice for these two items above (step 3). If you wish to import bulletin boards and/or user information into LON-CAPA please click 'Exit now' to quit the current IMS import process, and contact your domain coordinator and request a course coordinator role in a LON-CAPA course into which you can upload bulletin boards and/or enroll users.
+ ");
}
- print LOCFILE "\n";
- close(LOCFILE);
}
- }
- }
- print TOPFILE "";
- close(TOPFILE);
- foreach my $key (sort keys %pagecontents) {
- for (my $i=0; $i<@{$pagecontents{$key}}; $i++) {
- my $filestem = "/res/$udom/$uname/$newdir";
- my $filename = $destdir.'/pages/'.$key.'_'.$i.'.page';
- open(PAGEFILE,">$filename");
- print PAGEFILE qq|
-
+
+
+
+
+ Once you have checked the checkboxes for all areas you wish to import from the IMS package, and selected additional options (if available) you should click the 'Import package' button.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ENDDOCUMENT
+ } else {
+ $r->print("Unpacking of your IMS package failed because an IMS manifest file was not located in the package\n");
}
+ } else {
+ $r->print("Processing of your IMS package failed because the file you uploaded could not be unzipped\n");
}
- system(" rm -r $docroot/temp");
-}
-
-sub process_user {
- my ($res,$docroot,$destdir,$settings) = @_;
- my $xmlfile = $docroot."/temp/".$res.".dat";
- my $filecount = 0;
- my @state;
- my $userid = '';
- my $linknum = 0;
-
- my $p = HTML::Parser->new
- (
- xml_mode => 1,
- start_h =>
- [sub {
- my ($tagname, $attr) = @_;
- push @state, $tagname;
- if (@state eq " USERS USER") {
- $userid = $attr->{value};
- %{$$$settings{$userid}} = ();
- @{$$settings{$userid}{links}} = ();
- } elsif (@state eq "USERS USER LOGINID") {
- $$settings{$userid}{loginid} = $attr->{value};
- } elsif (@state eq "USERS USER PASSPHRASE") {
- $$settings{$userid}{passphrase} = $attr->{value};
- } elsif ("@state" eq "USERS USER STUDENTID" ) {
- $$settings{$userid}{studentid} = $attr->{value};
- } elsif ("@state" eq "USERS USER NAMES FAMILY" ) {
- $$settings{$userid}{family} = $attr->{value};
- } elsif ("@state" eq "USERS USER NAMES GIVEN" ) {
- $$settings{$userid}{given} = $attr->{value};
- } elsif ("@state" eq "USERS USER ADDRESSES BUSINESS DATA EMAIL") {
- $$settings{$userid}{email} = $attr->{value};
- } elsif ("@state" eq "USERS USER USER_ROLE") {
- $$settings{$userid}{user_role} = $attr->{value};
- } elsif ("@state" eq "USERS USER FLAGS ISAVAILABLE") {
- $$settings{$userid}{isavailable} = $attr->{value};
- } elsif ("@state" eq "USERS USER PERSONALPAGE FILELIST IMAGE") {
- $$settings{$userid}{image} = $attr->{value};
- } elsif ( ($state[-2] eq "LINKLIST") && ($state[-1] eq "LINK") ) {
- %{$$settings{$userid}{links}[$linknum]} = ();
- $$settings{$userid}{links}[$linknum]{url} = $attr->{value};
- $linknum ++;
- }
- }, "tagname, attr"],
- text_h =>
- [sub {
- my ($text) = @_;
- if ("@state" eq "USERS USER PERSONALPAGE TITLE") {
- $$settings{$userid}{title} = $text;
- } elsif ("@state" eq "USERS USER PERSONALPAGE DESCRIPTION") {
- $$settings{$userid}{description} = $text;
- } elsif (($state[-2] eq "LINK") && ($state[-1] eq "TITLE")) {
- $$settings{$userid}{links}[$linknum]{title} = $text;
- } elsif (($state[-3] eq "LINK") && ($state[-2] eq "DESCRIPTION") && ($state[-1] eq "TEXT")) {
- $$settings{$userid}{links}[$linknum]{text} = $text;
- }
- }, "dtext"],
- end_h =>
- [sub {
- my ($tagname) = @_;
- if (@state eq "USERS USER") {
- $linknum = 0;
- }
- pop @state;
- }, "tagname"],
- );
- $p->unbroken_text(1);
- $p->parse_file($xmlfile);
- $p->eof;
}
-sub process_group {
- my ($res,$docroot,$destdir,$settings) = @_;
- my $xmlfile = $docroot."/".$res.".dat";
- my $filecount = 0;
- my @state;
- my $grp;
-
- my $p = HTML::Parser->new
- (
- xml_mode => 1,
- start_h =>
- [sub {
- my ($tagname, $attr) = @_;
- push @state, $tagname;
- if (@state eq "GROUPS GROUP") {
- $grp = $attr->{id};
- }
- if (@state eq "GROUPS GROUP TITLE") {
- $$settings{$grp}{title} = $attr->{value};
- } elsif (@state eq "GROUPS GROUP FLAGS ISAVAILABLE") {
- $$settings{$grp}{isavailable} = $attr->{value};
- } elsif (@state eq "GROUPS GROUP FLAGS HASCHATROOM") {
- $$settings{$grp}{chat} = $attr->{value};
- } elsif ("@state" eq "GROUPS GROUP FLAGS HASDISCUSSIONBOARD") {
- $$settings{$grp}{discussion} = $attr->{value};
- } elsif ("@state" eq "GROUPS GROUP FLAGS HASTRANSFERAREA") {
- $$settings{$grp}{transfer} = $attr->{value};
- } elsif ("@state" eq "GROUPS GROUP FLAGS ISPUBLIC") {
- $$settings{$grp}{public} = $attr->{value};
- }
- }, "tagname, attr"],
- text_h =>
- [sub {
- my ($text) = @_;
- if ("@state" eq "GROUPS DESCRIPTION") {
- $$settings{$grp}{description} = $text;
-# print "Staff text is $text\n";
- }
- }, "dtext"],
- end_h =>
- [sub {
- my ($tagname) = @_;
- pop @state;
- }, "tagname"],
- );
- $p->unbroken_text(1);
- $p->parse_file($xmlfile);
- $p->eof;
-}
-
-sub process_staff {
- my ($res,$docroot,$destdir,$settings) = @_;
- my $xmlfile = $docroot."/temp/".$res.".dat";
- my $filecount = 0;
- my @state;
- %{$$settings{name}} = ();
- %{$$settings{office}} = ();
-
- my $p = HTML::Parser->new
- (
- xml_mode => 1,
- start_h =>
- [sub {
- my ($tagname, $attr) = @_;
- push @state, $tagname;
- if (@state eq "STAFFINFO TITLE") {
- $$settings{title} = $attr->{value};
- } elsif (@state eq "STAFFINFO BIOGRAPHY TEXTCOLOR") {
- $$settings{textcolor} = $attr->{value};
- } elsif (@state eq "STAFFINFO BIOGRAPHY FLAGS ISHTML") {
- $$settings{ishtml} = $attr->{value};
- } elsif ("@state" eq "STAFFINFO FLAGS ISAVAILABLE" ) {
- $$settings{isavailable} = $attr->{value};
- } elsif ("@state" eq "STAFFINFO FLAGS ISFOLDER" ) {
- $$settings{isfolder} = $attr->{value};
- } elsif ("@state" eq "STAFFINFO POSITION" ) {
- $$settings{position} = $attr->{value};
- } elsif ("@state" eq "STAFFINFO HOMEPAGE" ) {
- $$settings{homepage} = $attr->{value};
- } elsif ("@state" eq "STAFFINFO IMAGE") {
- $$settings{image} = $attr->{value};
- }
- }, "tagname, attr"],
- text_h =>
- [sub {
- my ($text) = @_;
- if ("@state" eq "STAFFINFO BIOGRAPHY TEXT") {
- $$settings{text} = $text;
-# print "Staff text is $text\n";
- } elsif ("@state" eq "STAFFINFO CONTACT PHONE") {
- $$settings{phone} = $text;
- } elsif ("@state" eq "STAFFINFO CONTACT EMAIL") {
- $$settings{email} = $text;
- } elsif ("@state" eq "STAFFINFO CONTACT NAME FORMALTITLE") {
- $$settings{name}{formaltitle} = $text;
- } elsif ("@state" eq "STAFFINFO CONTACT NAME FAMILY") {
- $$settings{name}{family} = $text;
- } elsif ("@state" eq "STAFFINFO CONTACT NAME GIVEN") {
- $$settings{name}{given} = $text;
- } elsif ("@state" eq "STAFFINFO CONTACT OFFICE HOURS") {
- $$settings{office}{hours} = $text;
- } elsif ("@state" eq "STAFFINFO CONTACT OFFICE ADDRESS") {
- $$settings{office}{address} = $text;
- }
- }, "dtext"],
- end_h =>
- [sub {
- my ($tagname) = @_;
- pop @state;
- }, "tagname"],
- );
- $p->unbroken_text(1);
- $p->parse_file($xmlfile);
- $p->eof;
-}
-
-sub process_link {
- my ($res,$docroot,$destdir,$settings) = @_;
- my $xmlfile = $docroot."/temp/".$res.".dat";
- my @state = ();
- %{$$settings{name}} = ();
- %{$$settings{office}} = ();
-
- my $p = HTML::Parser->new
- (
- xml_mode => 1,
- start_h =>
- [sub {
- my ($tagname, $attr) = @_;
- push @state, $tagname;
- if (@state eq "EXTERNALLINK TITLE") {
- $$settings{title} = $attr->{value};
- } elsif (@state eq "EXTERNALLINK TEXTCOLOR") {
- $$settings{textcolor} = $attr->{value};
- } elsif (@state eq "EXTERNALLINK DESCRIPTION FLAGS ISHTML") {
- $$settings{ishtml} = $attr->{value};
- } elsif ("@state" eq "EXTERNALLINKS FLAGS ISAVAILABLE" ) {
- $$settings{isavailable} = $attr->{value};
- } elsif ("@state" eq "EXTERNALLINKS FLAGS LAUNCHINNEWWINDOW" ) {
- $$settings{newwindow} = $attr->{value};
- } elsif ("@state" eq "EXTERNALLINKS FLAGS ISFOLDER" ) {
- $$settings{isfolder} = $attr->{value};
- } elsif ("@state" eq "EXTERNALLINKS POSITION" ) {
- $$settings{position} = $attr->{value};
- } elsif ("@state" eq "EXTERNALLINKS URL" ) {
- $$settings{url} = $attr->{value};
- }
- }, "tagname, attr"],
- text_h =>
- [sub {
- my ($text) = @_;
- if ("@state" eq "EXTERNALLINKS DESCRIPTION TEXT") {
- $$settings{text} = $text;
- }
- }, "dtext"],
- end_h =>
- [sub {
- my ($tagname) = @_;
- pop @state;
- }, "tagname"],
+# ---------------------------------------------------------------- Display Three
+sub display_three {
+ my ($r,$uname,$udom,$areas,$areaname,$cmsmap,$destdir,$newdir) = @_;
+ my $crs = '';
+ my $cdom = '';
+ my $db_handling = '';
+ my $timenow = time;
+ my $announce_handling = 'ok';
+ my $cms = $env{'form.source'};
+ if ( defined($env{'form.bb_crs'}) ) {
+ ($cdom,$crs) = split/\//,$env{'form.bb_crs'};
+ }
+ my $user_crs = '';
+ my $user_cdom = '';
+ my $user_handling = '';
+ if ( defined($env{'form.user_crs'}) ) {
+ ($user_cdom,$user_crs) = split/\//,$env{'form.user_crs'};
+ }
+ my $seqstem = "/res/$udom/$uname/$newdir";
+ my %importareas = ();
+ my %includedres = ();
+ my %includeditems = ();
+ my %randompicks = ();
+ my @targets = ();
+ my %resources = ();
+ my %items = ();
+ my %hrefs = ();
+ my %urls = ();
+ my %resinfo = ();
+ my %total = (
+ page => 0,
+ prob => 0,
+ seq => 0,
+ board => 0,
+ quiz => 0,
+ surv => 0,
);
- $p->unbroken_text(1);
- $p->parse_file($xmlfile);
- $p->eof;
-}
-sub process_db {
- my ($res,$docroot,$destdir,$settings) = @_;
- my $xmlfile = $docroot."/temp/".$res.".dat";
- my @state = ();
- my %threads; # all quotes, keyed by message ID
- my $msg_id; # the current message ID
- my %message; # the current message being accumulated for $msg_id
-
- my $p = HTML::Parser->new
- (
- xml_mode => 1,
- start_h =>
- [sub {
- my ($tagname, $attr) = @_;
- push @state, $tagname;
- my $depth = 0;
- my @seq = ();
- if (@state eq "FORUM TITLE") {
- $$settings{title} = $attr->{value};
- } elsif (@state eq "STAFFINFO BIOGRAPHY TEXTCOLOR") {
- $$settings{textcolor} = $attr->{value};
- } elsif (@state eq "FORUM DESCRIPTION FLAGS ISHTML") {
- $$settings{ishtml} = $attr->{value};
- } elsif (@state eq "FORUM DESCRIPTION FLAGS ISNEWLINELITERAL") {
- $$settings{newline} = $attr->{value};
- } elsif ("@state" eq "FORUM POSITION" ) {
- $$settings{position} = $attr->{value};
- } elsif ("@state" eq "FORUM FLAGS ISREADONLY") {
- $$settings{isavailable} = $attr->{value};
- } elsif ("@state" eq "FORUM FLAGS ISAVAILABLE" ) {
- $$settings{isavailable} = $attr->{value};
- } elsif ("@state" eq "FORUM FLAGS ALLOWANONYMOUSPOSTINGS" ) {
- $$settings{isfolder} = $attr->{value};
- } elsif ( ($state[0] eq "FORUM") && ($state[1] eq "MESSAGETHREADS") && ($state[2] eq "MSG") ) {
- if ($state[@state-1] eq "MSG") {
- $depth = @state - 3;
- if ($depth > @seq) {
- unless ($msg_id eq '') {
- push @seq, $msg_id;
- }
- }
- if ($depth < @seq) {
- pop @seq;
- }
- $msg_id = $attr->{value};
- %message = ();
- $message{depth} = $depth;
- if ($depth > 0) {
- $message{parent} = $seq[-1];
- } else {
- $message{parent} = "None";
+ my @pages = ();
+ my @sequences = ();
+ my @resrcfiles = ();
+
+ my $tempdir = $env{'form.tempdir'};
+
+ foreach my $area (@{$areas}) {
+ if (defined($env{"form.$area"}) ) {
+ if ($cms eq 'angel' && $area eq 'doc') {
+ foreach (@{$$cmsmap{$cms}{$area}}) {
+ $importareas{$_} = 1;
}
- } elsif ($state[@state-1] eq "TITLE") {
- $message{title} = $attr->{value};
- } elsif ( ( $state[@state-3] eq "MESSAGETEXT" ) && ( $state[@state-2] eq "FLAGS" ) && ( $state[@state-1] eq "ISHTML" ) ) {
- $message{ishtml} = $attr->{value};
- } elsif ( ( $state[@state-3] eq "MESSAGETEXT" ) && ( $state[@state-2] eq "FLAGS" ) && ( $state[@state-1] eq "ISNEWLINELITERAL" ) ) {
- $message{newline} = $attr->{value};
- } elsif ( ( $state[@state-2] eq "DATES" ) && ( $state[@state-1] eq "CREATED" ) ) {
- $message{created} = $attr->{value};
- } elsif ( $state[@state-2] eq "FLAGS") {
- if ($state[@state-1] eq "ISANONYMOUS") {
- $message{isanonymous} = $attr->{value};
- }
- } elsif ( $state[@state-2] eq "USER" ) {
- if ($state[@state-1] eq "USERID") {
- $message{userid} = $attr->{value};
- } elsif ($state[@state-1] eq "USERNAME") {
- $message{username} = $attr->{value};
- } elsif ($state[@state-1] eq "EMAIL") {
- $message{email} = $attr->{value};
- }
- } elsif ( ($state[@state-2] eq "FILELIST") && ($state[@state-2] eq "IMAGE") ) {
- $message{attachment} = $attr->{value};
+ } else {
+ $importareas{$$cmsmap{$cms}{$area}} = 1;
}
- }
- }, "tagname, attr"],
- text_h =>
- [sub {
- my ($text) = @_;
- if ("@state" eq "FORUM DESCRIPTION TEXT") {
- $$settings{text} = $text;
- } elsif ( ($state[0] eq "FORUM") && ($state[1] eq "MESSAGETHREADS") && ($state[2] eq "MSG") ) {
- if ( ($state[@state-2] eq "MESSAGETEXT") && ($state[@state-1] eq "TEXT") ){
- $message{text} = $text;
- }
- }
- }, "dtext"],
- end_h =>
- [sub {
- my ($tagname) = @_;
- if ( ($state[0] eq "FORUM") && ($state[1] eq "MESSAGETHREADS") && ($state[2] eq "MSG") ) {
- if ($state[@state-1] eq "MSG") {
- push @{$threads{$msg_id}}, { %message };
+ if ($area eq 'board') {
+ $db_handling = $env{'form.db_handling'};
+ } elsif ($area eq 'users') {
+ $user_handling = $env{'form.user_handling'};
}
}
- pop @state;
- }, "tagname"],
- );
- $p->unbroken_text(1);
- $p->parse_file($xmlfile);
- $p->eof;
-}
+ }
-sub process_assessment {
- my ($res,$docroot,$container,$dirname,$destdir,$settings) = @_;
- my $xmlfile = $docroot."/temp/".$res.".dat";
-# print "XML file is $xmlfile\n";
- my @state = ();
- my @allids = ();
- my %allanswers = ();
- my %allchoices = ();
- my $id; # the current question ID
- my $answer_id; # the current answer ID
- my %toptag = ( pool => 'POOL',
- quiz => 'ASSESSMENT',
- survey => 'ASSESSMENT'
- );
-# print "process_assessment is called, incoming: $res,$docroot,$container,$destdir\n";
-
- my $p = HTML::Parser->new
- (
- xml_mode => 1,
- start_h =>
- [sub {
- my ($tagname, $attr) = @_;
- push @state, $tagname;
- my $depth = 0;
- my @seq = ();
- my $class;
- my $state_str = join(" ",@state);
-# print "Current state is $state_str\n";
- if ($container eq "pool") {
- if ("@state" eq "POOL TITLE") {
- $$settings{title} = $attr->{value};
-# print "Title is $attr->{value}\n";
- }
- } else {
- if ("@state" eq "ASSESSMENT TITLE") {
- $$settings{title} = $attr->{value};
- } elsif ("@state" eq "ASSESSMENT FLAG" ) {
- $$settings{isnewline} = $attr->{value};
- } elsif ("@state" eq "ASSESSMENT FLAGS ISAVAILABLE") {
- $$settings{isavailable} = $attr->{value};
- } elsif ("@state" eq "ASSESSMENT FLAGS ISANONYMOUS" ) {
- $$settings{isanonymous} = $attr->{id};
- } elsif ("@state" eq "ASSESSMENT FLAGS GIVE FEEDBACK" ) {
- $$settings{feedback} = $attr->{id};
- } elsif ("@state" eq "ASSESSMENT FLAGS SHOWCORRECT" ) {
- $$settings{showcorrect} = $attr->{id};
- } elsif ("@state" eq "ASSESSMENT FLAGS SHOWRESULTS" ) {
- $$settings{showresults} = $attr->{id};
- } elsif ("@state" eq "ASSESSMENT FLAGS ALLOWMULTIPLE" ) {
- $$settings{allowmultiple} = $attr->{id};
- } elsif ("@state" eq "ASSESSMENT ASSESSMENTTYPE" ) {
- $$settings{type} = $attr->{id};
- }
- }
- if ("@state" eq "$toptag{$container} QUESTIONLIST QUESTION") {
- $id = $attr->{id};
- push @allids, $id;
- %{$$settings{$id}} = ();
- @{$allanswers{$id}} = ();
- $$settings{$id}{class} = $attr->{class};
- unless ($container eq "pool") {
- $$settings{$id}{points} = $attr->{points};
- }
- @{$$settings{$id}{correctanswer}} = ();
- } elsif ( ($state[0] eq $toptag{$container}) && ($state[-1] =~ m/^QUESTION_(\w+)$/) ) {
- $id = $attr->{id};
- } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "BODY") && ($state[3] eq "FLAGS") && ($state[4] eq "ISHTML") ) {
- $$settings{$id}{html} = $attr->{value};
- } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "BODY") && ($state[3] eq "FLAGS") && ($state[4] eq "ISNEWLINELITERAL") ) {
- $$settings{$id}{newline} = $attr->{value};
- } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "IMAGE") ) {
- $$settings{$id}{image} = $attr->{value};
- $$settings{$id}{style} = $attr->{style};
- } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "URL") ) {
- $$settings{$id}{url} = $attr->{value};
- $$settings{$id}{name} = $attr->{name};
- } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[-1] eq "ANSWER") ) {
- $answer_id = $attr->{id};
- push @{$allanswers{$id}},$answer_id;
- %{$$settings{$id}{$answer_id}} = ();
- $$settings{$id}{$answer_id}{position} = $attr->{position};
- if ($$settings{$id}{class} eq 'QUESTION_MATCH') {
- $$settings{$id}{$answer_id}{placement} = $attr->{placement};
- $$settings{$id}{$answer_id}{type} = 'answer';
- }
- } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[-1] eq "CHOICE") ) {
- $answer_id = $attr->{id};
- push @{$allchoices{$id}},$answer_id;
- %{$$settings{$id}{$answer_id}} = ();
- $$settings{$id}{$answer_id}{position} = $attr->{position};
- $$settings{$id}{$answer_id}{placement} = $attr->{placement};
- $$settings{$id}{$answer_id}{type} = 'choice';
- } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "ANSWER") && ($state[3] eq "IMAGE") ) {
- $$settings{$id}{$answer_id}{image} = $attr->{value};
- $$settings{$id}{$answer_id}{style} = $attr->{style};
- } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "ANSWER") && ($state[3] eq "URL") ) {
- $$settings{$id}{$answer_id}{url} = $attr->{value};
- } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "CHOICE") && ($state[3] eq "IMAGE") ) {
- $$settings{$id}{$answer_id}{image} = $attr->{value};
- $$settings{$id}{$answer_id}{style} = $attr->{style};
- } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "CHOICE") && ($state[3] eq "URL") ) {
- $$settings{$id}{$answer_id}{url} = $attr->{value};
- } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "GRADABLE") && ($state[3] eq "CORRECTANSWER") ) {
- my $corr_answer = $attr->{answer_id};
- push @{$$settings{$id}{correctanswer}}, $corr_answer;
-# print "Answer $corr_answer for question $id is correct\n";
- my $type = $1;
- if ($type eq 'TRUEFALSE') {
- $$settings{$id}{$corr_answer}{answer_position} = $attr->{position};
- } elsif ($type eq 'ORDER') {
- $$settings{$id}{$corr_answer}{order} = $attr->{order};
- } elsif ($type eq 'MATCH') {
- $$settings{$id}{$corr_answer}{choice_id} = $attr->{choice_id};
+ my $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,\%resources,\%items,\%hrefs,\%resinfo,'prepare',\%includedres);
+ if ($manifest_result eq 'ok') {
+ foreach my $res (sort keys %resources) {
+ if ($importareas{$resources{$res}{type}}) {
+ $includedres{$res} = 1;
}
}
- }, "tagname, attr"],
- text_h =>
- [sub {
- my ($text) = @_;
- unless ($container eq "pool") {
- if ("@state" eq "ASSESSMENT DESCRIPTION TEXT") {
- $$settings{description} = $text;
- } elsif ("@state" eq "ASSESSMENT INSTRUCTIONS ") {
- $$settings{instructions}{text} = $text;
- }
- }
- if ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "BODY") && ($state[3] eq "TEXT") ) {
- $$settings{$id}{text} = $text;
- } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "ANSWER") && ($state[3] eq "TEXT") ) {
- $$settings{$id}{$answer_id}{text} = $text;
- } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "CHOICE") && ($state[3] eq "TEXT") ) {
- $$settings{$id}{$answer_id}{text} = $text;
- } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "GRADABLE") && ($state[3] eq "FEEDBACK_WHEN_CORRECT") ) {
- $$settings{$id}{feedback_corr} = $text;
- } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "GRADABLE") && ($state[3] eq "FEEDBACK_WHEN_INCORRECT") ) {
- $$settings{$id}{feedback_incorr} = $text;
+ foreach my $itm (sort keys %items) {
+ &Apache::imsprocessor::get_imports(\%includeditems,\%items,\%resources,\%importareas,$itm);
}
- }, "dtext"],
- end_h =>
- [sub {
- my ($tagname) = @_;
- pop @state;
- }, "tagname"],
- );
- $p->unbroken_text(1);
- $p->parse_file($xmlfile);
- $p->eof;
-
- my $dirtitle = $$settings{'title'};
- $dirtitle =~ s/\W//g;
- $dirtitle .= '_'.$res;
- if (!-e "$destdir/problems/$dirtitle") {
- mkdir("$destdir/problems/$dirtitle",0755);
- }
- my $newdir = "$destdir/problems/$dirtitle";
- foreach my $id (@allids) {
-# print "Current ID is $id, type is $$settings{$id}{class} \n";
- if ($$settings{$id}{class} eq "QUESTION_ESSAY") {
- my $output;
- if ($container eq 'pool') {
- $output = qq|
-
-
-
-
- $$settings{$id}{feedbackcorr}
-
-|;
- if ($container eq 'pool') {
- $output .= qq|
- |;
- open(PROB,">$newdir/$id.problem");
- print PROB $output;
- close PROB;
- } else {
- $output .= qq|
- |;
- open(PROB,">$newdir/$id.problem");
- print PROB $output;
- close PROB;
- }
- } else {
- my $output;
- if ($container eq 'pool') {
- $output = qq|
-|;
- } else {
- $output = qq|
-|;
}
- $output .= qq|Link to file IMS import completed ");
+
+ if ($cms eq 'bb5') {
+ $r->print("Your IMS package has been processed successfully. A total of $total{seq} sequences, $total{page} pages, $total{board} bulletin boards, $total{quiz} quizzes, $total{surv} surveys and $total{prob} problems have been created.Your IMS package has been processed successfully. A total of $total{seq} sequences, $total{page} pages, and $total{board} bulletin boards have been created.Display new directory ");
+ if ($destdir =~ m-^/home/$uname/public_html/-) {
+ system (" rm -r -f $destdir/temp");
+ }
+ } elsif ($manifest_result eq 'nomanifest') {
+ $r->print("Processing of your IMS package failed, because the IMS content package did not contain an IMS manifest file. ");
}
- if ( defined($$settings{$id}{url}) ) {
- $output .= qq|$$settings{$id}{name}
-
- |;
- for (my $k=0; $k<@{$allanswers{$id}}; $k++) {
- $output .= "
-
- |;
- } elsif ($$settings{$id}{class} eq 'QUESTION_TRUEFALSE') {
- my $numfoils = @{$allanswers{$id}};
-# print "Number of foils is $numfoils\n";
- $output .= qq|
-
-
- |;
- for (my $k=0; $k<@{$allanswers{$id}}; $k++) {
- $output .= "
-
- |;
- } elsif ($$settings{$id}{class} eq 'QUESTION_MULTIPLEANSWER') {
- my $numfoils = @{$allanswers{$id}};
-# print "Number of foils is $numfoils\n";
- $output .= qq|
-
-
- |;
- for (my $k=0; $k<@{$allanswers{$id}}; $k++) {
- $output .= " 0) {
+ if (time < $role_start) {
+ $active_chk = 0;
+ }
}
- $output .= "\> \n";
- }
- chomp($output);
- $output .= qq|
-
-
- |;
- } elsif ($$settings{$id}{class} eq 'QUESTION_ORDER') {
- my $numfoils = @{$allanswers{$id}};
- $output .= qq|
-
-
- |;
- for (my $k=0; $k<@{$allanswers{$id}}; $k++) {
- $output .= "
-
- |;
- } elsif ($$settings{$id}{class} eq 'QUESTION_FILLINBLANK') {
- my $numerical = 1;
- for (my $k=0; $k<@{$allanswers{$id}}; $k++) {
- unless ($$settings{$id}{$allanswers{$id}[$k]}{text} =~ m/^\d+\.?\d*$/) {
- $numerical = 0;
+ if ($role_end > 0) {
+ if (time > $role_end) {
+ $active_chk = 0;
+ }
}
- }
- if ($numerical) {
- my $numans;
- my $tol;
- if (@{$allanswers{$id}} == 1) {
- $tol = 5;
- $numans = $$settings{$id}{$allanswers{$id}[0]}{text};
- } else {
- my $min = $$settings{$id}{$allanswers{$id}[0]}{text};
- my $max = $$settings{$id}{$allanswers{$id}[0]}{text};
- for (my $k=1; $k<@{$allanswers{$id}}; $k++) {
- if ($$settings{$id}{$allanswers{$id}[$k]}{text} <= $min) {
- $min = $$settings{$id}{$allanswers{$id}[$k]}{text};
- }
- if ($$settings{$id}{$allanswers{$id}[$k]}{text} >= $max) {
- $max = $$settings{$id}{$allanswers{$id}[$k]}{text};
+ if ($active_chk) {
+ my $currcode = '';
+ my %settings = &Apache::lonnet::get('environment',['internal.coursecode','description'],$cdom,$crs);
+ if (defined($settings{'description'}) ) {
+ $descrip{$crs} = $settings{'description'};
+ } else {
+ $descrip{$crs} = 'Unknown';
+ }
+ if (defined($settings{'internal.coursecode'}) ) {
+ $currcode = $settings{'internal.coursecode'};
+ if ($currcode eq '') {
+ $currcode = "____".$iter;
+ $iter ++;
}
+ } else {
+ $currcode = "____".$iter;
+ $iter ++;
}
- $numans = ($max + $min)/2;
- $tol = 100*($max - $min)/($numans*2);
- }
- $output .= qq|
-
-
- |;
- } 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};
+ unless (grep/^$currcode$/,@codes) {
+ push @codes,$currcode;
+ @{$courses{$currcode}} = ();
}
- my $regexpans = join('|',@answertext);
- $regexpans = '/^('.$regexpans.')\b/';
- $output .= qq|
-
-
-
-
- |;
+ push @{$courses{$currcode}}, $cdom.'/'.$crs;
}
}
- } elsif ($$settings{$id}{class} eq "QUESTION_MATCH") {
- $output .= qq|
-
-
-
-|;
- for (my $k=0; $k<@{$allchoices{$id}}; $k++) {
- $output .= qq|
--
-
- |;
- }
- $output .= qq|
-
-|;
- for (my $k=0; $k<@{$allanswers{$id}}; $k++) {
- $output .= qq|
-
-
- |;
- }
- $output .= qq|
-
-
- |;
- }
- if ($container eq 'pool') {
- $output .= qq|
- |;
- open(PROB,">$newdir/$id.problem");
- print PROB $output;
- close PROB;
- } else {
- $output .= qq|
- |;
- open(PROB,">$newdir/$id.problem");
- print PROB $output;
- close PROB;
}
-
- }
- }
-}
-
-
-sub create_ess {
- my ($newdir,$qnid,$qsettings,$container) = @_;
- my $output;
- if ($container eq 'pool') {
- $output = qq|
-
-
-
-
- $$qsettings{feedbackcorr}
-
-|;
- if ($container eq 'pool') {
- $output .= qq|
- |;
- open(PROB,">$newdir/$qnid.problem");
- print PROB $output;
- close PROB;
- } else {
- $output .= qq|
- |;
- open(PROB,">$newdir/$qnid.problem");
- print PROB $output;
- close PROB;
+ foreach my $code (sort @codes) {
+ foreach my $crsdom (@{$courses{$code}}) {
+ my ($cdom,$crs) = split/\//,$crsdom;
+ my $showcode = '';
+ unless ($code =~m/^____\d+$/) { $showcode = $code; }
+ $$crsentry{$crsdom} = $showcode.':'.$descrip{$crs};
+ push @{$crslist}, $crsdom;
+ }
}
return;
}
-sub process_announce {
- my ($res,$docroot,$destdir,$settings) = @_;
- my $xmlfile = $docroot."/temp/".$res.".dat";
- my @state = ();
- my $id;
- my $p = HTML::Parser->new
- (
- xml_mode => 1,
- start_h =>
- [sub {
- my ($tagname, $attr) = @_;
- push @state, $tagname;
- if ("@state" eq "ANNOUNCEMENT TITLE") {
- $$settings{title} = $attr->{value};
- $$settings{startassessment} = ();
-# print "Title is $$settings{title}\n";
- } elsif (@state eq "ANNOUNCEMENT DESCRIPTION FLAGS ISHTML") {
- $$settings{ishtml} = $attr->{value};
- } elsif ("@state" eq "ANNOUNCEMENT DESCRIPTION FLAGS ISNEWLINELITERAL" ) {
- $$settings{isnewline} = $attr->{value};
- } elsif ("@state" eq "CONTENT ISPERMANENT" ) {
- $$settings{ispermanent} = $attr->{value};
- } elsif ("@state" eq "ANNOUNCEMENT FILES STARTASSESSMENT" ) {
- $id = $attr->{id};
- $$settings{startassessment}{$id} = ();
- } elsif ("@state" eq "ANNOUNCEMENT FILES STARTASSESSMENT ATTRIB" ) {
- my $key = $attr->{key};
- $$settings{startassessment}{$id}{$key} = $attr->{value};
- }
- }, "tagname, attr"],
- text_h =>
- [sub {
- my ($text) = @_;
- if ("@state" eq "ANNOUNCEMENT DESCRIPTION TEXT") {
- $$settings{maindata}{text} = $text;
-# print "TEXT $text\n";
- }
- }, "dtext"],
- end_h =>
- [sub {
- my ($tagname) = @_;
- pop @state;
- }, "tagname"],
- );
- $p->unbroken_text(1);
- $p->parse_file($xmlfile);
- $p->eof;
-}
-
-sub process_content {
- my ($res,$docroot,$destdir,$settings,$dom,$user) = @_;
- my $xmlfile = $docroot."/temp/".$res.".dat";
- my $destresdir = $destdir;
- $destresdir =~ s|/home/$user/public_html/|/res/$dom/$user/|;
- my $filecount = 0;
- my @state;
- @{$$settings{files}} = ();
- my $p = HTML::Parser->new
- (
- xml_mode => 1,
- start_h =>
- [sub {
- my ($tagname, $attr) = @_;
- push @state, $tagname;
- if (@state eq "CONTENT MAINDATA") {
- %{$$settings{maindata}} = ();
- } elsif (@state eq "CONTENT MAINDATA TEXTCOLOR") {
- $$settings{maindata}{color} = $attr->{value};
- } elsif (@state eq "CONTENT MAINDATA FLAGS ISHTML") {
- $$settings{maindata}{ishtml} = $attr->{value};
- } elsif (@state eq "CONTENT MAINDATA FLAGS ISNEWLINELITERAL") {
- $$settings{maindata}{isnewline} = $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") {
-# @{$$settings{files}} = ();
- } elsif ("@state" eq "CONTENT FILES FILEREF") {
- %{$$settings{files}[$filecount]} = ();
- %{$$settings{files}[$filecount]{registry}} = ();
- } elsif ("@state" eq "CONTENT FILES FILEREF RELFILE" ) {
- $$settings{files}[$filecount]{'relfile'} = $attr->{value};
- } elsif ("@state" eq "CONTENT FILES FILEREF MIMETYPE") {
- $$settings{files}[$filecount]{mimetype} = $attr->{value};
- } elsif ("@state" eq "CONTENT FILES FILEREF CONTENTTYPE") {
- $$settings{files}[$filecount]{contenttype} = $attr->{value};
- } elsif ("@state" eq "CONTENT FILES FILEREF FILEACTION") {
- $$settings{files}[$filecount]{fileaction} = $attr->{value};
- } elsif ("@state" eq "CONTENT FILES FILEREF PACKAGEPARENT") {
- $$settings{files}[$filecount]{packageparent} = $attr->{value};
- } elsif ("@state" eq "CONTENT FILES FILEREF LINKNAME") {
- $$settings{files}[$filecount]{linkname} = $attr->{value};
- } elsif ("@state" eq "CONTENT FILES FILEREF REGISTRY REGISTRYENTRY") {
- my $key = $attr->{key};
- $$settings{files}[$filecount]{registry}{$key} = $attr->{value};
- }
- }, "tagname, attr"],
- text_h =>
- [sub {
- my ($text) = @_;
- if ("@state" eq "CONTENT TITLE") {
- $$settings{title} = $text;
- } elsif ("@state" eq "CONTENT MAINDATA TEXT") {
- $$settings{maindata}{text} = $text;
- } elsif ("@state" eq "CONTENT FILES FILEREF REFTEXT") {
- $$settings{files}[$filecount]{reftext} = $text;
- }
- }, "dtext"],
- end_h =>
- [sub {
- my ($tagname) = @_;
- if ("@state" eq "CONTENT FILES FILEREF") {
- $filecount ++;
- }
- pop @state;
- }, "tagname"],
- );
- $p->unbroken_text(1);
- $p->parse_file($xmlfile);
- $p->eof;
- my $linktag = '';
- my $fontcol = '';
- if (@{$$settings{files}} > 0) {
- for (my $filecount=0; $filecount<@{$$settings{files}}; $filecount++) {
- if ($$settings{files}[$filecount]{'fileaction'} eq 'embed') {
- if ( $$settings{files}[$filecount]{reftext} =~ m#<\!\-\-\s_(\d+)\\_\s\-\-\>#) {
- my $newtag = qq|$$settings{files}[$filecount]{linkname} |;
- } elsif ($$settings{files}[$filecount]{fileaction} eq 'package') {
-# print "Found a package\n";
- }
- }
- }
- if (defined($$settings{maindata}{textcolor})) {
- $fontcol = qq||;
- }
- if (defined($$settings{maindata}{text})) {
- if ($$settings{maindata}{ishtml} eq "false") {
- if ($$settings{maindata}{isnewline} eq "true") {
- $$settings{maindata}{text} =~ s#\n#$$settings{title}
-
-
-$fontcol
- |;
- unless ($$settings{title} eq '') {
- print FILE qq|$$settings{title} |;
- }
- print FILE qq|
-
- |;
- close(FILE);
-}
-
-
-
# ---------------------------------------------------------------- Main Handler
sub handler {
my $r=shift;
@@ -1659,84 +809,97 @@ sub handler {
my $current_page = '';
my $loadentries = '';
my $qcount = '';
+
+# get personal information for this user
+ my $user=$env{'user.name'};
+ my $dom=$env{'user.domain'};
+
#
-# phase two: re-attach user
+# re-attach user
#
- if ($ENV{'form.uploaduname'}) {
- $ENV{'form.filename'}='/priv/'.$ENV{'form.uploaduname'}.'/'.
- $ENV{'form.filename'};
+ if ($env{'form.uploaduname'}) {
+ $env{'form.filename'}='/priv/'.$env{'form.uploaduname'}.'/'.
+ $env{'form.filename'};
}
($uname,$udom)=
- &Apache::loncacc::constructaccess($ENV{'form.filename'},
+ &Apache::loncacc::constructaccess($env{'form.filename'},
$r->dir_config('lonDefDomain'));
unless (($uname) && ($udom)) {
$r->log_reason($uname.' at '.$udom.
- ' trying to publish file '.$ENV{'form.filename'}.
+ ' trying to publish file '.$env{'form.filename'}.
' - not authorized',
$r->filename);
return HTTP_NOT_ACCEPTABLE;
}
my $fn;
- if ($ENV{'form.filename'}) {
- $fn=$ENV{'form.filename'};
+ if ($env{'form.filename'}) {
+ $fn=$env{'form.filename'};
$fn=~s/^http\:\/\/[^\/]+\///;
$fn=~s/^\///;
$fn=~s/(\~|priv\/)(\w+)//;
$fn=~s/\/+/\//g;
} else {
- $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+ $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
' unspecified filename for upload', $r->filename);
return HTTP_NOT_FOUND;
}
+ my $zipupload = '/home/'.$uname.'/public_html'.$fn;
my $pathname = &File::Basename::dirname($fn);
my $fullpath = '/priv/'.$uname.$pathname;
unless ($pathname eq '/') {
$fullpath .= '/';
}
my $loadentries = '';
+
+ my @areas = ();
+ my %cmsmap = ();
+ my %areaname = ();
+ my $numcrs = 0;
+
+ &Apache::imsprocessor::ims_config(\@areas,\%cmsmap,\%areaname);
# ----------------------------------------------------------- Start page output
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
-
- if ($ENV{'form.phase'} eq 'three') {
- $current_page = &display_control();
- my @PAGES = ('ChooseDir','Blackboard5','ANGEL','WebCT');
- $page_name = $PAGES[$current_page];
-
- if ($page_name eq 'ChooseDir') {
- &jscript_zero($fullpath,\$javascript);
- } elsif ($page_name eq 'Confirmation') {
- &jscript_two(\$javascript,$uname);
- }
- } elsif ($ENV{'form.phase'} eq 'two') {
- &jscript_zero($fullpath,\$javascript);
- }
- $r->print("LON-CAPA Construction Space \n");
-
- $r->print(&Apache::loncommon::bodytag('Upload IMS package to Construction Space',undef,$loadentries));
-
- if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
+
+ if ($env{'form.phase'} eq 'two') {
+ &jscript_one($fullpath,\$javascript,$uname,$udom);
+ } elsif ($env{'form.phase'} eq 'three') {
+ &jscript_two(\$javascript,$user,$dom,\$numcrs);
+ } elsif ($env{'form.phase'} eq 'four') {
+ &jscript_three(\$javascript);
+ }
+ $javascript = "\n";
+
+ my $title = 'Upload IMS package to Construction Space';
+ $r->print(&Apache::loncommon::start_page($title, $javascript,
+ {'add_entries' =>
+ $loadentries,}));
+
+ if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
$r->print(''.&mt('Co-Author').': '.$uname.
&mt(' at ').$udom.' ![[Author Header]](/adm/lonInterFace/author.jpg)
\\n")
+ newWindow.document.write('$start_page')
+ newWindow.document.write("\\n