Add an "absval" parameter to allow contrib/dict_int to ignore signs.

tglsfdc · tglsfdc · commit 806eb92c0181 · 2020-03-08T18:35:06.000-04:00
Jeff Janes Discussion: https://postgr.es/m/CAMkU=1xRcs_BUPzR0+V3WndaCAv0E_m3h6aUEJ8NF-sY1nnHsw@mail.gmail.com
diff --git a/contrib/dict_int/dict_int.c b/contrib/dict_int/dict_int.c
@@ -21,6 +21,7 @@ typedef struct
 {
 	int			maxlen;
 	bool		rejectlong;
+	bool		absval;
 } DictInt;
 
 
@@ -37,6 +38,7 @@ dintdict_init(PG_FUNCTION_ARGS)
 	d = (DictInt *) palloc0(sizeof(DictInt));
 	d->maxlen = 6;
 	d->rejectlong = false;
+	d->absval = false;
 
 	foreach(l, dictoptions)
 	{
@@ -55,6 +57,10 @@ dintdict_init(PG_FUNCTION_ARGS)
 		{
 			d->rejectlong = defGetBoolean(defel);
 		}
+		else if (strcmp(defel->defname, "absval") == 0)
+		{
+			d->absval = defGetBoolean(defel);
+		}
 		else
 		{
 			ereport(ERROR,
@@ -72,11 +78,21 @@ dintdict_lexize(PG_FUNCTION_ARGS)
 {
 	DictInt    *d = (DictInt *) PG_GETARG_POINTER(0);
 	char	   *in = (char *) PG_GETARG_POINTER(1);
-	char	   *txt = pnstrdup(in, PG_GETARG_INT32(2));
+	int			len = PG_GETARG_INT32(2);
+	char	   *txt;
 	TSLexeme   *res = palloc0(sizeof(TSLexeme) * 2);
 
 	res[1].lexeme = NULL;
-	if (PG_GETARG_INT32(2) > d->maxlen)
+
+	if (d->absval && (in[0] == '+' || in[0] == '-'))
+	{
+		len--;
+		txt = pnstrdup(in + 1, len);
+	}
+	else
+		txt = pnstrdup(in, len);
+
+	if (len > d->maxlen)
 	{
 		if (d->rejectlong)
 		{
diff --git a/contrib/dict_int/expected/dict_int.out b/contrib/dict_int/expected/dict_int.out
@@ -302,3 +302,28 @@ select ts_lexize('intdict', '314532610153');
 
 ALTER TEXT SEARCH DICTIONARY intdict (MAXLEN = -214783648);
 ERROR:  maxlen value has to be >= 1
+select ts_lexize('intdict', '-40865854');
+ ts_lexize 
+-----------
+ {-40865}
+(1 row)
+
+select ts_lexize('intdict', '+40865854');
+ ts_lexize 
+-----------
+ {+40865}
+(1 row)
+
+ALTER TEXT SEARCH DICTIONARY intdict (ABSVAL = true);
+select ts_lexize('intdict', '-40865854');
+ ts_lexize 
+-----------
+ {408658}
+(1 row)
+
+select ts_lexize('intdict', '+40865854');
+ ts_lexize 
+-----------
+ {408658}
+(1 row)
+
diff --git a/contrib/dict_int/sql/dict_int.sql b/contrib/dict_int/sql/dict_int.sql
@@ -53,3 +53,9 @@ select ts_lexize('intdict', '641439323669');
 select ts_lexize('intdict', '314532610153');
 
 ALTER TEXT SEARCH DICTIONARY intdict (MAXLEN = -214783648);
+
+select ts_lexize('intdict', '-40865854');
+select ts_lexize('intdict', '+40865854');
+ALTER TEXT SEARCH DICTIONARY intdict (ABSVAL = true);
+select ts_lexize('intdict', '-40865854');
+select ts_lexize('intdict', '+40865854');
diff --git a/doc/src/sgml/dict-int.sgml b/doc/src/sgml/dict-int.sgml
@@ -25,7 +25,7 @@
   <title>Configuration</title>
 
   <para>
-   The dictionary accepts two options:
+   The dictionary accepts three options:
   </para>
 
   <itemizedlist>
@@ -46,6 +46,15 @@
      such an integer cannot be searched for.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The <literal>absval</literal> parameter specifies whether leading
+     <quote><literal>+</literal></quote> or <quote><literal>-</literal></quote>
+     signs should be removed from integer words.  The default
+     is <literal>false</literal>.  When <literal>true</literal>, the sign is
+     removed before <literal>maxlen</literal> is applied.
+    </para>
+   </listitem>
   </itemizedlist>
  </sect2>
 

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ typedef struct`
`21`	`21`	`{`
`22`	`22`	`int maxlen;`
`23`	`23`	`bool rejectlong;`
	`24`	`+ bool absval;`
`24`	`25`	`} DictInt;`
`25`	`26`
`26`	`27`
`@@ -37,6 +38,7 @@ dintdict_init(PG_FUNCTION_ARGS)`
`37`	`38`	`d = (DictInt *) palloc0(sizeof(DictInt));`
`38`	`39`	`d->maxlen = 6;`
`39`	`40`	`d->rejectlong = false;`
	`41`	`+ d->absval = false;`
`40`	`42`
`41`	`43`	`foreach(l, dictoptions)`
`42`	`44`	`{`
`@@ -55,6 +57,10 @@ dintdict_init(PG_FUNCTION_ARGS)`
`55`	`57`	`{`
`56`	`58`	`d->rejectlong = defGetBoolean(defel);`
`57`	`59`	`}`
	`60`	`+ else if (strcmp(defel->defname, "absval") == 0)`
	`61`	`+ {`
	`62`	`+ d->absval = defGetBoolean(defel);`
	`63`	`+ }`
`58`	`64`	`else`
`59`	`65`	`{`
`60`	`66`	`ereport(ERROR,`
`@@ -72,11 +78,21 @@ dintdict_lexize(PG_FUNCTION_ARGS)`
`72`	`78`	`{`
`73`	`79`	`DictInt d = (DictInt ) PG_GETARG_POINTER(0);`
`74`	`80`	`char in = (char ) PG_GETARG_POINTER(1);`
`75`		`- char *txt = pnstrdup(in, PG_GETARG_INT32(2));`
	`81`	`+ int len = PG_GETARG_INT32(2);`
	`82`	`+ char *txt;`
`76`	`83`	`TSLexeme res = palloc0(sizeof(TSLexeme) 2);`
`77`	`84`
`78`	`85`	`res[1].lexeme = NULL;`
`79`		`- if (PG_GETARG_INT32(2) > d->maxlen)`
	`86`	`+`
	`87`	`+ if (d->absval && (in[0] == '+' \|\| in[0] == '-'))`
	`88`	`+ {`
	`89`	`+ len--;`
	`90`	`+ txt = pnstrdup(in + 1, len);`
	`91`	`+ }`
	`92`	`+ else`
	`93`	`+ txt = pnstrdup(in, len);`
	`94`	`+`
	`95`	`+ if (len > d->maxlen)`
`80`	`96`	`{`
`81`	`97`	`if (d->rejectlong)`
`82`	`98`	`{`