adjusted include file names, if'd debug code

arangod/FulltextIndex/FTS_index.c

@@ -4,9 +4,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include "avodoc.h"
-#include "zstr.h"
-#include "FTS_index.h"
+
+#include "FulltextIndex/avodoc.h"
+#include "FulltextIndex/zstr.h"
+#include "FulltextIndex/FTS_index.h"
 
 /* codes - in zcode.c so need externs here  */
 extern ZCOD zcutf;
@@ -121,6 +122,8 @@ void FTS_FreeIndex ( FTS_index_t * ftx)
     free(ix->handles);
     free(ix);
 }
+
+#if 0
 int xxlet[100];
 void index2dump(FTS_real_index * ix, uint64_t kkey, int lev)
 {
@@ -230,7 +233,7 @@ temp=ix->handles[i];
     kroot=ZStrTuberK(ix->index2,0,0,0);
     index2dump(ix,kroot,1);
 }
-
+#endif
 void RealAddDocument(FTS_index_t * ftx, FTS_document_id_t docid)
 {
     FTS_real_index * ix;
@@ -245,14 +248,15 @@ void RealAddDocument(FTS_index_t * ftx, FTS_document_id_t docid)
     int ixlen;
     uint16_t * wpt;
     uint64_t handle, newhan, oldhan;
-    uint64_t kroot,kroot1;
+    uint64_t kroot;
+    uint64_t kroot1 = 0; /* initialise even if unused. this will prevent compiler warnings */
     int nowords,wdx;
     int i,j,len,j1,j2;
     uint8_t * utf;
     uint64_t unicode;
     uint64_t tran,x64,oldlet, newlet, bkey;
     uint64_t docb,dock;
-   
+
     ix = (FTS_real_index *)ftx;
     kroot=ZStrTuberK(ix->index2,0,0,0);
     if(ix->options==FTS_INDEX_SUBSTRINGS)

arangod/FulltextIndex/avodoc.c

@@ -4,11 +4,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
+
 #include "avodoc.h"
-#include "FTS_index.h"
+
+#include "FulltextIndex/FTS_index.h"
 
 
-FTS_texts_t * cons()
+static FTS_texts_t * cons(void)
 {
     FTS_texts_t * tx;
     tx=malloc(sizeof(FTS_texts_t));
@@ -162,6 +164,7 @@ FTS_texts_t * FTS_GetTexts
     return tx;
 }
 
+#if 0
 int main(int argc, char ** argv)
 {
     long long x1;
@@ -432,6 +435,7 @@ temp=queryres->_docs[i];
     printf("First simple test completed - free'd the index again\n");
     return 0;
 }
+#endif
 
 /* end of avodoc.c */
 

arangod/FulltextIndex/zcode.c

@@ -4,7 +4,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include "zstr.h"
+
+#include "FulltextIndex/zstr.h"
 
 /* zcutf code for storing letters in words  */
 uint64_t zcutfX[]={0,1,2,3,4,5,6,7,8,9,10,12,16,24,88,65624};

arangod/FulltextIndex/zstr.c

@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
+
 #include "zstr.h"
 
 ZSTR * ZStrCons(int elts)

arangod/Makefile.files

@@ -48,6 +48,10 @@ bin_arangod_SOURCES = \
 	arangod/BitIndexes/bitarray.c \
 	arangod/BitIndexes/bitarrayIndex.c \
 	arangod/GeoIndex/GeoIndex.c \
+	arangod/FulltextIndex/avodoc.c \
+	arangod/FulltextIndex/FTS_index.c \
+	arangod/FulltextIndex/zcode.c \
+	arangod/FulltextIndex/zstr.c \
 	arangod/HashIndex/hasharray.c \
 	arangod/HashIndex/hashindex.c \
 	arangod/IndexIterators/index-iterator.c \