diff options
| author | Adam Kocoloski <kocolosk@apache.org> | 2009-08-15 02:09:16 +0000 |
|---|---|---|
| committer | Adam Kocoloski <kocolosk@apache.org> | 2009-08-15 02:09:16 +0000 |
| commit | f56afb1ea2dbd59262947ed27bb1913394aeb5c6 (patch) | |
| tree | 240b1d142ddcf20a7398c06a7075f0ab169acc3b /src/couchdb/couch_server.erl | |
| parent | bff8b7d9751fad8319124fbfa238446170885b21 (diff) | |
replace regexp with re. Thanks Kim Shrier, Gordon Stratton. Closes COUCHDB-245
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@804428 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_server.erl')
| -rw-r--r-- | src/couchdb/couch_server.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl index 388647b8..23de5284 100644 --- a/src/couchdb/couch_server.erl +++ b/src/couchdb/couch_server.erl @@ -93,10 +93,10 @@ delete(DbName, Options) -> gen_server:call(couch_server, {delete, DbName, Options}). check_dbname(#server{dbname_regexp=RegExp}, DbName) -> - case regexp:match(DbName, RegExp) of + case re:run(DbName, RegExp, [{capture, none}]) of nomatch -> {error, illegal_database_name}; - _Match -> + match -> ok end. @@ -150,7 +150,7 @@ init([]) -> % spawn here so couch_config doesn't try to call itself spawn(fun() -> hash_admin_passwords() end) end), - {ok, RegExp} = regexp:parse("^[a-z][a-z0-9\\_\\$()\\+\\-\\/]*$"), + {ok, RegExp} = re:compile("^[a-z][a-z0-9\\_\\$()\\+\\-\\/]*$"), ets:new(couch_dbs_by_name, [set, private, named_table]), ets:new(couch_dbs_by_pid, [set, private, named_table]), ets:new(couch_dbs_by_lru, [ordered_set, private, named_table]), |