X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Frecctrl.c;h=c4dbdbc956347988e7da08eaa46e5701f17f9764;hb=e505b6cf2a7f6821264d82cd2e8869b2be38d0b2;hp=5205cd3fc1e5a7d46d80c63826b3c984181ebf97;hpb=b673999f9e517726d6e3789f3cefd194ce89ef15;p=idzebra-moved-to-github.git diff --git a/recctrl/recctrl.c b/recctrl/recctrl.c index 5205cd3..c4dbdbc 100644 --- a/recctrl/recctrl.c +++ b/recctrl/recctrl.c @@ -1,4 +1,4 @@ -/* $Id: recctrl.c,v 1.11 2004-09-30 07:23:15 adam Exp $ +/* $Id: recctrl.c,v 1.13 2004-11-19 10:27:12 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -98,7 +98,7 @@ RecTypeClass recTypeClass_create (Res res, NMEM nmem) if (module_path) { DIR *dir = opendir(module_path); - yaz_log(LOG_LOG, "searching filters in %s", module_path); + yaz_log(YLOG_LOG, "searching filters in %s", module_path); if (dir) { struct dirent *de; @@ -106,8 +106,7 @@ RecTypeClass recTypeClass_create (Res res, NMEM nmem) while ((de = readdir(dir))) { size_t dlen = strlen(de->d_name); - if ((de->d_type == DT_REG || de->d_type == DT_LNK) - && dlen >= 5 && + if (dlen >= 5 && !memcmp(de->d_name, "mod-", 4) && !strcmp(de->d_name + dlen - 3, ".so")) { @@ -119,20 +118,20 @@ RecTypeClass recTypeClass_create (Res res, NMEM nmem) mod_p = dlopen(fname, RTLD_NOW|RTLD_GLOBAL); if (mod_p && (fl = dlsym(mod_p, "idzebra_filter"))) { - yaz_log(LOG_LOG, "Loaded filter module %s", fname); + yaz_log(YLOG_LOG, "Loaded filter module %s", fname); recTypeClass_add(&rts, fl, nmem, mod_p); } else if (mod_p) { const char *err = dlerror(); - yaz_log(LOG_WARN, "dlsym failed %s %s", + yaz_log(YLOG_WARN, "dlsym failed %s %s", fname, err ? err : "none"); dlclose(mod_p); } else { const char *err = dlerror(); - yaz_log(LOG_WARN, "dlopen failed %s %s", + yaz_log(YLOG_WARN, "dlopen failed %s %s", fname, err ? err : "none"); } @@ -155,7 +154,7 @@ static void recTypeClass_add (struct recTypeClass **rts, RecType *rt, r->next = *rts; *rts = r; - yaz_log(LOG_LOG, "Adding filter %s", (*rt)->name); + yaz_log(YLOG_LOG, "Adding filter %s", (*rt)->name); r->module_handle = module_handle; module_handle = 0; /* so that we only store module_handle once */ r->recType = *rt;