X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Ftabcomplete.c;h=c1eeba429ac1afe2cda6aa86cb6ba63fecc03cb9;hb=d6efff2900cb1a9d4da10999d258ed0a4ceaf565;hp=20caa125dc22b3adfb7226c1f9510315c03168e3;hpb=a97dab98e81128f07806d68b6891dbf65c732ede;p=yaz-moved-to-github.git

diff --git a/client/tabcomplete.c b/client/tabcomplete.c
index 20caa12..c1eeba4 100644
--- a/client/tabcomplete.c
+++ b/client/tabcomplete.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2002, Index Data
  * See the file LICENSE for details.
  *
- * $Id: tabcomplete.c,v 1.4 2002-02-24 12:24:40 adam Exp $
+ * $Id: tabcomplete.c,v 1.9 2003-01-06 08:20:26 adam Exp $
  */
 
 #include <string.h>
@@ -12,20 +12,30 @@
 #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 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]);
 		};
@@ -34,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 {
@@ -49,8 +59,8 @@ 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_)
@@ -70,7 +80,7 @@ void oid_loader(struct oident* oid, void* 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;
@@ -81,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);  
 }
 
@@ -122,6 +138,14 @@ char* complete_attributeset(const char* text, int state)
 	return res;
 }
 
+
+char* default_completer(const char* text, int state)
+{
+	return complete_from_list(curret_global_list,text,state);
+}
+
+
+
 /*
  * Local variables:
  * tab-width: 4