Merge branch 'master' into yaz-744

[yaz-moved-to-github.git] / client / tabcomplete.c

diff --git a/client/tabcomplete.c b/client/tabcomplete.c
index 870188a..56c5e7e 100644 (file)
--- a/client/tabcomplete.c
+++ b/client/tabcomplete.c
@@ -1,43 +1,43 @@
-/*
- * Copyright (C) 1995-2006, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: tabcomplete.c,v 1.15 2006-05-07 19:43:00 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <yaz/oid.h>
 #include "tabcomplete.h"
-
-extern char** current_global_list;
+#include <yaz/oid_db.h>
 
 /* ***************************************************************************
  *
- * generic completer 
- * 
+ * generic completer
+ *
  * ***************************************************************************/
 
-char* complete_from_list(char* completions[], const char *text, int state)
-{       
+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) {
+
+    if (!completions)
+        return NULL;
+    if (state==0)
         idx = 0;
-    }
     for(; completions[idx]; ++ idx) {
         if(!
 #ifdef WIN32
            _strnicmp
 #else
            strncasecmp
-#endif              
+#endif
            (completions[idx],text,strlen(text))) {
-            ++idx; /* skip this entry on the next run */ 
+            ++idx; /* skip this entry on the next run */
             return (char*)strdup(completions[idx-1]);
         };
     };
@@ -47,109 +47,108 @@ 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 {
-    oid_class oclass;
-    char** values;
+    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;          
+
+    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*));
+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;
-    
-    oid_trav(oid_loader, &data);
-    
+
+    yaz_oid_trav(yaz_oid_std(), oid_loader, &data);
+
     data.values[data.index]=0;
-    return data.values;    
+    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); 
+    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); 
+    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); 
+    const 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(current_global_list, text, state);
-}
-
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab