-/* $Id: d1_attset.c,v 1.9 2006-05-19 13:49:33 adam Exp $
- Copyright (C) 1995-2006
+/* $Id: d1_attset.c,v 1.13 2007-01-15 15:10:14 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
{
int num;
char *name;
+ char *endptr;
data1_att *t;
- data1_local_attribute *locals;
if (argc < 3)
{
yaz_log(YLOG_WARN, "%s:%d: Bad # of args to att", file, lineno);
continue;
}
- num = atoi (argv[1]);
+ if (argc > 3)
+ {
+ yaz_log(YLOG_WARN, "%s:%d: Local attributes not supported",
+ file, lineno);
+ }
+ num = strtol(argv[1], &endptr, 10);
+ if (*endptr != '\0')
+ {
+ yaz_log(YLOG_WARN, "%s:%d: Bad attribute integer %s",
+ file, lineno, argv[1]);
+ continue;
+ }
name = argv[2];
- if (argc == 3) /* no local attributes given */
- {
- locals = (data1_local_attribute *)
- nmem_malloc(mem, sizeof(*locals));
- locals->local = num;
- locals->next = 0;
- }
- else /* parse the string "local{,local}" */
- {
- char *p = argv[3];
- data1_local_attribute **ap = &locals;
- do
- {
- *ap = (data1_local_attribute *)
- nmem_malloc(mem, sizeof(**ap));
- (*ap)->local = atoi(p);
- (*ap)->next = 0;
- ap = &(*ap)->next;
- }
- while ((p = strchr(p, ',')) && *(++p));
- }
t = *attp = (data1_att *)nmem_malloc(mem, sizeof(*t));
t->parent = res;
t->name = nmem_strdup(mem, name);
t->value = num;
- t->locals = locals;
t->next = 0;
attp = &t->next;
}