X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_read.c;h=1740c21494fe295caacd0f8c58d5b223fe0a33c9;hb=e7abd38ba0b6a5076d710a9bdc1eecd22abe00a8;hp=35eff2c05379d84f41b83bf8a676dececb25c6f0;hpb=110e7f1267301bf0174e9423b0b1a7172e0b3ae2;p=yaz-moved-to-github.git

diff --git a/retrieval/d1_read.c b/retrieval/d1_read.c
index 35eff2c..1740c21 100644
--- a/retrieval/d1_read.c
+++ b/retrieval/d1_read.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_read.c,v $
- * Revision 1.12  1996-10-11 10:35:38  adam
+ * Revision 1.14  1997-05-14 06:54:04  adam
+ * C++ support.
+ *
+ * Revision 1.13  1996/10/29 13:35:38  adam
+ * Implemented data1_set_tabpath and data1_get_tabpath.
+ *
+ * Revision 1.12  1996/10/11 10:35:38  adam
  * Fixed a bug that caused data1_read_node to core dump when no abstract
  * syntax was defined in a "sgml"-record.
  *
@@ -97,8 +103,24 @@
 
 char *data1_tabpath = 0; /* global path for tables */
 
-void data1_set_tabpath(char *p)
-{ data1_tabpath = p; }
+void data1_set_tabpath(const char *p)
+{
+    if (data1_tabpath)
+    {
+        xfree (data1_tabpath);
+        data1_tabpath = NULL;
+    }
+    if (p)
+    {
+        data1_tabpath = xmalloc (strlen(p)+1);
+        strcpy (data1_tabpath, p);
+    }
+}
+
+const char *data1_get_tabpath (void)
+{
+    return data1_tabpath;
+}
 
 #if 0
 static data1_node *freelist = 0;
@@ -283,18 +305,18 @@ data1_node *data1_read_node(char **buf, data1_node *parent, int *line,
 	}
 	else if (!strncmp(tag, "var", 3))
 	{
-	    char class[DATA1_MAX_SYMBOL], type[DATA1_MAX_SYMBOL];
+	    char tclass[DATA1_MAX_SYMBOL], type[DATA1_MAX_SYMBOL];
 	    data1_vartype *tp;
 	    int val_offset;
 	    data1_node *p;
 
-	    if (sscanf(args, "%s %s %n", class, type, &val_offset) != 2)
+	    if (sscanf(args, "%s %s %n", tclass, type, &val_offset) != 2)
 	    {
 		logf(LOG_WARN, "Malformed variant triple at '%s'", tag);
 		return 0;
 	    }
 	    if (!(tp = data1_getvartypebyct(parent->root->u.root.absyn->varset,
-		class, type)))
+		tclass, type)))
 		return 0;
 	    
 	    /*