Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4421/modules/pftijah
Modified Files:
nexi.c nexi_generate_mil.c nexi_preprocessor.c
pftijah_tokenize.l serialize_pftijah.mx
Log Message:
propagated changes of Wednesday Jun 13 2007 - Friday Jun 15 2007
from the XQuery_0-18 branch to the development trunk
Index: serialize_pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/serialize_pftijah.mx,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- serialize_pftijah.mx 15 Jun 2007 09:32:43 -0000 1.52
+++ serialize_pftijah.mx 15 Jun 2007 14:41:36 -0000 1.53
@@ -25,8 +25,6 @@
@t serialize_pftijah
@h
-#include <gdk.h>
-
struct tijahContextStruct;
extern int handleTijahTerm(struct tijahContextStruct *ctx, char* term);
@@ -38,7 +36,7 @@
extern char* normalizeTerm(struct tijahContextStruct *ctx, char* term );
-extern int CMDtj_normalizeTerm(char** res, str term, str stemmer);
+extern int CMDtj_normalizeTerm(char** res, char *term, char *stemmer);
@c
#include <pf_config.h>
@@ -57,6 +55,8 @@
#include "serialize_null.h"
#include "serialize_pftijah.h"
+#include <gdk.h>
+
#include "pftijah_stem.h"
#include "pftijah_util.h"
@@ -999,7 +999,7 @@
return res;
}
-int CMDtj_normalizeTerm(char** res, str term, str stemmer) {
+int CMDtj_normalizeTerm(char** res, char *term, char *stemmer) {
tjStemCtx* stemCtx = getStemmingContext( stemmer );
if ( stemCtx->stem ) {
Index: pftijah_tokenize.l
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah_tokenize.l,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- pftijah_tokenize.l 30 May 2007 14:01:53 -0000 1.15
+++ pftijah_tokenize.l 15 Jun 2007 14:41:36 -0000 1.16
@@ -34,6 +34,8 @@
#include <pf_config.h>
#include "serialize_pftijah.h"
+#include <ctype.h>
+#include <string.h>
static char *c, *e;
Index: nexi.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/nexi.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- nexi.c 15 Jun 2007 07:00:41 -0000 1.67
+++ nexi.c 15 Jun 2007 14:41:34 -0000 1.68
@@ -73,7 +73,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include <getopt.h>
#include <string.h>
#include "pftijah.h"
Index: nexi_preprocessor.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/nexi_preprocessor.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- nexi_preprocessor.c 21 Mar 2007 07:35:28 -0000 1.8
+++ nexi_preprocessor.c 15 Jun 2007 14:41:34 -0000 1.9
@@ -33,7 +33,9 @@
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
#include <strings.h>
+#endif
#include "nexi.h"
#include <pftijah_stem.h>
Index: nexi_generate_mil.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/nexi_generate_mil.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- nexi_generate_mil.c 4 Jun 2007 21:45:08 -0000 1.34
+++ nexi_generate_mil.c 15 Jun 2007 14:41:34 -0000 1.35
@@ -34,7 +34,9 @@
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
#include <strings.h>
+#endif
#include <assert.h>
#include <gdk.h>
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
