version 1.121, 2003/04/02 02:17:10
|
version 1.122, 2003/06/24 23:24:48
|
Line 190 sub metaeval {
|
Line 190 sub metaeval {
|
} |
} |
if ($metadatafields{$unikey}) { |
if ($metadatafields{$unikey}) { |
my $newentry=$parser->get_text('/'.$entry); |
my $newentry=$parser->get_text('/'.$entry); |
unless (($metadatafields{$unikey}=~/$newentry/) || |
unless (($metadatafields{$unikey}=~/\Q$newentry\E/) || |
($newentry eq '')) { |
($newentry eq '')) { |
$metadatafields{$unikey}.=', '.$newentry; |
$metadatafields{$unikey}.=', '.$newentry; |
} |
} |
Line 911 sub publish {
|
Line 911 sub publish {
|
# ------------------------------------------------ Check out directory hierachy |
# ------------------------------------------------ Check out directory hierachy |
|
|
my $thisdisfn=$source; |
my $thisdisfn=$source; |
$thisdisfn=~s/^\/home\/$cuname\///; |
$thisdisfn=~s/^\/home\/\Q$cuname\E\///; |
|
|
my @urlparts=split(/\//,$thisdisfn); |
my @urlparts=split(/\//,$thisdisfn); |
$#urlparts--; |
$#urlparts--; |
Line 1054 END
|
Line 1054 END
|
foreach (sort keys %keywords) { |
foreach (sort keys %keywords) { |
$keywordout.='<td><input type="checkbox" name="keywords" value="'.$_.'"'; |
$keywordout.='<td><input type="checkbox" name="keywords" value="'.$_.'"'; |
if ($metadatafields{'keywords'}) { |
if ($metadatafields{'keywords'}) { |
if ($metadatafields{'keywords'}=~/$_/) { |
if ($metadatafields{'keywords'}=~/\Q$_\E/) { |
$keywordout.=' checked="on"'; |
$keywordout.=' checked="on"'; |
} |
} |
} elsif (&Apache::loncommon::keyword($_)) { |
} elsif (&Apache::loncommon::keyword($_)) { |
Line 1144 END
|
Line 1144 END
|
$ENV{'form.keywords'}=''; |
$ENV{'form.keywords'}=''; |
foreach (keys %keywords) { |
foreach (keys %keywords) { |
if ($metadatafields{'keywords'}) { |
if ($metadatafields{'keywords'}) { |
if ($metadatafields{'keywords'}=~/$_/) { |
if ($metadatafields{'keywords'}=~/\Q$_\E/) { |
$ENV{'form.keywords'}.=$_.','; |
$ENV{'form.keywords'}.=$_.','; |
} |
} |
} elsif (&Apache::loncommon::keyword($_)) { |
} elsif (&Apache::loncommon::keyword($_)) { |
Line 1435 sub phasetwo {
|
Line 1435 sub phasetwo {
|
# ------------------------------------------------ Provide link to new resource |
# ------------------------------------------------ Provide link to new resource |
unless ($batch) { |
unless ($batch) { |
my $thisdistarget=$target; |
my $thisdistarget=$target; |
$thisdistarget=~s/^$docroot//; |
$thisdistarget=~s/^\Q$docroot\E//; |
|
|
my $thissrc=$source; |
my $thissrc=$source; |
$thissrc=~s/^\/home\/(\w+)\/public_html/\/priv\/$1/; |
$thissrc=~s/^\/home\/(\w+)\/public_html/\/priv\/$1/; |
Line 1465 sub batchpublish {
|
Line 1465 sub batchpublish {
|
|
|
my $docroot=$r->dir_config('lonDocRoot'); |
my $docroot=$r->dir_config('lonDocRoot'); |
my $thisdistarget=$targetfile; |
my $thisdistarget=$targetfile; |
$thisdistarget=~s/^$docroot//; |
$thisdistarget=~s/^\Q$docroot\E//; |
|
|
|
|
undef %metadatafields; |
undef %metadatafields; |
Line 1702 unless ($ENV{'form.phase'} eq 'two') {
|
Line 1702 unless ($ENV{'form.phase'} eq 'two') {
|
$thistarget=~s/\/public\_html//; |
$thistarget=~s/\/public\_html//; |
|
|
my $thisdistarget=$thistarget; |
my $thisdistarget=$thistarget; |
$thisdistarget=~s/^$docroot//; |
$thisdistarget=~s/^\Q$docroot\E//; |
|
|
my $thisdisfn=$thisfn; |
my $thisdisfn=$thisfn; |
$thisdisfn=~s/^\/home\/$cuname\/public_html\///; |
$thisdisfn=~s/^\/home\/\Q$cuname\E\/public_html\///; |
|
|
if ($fn=~/\/$/) { |
if ($fn=~/\/$/) { |
# -------------------------------------------------------- This is a directory |
# -------------------------------------------------------- This is a directory |