Groonga - fulltext search engine.

[Groonga-commit] groonga/groonga [master] Don't report an error when MeCab tokenizer shared object isn't found

Kouhei Sutou null+****@clear*****
Tue Jan 15 13:01:09 JST 2013

• Previous message: [Groonga-commit] groonga/express-kotoumi [master] Add test for message builder about search request, with options
• Next message: [Groonga-commit] [Still Failing] groonga/groonga#1284 (master - 5b06a91)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Kouhei Sutou	2013-01-15 13:01:09 +0900 (Tue, 15 Jan 2013)

  New Revision: 5b06a91ce211b798d8dcb775d53b7387a3f6cc9c
  https://github.com/groonga/groonga/commit/5b06a91ce211b798d8dcb775d53b7387a3f6cc9c

  Log:
    Don't report an error when MeCab tokenizer shared object isn't found
    
    We are providing the MeCab tokenizer enabled groonga package but the
    MeCab tokenizer is optional package.
    
    Some users don't have it. For those users, it is not an error that the
    MeCab tokenizer doesn't exist. But error message is logged. So we
    don't report the error message.
    
    [groonga-dev,01174]
    
    Reported by wing. Thanks!!!

  Modified files:
    lib/plugin.c
    lib/plugin_in.h
    lib/token.c

  Modified: lib/plugin.c (+97 -70)
===================================================================
--- lib/plugin.c    2013-01-10 19:41:19 +0900 (798634e)
+++ lib/plugin.c    2013-01-15 13:01:09 +0900 (07bbff6)
@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 2 -*- */
 /*
-  Copyright(C) 2012 Brazil
+  Copyright(C) 2012-2013 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -272,69 +272,8 @@ grn_plugin_register_by_path(grn_ctx *ctx, const char *path)
   }
   GRN_API_ENTER;
   if (GRN_DB_P(db)) {
-    grn_id id = GRN_ID_NIL;
-    FILE *plugin_file;
-    char complemented_path[PATH_MAX], complemented_libs_path[PATH_MAX];
-    size_t path_len;
-
-    if ((path_len = strlen(path)) >= PATH_MAX) {
-      ERR(GRN_FILENAME_TOO_LONG, "too long plugin path: <%s>", path);
-      goto exit;
-    }
-    plugin_file = fopen(path, "r");
-    if (plugin_file) {
-      fclose(plugin_file);
-      id = grn_plugin_open(ctx, path);
-    } else {
-      if ((path_len += strlen(grn_plugin_get_suffix())) >= PATH_MAX) {
-        ERR(GRN_FILENAME_TOO_LONG,
-            "too long plugin path: <%s%s>",
-            path, grn_plugin_get_suffix());
-        goto exit;
-      }
-      strcpy(complemented_path, path);
-      strcat(complemented_path, grn_plugin_get_suffix());
-      plugin_file = fopen(complemented_path, "r");
-      if (plugin_file) {
-        fclose(plugin_file);
-        id = grn_plugin_open(ctx, complemented_path);
-        if (id) {
-          path = complemented_path;
-        }
-      } else {
-        const char *base_name;
-
-        base_name = strrchr(path, '/');
-        if (base_name) {
-          path_len = base_name - path + strlen("/.libs") + strlen(base_name);
-          if ((path_len += strlen(grn_plugin_get_suffix())) >= PATH_MAX) {
-            ERR(GRN_FILENAME_TOO_LONG,
-                "too long plugin path: <%.*s/.libs%s%s>",
-                (int)(base_name - path), path, base_name, grn_plugin_get_suffix());
-            goto exit;
-          }
-          complemented_libs_path[0] = '\0';
-          strncat(complemented_libs_path, path, base_name - path);
-          strcat(complemented_libs_path, "/.libs");
-          strcat(complemented_libs_path, base_name);
-          strcat(complemented_libs_path, grn_plugin_get_suffix());
-          plugin_file = fopen(complemented_libs_path, "r");
-          if (plugin_file) {
-            fclose(plugin_file);
-            id = grn_plugin_open(ctx, complemented_libs_path);
-            if (id) {
-              path = complemented_libs_path;
-            }
-          } else {
-            ERR(GRN_NO_SUCH_FILE_OR_DIRECTORY,
-                "cannot open shared object file: "
-                "No such file or directory: <%s> and <%s>",
-                complemented_path, complemented_libs_path);
-          }
-        }
-      }
-    }
-
+    grn_id id;
+    id = grn_plugin_open(ctx, path);
     if (id) {
       ctx->impl->plugin_path = path;
       ctx->rc = grn_plugin_call_register(ctx, id);
@@ -346,7 +285,6 @@ grn_plugin_register_by_path(grn_ctx *ctx, const char *path)
   } else {
     ERR(GRN_INVALID_ARGUMENT, "invalid db assigned");
   }
-exit :
   GRN_API_RETURN(ctx->rc);
 }
 
@@ -381,14 +319,19 @@ grn_plugin_get_system_plugins_dir(void)
 }
 #endif /* WIN32 */
 
