Changeset 6541 for trunk/gsdl/macros/kazakh.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/kazakh.dm (modified) (2 diffs)

trunk/gsdl/macros/kazakh.dm

@@ -552 +552 @@
 _textandnot_ [l=kz] {жәМе еЌес}
 
-# _hselection_, _jselection_, _nselection_ and _gselection_ are set from 
-# within the server some or all of them may remain unset
-
-
-_textsimplesearch_ [l=kz] {ІзЎеу пП _If_(_hselection_, _hselection_) _If_(_jselection_, _textjselect_) _If_(_gselection_, Ўеңгей _gselection_ бПйыМша) _If_(_nselection_, тіліМЎе  _nselection_  )
-,сөзЎерЎеМ _querytypeselection_ тұратыМ}
-
-_textadvancedsearch_ [l=kz] {ІзЎеу _If_(_hselection_, _hselection_, _defaultindextext_) _If_(_jselection_,_textjselect_) _If_(_gselection_, Ўеңгей _gselection_ бПйыМша)_If_(_nselection_, тіліМЎе_nselection_ ) 
- сұраМыЌЎы  _querytypeselection_ қПлЎаМып}
-
-_textsimplesearchmgpp_ [l=kz] {ІзЎеу пП _fqfselection_ _If_(_jselection_, of _jselection_) _If_(_gselection_, Ўеңгей _gselection_ бПйыМша) _If_(_nselection_, тіліМЎе  _nselection_  )
-,сөзЎерЎеМ _querytypeselection_ тұратыМ}
-
-_textadvancedsearchmgpp_ [l=kz] {ІзЎеу _fqfselection_ _If_(_jselection_,of _jselection_) _If_(_gselection_, Ўеңгей _gselection_ бПйыМша)_If_(_nselection_, тіліМЎе_nselection_ ) 
- сұраМыЌЎы  _querytypeselection_ қПлЎаМып}
+# _indexselection_, _jselection_, _nselection_ and _gselection_ are set from 
+# within the server - _indexselection_ is always set, but the others may be 
+# unset
+
+
+_textsimplesearch_ [l=kz] {ІзЎеу пП _indexselection_ _If_(_jselection_, of _jselection_) _If_(_gselection_, Ўеңгей _gselection_ бПйыМша) _If_(_nselection_, тіліМЎе  _nselection_  ),сөзЎерЎеМ _querytypeselection_ тұратыМ}
+
+_textadvancedsearch_ [l=kz] {ІзЎеу _indexselection_ _If_(_jselection_, of _jselection_) _If_(_gselection_, Ўеңгей _gselection_ бПйыМша)_If_(_nselection_, тіліМЎе_nselection_ )  сұраМыЌЎы  _querytypeselection_ қПлЎаМып}
 
 _textformsimplesearch_ [l=kz] {БПйыМша ізЎеу _If_(_jselection_, _jselection_) _If_(_gformselection_, Ўеңгей _gformselection_ бПйыМша)_If_(_nselection_, тіліМЎе _nselection_ )
@@ -573 +566 @@
 _textformadvancedsearch_ [l=kz] {ІзЎеу _If_(_jselection_,_jselection_) _If_(_gformselection_, Ўеңгей _gformselection_ бПйыМша)_If_(_nselection_, тіліМЎе _nselection_ ) 
 жәМе реті бПйыМша бейМелеу _formquerytypeselection_}
-
-
-_textjselect_ [l=kz] {_If_(_hselection_, of) _jselection_}