-/* $Id: d1_espec.c,v 1.9 2005-03-05 11:35:18 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: d1_espec.c,v 1.15 2007-04-16 21:54:37 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 <stdlib.h>
#include <yaz/odr.h>
#include <yaz/proto.h>
#include <idzebra/data1.h>
+#include <yaz/oid_db.h>
static Z_Variant *read_variant(int argc, char **argv, NMEM nmem,
const char *file, int lineno)
{
Z_Variant *r = (Z_Variant *)nmem_malloc(nmem, sizeof(*r));
- oident var1;
int i;
- int oid[OID_SIZE];
-
- var1.proto = PROTO_Z3950;
- var1.oclass = CLASS_VARSET;
- var1.value = VAL_VAR1;
- r->globalVariantSetId = odr_oiddup_nmem(nmem, oid_ent_to_oid(&var1, oid));
+ r->globalVariantSetId = odr_oiddup_nmem(nmem, yaz_oid_varset_variant_1);
if (argc)
r->triples = (Z_Triple **)nmem_malloc(nmem, sizeof(Z_Triple*) * argc);
else
Z_Espec1 *res = (Z_Espec1 *)nmem_malloc(nmem, sizeof(*res));
if (!(f = data1_path_fopen(dh, file, "r")))
- {
- yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", file);
return 0;
- }
res->num_elementSetNames = 0;
res->elementSetNames = 0;
fclose (f);
return res;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+