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
WS changes for function calls.
[idzebra-moved-to-github.git]
/
data1
/
d1_tagset.c
diff --git
a/data1/d1_tagset.c
b/data1/d1_tagset.c
index
e0a8570
..
b55dfaa
100644
(file)
--- a/
data1/d1_tagset.c
+++ b/
data1/d1_tagset.c
@@
-1,6
+1,6
@@
-/* $Id: d1_tagset.c,v 1.2 2002-10-22 13:19:50 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: d1_tagset.c,v 1.10 2007-04-16 08:44:31 adam Exp $
+ Copyright (C) 1995-2007
+ Index Data ApS
This file is part of the Zebra server.
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,7
+25,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <string.h>
#include <yaz/log.h>
#include <string.h>
#include <yaz/log.h>
-#include <data1.h>
+#include <idzebra/data1.h>
+#include <yaz/oid_db.h>
/*
* We'll probably want to add some sort of hashed index to these lookup-
/*
* We'll probably want to add some sort of hashed index to these lookup-
@@
-108,7
+109,7
@@
data1_tagset *data1_empty_tagset (data1_handle dh)
data1_tagset *res =
(data1_tagset *) nmem_malloc(data1_nmem_get (dh), sizeof(*res));
res->name = 0;
data1_tagset *res =
(data1_tagset *) nmem_malloc(data1_nmem_get (dh), sizeof(*res));
res->name = 0;
- res->reference = VAL_NONE;
+ res->oid = 0;
res->tags = 0;
res->type = 0;
res->children = 0;
res->tags = 0;
res->type = 0;
res->children = 0;
@@
-129,7
+130,7
@@
data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
if (!(f = data1_path_fopen(dh, file, "r")))
{
if (!(f = data1_path_fopen(dh, file, "r")))
{
- yaz_log(LOG_WARN|LOG_ERRNO, "%s", file);
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", file);
return 0;
}
res = data1_empty_tagset (dh);
return 0;
}
res = data1_empty_tagset (dh);
@@
-149,7
+150,7
@@
data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
if (argc != 4)
{
if (argc != 4)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # args to tag", file, lineno);
+ yaz_log(YLOG_WARN, "%s:%d: Bad # args to tag", file, lineno);
continue;
}
value = atoi(argv[1]);
continue;
}
value = atoi(argv[1]);
@@
-167,7
+168,7
@@
data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
if (!(rr->kind = data1_maptype(dh, type)))
{
if (!(rr->kind = data1_maptype(dh, type)))
{
- yaz_log(LOG_WARN, "%s:%d: Unknown datatype %s",
+ yaz_log(YLOG_WARN, "%s:%d: Unknown datatype %s",
file, lineno, type);
fclose(f);
return 0;
file, lineno, type);
fclose(f);
return 0;
@@
-195,7
+196,7
@@
data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
{
if (argc != 2)
{
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # args to name", file, lineno);
+ yaz_log(YLOG_WARN, "%s:%d: Bad # args to name", file, lineno);
continue;
}
res->name = nmem_strdup(mem, argv[1]);
continue;
}
res->name = nmem_strdup(mem, argv[1]);
@@
-206,14
+207,16
@@
data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
if (argc != 2)
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # args to reference",
+ yaz_log(YLOG_WARN, "%s:%d: Bad # args to reference",
file, lineno);
continue;
}
name = argv[1];
file, lineno);
continue;
}
name = argv[1];
- if ((res->reference = oid_getvalbyname(name)) == VAL_NONE)
+ res->oid = yaz_string_to_oid_nmem(yaz_oid_std(),
+ CLASS_TAGSET, name, mem);
+ if (!res->oid)
{
{
- yaz_log(LOG_WARN, "%s:%d: Unknown tagset ref '%s'",
+ yaz_log(YLOG_WARN, "%s:%d: Unknown tagset ref '%s'",
file, lineno, name);
continue;
}
file, lineno, name);
continue;
}
@@
-222,7
+225,7
@@
data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
{
if (argc != 2)
{
{
if (argc != 2)
{
- yaz_log (LOG_WARN, "%s:%d: Bad # args to type", file, lineno);
+ yaz_log (YLOG_WARN, "%s:%d: Bad # args to type", file, lineno);
continue;
}
if (!res->type)
continue;
}
if (!res->type)
@@
-235,7
+238,7
@@
data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
if (argc < 2)
{
if (argc < 2)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # args to include",
+ yaz_log(YLOG_WARN, "%s:%d: Bad # args to include",
file, lineno);
continue;
}
file, lineno);
continue;
}
@@
-245,7
+248,7
@@
data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
*childp = data1_read_tagset (dh, name, type);
if (!(*childp))
{
*childp = data1_read_tagset (dh, name, type);
if (!(*childp))
{
- yaz_log(LOG_WARN, "%s:%d: Inclusion failed for tagset %s",
+ yaz_log(YLOG_WARN, "%s:%d: Inclusion failed for tagset %s",
file, lineno, name);
continue;
}
file, lineno, name);
continue;
}
@@
-253,10
+256,18
@@
data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
}
else
{
}
else
{
- yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'",
+ yaz_log(YLOG_WARN, "%s:%d: Unknown directive '%s'",
file, lineno, cmd);
}
}
fclose(f);
return res;
}
file, lineno, cmd);
}
}
fclose(f);
return res;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+