/*
- * Copyright (C) 1995-2006, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: tabcomplete.c,v 1.15 2006-05-07 19:43:00 adam Exp $
+ * $Id: tabcomplete.c,v 1.19 2007-05-08 08:22:35 adam Exp $
*/
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
-#include <yaz/oid.h>
#include "tabcomplete.h"
-
-extern char** current_global_list;
+#include <yaz/oid_db.h>
/* ***************************************************************************
*
*
* ***************************************************************************/
-char* complete_from_list(char* completions[], const char *text, int state)
+char *complete_from_list(const char** completions,
+ const char *text, int state)
{
#if HAVE_READLINE_READLINE_H
static int idx;
- if(!completions) return NULL;
- if(state==0) {
+ if (!completions)
+ return NULL;
+ if (state==0)
idx = 0;
- }
for(; completions[idx]; ++ idx) {
if(!
#ifdef WIN32
typedef struct {
- oid_class oclass;
- char** values;
+ int oclass;
+ const char** values;
size_t index;
size_t max;
} oid_callback_t;
of pointers into the oid owned data
*/
-void oid_loader(struct oident* oid, void* data_)
+void oid_loader(const Odr_oid *oid,
+ oid_class oclass, const char *name, void* data_)
{
oid_callback_t* data=(oid_callback_t*) data_;
-
- if((oid->oclass == CLASS_GENERAL) || (oid->oclass == data->oclass)) {
- if(data->index==data->max) {
- data->values=(char**)realloc(data->values,((data->max+1)*2)*sizeof(char*));
- data->max=(data->max+1)*2 - 1;
- };
- data->values[data->index]=oid->desc;
+ if ((oclass == CLASS_GENERAL) || (oclass == data->oclass))
+ {
+ if (data->index==data->max)
+ {
+ data->values=(const char**)
+ realloc(data->values,((data->max+1)*2)*sizeof(char*));
+ data->max=(data->max+1)*2 - 1;
+ }
+ data->values[data->index] = name;
++data->index;
}
}
-char** build_list_for_oclass(oid_class oclass)
+const char** build_list_for_oclass(oid_class oclass)
{
oid_callback_t data;
- data.values = (char **) calloc(10,sizeof(char*));
+ data.values = (const char **) calloc(10,sizeof(char*));
data.index = 0;
data.max = 9;
data.oclass = oclass;
-
- oid_trav(oid_loader, &data);
-
+
+ yaz_oid_trav(yaz_oid_std(), oid_loader, &data);
+
data.values[data.index]=0;
return data.values;
}
char* complete_querytype(const char *text, int state)
{
- char* querytypes[] = {"ccl2rpn","prefix","cclrpn","ccl","cql", 0};
+ static const char* querytypes[] = {"ccl2rpn","prefix","cclrpn","ccl","cql", 0};
return complete_from_list(querytypes,text,state);
}
char* complete_auto_reconnect(const char *text, int state)
{
- char* querytypes[] = {"on","off",0};
+ static const char* querytypes[] = {"on","off",0};
return complete_from_list(querytypes,text,state);
}
char* complete_format(const char* text, int state)
{
- char** list=build_list_for_oclass(CLASS_RECSYN);
+ const char** list = build_list_for_oclass(CLASS_RECSYN);
char* res=complete_from_list(list,text,state);
free(list);
char* complete_schema(const char* text, int state)
{
- char** list = build_list_for_oclass(CLASS_SCHEMA);
+ const char** list = build_list_for_oclass(CLASS_SCHEMA);
char* res = complete_from_list(list,text,state);
free(list);
char* complete_attributeset(const char* text, int state)
{
- char** list = build_list_for_oclass(CLASS_ATTSET);
+ const char** list = build_list_for_oclass(CLASS_ATTSET);
char* res = complete_from_list(list,text,state);
free(list);
}
-char* default_completer(const char* text, int state)
-{
- return complete_from_list(current_global_list, text, state);
-}
-
/*
* Local variables:
* c-basic-offset: 4