Skip to content

Commit bad5046

Browse files
committed
merjge fix for merge errors
2 parents 6d5be22 + 2899419 commit bad5046

File tree

14 files changed

+771
-74
lines changed

14 files changed

+771
-74
lines changed

src/backend/tsearch/Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Makefile for backend/tsearch
44
#
5-
# Copyright (c) 2006-2015, PostgreSQL Global Development Group
5+
# Copyright (c) 2006-2016, PostgreSQL Global Development Group
66
#
77
# src/backend/tsearch/Makefile
88
#
@@ -13,8 +13,10 @@ include $(top_builddir)/src/Makefile.global
1313

1414
DICTDIR=tsearch_data
1515

16-
DICTFILES=synonym_sample.syn thesaurus_sample.ths hunspell_sample.affix \
17-
ispell_sample.affix ispell_sample.dict
16+
DICTFILES=dicts/synonym_sample.syn dicts/thesaurus_sample.ths \
17+
dicts/hunspell_sample.affix dicts/ispell_sample.affix dicts/ispell_sample.dict \
18+
dicts/hunspell_sample_long.affix dicts/hunspell_sample_long.dict \
19+
dicts/hunspell_sample_num.affix dicts/hunspell_sample_num.dict
1820

1921
OBJS = ts_locale.o ts_parse.o wparser.o wparser_def.o dict.o \
2022
dict_simple.o dict_synonym.o dict_thesaurus.o \
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
FLAG long
2+
3+
AF 7
4+
AF cZ #1
5+
AF cL #2
6+
AF sGsJpUsS #3
7+
AF sSpB #4
8+
AF cZsS #5
9+
AF sScZs\ #6
10+
AF sA #7
11+
12+
COMPOUNDFLAG cZ
13+
ONLYINCOMPOUND cL
14+
15+
PFX pB Y 1
16+
PFX pB 0 re .
17+
18+
PFX pU N 1
19+
PFX pU 0 un .
20+
21+
SFX sJ Y 1
22+
SFX sJ 0 INGS [^E]
23+
24+
SFX sG Y 1
25+
SFX sG 0 ING [^E]
26+
27+
SFX sS Y 1
28+
SFX sS 0 S [^SXZHY]
29+
30+
SFX sA Y 1
31+
SFX sA Y IES [^AEIOU]Y
32+
33+
SFX s\ N 1
34+
SFX s\ 0 Y/2 [^Y]
35+
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
book/3
2+
booking/4
3+
footballklubber
4+
foot/5
5+
football/1
6+
ball/6
7+
klubber/1
8+
sky/7
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
FLAG num
2+
3+
COMPOUNDFLAG 101
4+
ONLYINCOMPOUND 102
5+
6+
PFX 201 Y 1
7+
PFX 201 0 re .
8+
9+
PFX 202 N 1
10+
PFX 202 0 un .
11+
12+
SFX 301 Y 1
13+
SFX 301 0 INGS [^E]
14+
15+
SFX 302 Y 1
16+
SFX 302 0 ING [^E]
17+
18+
SFX 303 Y 1
19+
SFX 303 0 S [^SXZHY]
20+
21+
SFX 304 Y 1
22+
SFX 304 Y IES [^AEIOU]Y
23+
24+
SFX 305 N 1
25+
SFX 305 0 Y/102 [^Y]
26+
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
book/302,301,202,303
2+
booking/303,201
3+
footballklubber
4+
foot/101,303
5+
football/101
6+
ball/303,101,305
7+
klubber/101
8+
sky/304

0 commit comments

Comments
 (0)