-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*));
- data->max=(data->max+1)*2 - 1;
- };
- 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.index = 0;
- data.max = 9;
- data.oclass = oclass;
-
- oid_trav(oid_loader, &data);
-
- data.values[data.index]=0;
- return data.values;
-};
-
-/* *****************************************************************************
- *
- * the compleater functions
- *
- * *****************************************************************************/
-
-char* complete_querytype(char *text, int state) {
- char* querytypes[] = {"ccl2rpn","prefix","cclrpn","ccl",0};
- return complete_from_list(querytypes,text,state);
-};
-
-
-char* complete_format(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** 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** list=build_list_for_oclass(CLASS_ATTSET);
- char* res=complete_from_list(list,text,state);
-
- free(list);
- return res;
-};
+void oid_loader(const Odr_oid *oid,
+ oid_class oclass, const char *name, void* data_)
+{
+ oid_callback_t* data=(oid_callback_t*) data_;
+
+ 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;
+ }
+}
+
+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;
+
+ yaz_oid_trav(yaz_oid_std(), oid_loader, &data);
+
+ data.values[data.index]=0;
+ return data.values;
+}
+
+/* ***************************************************************************
+ *
+ * the completer functions
+ *
+ * ***************************************************************************/
+
+char* complete_querytype(const char *text, int 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)
+{
+ static const char* querytypes[] = {"on","off",0};
+ return complete_from_list(querytypes,text,state);
+}
+
+
+char* complete_format(const char* text, int state)
+{
+ 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)
+{
+ 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)
+{
+ const char** list = build_list_for_oclass(CLASS_ATTSET);
+ char* res = complete_from_list(list,text,state);
+
+ free(list);
+ return res;
+}
+