--- loncom/interface/lonsearchcat.pm	2001/03/22 13:40:07	1.68
+++ loncom/interface/lonsearchcat.pm	2001/03/22 14:24:39	1.75
@@ -792,7 +792,11 @@ sub build_custommetadata_query {
 			  -build => 'Text::Query::BuildAdvancedString');
     $q->prepare($logic_statement);
     my $matchexp=${$q}{'-parse'}{'-build'}{'matchstring'};
-    return $matchexp;
+    # 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;
+    return $oldmatchexp . $matchexp;
 }
 
 # - Recursively parse a reverse notation expression into a SQL query expression
@@ -1014,6 +1018,7 @@ sub make_persistent {
 	if (/^form\./ && !/submit/) {
 	    my $name=$_;
 	    my $key=$name;
+	    $ENV{$key}=~s/\'//g; # do not mess with html field syntax
 	    $name=~s/^form\.//;
 	    $persistent.=<<END;
 <input type='hidden' name='$name' value='$ENV{$key}' />