zebrasrv: sortkeys args are optional

[idzebra-moved-to-github.git] / data1 / d1_varset.c

diff --git a/data1/d1_varset.c b/data1/d1_varset.c
index 92c95a5..843b271 100644 (file)
--- a/data1/d1_varset.c
+++ b/data1/d1_varset.c
@@ -1,8 +1,5 @@
-/* $Id: d1_varset.c,v 1.4 2004-11-19 10:26:53 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
 
 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
@@ -15,20 +12,23 @@ 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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <string.h>
 #include <stdlib.h>
 
-#include <yaz/oid.h>
-#include <yaz/ylog.h>
+#include <yaz/oid_db.h>
+#include <yaz/log.h>
 #include <d1_absyn.h>
 
 data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
-                                    char *zclass, char *type)
+                                    const char *zclass, const char *type)
 {
     data1_varclass *c;
     data1_vartype *t;
@@ -65,7 +65,7 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
     char *argv[50],line[512];
 
     res->name = 0;
-    res->reference = VAL_NONE;
+    res->oid = 0;
     res->classes = 0;
 
     if (!(f = data1_path_fopen(dh, file, "r")))
@@ -142,7 +142,9 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
                        file, lineno);
                continue;
            }
-           if ((res->reference = oid_getvalbyname(argv[1])) == VAL_NONE)
+            res->oid = yaz_string_to_oid_nmem(yaz_oid_std(),
+                                              CLASS_VARSET, argv[1], mem);
+           if (!res->oid)
            {
                yaz_log(YLOG_WARN, "%s:%d: Unknown reference '%s'",
                        file, lineno, argv[1]);
@@ -156,3 +158,12 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
     fclose(f);
     return res;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+