X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=recctrl%2Fcsvread.c;h=cbf73e1be2e37bc483a4a1f582399eb6ae5c8403;hb=b6ff969813b5ac4c0a6b266979469b0cc24201fd;hp=988d5fe24fd85fff49a466a0aaacd69024550fca;hpb=e7e1b9261c5b813008b95f279be96b13568ffedf;p=idzebra-moved-to-github.git

diff --git a/recctrl/csvread.c b/recctrl/csvread.c
index 988d5fe..cbf73e1 100644
--- a/recctrl/csvread.c
+++ b/recctrl/csvread.c
@@ -1,4 +1,4 @@
-/* $Id: csvread.c,v 1.2 2005-12-05 13:58:52 marc Exp $
+/* $Id: csvread.c,v 1.4 2006-04-26 11:12:31 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -46,7 +46,7 @@ struct csv_getc_info {
 };
 */
 
-static struct csv_t {
+struct csv_t {
   NMEM nmem;
   int buf_size;
   char *buf;
@@ -66,7 +66,7 @@ static struct csv_t {
 };
 
 
-static void grs_config_csv(void *clientData, Res res, const char *args)
+static ZEBRA_RES grs_config_csv(void *clientData, Res res, const char *args)
 {
   int i;
   struct csv_t *csvp = (struct csv_t*) clientData;
@@ -91,8 +91,8 @@ static void grs_config_csv(void *clientData, Res res, const char *args)
   /* csvp->field_names = 0; */ /*nmem_strdup(csvp->nmem, "a|b|c|d|e");*/
 
   csvp->field_name 
-    = nmem_malloc(csvp->nmem, 
-                  sizeof(*(csvp->field_name)) * csvp->max_nr_fields);
+      = nmem_malloc(csvp->nmem, 
+		    sizeof(*(csvp->field_name)) * csvp->max_nr_fields);
   for (i = 0; i < csvp->max_nr_fields; i++){
     csvp->field_name[i] = 0; 
   }
@@ -103,6 +103,7 @@ static void grs_config_csv(void *clientData, Res res, const char *args)
   */
 
   yaz_log (YLOG_LOG, "Ended CSV filter grs_config_csv");
+  return ZEBRA_OK;
 }
 
 
@@ -261,9 +262,9 @@ static data1_node *grs_read_csv (struct grs_read_info *gri)
 
 static void *grs_init_csv(Res res, RecType recType)
 {
-  yaz_log (YLOG_LOG, "Called CSV filter grs_init_csv");
   NMEM m = nmem_create();
   struct csv_t *csvp = (struct csv_t *) nmem_malloc(m, sizeof(*csvp));
+  yaz_log (YLOG_LOG, "Called CSV filter grs_init_csv");
   csvp->nmem = m;
   yaz_log (YLOG_LOG, "Ended CSV filter grs_init_csv");
   return csvp;