From edff0b159ebbd0f26f58dda840f36ee400faab0c Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 18 Feb 1999 14:59:54 +0000
Subject: [PATCH] Minor changes.

---
 index/main.c     |    6 +++++-
 index/retrieve.c |    8 +++++---
 recctrl/recgrs.c |   24 +++++++++++++++++++++---
 tab/default.idx  |    4 ++--
 4 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/index/main.c b/index/main.c
index 25dcd26..68e68a3 100644
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.61  1999-02-02 14:51:00  adam
+ * Revision 1.62  1999-02-18 15:01:24  adam
+ * Minor changes.
+ *
+ * Revision 1.61  1999/02/02 14:51:00  adam
  * Updated WIN32 code specific sections. Changed header.
  *
  * Revision 1.60  1998/10/28 10:54:39  adam
@@ -302,6 +305,7 @@ int main (int argc, char **argv)
         " -n            Don't use shadow system.\n"
 	" -s            Show analysis on stdout, but do no work.\n"
 	" -v <level>    Set logging to <level>.\n"
+        " -l <file>     Write log to <file>.\n"
         " -f <n>        Display information for the first <n> records.\n"
         " -V            Show version.\n"
                  );
diff --git a/index/retrieve.c b/index/retrieve.c
index 43661f2..8e7aeca 100644
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: retrieve.c,v $
- * Revision 1.5  1999-02-17 11:29:56  adam
+ * Revision 1.6  1999-02-18 15:01:25  adam
+ * Minor changes.
+ *
+ * Revision 1.5  1999/02/17 11:29:56  adam
  * Fixed in record_fetch. Minor updates to API.
  *
  * Revision 1.4  1999/02/02 14:51:07  adam
@@ -232,9 +235,8 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
     retrieveCtrl.dh = zh->dh;
     (*rt->retrieve)(&retrieveCtrl);
     *output_format = retrieveCtrl.output_format;
+    *rec_bufp = retrieveCtrl.rec_buf;
     *rec_lenp = retrieveCtrl.rec_len;
-    *rec_bufp = odr_malloc (stream, *rec_lenp);
-    memcpy (*rec_bufp, retrieveCtrl.rec_buf, *rec_lenp);
     if (fc.fd != -1)
         close (fc.fd);
     rec_rm (&rec);
diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c
index d2beb77..7f25b55 100644
--- a/recctrl/recgrs.c
+++ b/recctrl/recgrs.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recgrs.c,v $
- * Revision 1.24  1999-02-02 14:51:28  adam
+ * Revision 1.25  1999-02-18 15:01:26  adam
+ * Minor changes.
+ *
+ * Revision 1.24  1999/02/02 14:51:28  adam
  * Updated WIN32 code specific sections. Changed header.
  *
  * Revision 1.23  1998/10/18 07:51:10  adam
@@ -620,11 +623,23 @@ static int grs_retrieve(struct recRetrieveCtrl *p)
 	    if (!(p->rec_buf = data1_nodetobuf(p->dh, node, selected,
 		(int*)&p->rec_len)))
 		p->diagnostic = 238;
+	    else
+	    {
+		char *new_buf = (char*) odr_malloc (p->odr, p->rec_len);
+		memcpy (new_buf, p->rec_buf, p->rec_len);
+		p->rec_buf = new_buf;
+	    }
 	    break;
 	case VAL_SOIF:
 	    if (!(p->rec_buf = data1_nodetosoif(p->dh, node, selected,
 						(int*)&p->rec_len)))
 		p->diagnostic = 238;
+	    else
+	    {
+		char *new_buf = (char*) odr_malloc (p->odr, p->rec_len);
+		memcpy (new_buf, p->rec_buf, p->rec_len);
+		p->rec_buf = new_buf;
+	    }
 	    break;
 	default:
             if (!node->u.root.absyn)
@@ -644,9 +659,12 @@ static int grs_retrieve(struct recRetrieveCtrl *p)
 	    if (!(p->rec_buf = data1_nodetomarc(p->dh, marctab, node,
 						selected,
 						(int*)&p->rec_len)))
-	    {
 		p->diagnostic = 238;
-		break;
+	    else
+	    {
+		char *new_buf = (char*) odr_malloc (p->odr, p->rec_len);
+		memcpy (new_buf, p->rec_buf, p->rec_len);
+		p->rec_buf = new_buf;
 	    }
     }
     if (node)
diff --git a/tab/default.idx b/tab/default.idx
index 029bb9f..fc29767 100644
--- a/tab/default.idx
+++ b/tab/default.idx
@@ -1,10 +1,10 @@
 # Zebra indexes as referred to from the *.abs-files.
-#  $Id: default.idx,v 1.6 1999-02-12 13:29:24 adam Exp $
+#  $Id: default.idx,v 1.7 1999-02-18 14:59:54 adam Exp $
 #
 # Traditional word index
 index w
 completeness 0
-position 0
+position 1
 charmap string.chr
 
 # Phrase index
-- 
1.7.10.4