version 1.215, 2006/12/06 22:22:39
|
version 1.219, 2007/02/01 02:38:05
|
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 471 sub set_allow {
|
Line 472 sub set_allow {
|
($newurl !~ /^\#/)) { |
($newurl !~ /^\#/)) { |
$$allow{&absoluteurl($newurl,$target)}=1; |
$$allow{&absoluteurl($newurl,$target)}=1; |
} |
} |
return $return_url |
return $return_url; |
} |
} |
|
|
######################################### |
######################################### |
Line 495 sub get_subscribed_hosts {
|
Line 496 sub get_subscribed_hosts {
|
my $srcf=$2; |
my $srcf=$2; |
opendir(DIR,$1); |
opendir(DIR,$1); |
while ($filename=readdir(DIR)) { |
while ($filename=readdir(DIR)) { |
if ($filename=~/\Q$srcf\E\.(\w+)$/) { |
if ($filename=~/\Q$srcf\E\.($match_lonid)$/) { |
my $subhost=$1; |
my $subhost=$1; |
if (($subhost ne 'meta' && $subhost ne 'subscription' && |
if (($subhost ne 'meta' && $subhost ne 'subscription' && |
$subhost ne 'tmp') && |
$subhost ne 'tmp') && |
Line 507 sub get_subscribed_hosts {
|
Line 508 sub get_subscribed_hosts {
|
closedir(DIR); |
closedir(DIR); |
my $sh; |
my $sh; |
if ( $sh=Apache::File->new("$target.subscription") ) { |
if ( $sh=Apache::File->new("$target.subscription") ) { |
&Apache::lonnet::logthis("opened $target.subscription"); |
|
while (my $subline=<$sh>) { |
while (my $subline=<$sh>) { |
if ($subline =~ /(^\w+):/) { |
if ($subline =~ /^($match_lonid):/) { |
if ($1 ne $Apache::lonnet::perlvar{'lonHostID'}) { |
if ($1 ne $Apache::lonnet::perlvar{'lonHostID'}) { |
push(@subscribed,$1); |
push(@subscribed,$1); |
} |
} |
} else { |
|
&Apache::lonnet::logthis("No Match for $subline"); |
|
} |
} |
} |
} |
} else { |
|
&Apache::lonnet::logthis("Unable to open $target.subscription"); |
|
} |
} |
return @subscribed; |
return @subscribed; |
} |
} |
Line 719 sub fix_ids_and_indices {
|
Line 715 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 1099 sub publish {
|
Line 1096 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 1115 sub publish {
|
Line 1114 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 |