X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_absyn.c;h=9e4d41b492ce6c1042d303e41f5a44af02181b3d;hb=32ff7687bdfe5b972d54b1ba4f3078cee011fadf;hp=75f69bd2ae3aeb6971a078aad0249a1a666074f8;hpb=7dbfe8eb851425008edcba35173278f1c54fc037;p=yaz-moved-to-github.git

diff --git a/retrieval/d1_absyn.c b/retrieval/d1_absyn.c
index 75f69bd..9e4d41b 100644
--- a/retrieval/d1_absyn.c
+++ b/retrieval/d1_absyn.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_absyn.c,v $
- * Revision 1.30  2000-12-05 19:07:24  adam
+ * Revision 1.32  2002-07-25 12:52:53  adam
+ * Character set negotiation updates
+ *
+ * Revision 1.31  2002/04/04 20:49:46  adam
+ * New functions yaz_is_abspath, yaz_path_fopen_base
+ *
+ * Revision 1.30  2000/12/05 19:07:24  adam
  * Fixed problem with element level in reading of abstract syntax.
  *
  * Revision 1.29  2000/12/05 14:34:49  adam
@@ -416,7 +422,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file)
     int argc;
     char *argv[50], line[512];
 
-    if (!(f = yaz_path_fopen(data1_get_tabpath (dh), file, "r")))
+    if (!(f = data1_path_fopen(dh, file, "r")))
     {
 	yaz_log(LOG_WARN|LOG_ERRNO, "Couldn't open %s", file);
 	return 0;
@@ -426,6 +432,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file)
     res->name = 0;
     res->reference = VAL_NONE;
     res->tagset = 0;
+    res->encoding = 0;
     tagset_childp = &res->tagset;
 
     res->attset = data1_empty_attset (dh);
@@ -766,6 +773,16 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file)
 	    }
 	    marcp = &(*marcp)->next;
 	}
+	else if (!strcmp(cmd, "encoding"))
+	{
+	    if (argc != 2)
+	    {
+		yaz_log(LOG_WARN, "%s:%d: Bad # or args for encoding",
+		     file, lineno);
+		continue;
+	    }
+            res->encoding = nmem_strdup (data1_nmem_get(dh), argv[1]);
+	}
 	else
 	{
 	    yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'", file, lineno, cmd);