X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Ftabcomplete.c;h=07cb0f091eb4cc88aa393b01000aa6e4e413e933;hp=9513965ec4114e992c350a7381869e1b82567e69;hb=aea27bc0e4e3f310196f0e6cee3de8cac69e9806;hpb=2984a4a74dbbe7aaf4f07788ae4785041cf6004a

diff --git a/client/tabcomplete.c b/client/tabcomplete.c
index 9513965..07cb0f0 100644
--- a/client/tabcomplete.c
+++ b/client/tabcomplete.c
@@ -1,8 +1,18 @@
-#include "tabcomplete.h"
+/*
+ * Copyright (c) 2002, Index Data
+ * See the file LICENSE for details.
+ *
+ * $Id: tabcomplete.c,v 1.7 2002-08-29 19:34:44 ja7 Exp $
+ */
+
 #include <string.h>
-#include <yaz/oid.h>
 #include <stdio.h>
+#include <stdlib.h>
+
+#include <yaz/oid.h>
+#include "tabcomplete.h"
 
+extern char** curret_global_list;
 
 /* *****************************************************************************
  *
@@ -10,19 +20,28 @@
  * 
  * *****************************************************************************/
 
-char* complete_from_list(char* completions[], char *text, int state) {
-	static idx;
+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(!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]);
 		};
 	};
 	return NULL;
-};
+}
 
 
 /* *****************************************************************************
@@ -44,10 +63,11 @@ typedef struct {
   owned data 
 */
 
-void oid_loader(struct oident* oid, void* data_) {
+void oid_loader(struct oident* oid, void* 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*));
@@ -56,7 +76,7 @@ void oid_loader(struct oident* oid, void* data_) {
 		data->values[data->index]=oid->desc;
 		++data->index;		
 	}
-};
+}
 
 char** build_list_for_oclass(oid_class oclass) {	
 	oid_callback_t data;	
@@ -69,7 +89,7 @@ char** build_list_for_oclass(oid_class oclass) {
 	
 	data.values[data.index]=0;
 	return data.values;	   
-};
+}
 
 /* *****************************************************************************
  * 
@@ -77,36 +97,54 @@ char** build_list_for_oclass(oid_class oclass) {
  * 
  * *****************************************************************************/
 
-char* complete_querytype(char *text, int state) {
-  char* querytypes[] = {"ccl2rpn","prefix","cclrpn","ccl",0};
-  return complete_from_list(querytypes,text,state);  
-};
+char* complete_querytype(const char *text, int state)
+{
+    char* querytypes[] = {"ccl2rpn","prefix","cclrpn","ccl",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);  
+}
 
 
-char* complete_format(char* text, int 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;
-};
+}
 
-char* complete_schema(char* text, int state) {
+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;
-};
+}
 
 
-char* complete_attributeset(char* text, int state) {
+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;
-};
+}
+
+
+char* default_completer(const char* text, int state)
+{
+	return complete_from_list(curret_global_list,text,state);
+}
+
+
 
 /*
  * Local variables: