Commitd3e36da

committed

Make the standard stopword files be sought relative to share_dir, so

that a tsearch2 installation can be relocatable.

1 parent4347cc2 commitd3e36daCopy full SHA for d3e36da

File tree

+22

-10

lines changed

+22

-10

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.7 2004/08/20 20:13:09 momjian Exp $`
	`1`	`+# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.8 2004/10/17 23:09:31 tgl Exp $`
`2`	`2`
`3`	`3`	`MODULE_big = tsearch2`
`4`	`4`	`OBJS = dict_ex.o dict.o snmap.o stopword.o common.o prs_dcfg.o\`
`@@ -39,8 +39,7 @@ $(SUBDIRS:%=%-recursive):`
`39`	`39`	`$(MAKE) -C $(subst -recursive,,$@) SUBSYS.o`
`40`	`40`
`41`	`41`	`tsearch2.sql: tsearch.sql.in`
`42`		`-sed -e's,MODULE_PATHNAME,$$libdir/$(MODULE_big),g'\`
`43`		`- -e's,DATA_PATH,$(datadir)/contrib,g'$<>$@`
	`42`	`+sed -e's,MODULE_PATHNAME,$$libdir/$(MODULE_big),g'$<>$@`
`44`	`43`
`45`	`44`	`untsearch2.sql: untsearch.sql.in`
`46`	`45`	`cp$<$@`

Lines changed: 18 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@`
`2`	`2`	`* stopword library`
`3`	`3`	`* Teodor Sigaev <teodor@sigaev.ru>`
`4`	`4`	`*/`
`5`		`-#include<errno.h>`
`6`		`-#include<stdlib.h>`
`7`		`-#include<string.h>`
	`5`	`+#include"postgres.h"`
	`6`	`+`
`8`	`7`	`#include<ctype.h>`
`9`	`8`
`10`		`-#include"postgres.h"`
	`9`	`+#include"miscadmin.h"`
	`10`	`+`
`11`	`11`	`#include"common.h"`
`12`	`12`	`#include"dict.h"`
`13`	`13`
`@@ -51,10 +51,23 @@ readstoplist(text in, StopList s)`
`51`	`51`	`if (in&&VARSIZE(in)-VARHDRSZ>0)`
`52`	`52`	`{`
`53`	`53`	`char*filename=text2char(in);`
`54`		`-FILE*hin=NULL;`
	`54`	`+FILE*hin;`
`55`	`55`	`charbuf[STOPBUFLEN];`
`56`	`56`	`intreallen=0;`
`57`	`57`
	`58`	`+/* if path is relative, take it as relative to share dir */`
	`59`	`+if (!is_absolute_path(filename))`
	`60`	`+{`
	`61`	`+charsharepath[MAXPGPATH];`
	`62`	`+char*absfn;`
	`63`	`+`
	`64`	`+get_share_path(my_exec_path,sharepath);`
	`65`	`+absfn=palloc(strlen(sharepath)+strlen(filename)+2);`
	`66`	`+sprintf(absfn,"%s/%s",sharepath,filename);`
	`67`	`+pfree(filename);`
	`68`	`+filename=absfn;`
	`69`	`+}`
	`70`	`+`
`58`	`71`	`if ((hin=fopen(filename,"r"))==NULL)`
`59`	`72`	`ereport(ERROR,`
`60`	`73`	`(errcode(ERRCODE_CONFIG_FILE_ERROR),`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ CREATE FUNCTION snb_lexize(internal,internal,int4)`
`77`	`77`	`insert into pg_ts_dict select`
`78`	`78`	`'en_stem',`
`79`	`79`	`'snb_en_init(text)',`
`80`		`-'DATA_PATH/english.stop',`
	`80`	`+'contrib/english.stop',`
`81`	`81`	`'snb_lexize(internal,internal,int4)',`
`82`	`82`	`'English Stemmer. Snowball.'`
`83`	`83`	`;`
`@@ -90,7 +90,7 @@ CREATE FUNCTION snb_ru_init(text)`
`90`	`90`	`insert into pg_ts_dict select`
`91`	`91`	`'ru_stem',`
`92`	`92`	`'snb_ru_init(text)',`
`93`		`-'DATA_PATH/russian.stop',`
	`93`	`+'contrib/russian.stop',`
`94`	`94`	`'snb_lexize(internal,internal,int4)',`
`95`	`95`	`'Russian Stemmer. Snowball.'`
`96`	`96`	`;`

Comments

(0)