-grn_rc
-grn_plugin_register(grn_ctx *ctx, const char *name)
+char *
+grn_plugin_find_path(grn_ctx *ctx, const char *name)
 {
   const char *plugins_dir;
   char dir_last_char;
   char path[PATH_MAX];
   int name_length, max_name_length;
+  FILE *plugin_file;
+  char complemented_path[PATH_MAX], complemented_libs_path[PATH_MAX];
+  char *found_path = NULL;
+  size_t path_len;
 
+  GRN_API_ENTER;
   if (name[0] == '/') {
     path[0] = '\0';
   } else {
@@ -411,12 +354,96 @@ grn_plugin_register(grn_ctx *ctx, const char *name)
         "plugin name is too long: %d (max: %d) <%s%s>",
         name_length, max_name_length,
         path, name);
-    return ctx->rc;
+    goto exit;
   }
-
   strcat(path, name);
 
-  return grn_plugin_register_by_path(ctx, path);
+  plugin_file = fopen(path, "r");
+  if (plugin_file) {
+    fclose(plugin_file);
+    found_path = GRN_STRDUP(path);
+  } else {
+    path_len = strlen(path);
+    path_len += strlen(grn_plugin_get_suffix());
+    if (path_len >= PATH_MAX) {
+      ERR(GRN_FILENAME_TOO_LONG,
+          "too long plugin path: <%s%s>",
+          path, grn_plugin_get_suffix());
+      goto exit;
+    }
+    strcpy(complemented_path, path);
+    strcat(complemented_path, grn_plugin_get_suffix());
+    plugin_file = fopen(complemented_path, "r");
+    if (plugin_file) {
+      fclose(plugin_file);
+      found_path = GRN_STRDUP(complemented_path);
+    } else {
+      const char *base_name;
+
+      base_name = strrchr(path, '/');
+      if (base_name) {
+        path_len = base_name - path + strlen("/.libs") + strlen(base_name);
+        path_len += strlen(grn_plugin_get_suffix());
+        if (path_len >= PATH_MAX) {
+          ERR(GRN_FILENAME_TOO_LONG,
+              "too long plugin path: <%.*s/.libs%s%s>",
+              (int)(base_name - path), path, base_name, grn_plugin_get_suffix());
+          goto exit;
+        }
+        complemented_libs_path[0] = '\0';
+        strncat(complemented_libs_path, path, base_name - path);
+        strcat(complemented_libs_path, "/.libs");
+        strcat(complemented_libs_path, base_name);
+        strcat(complemented_libs_path, grn_plugin_get_suffix());
+        plugin_file = fopen(complemented_libs_path, "r");
+        if (plugin_file) {
+          fclose(plugin_file);
+          found_path = GRN_STRDUP(complemented_libs_path);
+        }
+      }
+    }
+  }
+
+exit :
+  GRN_API_RETURN(found_path);
+}
+
+grn_rc
+grn_plugin_register(grn_ctx *ctx, const char *name)
+{
+  grn_rc rc;
+  char *path;
+
+  GRN_API_ENTER;
+  path = grn_plugin_find_path(ctx, name);
+  if (path) {
+    rc = grn_plugin_register_by_path(ctx, path);
+    GRN_FREE(path);
+  } else {
+    if (ctx->rc == GRN_SUCCESS) {
+      const char *prefix, *prefix_separator, *suffix;
+      if (name[0] == '/') {
+        prefix = "";
+        prefix_separator = "";
+        suffix = "";
+      } else {
+        prefix = getenv("GRN_PLUGINS_DIR");
+        if (!prefix) {
+          prefix = grn_plugin_get_system_plugins_dir();
+        }
+        if (prefix[strlen(prefix) - 1] != '/') {
+          prefix_separator = "/";
+        } else {
+          prefix_separator = "";
+        }
+        suffix = grn_plugin_get_suffix();
+      }
+      ERR(GRN_NO_SUCH_FILE_OR_DIRECTORY,
+          "cannot find plugin file: <%s%s%s%s>",
+          prefix, prefix_separator, name, suffix);
+    }
+  }
+  GRN_API_RETURN(rc);
 }
 
 void *

  Modified: lib/plugin_in.h (+2 -1)
