version 1.47, 2009/07/15 08:26:55
|
version 1.48, 2009/08/17 03:52:09
|
Line 62 sub ims_config {
|
Line 62 sub ims_config {
|
users => 'course/x-bb-user', |
users => 'course/x-bb-user', |
); |
); |
$$cmsmap{bb6}{conference} = 'resource/x-bb-conference'; |
$$cmsmap{bb6}{conference} = 'resource/x-bb-conference'; |
%{$$cmsmap{angel}} = ( |
%{$$cmsmap{angel5}} = ( |
board => 'BOARD', |
board => 'BOARD', |
extlink => 'LINK', |
extlink => 'LINK', |
msg => 'MESSAGE', |
msg => 'MESSAGE', |
quiz => 'QUIZ', |
quiz => 'QUIZ', |
survey => 'FORM', |
survey => 'FORM', |
); |
); |
@{$$cmsmap{angel}{doc}} = ('FILE','PAGE'); |
@{$$cmsmap{angel5}{doc}} = ('FILE','PAGE'); |
%{$$cmsmap{webctce4}} = ( |
%{$$cmsmap{webctce4}} = ( |
quiz => 'webctquiz', |
quiz => 'webctquiz', |
survey => 'webctsurvey', |
survey => 'webctsurvey', |
Line 170 sub process_manifest {
|
Line 170 sub process_manifest {
|
my %toc = ( |
my %toc = ( |
bb6 => 'organization', |
bb6 => 'organization', |
bb5 => 'tableofcontents', |
bb5 => 'tableofcontents', |
angel => 'organization', |
angel5 => 'organization', |
webctce4 => 'organization', |
webctce4 => 'organization', |
webctvista4 => 'organization' |
webctvista4 => 'organization' |
); |
); |
Line 183 sub process_manifest {
|
Line 183 sub process_manifest {
|
revitm => 'Top' |
revitm => 'Top' |
); |
); |
|
|
if ($cms eq 'angel') { |
if ($cms eq 'angel5') { |
$$resources{'toplevel'}{type} = "FOLDER"; |
$$resources{'toplevel'}{type} = "FOLDER"; |
} elsif ($cms eq 'bb5' || $cms eq 'bb6') { |
} elsif ($cms eq 'bb5' || $cms eq 'bb6') { |
$$resources{'toplevel'}{type} = 'resource/x-bb-document'; |
$$resources{'toplevel'}{type} = 'resource/x-bb-document'; |
Line 230 sub parse_manifest {
|
Line 230 sub parse_manifest {
|
if ($cms eq 'bb5') { |
if ($cms eq 'bb5') { |
$$items{$itm}{title} = $attr->{title}; |
$$items{$itm}{title} = $attr->{title}; |
} |
} |
} elsif ($cms eq 'angel') { |
} elsif ($cms eq 'angel5') { |
if ($attr->{identifierref} =~ m/^res(.+)$/) { |
if ($attr->{identifierref} =~ m/^res(.+)$/) { |
$$items{$itm}{resnum} = $1; |
$$items{$itm}{resnum} = $1; |
} |
} |
Line 298 sub parse_manifest {
|
Line 298 sub parse_manifest {
|
} elsif ($cms eq 'webctvista4') { |
} elsif ($cms eq 'webctvista4') { |
$$resources{$identifier}{type} = $attr->{type}; |
$$resources{$identifier}{type} = $attr->{type}; |
$$resources{$identifier}{'webct:coType'} = $attr->{'webct:coType'}; |
$$resources{$identifier}{'webct:coType'} = $attr->{'webct:coType'}; |
} elsif ($cms eq 'angel') { |
} elsif ($cms eq 'angel5') { |
$identifier = substr($identifier,3); |
$identifier = substr($identifier,3); |
if ($attr->{href} =~ m-^_assoc/$identifier/(.+)$-) { |
if ($attr->{href} =~ m-^_assoc/$identifier/(.+)$-) { |
$$resources{$identifier}{file} = $1; |
$$resources{$identifier}{file} = $1; |
Line 327 sub parse_manifest {
|
Line 327 sub parse_manifest {
|
$items,$resources,$resinfo, |
$items,$resources,$resinfo, |
$hrefs,$currseqref); |
$hrefs,$currseqref); |
} |
} |
} elsif ($cms eq 'angel') { |
} elsif ($cms eq 'angel5') { |
if ($attr->{href} =~ m/^_assoc\\$identifier\\(.+)$/) { |
if ($attr->{href} =~ m/^_assoc\\$identifier\\(.+)$/) { |
push @{$$hrefs{$identifier}},$1; |
push @{$$hrefs{$identifier}},$1; |
} elsif ($attr->{href} =~ m/^Icons\\icon(\w+)\.gif/) { |
} elsif ($attr->{href} =~ m/^Icons\\icon(\w+)\.gif/) { |
Line 351 sub parse_manifest {
|
Line 351 sub parse_manifest {
|
} |
} |
if ($state[0] eq "manifest" && $state[1] eq "organizations" && $state[2] eq $$toc{$cms} && $state[-1] eq "title") { |
if ($state[0] eq "manifest" && $state[1] eq "organizations" && $state[2] eq $$toc{$cms} && $state[-1] eq "title") { |
if ($$includeditems{$itm} || $phase ne 'build') { |
if ($$includeditems{$itm} || $phase ne 'build') { |
if ($cms eq 'angel' || $cms eq 'bb6' || $cms eq 'webctvista4') { |
if ($cms eq 'angel5' || $cms eq 'bb6' || $cms eq 'webctvista4') { |
$$items{$itm}{title} = $text; |
$$items{$itm}{title} = $text; |
} |
} |
if ($cms eq 'webctce4') { |
if ($cms eq 'webctce4') { |
Line 426 sub copy_resources {
|
Line 426 sub copy_resources {
|
} |
} |
my $filename = ''; |
my $filename = ''; |
my $fpath = $timenow.'/resfiles/'.$key.'/'; |
my $fpath = $timenow.'/resfiles/'.$key.'/'; |
if ($cms eq 'angel') { |
if ($cms eq 'angel5') { |
if ($file eq 'pg'.$key.'.htm') { |
if ($file eq 'pg'.$key.'.htm') { |
next; |
next; |
} |
} |
Line 456 sub copy_resources {
|
Line 456 sub copy_resources {
|
if (grep/^$key$/,@{$targets}) { |
if (grep/^$key$/,@{$targets}) { |
foreach my $file (@{$$hrefs{$key}}) { |
foreach my $file (@{$$hrefs{$key}}) { |
$file =~ s-\\-/-g; |
$file =~ s-\\-/-g; |
if ( ($cms eq 'angel' && $file ne 'pg'.$key.'.htm') || ($cms eq 'bb5') || ($cms eq 'bb6')) { |
if ( ($cms eq 'angel5' && $file ne 'pg'.$key.'.htm') || ($cms eq 'bb5') || ($cms eq 'bb6')) { |
if (!-e "$destdir/resfiles/$key") { |
if (!-e "$destdir/resfiles/$key") { |
mkdir("$destdir/resfiles/$key",0770); |
mkdir("$destdir/resfiles/$key",0770); |
} |
} |
Line 472 sub copy_resources {
|
Line 472 sub copy_resources {
|
} |
} |
} |
} |
my $renameres; |
my $renameres; |
if ($cms eq 'angel') { |
if ($cms eq 'angel5') { |
$renameres = rename("$tempdir/_assoc/$key/$file","$destdir/resfiles/$key/$file"); |
$renameres = rename("$tempdir/_assoc/$key/$file","$destdir/resfiles/$key/$file"); |
} elsif ($cms eq 'bb5' || $cms eq 'bb6') { |
} elsif ($cms eq 'bb5' || $cms eq 'bb6') { |
$renameres = rename("$tempdir/$key/$file","$destdir/resfiles/$key/$file"); |
$renameres = rename("$tempdir/$key/$file","$destdir/resfiles/$key/$file"); |
Line 537 sub process_resinfo {
|
Line 537 sub process_resinfo {
|
mkdir("$destdir/resfiles",0770); |
mkdir("$destdir/resfiles",0770); |
} |
} |
} |
} |
if ($cms eq 'angel') { |
if ($cms eq 'angel5') { |
my $currboard = ''; |
my $currboard = ''; |
foreach my $key (sort keys %{$resources}) { |
foreach my $key (sort keys %{$resources}) { |
if (grep/^$key$/,@{$targets}) { |
if (grep/^$key$/,@{$targets}) { |
Line 764 sub build_structure {
|
Line 764 sub build_structure {
|
$seqtitle =~ s|/+|_|g; |
$seqtitle =~ s|/+|_|g; |
$seqtitle =~ s/\s+/_/g; |
$seqtitle =~ s/\s+/_/g; |
$seqtitle .= '_'.$key; |
$seqtitle .= '_'.$key; |
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)) { |
if (($cms eq 'angel5' && $type eq "FOLDER") || (($cms eq 'bb5' || $cms eq 'bb6') && $$resinfo{$resnum}{'isfolder'} eq "true") && (($type eq "resource/x-bb-document") || ($type eq "resource/x-bb-staffinfo") || ($type eq "resource/x-bb-externallink")) || ($cms eq 'webctce4' && $contentscount > 0)) { |
unless (($cms eq 'bb5') && $key eq 'Top') { |
unless (($cms eq 'bb5') && $key eq 'Top') { |
$seqtext{$key} = "<map>\n"; |
$seqtext{$key} = "<map>\n"; |
} |
} |
Line 1007 sub build_structure {
|
Line 1007 sub build_structure {
|
sub make_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,$title) = @_; |
my ($cms,$key,$srcstem,$flag,$count,$timestamp,$boardnum,$hrefs,$pagecontents,$res,$type,$file,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount,$randompick,$title) = @_; |
my $src =''; |
my $src =''; |
if (($cms eq 'angel' && $type eq 'FOLDER') || (($cms eq 'bb5' || $cms eq 'bb6') && (($$resinfo{$res}{'isfolder'} eq 'true') || $key eq 'Top')) || ($cms eq 'webctce4' && $contitemcount > 0)) { |
if (($cms eq 'angel5' && $type eq 'FOLDER') || (($cms eq 'bb5' || $cms eq 'bb6') && (($$resinfo{$res}{'isfolder'} eq 'true') || $key eq 'Top')) || ($cms eq 'webctce4' && $contitemcount > 0)) { |
$src = $srcstem.'/sequences/'.$contitem.'.sequence'; |
$src = $srcstem.'/sequences/'.$contitem.'.sequence'; |
if ($cms eq 'webctce4') { |
if ($cms eq 'webctce4') { |
$title =~ s|/+|_|g; |
$title =~ s|/+|_|g; |
Line 1023 sub make_structure {
|
Line 1023 sub make_structure {
|
$$flag{$key}{page} = 0; |
$$flag{$key}{page} = 0; |
$$flag{$key}{seq} = 1; |
$$flag{$key}{seq} = 1; |
$$count{$key}{seq} ++; |
$$count{$key}{seq} ++; |
} elsif ($cms eq 'angel' && $type eq 'BOARD') { |
} elsif ($cms eq 'angel5' && $type eq 'BOARD') { |
$src = '/adm/'.$cdom.'/'.$uname.'/'.$$timestamp[$$boardnum{$res}].'/bulletinboard'; |
$src = '/adm/'.$cdom.'/'.$uname.'/'.$$timestamp[$$boardnum{$res}].'/bulletinboard'; |
$$flag{$key}{page} = 0; |
$$flag{$key}{page} = 0; |
$$flag{$key}{board} = 1; |
$$flag{$key}{board} = 1; |
$$count{$key}{board} ++; |
$$count{$key}{board} ++; |
} elsif ($cms eq 'angel' && $type eq "FILE") { |
} elsif ($cms eq 'angel5' && $type eq "FILE") { |
foreach my $file (@{$$hrefs{$res}}) { |
foreach my $file (@{$$hrefs{$res}}) { |
unless ($file eq 'pg'.$res.'.htm') { |
unless ($file eq 'pg'.$res.'.htm') { |
$src = $srcstem.'/resfiles/'.$res.'/'.$file; |
$src = $srcstem.'/resfiles/'.$res.'/'.$file; |
Line 1036 sub make_structure {
|
Line 1036 sub make_structure {
|
} |
} |
$$flag{$key}{page} = 0; |
$$flag{$key}{page} = 0; |
$$flag{$key}{file} = 1; |
$$flag{$key}{file} = 1; |
} elsif ($cms eq 'angel' && (($type eq "PAGE") || ($type eq "LINK")) ) { |
} elsif ($cms eq 'angel5' && (($type eq "PAGE") || ($type eq "LINK")) ) { |
if ($$flag{$key}{page}) { |
if ($$flag{$key}{page}) { |
if ($$count{$key}{page} == -1) { |
if ($$count{$key}{page} == -1) { |
&Apache::lonnet::logthis("IMS Angel import error in array index for page: value = -1, resource is $key, type is $type."); |
&Apache::lonnet::logthis("IMS Angel import error in array index for page: value = -1, resource is $key, type is $type."); |