X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Ftabcomplete.c;h=697077839e4f42f0a21dd18ea17696077fbd447f;hp=c1eeba429ac1afe2cda6aa86cb6ba63fecc03cb9;hb=280940bf70395d3bccf45208efc302b6a7daf03e;hpb=4d531a1a9131d69c3b6c27fbac42837e22cff61c diff --git a/client/tabcomplete.c b/client/tabcomplete.c index c1eeba4..6970778 100644 --- a/client/tabcomplete.c +++ b/client/tabcomplete.c @@ -1,154 +1,156 @@ -/* - * Copyright (c) 2002, Index Data +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2013 Index Data * See the file LICENSE for details. - * - * $Id: tabcomplete.c,v 1.9 2003-01-06 08:20:26 adam Exp $ */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include -#include #include "tabcomplete.h" - -extern char** curret_global_list; +#include /* *************************************************************************** * - * generic completer - * + * generic completer + * * ***************************************************************************/ -char* complete_from_list(char* completions[], const char *text, int state) -{ - static int idx; - - if(!completions) return NULL; - if(state==0) { - idx = 0; - } - for(; completions[idx]; ++ idx) { - if(! +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) + idx = 0; + for(; completions[idx]; ++ idx) { + if(! #ifdef WIN32 - _strnicmp + _strnicmp #else - strncasecmp -#endif - (completions[idx],text,strlen(text))) { - ++idx; /* skip this entry on the next run */ - return (char*)strdup(completions[idx-1]); - }; - }; - return NULL; + strncasecmp +#endif + (completions[idx],text,strlen(text))) { + ++idx; /* skip this entry on the next run */ + return (char*)strdup(completions[idx-1]); + }; + }; +#endif + return NULL; } /* *************************************************************************** - * + * * code for getting a list of valid strings from the oid subsystem - * + * * ***************************************************************************/ - + typedef struct { - oid_class oclass; - char** values; - size_t index; - size_t max; + int oclass; + const char** values; + size_t index; + size_t max; } oid_callback_t; /*! This is the call back function given to oid_trav... it updates the list - of pointers into the oid owned data + 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; - ++data->index; - } + oid_callback_t* data=(oid_callback_t*) data_; + + 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) { - oid_callback_t data; - data.values = (char **) calloc(10,sizeof(char*)); - data.index = 0; - data.max = 9; - data.oclass = oclass; - - oid_trav(oid_loader, &data); - - data.values[data.index]=0; - return data.values; +const char** build_list_for_oclass(oid_class oclass) +{ + oid_callback_t data; + data.values = (const char **) calloc(10,sizeof(char*)); + data.index = 0; + data.max = 9; + data.oclass = oclass; + + yaz_oid_trav(yaz_oid_std(), oid_loader, &data); + + data.values[data.index]=0; + return data.values; } /* *************************************************************************** - * - * the completer functions - * + * + * the completer functions + * * ***************************************************************************/ char* complete_querytype(const char *text, int state) { - char* querytypes[] = {"ccl2rpn","prefix","cclrpn","ccl","cql", 0}; - return complete_from_list(querytypes,text,state); + static const char* querytypes[] = {"ccl2rpn","prefix","cclrpn","ccl","cql", "cql2rpn", 0}; + return complete_from_list(querytypes,text,state); } char* complete_auto_reconnect(const char *text, int state) { - char* querytypes[] = {"on","off",0}; - return complete_from_list(querytypes,text,state); + 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); - char* res=complete_from_list(list,text,state); - - free(list); - return res; + const char** list = build_list_for_oclass(CLASS_RECSYN); + char* res=complete_from_list(list,text,state); + + free(list); + return res; } char* complete_schema(const char* text, int state) { - char** list=build_list_for_oclass(CLASS_SCHEMA); - char* res=complete_from_list(list,text,state); - - free(list); - return res; + const char** list = build_list_for_oclass(CLASS_SCHEMA); + char* res = complete_from_list(list,text,state); + + free(list); + return res; } char* complete_attributeset(const char* text, int state) { - char** list=build_list_for_oclass(CLASS_ATTSET); - char* res=complete_from_list(list,text,state); - - free(list); - return res; -} - + const char** list = build_list_for_oclass(CLASS_ATTSET); + char* res = complete_from_list(list,text,state); -char* default_completer(const char* text, int state) -{ - return complete_from_list(curret_global_list,text,state); + free(list); + return res; } - /* * Local variables: - * tab-width: 4 * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil * End: + * vim: shiftwidth=4 tabstop=8 expandtab */ +