===================================================================
--- lib/plugin_in.h    2013-01-10 19:41:19 +0900 (b22c26b)
+++ lib/plugin_in.h    2013-01-15 13:01:09 +0900 (6684da6)
@@ -1,5 +1,5 @@
 /* -*- c-basic-offset: 2 -*- */
-/* Copyright(C) 2010-2011 Brazil
+/* Copyright(C) 2010-2013 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -59,6 +59,7 @@ grn_id grn_plugin_open(grn_ctx *ctx, const char *filename);
 grn_rc grn_plugin_close(grn_ctx *ctx, grn_id id);
 grn_id grn_plugin_get(grn_ctx *ctx, const char *filename);
 const char *grn_plugin_path(grn_ctx *ctx, grn_id id);
+char *grn_plugin_find_path(grn_ctx *ctx, const char *name);
 
 #ifdef __cplusplus
 }

  Modified: lib/token.c (+13 -1)
===================================================================
--- lib/token.c    2013-01-10 19:41:19 +0900 (7cb7380)
+++ lib/token.c    2013-01-15 13:01:09 +0900 (f3b99f1)
@@ -24,6 +24,7 @@
 #include "dat.h"
 #include "hash.h"
 #include "string_in.h"
+#include "plugin_in.h"
 #include <groonga/tokenizer.h>
 
 grn_obj *grn_token_uvector = NULL;
@@ -648,7 +649,18 @@ grn_db_init_mecab_tokenizer(grn_ctx *ctx)
   case GRN_ENC_EUC_JP :
   case GRN_ENC_UTF8 :
   case GRN_ENC_SJIS :
-    return grn_plugin_register(ctx, "tokenizers/mecab");
+    {
+      const char *mecab_plugin_name = "tokenizers/mecab";
+      char *path;
+      path = grn_plugin_find_path(ctx, mecab_plugin_name);
+      if (path) {
+        GRN_FREE(path);
+        return grn_plugin_register(ctx, mecab_plugin_name);
+      } else {
+        return GRN_NO_SUCH_FILE_OR_DIRECTORY;
+      }
+    }
+    break;
   default :
     return GRN_OPERATION_NOT_SUPPORTED;
   }
-------------- next part --------------
HTML����������������������������...
Télécharger 

• Previous message: [Groonga-commit] groonga/express-kotoumi [master] Add test for message builder about search request, with options
• Next message: [Groonga-commit] [Still Failing] groonga/groonga#1284 (master - 5b06a91)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]