Changeset 6541 for trunk/gsdl/macros/english.dm

Timestamp:

2004-01-19T12:06:47+13:00 (20 years ago)

Author:

kjdon

Message:

removed the textsimplesearchmgpp, textadvancedsearchmgpp and textjselect macros. mg and mgpp now use the same simple search form text, and the textjselect has been merged into the text...search macros - indexselection is always set, so don't need to test on it any longer

File:

• trunk/gsdl/macros/english.dm (modified) (1 diff)

trunk/gsdl/macros/english.dm

@@ -644 +644 @@
 _textandnot_{and not}
 
-# _hselection_, _jselection_, _nselection_ and _gselection_ are set from 
-# within the server some or all of them may remain unset
-
-
-_textsimplesearch_ {Search for _If_(_hselection_, _hselection_) _If_(_jselection_, _textjselect_) _If_(_gselection_, at _gselection_ level) _If_(_nselection_, in _nselection_ language)
-which contain _querytypeselection_ of the words}
-
-_textadvancedsearch_ {Search _If_(_hselection_, _hselection_, _defaultindextext_) _If_(_jselection_,_textjselect_) _If_(_gselection_, at _gselection_ level)_If_(_nselection_, in _nselection_ language) 
-using _querytypeselection_ query}
-
-_textjselect_ {_If_(_hselection_, of) _jselection_}
-
-#have changed mgpp search headers
-_textsimplesearchmgpp_ {Search for _fqfselection_ _If_(_jselection_,of _jselection_ )_If_(_gselection_,at _gselection_ level )_If_(_nselection_,in _nselection_ language )which contain _querytypeselection_ of the words}
-
-_textadvancedsearchmgpp_ {Search _fqfselection_ _If_(_jselection_,of _jselection_ )_If_(_gselection_,at _gselection_ level )_If_(_nselection_,in _nselection_ language )using _querytypeselection_ query}
+# _indexselection_, _jselection_, _nselection_ and _gselection_ are set from 
+# within the server - _indexselection_ is always set, but the others may be 
+# unset
+
+_textsimplesearch_{Search for _indexselection_ _If_(_jselection_,of _jselection_ )_If_(_gselection_, at _gselection_ level )_If_(_nselection_,in _nselection_ language )which contain _querytypeselection_ of the words}
+
+_textadvancedsearch_ {Search _indexselection_ _If_(_jselection_,of _jselection_ )_If_(_gselection_,at _gselection_ level )_If_(_nselection_,in _nselection_ language )using _querytypeselection_ query}
 
 _textformsimplesearch_ {Search _If_(_jselection_,_jselection_ )_If_(_gformselection_,at _gformselection_ level )_If_(_nselection_,in _nselection_ language )for _formquerytypeselection_ of}