Subversion Repositories wimsdev

Rev

Rev 7107 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7107 Rev 7562
Line 89... Line 89...
89 
search_category=!replace tool by T in $search_category
 89 
search_category=!replace tool by T in $search_category
90 
search_category=!replace recreation by R in $search_category
 90 
search_category=!replace recreation by R in $search_category
91 
search_category=!trim $search_category
 91 
search_category=!trim $search_category
92 
search_category=!char 1 of $search_category
 92 
search_category=!char 1 of $search_category
93 
!bound search_category within $slist default V
 93 
!bound search_category within $slist default V
- 
 
 94 
search_adresse=search_keywords="$search_keywords"
- 
 
 95 
!if $search_category!=$empty
- 
 
 96 
   search_adresse=$search_adresse&search_category=$search_category
- 
 
 97 
!endif
- 
 
 98 
!if $search_lang!=$empty
- 
 
 99 
   search_adresse=$search_adresse&search_lang=$search_lang
- 
 
 100 
!endif
- 
 
 101 
!if $search_and!=$empty and $search_and!=no
- 
 
 102 
   search_adresse=$search_adresse&search_and=$search_and
- 
 
 103 
!endif
94 
!if $search_category=V
 104 
!if $search_category=V
95 
 gotcnt=0
 105 
 gotcnt=0
96 
 !exit
 106 
 !exit
97 
!endif
 107 
!endif
98 
 
 108 
 
Line 116... Line 126...
116 
  k_=!lower $search_keywords
 126 
  k_=!lower $search_keywords
117 
  k_=!deaccent $k_
 127 
  k_=!deaccent $k_
118 
  l_=[
 128 
  l_=[
119 
  e_==
 129 
  e_==
120 
  !if f isvarof $k_ or g isvarof $k_ or x isvarof $k_ or y isvarof $k_ or\
 130 
  !if f isvarof $k_ or g isvarof $k_ or x isvarof $k_ or y isvarof $k_ or\
121 
	z isvarof $k_ or b isvarof $k_ or c isvarof $k_ or i isvarof $k_ or\
 131 
    z isvarof $k_ or b isvarof $k_ or c isvarof $k_ or i isvarof $k_ or\
122 
	^ isin $k_ or / isin $k_ or $e_ isin $k_ or\
 132 
    ^ isin $k_ or / isin $k_ or $e_ isin $k_ or\
123 
	.0 isin $k_ or .1 isin $k_ or .2 isin $k_ or .3 isin $k_ or\
 133 
    .0 isin $k_ or .1 isin $k_ or .2 isin $k_ or .3 isin $k_ or\
124 
	.4 isin $k_ or .5 isin $k_ or .6 isin $k_ or .7 isin $k_ or\
 134 
    .4 isin $k_ or .5 isin $k_ or .6 isin $k_ or .7 isin $k_ or\
125 
	.8 isin $k_ or .9 isin $k_ or $l_ isin $k_
 135 
    .8 isin $k_ or .9 isin $k_ or $l_ isin $k_
126 
    error=expression
 136 
    error=expression
127 
    gotcnt=0
 137 
    gotcnt=0
128 
    !goto bailout
 138 
    !goto bailout
129 
  !endif
 139 
  !endif
130 
  srch=!translate internal `'".+-_()[]{};: to $             $ in $search_keywords
 140 
  srch=!translate internal `'".+-_()[]{};: to $             $ in $search_keywords
Line 283... Line 293...
283 
  gotm$cat=!exec translator $(gotm$cat)
 293 
  gotm$cat=!exec translator $(gotm$cat)
284 
 !endif
 294 
 !endif
285 
 !next
 295 
 !next
286 
!endif
 296 
!endif
287 
!if $search_category isin AT and $search_keywords!=$empty and\
 297 
!if $search_category isin AT and $search_keywords!=$empty and\
288 
	P isin $slist and ($gotcnt<=8 or $gottype!=search)
 298 
    P isin $slist and ($gotcnt<=8 or $gottype!=search)
289 
 gotm1=$gotm
 299 
 gotm1=$gotm
290 
 gotcnt1=$gotcnt
 300 
 gotcnt1=$gotcnt
291 
 gottype1=$gottype
 301 
 gottype1=$gottype
292 
 !read search.P
 302 
 !read search.P
293 
 !if $gotcnt>0
 303 
 !if $gotcnt>0