[LON-CAPA-cvs] cvs: loncom /interface lonsearchcat.pm

[matthew]

matthew		Wed Jun 19 16:39:11 2002 EDT

  Modified files:              
    /loncom/interface	lonsearchcat.pm 
  Log:
  Removed globals that were not actually global.
  
  
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.122 loncom/interface/lonsearchcat.pm:1.123
--- loncom/interface/lonsearchcat.pm:1.122	Wed Jun 19 15:40:38 2002
+++ loncom/interface/lonsearchcat.pm	Wed Jun 19 16:39:11 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.122 2002/06/19 19:40:38 matthew Exp $
+# $Id: lonsearchcat.pm,v 1.123 2002/06/19 20:39:11 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -137,11 +137,6 @@
 
 The ubiquitous database hash
 
-=item $basicviewselect and $advancedviewselect
-
-View selection forms.  These are not actually global and will be 
-moved soon.
-
 =item $diropendb 
 
 The full path to the (temporary) search database file.  This is set and
@@ -174,24 +169,6 @@
 # Summary View ---> sub summary_view
 # Fielded Format ---> sub fielded_format_view
 # XML/SGML ---> sub xml_sgml_view
-my $basicviewselect=<<END;
-<select name='basicviewselect'>
-<option value='Detailed Citation View' selected="true">
-Detailed Citation View</option>
-<option value='Summary View'>Summary View</option>
-<option value='Fielded Format'>Fielded Format</option>
-<option value='XML/SGML'>XML/SGML</option>
-</select>
-END
-my $advancedviewselect=<<END;
-<select name='advancedviewselect'>
-<option value='Detailed Citation View' selected="true">
-Detailed Citation View</option>
-<option value='Summary View'>Summary View</option>
-<option value='Fielded Format'>Fielded Format</option>
-<option value='XML/SGML'>XML/SGML</option>
-</select>
-END
 
 #------------------------------------------------------------- global variables
 my $diropendb = "";
@@ -458,7 +435,15 @@
 <input type="submit" name="basicsubmit" value='SEARCH' />
 <input type="reset" name="reset" value='RESET' />
 $closebutton
-$basicviewselect
+<!-- basic view selection -->
+<select name='basicviewselect'>
+<option value='Detailed Citation View' selected="true">
+Detailed Citation View</option>
+<option value='Summary View'>Summary View</option>
+<option value='Fielded Format'>Fielded Format</option>
+<option value='XML/SGML'>XML/SGML</option>
+</select>
+<!-- end of basic view selection -->
 <input type="button" value="HELP" onClick="openhelp()" />
 </p>
 <hr />
@@ -468,7 +453,15 @@
 <input type="submit" name="advancedsubmit" value='SEARCH' />
 <input type="reset" name="reset" value='RESET' />
 $closebutton
-$advancedviewselect
+<!-- advance view select -->
+<select name='advancedviewselect'>
+<option value='Detailed Citation View' selected="true">
+Detailed Citation View</option>
+<option value='Summary View'>Summary View</option>
+<option value='Fielded Format'>Fielded Format</option>
+<option value='XML/SGML'>XML/SGML</option>
+</select>
+<!-- end of advanced view select -->
 <input type="button" value="HELP" onClick="openhelp()" />
 </p>
 </form>