X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Ftabcomplete.c;h=61bec92586620950f7af4d48cfa1dc35427bf30f;hp=d7bbe1c350e968b66f6acb114d513fba9a47d307;hb=4c176312acdc3444c9afc820f76a393e64668e52;hpb=c142c150b731e1dde2a1aef89fb3b326ea88cace

diff --git a/client/tabcomplete.c b/client/tabcomplete.c
index d7bbe1c..61bec92 100644
--- a/client/tabcomplete.c
+++ b/client/tabcomplete.c
@@ -1,30 +1,41 @@
 /*
- * Copyright (c) 2002, Index Data
+ * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: tabcomplete.c,v 1.2 2002-01-30 14:51:45 adam Exp $
+ * $Id: tabcomplete.c,v 1.10 2005-01-15 19:47:08 adam Exp $
  */
 
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <yaz/oid.h>
 #include "tabcomplete.h"
 
-/* *****************************************************************************
+extern char** curret_global_list;
+
+/* ***************************************************************************
  *
- * generic compleater 
+ * generic completer 
  * 
- * *****************************************************************************/
+ * ***************************************************************************/
 
 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(!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]);
 		};
@@ -33,11 +44,11 @@ char* complete_from_list(char* completions[], const char *text, int state)
 }
 
 
-/* *****************************************************************************
+/* ***************************************************************************
  * 
  * code for getting a list of valid strings from the oid subsystem
  * 
- * *****************************************************************************/
+ * ***************************************************************************/
    
 
 typedef struct {
@@ -48,15 +59,15 @@ typedef struct {
 } oid_callback_t;
 
 /*!
-  This is the call back function given to oid_trav... it updates the list of pointers into the oid
-  owned data 
+  This is the call back function given to oid_trav... it updates the list
+  of pointers into the oid owned 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*));
@@ -65,11 +76,11 @@ 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;	
-	data.values = calloc(10,sizeof(char*));
+	data.values = (char **) calloc(10,sizeof(char*));
 	data.index = 0;
 	data.max = 9;
 	data.oclass = oclass;
@@ -80,15 +91,21 @@ char** build_list_for_oclass(oid_class oclass) {
 	return data.values;	   
 }
 
-/* *****************************************************************************
+/* ***************************************************************************
  * 
- * the compleater functions 
+ * the completer functions 
  * 
- * *****************************************************************************/
+ * ***************************************************************************/
 
 char* complete_querytype(const char *text, int state)
 {
-    char* querytypes[] = {"ccl2rpn","prefix","cclrpn","ccl",0};
+    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};
     return complete_from_list(querytypes,text,state);  
 }
 
@@ -119,7 +136,15 @@ char* complete_attributeset(const char* text, int state)
 	
 	free(list);	
 	return res;
-};
+}
+
+
+char* default_completer(const char* text, int state)
+{
+	return complete_from_list(curret_global_list,text,state);
+}
+
+
 
 /*
  * Local variables: