--- loncom/interface/lonsearchcat.pm 2001/03/27 20:33:40 1.87
+++ loncom/interface/lonsearchcat.pm 2001/03/27 21:41:06 1.89
@@ -696,7 +696,7 @@ sub output_results {
$customshow=~s/[^\w\s]//g;
my @fields=map {"$_:"}
split(/\s+/,$customshow);
- my @customfields=split(/\s+/,$customshow);
+ @customfields=split(/\s+/,$customshow);
if ($customshow) {
$extrashow="
\n";
}
@@ -730,11 +730,15 @@ sub output_results {
foreach my $field (@customfields) {
my $value='';
if ($customhash{$url}=~/\<${field}[^\>]*\>(.*?)\<\/${field}[^\>]*\>/s) {
- my $value=$1;
+ $value=$1;
}
- $extrashow2=~s/\<\!\-\- $field \-\-\>/$value/g;
+ $extrashow2=~s/\<\!\-\- $field \-\-\>/ $value/g;
}
}
+
+ $compiledresult.=<
+END
$compiledresult.=<
END
@@ -865,7 +869,7 @@ sub build_custommetadata_query {
# quick fix to change literal into xml tag-matching
# will eventually have to write a separate builder module
my $oldmatchexp=$matchexp;
- $matchexp=~s/(\w+)\\\=(\w+)/\\\<$1\\\>\[\^\\\<\]\*$2\[\^\\\<\]\*\\\<\\\/$1\\\>/g;
+ $matchexp=~s/(\w+)\\\=([\w\\\+]+)/\\\<$1\\\>\[\^\\\<\]\*$2\[\^\\\<\]\*\\\<\\\/$1\\\>/g;
return $matchexp;
}