projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update for YAZ 3s new OID system
[idzebra-moved-to-github.git]
/
data1
/
d1_attset.c
diff --git
a/data1/d1_attset.c
b/data1/d1_attset.c
index
17963e9
..
fd0bd72
100644
(file)
--- a/
data1/d1_attset.c
+++ b/
data1/d1_attset.c
@@
-1,5
+1,5
@@
-/* $Id: d1_attset.c,v 1.10 2006-05-19 23:45:28 adam Exp $
- Copyright (C) 1995-2006
+/* $Id: d1_attset.c,v 1.14 2007-04-16 08:44:31 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
Index Data ApS
This file is part of the Zebra server.
@@
-15,9
+15,9
@@
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
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>
*/
#include <stdio.h>
@@
-25,6
+25,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdlib.h>
#include <yaz/log.h>
#include <stdlib.h>
#include <yaz/log.h>
+#include <yaz/oid_db.h>
#include <idzebra/data1.h>
data1_att *data1_getattbyname(data1_handle dh, data1_attset *s, const char *name)
#include <idzebra/data1.h>
data1_att *data1_getattbyname(data1_handle dh, data1_attset *s, const char *name)
@@
-52,7
+53,7
@@
data1_attset *data1_empty_attset(data1_handle dh)
data1_attset *res = (data1_attset*) nmem_malloc(mem,sizeof(*res));
res->name = 0;
data1_attset *res = (data1_attset*) nmem_malloc(mem,sizeof(*res));
res->name = 0;
- res->reference = VAL_NONE;
+ res->oid = 0;
res->atts = 0;
res->children = 0;
res->next = 0;
res->atts = 0;
res->children = 0;
res->next = 0;
@@
-84,6
+85,7
@@
data1_attset *data1_read_attset(data1_handle dh, const char *file)
{
int num;
char *name;
{
int num;
char *name;
+ char *endptr;
data1_att *t;
if (argc < 3)
data1_att *t;
if (argc < 3)
@@
-96,7
+98,13
@@
data1_attset *data1_read_attset(data1_handle dh, const char *file)
yaz_log(YLOG_WARN, "%s:%d: Local attributes not supported",
file, lineno);
}
yaz_log(YLOG_WARN, "%s:%d: Local attributes not supported",
file, lineno);
}
- num = atoi (argv[1]);
+ 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];
t = *attp = (data1_att *)nmem_malloc(mem, sizeof(*t));
name = argv[2];
t = *attp = (data1_att *)nmem_malloc(mem, sizeof(*t));
@@
-125,7
+133,10
@@
data1_attset *data1_read_attset(data1_handle dh, const char *file)
continue;
}
name = argv[1];
continue;
}
name = argv[1];
- if ((res->reference = oid_getvalbyname(name)) == VAL_NONE)
+
+ res->oid = yaz_string_to_oid_nmem(yaz_oid_std(),
+ CLASS_ATTSET, name, mem);
+ if (!res->oid)
{
yaz_log(YLOG_WARN, "%s:%d: Unknown reference oid '%s'",
file, lineno, name);
{
yaz_log(YLOG_WARN, "%s:%d: Unknown reference oid '%s'",
file, lineno, name);