Convert to ISO-8859-1 for indexing and retrieval

diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c
index 1e0c72a..b832911 100644 (file)
--- a/recctrl/recgrs.c
+++ b/recctrl/recgrs.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1994-2002, Index Data
  * All rights reserved.
  *
- * $Id: recgrs.c,v 1.53 2002-07-03 10:05:19 adam Exp $
+ * $Id: recgrs.c,v 1.54 2002-07-05 16:07:02 adam Exp $
  */
 
 #include <stdio.h>
@@ -358,6 +358,7 @@ int grs_extract_tree(struct recExtractCtrl *p, data1_node *n)
             (*p->schemaAdd)(p, oidtmp);
     }
     (*p->init)(p, &wrd);
+
     return dumpkeys(n, p, 0, &wrd);
 }
 
@@ -398,6 +399,8 @@ static int grs_extract_sub(struct grs_handlers *h, struct recExtractCtrl *p,
 #if 0
     data1_pr_tree (p->dh, n, stdout);
 #endif
+    data1_iconv (p->dh, mem, n, "ISO-8859-1", "UTF-8");
+
     (*p->init)(p, &wrd);
     if (dumpkeys(n, p, 0, &wrd) < 0)
     {
@@ -708,6 +711,9 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
 #if 0
     data1_pr_tree (p->dh, node, stdout);
 #endif
+#if 1
+    data1_iconv (p->dh, mem, node, "ISO-8859-1", "UTF-8");
+#endif
     logf (LOG_DEBUG, "grs_retrieve: transfer syntax mapping");
     switch (p->output_format = (p->input_format != VAL_NONE ?
                                p->input_format : VAL_SUTRS))

diff --git a/test/gils/Makefile.am b/test/gils/Makefile.am
index e7257fd..0b1075a 100644 (file)
--- a/test/gils/Makefile.am
+++ b/test/gils/Makefile.am
@@ -6,8 +6,4 @@ dist-hook:
        -mkdir $(distdir)/records
        cp $(srcdir)/records/*.grs $(distdir)/records
 
-test:
-       ../../index/zmbolidx init
-       ../../index/zmbolidx update records
-
 TESTS = t1.sh t2.sh t3.sh t4.sh t5.sh t6.sh t7.sh t8.sh