-/*
- * Copyright (C) 1994-2002, Index Data
- * All rights reserved.
- *
- * $Id: recgrs.c,v 1.57 2002-08-01 09:37:44 adam Exp $
- */
+/* $Id: recgrs.c,v 1.59 2002-08-02 19:26:56 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+ Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra. If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
#include <stdio.h>
#include <assert.h>
else
{
data1_xattr *xp;
- (*p->tokenAdd)(wrd);
-
-#if 0
- for (xp = n->u.tag.attributes; xp; xp = xp->next)
+ (*p->tokenAdd)(wrd); /* index element pag (AKA tag path) */
+ if (use == 1)
{
- if (use == 1)
- { /* attribute (no value) */
- wrd->reg_type = '0';
- wrd->attrUse = 3;
- wrd->string = xp->name;
- wrd->length = strlen(xp->name);
-
- wrd->seqno--;
- (*p->tokenAdd)(wrd);
- }
- }
-#else
- for (xp = n->u.tag.attributes; xp; xp = xp->next)
- {
- char comb[512];
-
- if (use == 1)
- { /* attribute start */
+ for (xp = n->u.tag.attributes; xp; xp = xp->next)
+ {
+ char comb[512];
+ /* attribute (no value) */
wrd->reg_type = '0';
wrd->attrUse = 3;
wrd->string = xp->name;
wrd->seqno--;
(*p->tokenAdd)(wrd);
- }
-
- if (use == 1 && xp->value &&
- strlen(xp->name) + strlen(xp->value) < sizeof(comb)-2)
+
+ if (xp->value &&
+ strlen(xp->name) + strlen(xp->value) < sizeof(comb)-2)
+ {
+ /* attribute value exact */
+ strcpy (comb, xp->name);
+ strcat (comb, "=");
+ strcat (comb, xp->value);
+
+ wrd->attrUse = 3;
+ wrd->reg_type = '0';
+ wrd->string = comb;
+ wrd->length = strlen(comb);
+ wrd->seqno--;
+
+ (*p->tokenAdd)(wrd);
+ }
+ }
+ for (xp = n->u.tag.attributes; xp; xp = xp->next)
{
- /* attribute value exact */
- strcpy (comb, xp->name);
- strcat (comb, "=");
- strcat (comb, xp->value);
+ char attr_tag_path_full[1024];
- wrd->attrUse = 3;
+ sprintf (attr_tag_path_full, "@%s/%.*s",
+ xp->name, flen, tag_path_full);
+
wrd->reg_type = '0';
- wrd->string = comb;
- wrd->length = strlen(comb);
- wrd->seqno--;
-
+ wrd->attrUse = 1;
+ wrd->string = attr_tag_path_full;
+ wrd->length = strlen(attr_tag_path_full);
(*p->tokenAdd)(wrd);
-
- /* attribute value phrase */
-
+
wrd->attrUse = 1015;
wrd->reg_type = 'w';
wrd->string = xp->value;
wrd->length = strlen(xp->value);
-
+
(*p->tokenAdd)(wrd);
- }
- if (use == 2)
- {
- wrd->reg_type = '0';
- wrd->attrUse = 4;
- wrd->string = xp->name;
- wrd->length = strlen(xp->name);
+ wrd->reg_type = '0';
+ wrd->attrUse = 2;
+ wrd->string = attr_tag_path_full;
+ wrd->length = strlen(attr_tag_path_full);
(*p->tokenAdd)(wrd);
}
}
-#endif
}
- break;
}
}