version 1.141, 2003/11/01 17:09:52
|
version 1.143, 2003/11/04 16:15:56
|
Line 214 sub metaeval {
|
Line 214 sub metaeval {
|
$newentry=~s/^\s*//; |
$newentry=~s/^\s*//; |
if ($newentry !~m|^/res|) { $newentry=$prefix.$newentry; } |
if ($newentry !~m|^/res|) { $newentry=$prefix.$newentry; } |
} |
} |
if ($metadatafields{$unikey}) { |
unless ($metadatafields{$unikey}=~/\w/) { |
unless (($metadatafields{$unikey}=~/\Q$newentry\E/) || |
|
($newentry eq '')) { |
|
$metadatafields{$unikey}.=', '.$newentry; |
|
} |
|
} else { |
|
$metadatafields{$unikey}=$newentry; |
$metadatafields{$unikey}=$newentry; |
} |
} |
} |
} |
Line 815 sub store_metadata {
|
Line 810 sub store_metadata {
|
return (undef,$status); |
return (undef,$status); |
} |
} |
|
|
|
|
|
# ============================================== Parse file itself for metadata |
|
|
|
|
|
sub parseformeta { |
|
my ($source,$style)=@_; |
|
my $allmeta=''; |
|
if (($style eq 'ssi') || ($style eq 'prv')) { |
|
my $dir=$source; |
|
$dir=~s-/[^/]*$--; |
|
my $file=$source; |
|
$file=(split('/',$file))[-1]; |
|
$source=&Apache::lonnet::hreflocation($dir,$file); |
|
$allmeta=&Apache::lonnet::ssi_body($source,('grade_target' => 'meta')); |
|
&metaeval($allmeta); |
|
} |
|
return $allmeta; |
|
} |
|
|
######################################### |
######################################### |
######################################### |
######################################### |
|
|
Line 952 sub publish {
|
Line 966 sub publish {
|
$ENV{'user.domain'}; |
$ENV{'user.domain'}; |
$metadatafields{'authorspace'}=$cuname.'@'.$cudom; |
$metadatafields{'authorspace'}=$cuname.'@'.$cudom; |
|
|
|
# ----------------------------------------------------------- Parse file itself |
|
|
|
&parseformeta($source,$style); |
# ------------------------------------------------ Check out directory hierachy |
# ------------------------------------------------ Check out directory hierachy |
|
|
my $thisdisfn=$source; |
my $thisdisfn=$source; |
Line 990 sub publish {
|
Line 1007 sub publish {
|
} |
} |
|
|
} |
} |
|
# ------------------------------------------ See if anything new in file itself |
|
|
|
$allmeta=&parseformeta($source,$style); |
|
|
# -------------------------------------------------- Parse content for metadata |
|
if (($style eq 'ssi') || ($style eq 'prv')) { |
|
my $dir=$source; |
|
$dir=~s-/[^/]*$--; |
|
my $file=$source; |
|
$file=(split('/',$file))[-1]; |
|
$source=&Apache::lonnet::hreflocation($dir,$file); |
|
$allmeta=&Apache::lonnet::ssi_body($source,('grade_target' => 'meta')); |
|
|
|
&metaeval($allmeta); |
|
} |
|
# ---------------- Find and document discrepancies in the parameters and stores |
# ---------------- Find and document discrepancies in the parameters and stores |
|
|
my $chparms=''; |
my $chparms=''; |