@@ -7,14 +7,14 @@ EBINDIR=$(top_builddir)/ebin ERL=erl $(ERLCFLAGS) -pa ebin $(ERLFLAGS) -noshell -eval -mod_scribe_FILES = ejabberd_auth_couchdb.erl auth_couchdb_test.erl -mod_scribe_BEAMS = ejabberd_auth_couchdb.beam auth_couchdb_test.beam +mod_ejabberd_couch_FILES = ejabberd_couch.erl ejabberd_auth_couchdb.erl auth_couchdb_test.erl +mod_ejabberd_couch_BEAMS = ejabberd_couch.beam ejabberd_auth_couchdb.beam auth_couchdb_test.beam -EXTRA_DIST = ${addprefix $(ESRCDIR)/, $(mod_scribe_FILES)} +EXTRA_DIST = ${addprefix $(ESRCDIR)/, $(mod_ejabberd_couch_FILES)} -mod_scribedir = $(EJABBERD_PREFIX)/ebin -mod_scribe_DATA = ${addprefix $(EBINDIR)/, $(mod_scribe_BEAMS)} -CLEANFILES = $(mod_scribe_DATA) +mod_ejabberd_couchdir = $(EJABBERD_PREFIX)/ebin +mod_ejabberd_couch_DATA = ${addprefix $(EBINDIR)/, $(mod_ejabberd_couch_BEAMS)} +CLEANFILES = $(mod_ejabberd_couch_DATA) test: all $(ERL) 'auth_couchdb_test:test(), halt().' Makefile.am @@ -2,8 +2,10 @@ -author("tofu@collecta.com"). +-include("ejabberd.hrl"). + -export([init/1, - doc_delete/3, + doc_delete/2, doc_update/3, doc_create/3, doc_get/2 @@ -19,7 +21,7 @@ init(Opts) -> ok. get_url(Name, Id) -> - CouchUrl = "http://"++get_opt(host)++":"++get_opt(port)++"/", + CouchUrl = "http://"++get_opt(host, "127.0.0.1")++":"++get_opt(port, "5984")++"/", CouchUrl ++ "/" ++ Name ++ "/" ++ Id. send_request(Url, Type, Doc) -> @@ -34,12 +36,12 @@ send_request(Url, Type, Doc) -> [{"Content-Type", "application/json"}], Type, EncDoc, Options) of - {ok, "200", _Headers, Payload} = Res-> + {ok, "200", _Headers, Payload} -> rfc4627:decode(Payload); - {ok, "201", _Headers, Payload} = Res-> + {ok, "201", _Headers, Payload} -> rfc4627:decode(Payload); Error -> - ?ERROR("~p sending ~p to ~p~n", + ?ERROR_MSG("~p sending ~p to ~p~n", [Error, Doc, Url]), throw({error, storage_error, Error}) end. @@ -57,7 +59,7 @@ doc_create(Name, Id, Value) -> send_request(Url, put, Value). doc_get(Name, Id) -> - Url = CouchUrl ++ "/" ++ Id, + Url = get_url(Name, Id), send_request(Url, get, []). src/ejabberd_couch.erl cd6227974120f8b8dc0d25360a4c78b588eaebbe Christopher 'Tofu' Zorn tofu@stanziq.com http://github.com/twonds/ejabberd_couchdb/commit/b2b5ff3a477706c927ed83e277c6f42d21ba5950 b2b5ff3a477706c927ed83e277c6f42d21ba5950 2009-06-10T07:13:03-07:00 2009-06-10T07:13:03-07:00 fix syntax and other bugs, we can compile and test now 508f49a3d9a591d264d875399cda23d9859d445e Christopher 'Tofu' Zorn tofu@stanziq.com