X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_marc.c;h=198e8520365b478123060926050b6f25a9cd1866;hb=4b867394d5d5dda2be8427c96e0fb0fd07eddbdc;hp=6c3d0a17180af88a39848c36a6b2b445c26c7b76;hpb=7eb2f0de616840d9a340519eac4c271820cd1248;p=yaz-moved-to-github.git

diff --git a/retrieval/d1_marc.c b/retrieval/d1_marc.c
index 6c3d0a1..198e852 100644
--- a/retrieval/d1_marc.c
+++ b/retrieval/d1_marc.c
@@ -1,10 +1,25 @@
 /*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_marc.c,v $
- * Revision 1.7  1997-09-05 09:50:57  adam
+ * Revision 1.12  1998-02-23 10:57:09  adam
+ * Take care of integer data nodes as well in conversion.
+ *
+ * Revision 1.11  1998/02/11 11:53:35  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.10  1997/09/30 11:50:04  adam
+ * Added handler data1_get_map_buf that is used by data1_nodetomarc.
+ *
+ * Revision 1.9  1997/09/24 13:35:45  adam
+ * Added two members to data1_marctab to ease reading of weird MARC records.
+ *
+ * Revision 1.8  1997/09/17 12:10:37  adam
+ * YAZ version 1.4.
+ *
+ * Revision 1.7  1997/09/05 09:50:57  adam
  * Removed global data1_tabpath - uses data1_get_tabpath() instead.
  *
  * Revision 1.6  1997/09/04 13:51:58  adam
@@ -42,14 +57,15 @@
 #include <data1.h>
 #include <tpath.h>
 
-data1_marctab *data1_read_marctab(char *file)
+data1_marctab *data1_read_marctab (data1_handle dh, const char *file)
 {
     FILE *f;
-    data1_marctab *res = xmalloc(sizeof(*res));
+    NMEM mem = data1_nmem_get (dh);
+    data1_marctab *res = (data1_marctab *)nmem_malloc(mem, sizeof(*res));
     char line[512], *argv[50];
     int argc;
     
-    if (!(f = yaz_path_fopen(data1_get_tabpath(), file, "r")))
+    if (!(f = yaz_path_fopen(data1_get_tabpath(dh), file, "r")))
     {
 	logf(LOG_WARN|LOG_ERRNO, "%s", file);
 	return 0;
@@ -67,6 +83,8 @@ data1_marctab *data1_read_marctab(char *file)
     strcpy(res->implementation_codes, "    ");
     res->indicator_length = 2;
     res->identifier_length = 2;
+    res->force_indicator_length = -1;
+    res->force_identifier_length = -1;
     strcpy(res->user_systems, "z  ");
 
     while ((argc = readconf_line(f, line, 512, argv, 50)))
@@ -77,8 +95,7 @@ data1_marctab *data1_read_marctab(char *file)
 		logf(LOG_WARN, "%s: Bad name directive");
 		continue;
 	    }
-	    res->name = xmalloc(strlen(argv[1])+1);
-	    strcpy(res->name, argv[1]);
+	    res->name = nmem_strdup(mem, argv[1]);
 	}
 	else if (!strcmp(argv[0], "reference"))
 	{
@@ -130,6 +147,24 @@ data1_marctab *data1_read_marctab(char *file)
 	    }
 	    strncpy(res->future_use, argv[1], 2);
 	}
+	else if (!strcmp(argv[0], "force-indicator-length"))
+	{
+	    if (argc != 2)
+	    {
+		logf(LOG_WARN, "%s: Bad future-use");
+		continue;
+	    }
+	    res->force_indicator_length = atoi(argv[1]);
+	}
+	else if (!strcmp(argv[0], "force-identifier-length"))
+	{
+	    if (argc != 2)
+	    {
+		logf(LOG_WARN, "%s: Bad future-use");
+		continue;
+	    }
+	    res->force_identifier_length = atoi(argv[1]);
+	}
 	else
 	    logf(LOG_WARN, "%s: Bad directive '%s'", file, argv[0]);
 
@@ -147,7 +182,8 @@ static char *get_data(data1_node *n, int *len)
 
     while (n->which != DATA1N_data && n->child)
 	n = n->child;
-    if (n->which != DATA1N_data || n->u.data.what != DATA1I_text)
+    if (n->which != DATA1N_data || 
+	(n->u.data.what != DATA1I_text && n->u.data.what != DATA1I_num))
     {
 	r = "[Structured/included data]";
 	*len = strlen(r);
@@ -162,7 +198,7 @@ static char *get_data(data1_node *n, int *len)
 
 static void memint (char *p, int val, int len)
 {
-    static char buf[9];
+    char buf[10];
 
     if (len == 1)
         *p = val + '0';
@@ -196,6 +232,7 @@ static int nodetomarc(data1_marctab *p, data1_node *n, int selected,
     char *op;
     data1_node *field, *subf;
 
+    logf (LOG_DEBUG, "nodetomarc");
     for (field = n->child; field; field = field->next)
     {
 	if (field->which != DATA1N_tag)
@@ -233,9 +270,9 @@ static int nodetomarc(data1_marctab *p, data1_node *n, int selected,
     }
 
     if (!*buf)
-	*buf = xmalloc(*size = len);
+	*buf = (char *)xmalloc(*size = len);
     else if (*size <= len)
-	*buf = xrealloc(*buf, *size = len);
+	*buf = (char *)xrealloc(*buf, *size = len);
 	
     op = *buf;
     memint (op, len, 5);
@@ -303,11 +340,12 @@ static int nodetomarc(data1_marctab *p, data1_node *n, int selected,
     return len;
 }
 
-char *data1_nodetomarc(data1_marctab *p, data1_node *n, int selected, int *len)
+char *data1_nodetomarc(data1_handle dh, data1_marctab *p, data1_node *n,
+		       int selected, int *len)
 {
-    static char *buf = 0;
-    static int size = 0;
+    int *size;
+    char **buf = data1_get_map_buf (dh, &size);
 
-    *len = nodetomarc(p, n, selected, &buf, &size);
-    return buf;
+    *len = nodetomarc(p, n, selected, buf, size);
+    return *buf;
 }