--- loncom/interface/lonsearchcat.pm	2001/03/22 13:33:07	1.67
+++ loncom/interface/lonsearchcat.pm	2001/03/22 13:40:07	1.68
@@ -94,7 +94,7 @@ sub handler {
 END
 
     $closebutton=<<END if $ENV{'form.catalogmode'} eq 'interactive';
-<input type="button" name="close" value="CLOSE" onClick="self.close()">
+<input type="button" name="close" value='CLOSE' onClick="self.close()">
 END
 
 # ------------------------------------------------ First, check out environment
@@ -267,8 +267,8 @@ ENDDOCUMENT
     $r->print(<<ENDDOCUMENT);
 <font color="#800000">Search historic archives</font>
 <br>
-<input type="submit" name="basicsubmit" value="SEARCH">
-<input type="reset" name="reset" value="RESET">
+<input type="submit" name="basicsubmit" value='SEARCH' />
+<input type="reset" name="reset" value='RESET' />
 $closebutton
 $basicviewselect
 </p>
@@ -276,8 +276,8 @@ $basicviewselect
 <h3>Advanced Search</h3>
 $scrout
 <p>
-<input type="submit" name="advancedsubmit" value="SEARCH">
-<input type="reset" name="reset" value="RESET">
+<input type="submit" name="advancedsubmit" value='SEARCH' />
+<input type="reset" name="reset" value='RESET' />
 $closebutton
 $advancedviewselect
 </p>
@@ -292,14 +292,15 @@ ENDDOCUMENT
 
 sub simpletextfield {
     my ($name,$value)=@_;
-    return '<input type=text name="'.$name.'" size=20 value="'.$value.'">';
+    return '<input type=text name=\''.$name.
+	   '\' size=20 value=\''.$value.'\' />';
 }
 
 sub simplecheckbox {
     my ($name,$value)=@_;
     my $checked='';
     $checked="CHECKED" if $value eq 'on';
-    return '<input type=checkbox name="'.$name.'" '. $checked . '>';
+    return '<input type=checkbox name=\''.$name.'\' '. $checked . '>';
 }
 
 sub searchphrasefield {
@@ -311,7 +312,7 @@ END
     my $uctitle=uc($title);
     return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:</b>".
 	   "</FONT> $instruction<br>".
-           '<input type=text name="'.$name.'" size=80 value="'.$value.'">';
+           '<input type=text name="'.$name.'" size=80 value=\''.$value.'\'>';
 }
 
 sub dateboxes {
@@ -464,7 +465,7 @@ sub selectbox {
     my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
 	"</b></font><br>".'<select name="'.$name.'">';
     map {
-        $selout.='<option value="'.$_.'"';
+        $selout.='<option value=\''.$_.'\'';
         if ($_ eq $value) { $selout.=' selected'; }
         $selout.='>'.$options{$_}.'</option>';
     } sort keys %options;
@@ -487,7 +488,7 @@ sub advancedsearch {
 		   'lastrevisiondateend_day','lastrevisiondateend_year',
 		   'notes','abstract','mime','language','owner',
 		   'custommetadata') {
-	$ENV{"form.$field"}=~s/[^\w\s\(\)\-\"\']//g;
+	$ENV{"form.$field"}=~s/[^\w\s\(\)\=\-\"\']//g;
     }
     for my $field ('title','author','subject','keywords','url','version',
 		   'notes','abstract','mime','language','owner',
@@ -1013,10 +1014,9 @@ sub make_persistent {
 	if (/^form\./ && !/submit/) {
 	    my $name=$_;
 	    my $key=$name;
-	    $ENV{$key}=~s/\"/\&quot\;/g;
 	    $name=~s/^form\.//;
 	    $persistent.=<<END;
-<INPUT TYPE='hidden' NAME='$name' VALUE='$ENV{$key}'>
+<input type='hidden' name='$name' value='$ENV{$key}' />
 END
         }
     } (keys %ENV);