X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=retrieval%2Fd1_espec.c;h=0b12c27dafe3ce22d543e8c723cb9772b6b62474;hp=59dd3d783a3fa627a61f5a8ec24b22946b9647df;hb=6866fce7b026f5ce8b75945f72a844d7b44abd85;hpb=ab6f8762c003a867d0e1eb8ac5686a99de47976a

diff --git a/retrieval/d1_espec.c b/retrieval/d1_espec.c
index 59dd3d7..0b12c27 100644
--- a/retrieval/d1_espec.c
+++ b/retrieval/d1_espec.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 1995-2001, Index Data.
+ * Copyright (c) 1995-2002, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Id: d1_espec.c,v 1.20 2001-09-30 20:15:49 adam Exp $
+ * $Id: d1_espec.c,v 1.22 2002-05-03 13:48:27 adam Exp $
  */
 
 #include <stdlib.h>
@@ -39,7 +39,7 @@ static Z_Variant *read_variant(int argc, char **argv, NMEM nmem,
 	char value[512];
 	Z_Triple *t;
 
-	if (sscanf(argv[i], "(%d,%d,%[^)])", &zclass, &type, value) < 3)
+	if (sscanf(argv[i], "(%d,%d,%511[^)])", &zclass, &type, value) < 3)
 	{
 	    yaz_log(LOG_WARN, "%s:%d: Syntax error in variant component '%s'",
 		    file, lineno, argv[i]);
@@ -150,8 +150,8 @@ static Z_ETagUnit *read_tagunit(char *buf, NMEM nmem,
 	else
 	    u->u.wildThing = read_occurrences(0, nmem, file, lineno);
     }
-    else if ((terms = sscanf(buf, "(%d,%[^)]):%[a-zA-Z0-9+]", &type, value,
-			     occ)) >= 2)
+    else if ((terms = sscanf(buf, "(%d,%511[^)]):%511[a-zA-Z0-9+]",
+                             &type, value, occ)) >= 2)
     {
 	int numval;
 	Z_SpecificTag *t;
@@ -202,7 +202,7 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
     char *argv[50], line[512];
     Z_Espec1 *res = (Z_Espec1 *)nmem_malloc(nmem, sizeof(*res));
     
-    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, "%s", file);
 	return 0;