X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Ftabcomplete.c;h=31c696e2be80567dbd5baed15ce2d97771c8a1c0;hp=870188aa5e36f7fcbc1e705d17cf3df5b97ec88a;hb=a95e1c4f3d0f4edad819cf20832fbab228db81d3;hpb=248491b25960ff7c08860dd0065f7e04cc550e90

diff --git a/client/tabcomplete.c b/client/tabcomplete.c
index 870188a..31c696e 100644
--- a/client/tabcomplete.c
+++ b/client/tabcomplete.c
@@ -1,18 +1,14 @@
-/*
- * Copyright (C) 1995-2006, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tabcomplete.c,v 1.15 2006-05-07 19:43:00 adam Exp $
  */
 
 #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>
 
 /* ***************************************************************************
  *
@@ -20,15 +16,16 @@ extern char** current_global_list;
  * 
  * ***************************************************************************/
 
-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
@@ -54,8 +51,8 @@ char* complete_from_list(char* completions[], const char *text, int state)
    
 
 typedef struct {
-    oid_class oclass;
-    char** values;
+    int oclass;
+    const char** values;
     size_t index;
     size_t max;
 } oid_callback_t;
@@ -65,31 +62,34 @@ typedef struct {
   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;
+    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)
+const char** build_list_for_oclass(oid_class oclass)
 { 
     oid_callback_t data;        
-    data.values = (char **) calloc(10,sizeof(char*));
+    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;    
 }
@@ -102,20 +102,20 @@ char** build_list_for_oclass(oid_class oclass)
 
 char* complete_querytype(const char *text, int state)
 {
-    char* querytypes[] = {"ccl2rpn","prefix","cclrpn","ccl","cql", 0};
+    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};
+    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);
+    const char** list = build_list_for_oclass(CLASS_RECSYN);
     char* res=complete_from_list(list,text,state);  
     
     free(list); 
@@ -124,7 +124,7 @@ char* complete_format(const char* text, int state)
 
 char* complete_schema(const char* text, int state)
 {
-    char** list = build_list_for_oclass(CLASS_SCHEMA);
+    const char** list = build_list_for_oclass(CLASS_SCHEMA);
     char* res = complete_from_list(list,text,state);  
     
     free(list); 
@@ -134,7 +134,7 @@ char* complete_schema(const char* text, int state)
 
 char* complete_attributeset(const char* text, int state)
 {
-    char** list = build_list_for_oclass(CLASS_ATTSET);
+    const char** list = build_list_for_oclass(CLASS_ATTSET);
     char* res = complete_from_list(list,text,state);  
     
     free(list); 
@@ -142,14 +142,10 @@ char* complete_attributeset(const char* text, int state)
 }
 
 
-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