X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_marc.c;h=4957bfb7e94c6487a89e8421ae1971d979709cfe;hb=086436151f45e51a855c748010a95615bc5e30a0;hp=2ac1842e4623cec850f364a1f0d019105ffde726;hpb=cea212fba995de3fa0d6d6723d828f6fd7ca31df;p=yaz-moved-to-github.git

diff --git a/retrieval/d1_marc.c b/retrieval/d1_marc.c
index 2ac1842..4957bfb 100644
--- a/retrieval/d1_marc.c
+++ b/retrieval/d1_marc.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_marc.c,v $
- * Revision 1.1  1995-11-01 11:56:08  quinn
+ * Revision 1.4  1996-03-25 10:18:03  quinn
+ * Removed trailing whitespace from data elements
+ *
+ * Revision 1.3  1995/11/01  16:34:57  quinn
+ * Making data1 look for tables in data1_tabpath
+ *
+ * Revision 1.2  1995/11/01  13:54:48  quinn
+ * Minor adjustments
+ *
+ * Revision 1.1  1995/11/01  11:56:08  quinn
  * Added Retrieval (data management) functions en masse.
  *
  *
@@ -14,12 +23,14 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 
 #include <oid.h>
 #include <log.h>
 #include <readconf.h>
 #include <xmalloc.h>
-#include "data1.h"
+#include <data1.h>
+#include <tpath.h>
 
 #define ISO2709_RS 035
 #define ISO2709_FS 036
@@ -32,7 +43,7 @@ data1_marctab *data1_read_marctab(char *file)
     char line[512], *argv[50];
     int argc;
     
-    if (!(f = fopen(file, "r")))
+    if (!(f = yaz_path_fopen(data1_tabpath, file, "r")))
     {
 	logf(LOG_WARN|LOG_ERRNO, "%s", file);
 	return 0;
@@ -138,6 +149,8 @@ static char *get_data(data1_node *n, int *len)
     }
 
     *len = n->u.data.len;
+    while (*len && isspace(n->u.data.data[*len - 1]))
+	(*len)--;
     return n->u.data.data;
 }