# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
+@SET_MAKE@
+
all-recursive install-data-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive info-recursive dvi-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
+ rev="$$subdir $$rev"; \
+ test "$$subdir" = "." && dot_seen=yes; \
done; \
- rev="$$rev ."; \
+ test "$$dot_seen" = "no" && rev=". $$rev"; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
echo "Making $$target in $$subdir"; \
* OF THIS SOFTWARE.
*
* $Log: data1.h,v $
- * Revision 1.5 2000-11-29 14:22:47 adam
+ * Revision 1.6 2000-12-05 12:21:45 adam
+ * Added termlist source for data1 system.
+ *
+ * Revision 1.5 2000/11/29 14:22:47 adam
* Implemented XML/SGML attributes for data1 so that d1_read reads them
* and d1_write generates proper attributes for XML/SGML records. Added
* register locking for threaded version.
{
data1_att *att;
char *structure;
+ char *source;
struct data1_termlist *next;
} data1_termlist;
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_absyn.c,v $
- * Revision 1.27 1999-12-21 14:16:19 ian
+ * Revision 1.28 2000-12-05 12:21:45 adam
+ * Added termlist source for data1 system.
+ *
+ * Revision 1.27 1999/12/21 14:16:19 ian
* Changed retrieval module to allow data1 trees with no associated absyn.
* Also added a simple interface for extracting values from data1 trees using
* a string based tagpath.
do
{
char attname[512], structure[512];
+ char *source;
int r;
if (!(r = sscanf(p, "%511[^:,]:%511[^,]", attname,
fclose(f);
return 0;
}
+ if (r == 2 && (source = strchr(structure, ':')))
+ *source++ = '\0'; /* cut off structure .. */
+ else
+ source = "data"; /* ok: default is leaf data */
+ (*tp)->source = (char *)
+ nmem_strdup (data1_nmem_get (dh), source);
+
if (r < 2) /* is the structure qualified? */
(*tp)->structure = "w";
else
- {
(*tp)->structure = (char *)
- nmem_malloc (data1_nmem_get (dh),
- strlen(structure)+1);
- strcpy ((*tp)->structure, structure);
- }
+ nmem_strdup (data1_nmem_get (dh), structure);
tp = &(*tp)->next;
}
while ((p = strchr(p, ',')) && *(++p));