projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[yaz-moved-to-github.git]
/
retrieval
/
d1_handle.c
diff --git
a/retrieval/d1_handle.c
b/retrieval/d1_handle.c
index
d294218
..
0c1fef1
100644
(file)
--- a/
retrieval/d1_handle.c
+++ b/
retrieval/d1_handle.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_handle.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_handle.c,v $
- * Revision 1.1 1997-09-17 12:28:24 adam
+ * Revision 1.3 1998-02-11 11:53:35 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.2 1997/09/30 11:50:04 adam
+ * Added handler data1_get_map_buf that is used by data1_nodetomarc.
+ *
+ * Revision 1.1 1997/09/17 12:28:24 adam
* Introduced new 'global' data1 handle.
*
*/
* Introduced new 'global' data1 handle.
*
*/
@@
-18,21
+24,29
@@
struct data1_handle_info {
WRBUF wrbuf;
char *tab_path;
struct data1_handle_info {
WRBUF wrbuf;
char *tab_path;
+
char *read_buf;
int read_len;
char *read_buf;
int read_len;
+
data1_absyn_cache absyn_cache;
data1_absyn_cache absyn_cache;
+
+ char *map_buf;
+ int map_len;
+
NMEM mem;
};
data1_handle data1_create (void)
{
NMEM mem;
};
data1_handle data1_create (void)
{
- data1_handle p = xmalloc (sizeof(*p));
+ data1_handle p = (data1_handle)xmalloc (sizeof(*p));
if (!p)
return NULL;
p->tab_path = NULL;
p->wrbuf = wrbuf_alloc();
p->read_buf = NULL;
p->read_len = 0;
if (!p)
return NULL;
p->tab_path = NULL;
p->wrbuf = wrbuf_alloc();
p->read_buf = NULL;
p->read_len = 0;
+ p->map_buf = NULL;
+ p->map_len = 0;
p->absyn_cache = NULL;
p->mem = nmem_create ();
return p;
p->absyn_cache = NULL;
p->mem = nmem_create ();
return p;
@@
-57,6
+71,8
@@
void data1_destroy (data1_handle dh)
xfree (dh->tab_path);
if (dh->read_buf)
xfree (dh->read_buf);
xfree (dh->tab_path);
if (dh->read_buf)
xfree (dh->read_buf);
+ if (dh->map_buf)
+ xfree (dh->map_buf);
nmem_destroy (dh->mem);
xfree (dh);
nmem_destroy (dh->mem);
xfree (dh);
@@
-70,9
+86,16
@@
WRBUF data1_get_wrbuf (data1_handle dp)
char **data1_get_read_buf (data1_handle dp, int **lenp)
{
*lenp = &dp->read_len;
char **data1_get_read_buf (data1_handle dp, int **lenp)
{
*lenp = &dp->read_len;
+ logf (LOG_DEBUG, "data1_get_read_buf lenp=%u", **lenp);
return &dp->read_buf;
}
return &dp->read_buf;
}
+char **data1_get_map_buf (data1_handle dp, int **lenp)
+{
+ *lenp = &dp->map_len;
+ logf (LOG_DEBUG, "data1_get_map_buf lenp=%u", **lenp);
+ return &dp->map_buf;
+}
void data1_set_tabpath (data1_handle dp, const char *p)
{
void data1_set_tabpath (data1_handle dp, const char *p)
{
@@
-83,7
+106,7
@@
void data1_set_tabpath (data1_handle dp, const char *p)
}
if (p)
{
}
if (p)
{
- dp->tab_path = xmalloc (strlen(p)+1);
+ dp->tab_path = (char *)xmalloc (strlen(p)+1);
strcpy (dp->tab_path, p);
}
}
strcpy (dp->tab_path, p);
}
}