version 1.217, 2007/01/19 06:10:09
|
version 1.222, 2007/03/02 23:20:17
|
Line 183 sub metaeval {
|
Line 183 sub metaeval {
|
if ($token->[0] eq 'S') { |
if ($token->[0] eq 'S') { |
my $entry=$token->[1]; |
my $entry=$token->[1]; |
my $unikey=$entry; |
my $unikey=$entry; |
|
next if ($entry =~ m/^(?:parameter|stores)_/); |
if (defined($token->[2]->{'package'})) { |
if (defined($token->[2]->{'package'})) { |
$unikey.='_package_'.$token->[2]->{'package'}; |
$unikey.="\0package\0".$token->[2]->{'package'}; |
} |
} |
if (defined($token->[2]->{'part'})) { |
if (defined($token->[2]->{'part'})) { |
$unikey.='_'.$token->[2]->{'part'}; |
$unikey.="\0".$token->[2]->{'part'}; |
} |
} |
if (defined($token->[2]->{'id'})) { |
if (defined($token->[2]->{'id'})) { |
$unikey.='_'.$token->[2]->{'id'}; |
$unikey.="\0".$token->[2]->{'id'}; |
} |
} |
if (defined($token->[2]->{'name'})) { |
if (defined($token->[2]->{'name'})) { |
$unikey.='_'.$token->[2]->{'name'}; |
$unikey.="\0".$token->[2]->{'name'}; |
} |
} |
foreach (@{$token->[3]}) { |
foreach (@{$token->[3]}) { |
$metadatafields{$unikey.'.'.$_}=$token->[2]->{$_}; |
$metadatafields{$unikey.'.'.$_}=$token->[2]->{$_}; |
Line 408 sub urlfixup {
|
Line 409 sub urlfixup {
|
if ($url =~ /^mailto:/i) { return $url; } |
if ($url =~ /^mailto:/i) { return $url; } |
#internal document links need no fixing |
#internal document links need no fixing |
if ($url =~ /^\#/) { return $url; } |
if ($url =~ /^\#/) { return $url; } |
my ($host)=($url=~/(?:http\:\/\/)*([^\/]+)/); |
my ($host)=($url=~/(?:(?:http|https|ftp)\:\/\/)*([^\/]+)/); |
foreach (values %Apache::lonnet::hostname) { |
my %all_hostnames = &Apache::lonnet::all_hostnames(); |
if ($_ eq $host) { |
foreach my $hostname (values(%all_hostnames)) { |
$url=~s/^http\:\/\///; |
if ($hostname eq $host) { |
$url=~s/^$host//; |
$url=~s/^(?:http|https|ftp)\:\/\///; |
|
$url=~s/^\Q$host\E//; |
} |
} |
} |
} |
if ($url=~/^http\:\/\//) { return $url; } |
if ($url=~/^(?:http|https|ftp)\:\/\//) { return $url; } |
$url=~s/\~$cuname/res\/$cudom\/$cuname/; |
$url=~s{\Q~$cuname\E}{res/$cudom/$cuname}; |
return $url; |
return $url; |
} |
} |
|
|
Line 467 sub set_allow {
|
Line 469 sub set_allow {
|
} |
} |
if (($newurl !~ /^javascript:/i) && |
if (($newurl !~ /^javascript:/i) && |
($newurl !~ /^mailto:/i) && |
($newurl !~ /^mailto:/i) && |
($newurl !~ /^http:/i) && |
($newurl !~ /^(?:http|https|ftp):/i) && |
($newurl !~ /^\#/)) { |
($newurl !~ /^\#/)) { |
$$allow{&absoluteurl($newurl,$target)}=1; |
$$allow{&absoluteurl($newurl,$target)}=1; |
} |
} |
return $return_url |
return $return_url; |
} |
} |
|
|
######################################### |
######################################### |
Line 714 sub fix_ids_and_indices {
|
Line 716 sub fix_ids_and_indices {
|
($lctag eq 'image')) { |
($lctag eq 'image')) { |
my $next_token=$parser[-1]->get_token(); |
my $next_token=$parser[-1]->get_token(); |
if ($next_token->[0] eq 'T') { |
if ($next_token->[0] eq 'T') { |
|
$next_token->[1] =~ s/[\n\r\f]+//g; |
$next_token->[1]=&set_allow(\%allow,$logfile, |
$next_token->[1]=&set_allow(\%allow,$logfile, |
$target,$tag, |
$target,$tag, |
$next_token->[1]); |
$next_token->[1]); |
Line 1094 sub publish {
|
Line 1097 sub publish {
|
if (($_=~/^parameter/) || ($_=~/^stores/)) { |
if (($_=~/^parameter/) || ($_=~/^stores/)) { |
unless ($_=~/\.\w+$/) { |
unless ($_=~/\.\w+$/) { |
unless ($oldparmstores{$_}) { |
unless ($oldparmstores{$_}) { |
print $logfile 'New: '.$_."\n"; |
my $disp_key = $_; |
$chparms.=$_.' '; |
$disp_key =~ tr/\0/_/; |
|
print $logfile ('New: '.$disp_key."\n"); |
|
$chparms .= $disp_key.' '; |
} |
} |
} |
} |
} |
} |
Line 1110 sub publish {
|
Line 1115 sub publish {
|
if (($_=~/^parameter/) || ($_=~/^stores/)) { |
if (($_=~/^parameter/) || ($_=~/^stores/)) { |
unless (($metadatafields{$_.'.name'}) || |
unless (($metadatafields{$_.'.name'}) || |
($metadatafields{$_.'.package'}) || ($_=~/\.\w+$/)) { |
($metadatafields{$_.'.package'}) || ($_=~/\.\w+$/)) { |
print $logfile 'Obsolete: '.$_."\n"; |
my $disp_key = $_; |
$chparms.=$_.' '; |
$disp_key =~ tr/\0/_/; |
|
print $logfile ('Obsolete: '.$disp_key."\n"); |
|
$chparms.=$disp_key.' '; |
} |
} |
} |
} |
} |
} |
if ($chparms) { |
if ($chparms) { |
$scrout.='<p><b>'.&mt('Obsolete parameters or stored values').':</b> '. |
$scrout.='<p><b>'.&mt('Obsolete parameters or stored values').':</b> '. |
$chparms.'</p><h1><font color="red">'.&mt('Warning!'). |
$chparms.'</p><h1><span class="LC_warning">'.&mt('Warning!'). |
'</font></h1><p><font color="red" size="+1">'. |
'</span></h1><p><span class="LC_warning">'. |
&mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</font></p><hr />'; |
&mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</span></p><hr />'; |
} |
} |
|
|
# ------------------------------------------------------- Now have all metadata |
# ------------------------------------------------------- Now have all metadata |