projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make insert_node work (again)
[yaz-moved-to-github.git]
/
client
/
tabcomplete.c
diff --git
a/client/tabcomplete.c
b/client/tabcomplete.c
index
d3ec86a
..
ad48f3b
100644
(file)
--- a/
client/tabcomplete.c
+++ b/
client/tabcomplete.c
@@
-2,7
+2,7
@@
* Copyright (c) 2002, Index Data
* See the file LICENSE for details.
*
* Copyright (c) 2002, Index Data
* See the file LICENSE for details.
*
- * $Id: tabcomplete.c,v 1.3 2002-01-30 22:02:03 adam Exp $
+ * $Id: tabcomplete.c,v 1.8 2002-09-24 08:05:41 adam Exp $
*/
#include <string.h>
*/
#include <string.h>
@@
-12,6
+12,8
@@
#include <yaz/oid.h>
#include "tabcomplete.h"
#include <yaz/oid.h>
#include "tabcomplete.h"
+extern char** curret_global_list;
+
/* *****************************************************************************
*
* generic compleater
/* *****************************************************************************
*
* generic compleater
@@
-19,13
+21,21
@@
* *****************************************************************************/
char* complete_from_list(char* completions[], const char *text, int state)
* *****************************************************************************/
char* complete_from_list(char* completions[], const char *text, int state)
-{
- static idx;
+{
+ static int idx;
+
+ if(!completions) return NULL;
if(state==0) {
idx = 0;
}
for(; completions[idx]; ++ idx) {
if(state==0) {
idx = 0;
}
for(; completions[idx]; ++ idx) {
- if(!strncmp(completions[idx],text,strlen(text))) {
+ if(!
+#ifdef WIN32
+ _strnicmp
+#else
+ strncasecmp
+#endif
+ (completions[idx],text,strlen(text))) {
++idx; /* skip this entry on the next run */
return (char*)strdup(completions[idx-1]);
};
++idx; /* skip this entry on the next run */
return (char*)strdup(completions[idx-1]);
};
@@
-57,7
+67,7
@@
void oid_loader(struct oident* oid, void* data_)
{
oid_callback_t* data=(oid_callback_t*) data_;
{
oid_callback_t* data=(oid_callback_t*) data_;
- //fprintf(stderr,"ja7: called with %d: %s\n",oid->oclass,oid->desc);
+
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*));
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*));
@@
-66,11
+76,11
@@
void oid_loader(struct oident* oid, void* data_)
data->values[data->index]=oid->desc;
++data->index;
}
data->values[data->index]=oid->desc;
++data->index;
}
-};
+}
char** build_list_for_oclass(oid_class oclass) {
oid_callback_t data;
char** build_list_for_oclass(oid_class oclass) {
oid_callback_t data;
- data.values = calloc(10,sizeof(char*));
+ data.values = (char **) calloc(10,sizeof(char*));
data.index = 0;
data.max = 9;
data.oclass = oclass;
data.index = 0;
data.max = 9;
data.oclass = oclass;
@@
-93,6
+103,12
@@
char* complete_querytype(const char *text, int state)
return complete_from_list(querytypes,text,state);
}
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);
+}
+
char* complete_format(const char* text, int state)
{
char* complete_format(const char* text, int state)
{
@@
-120,7
+136,15
@@
char* complete_attributeset(const char* text, int state)
free(list);
return res;
free(list);
return res;
-};
+}
+
+
+char* default_completer(const char* text, int state)
+{
+ return complete_from_list(curret_global_list,text,state);
+}
+
+
/*
* Local variables:
/*
* Local variables: