@@ -22,9 +22,11 @@ {"src/rest/*", [debug_info, {outdir, "ebin"}, {i,"include"}]}. {"src/domains/*", [debug_info, {outdir, "ebin"}, {i,"include"}]}. {"src/domains/matcher/*", [debug_info, {outdir, "ebin"}, {i,"include"}]}. +{"src/domains/survey/*", [debug_info, {outdir, "ebin"}, {i,"include"}]}. {"src/sinks/*", [debug_info, {outdir, "ebin"}, {i,"include"}]}. {"src/sinks/audit/*", [debug_info, {outdir, "ebin"}, {i,"include"}]}. {"src/sinks/index/*", [debug_info, {outdir, "ebin"}, {i,"include"}]}. +{"src/sinks/append/*", [debug_info, {outdir, "ebin"}, {i,"include"}]}. {"src/sinks/default/*", [debug_info, {outdir, "ebin"}, {i,"include"}]}. {"src/core/*", [debug_info, {outdir, "ebin"}, {i,"include"}]}. {"src/test/*", [debug_info, {outdir, "ebin"}, {i,"include"}]}. Reactor/Emakefile @@ -168,8 +168,8 @@ code_change(_OldVsn, State, _Extra) -> queue(Domain,{nomatch})-> void; queue(Domain,{Sink,Data})-> - case queue_server:add(Domain,Sink,Data) of - {ok} -> void; + case queue_server:add(?DOMAIN ++ ?CONTEXT ++ ?QUEUE,Sink,Data) of + {ok,Xref} -> Xref; {error,Why} -> error({"Error putting on " ++ Domain ++ " queue",Why,{Sink,Data}}) end; queue(Domain,Unrecognised) -> @@ -191,10 +191,11 @@ get_server(Matchername) -> % the matchers are OTP applications we need to call m load_matcher(Domain) -> %% Start matcher OTP app, if module fails to load/start use error app instead Matcher = case domain:retrieve(Domain) of - {ok,{atomic,[{domain,_Dom,_Owner,undefined}]}} -> ?ERRORMATCHER; - {ok,{atomic,[{domain,_Dom,_Owner,Match}]}} -> Match; + {atomic,[{domain,_Dom,_Owner,undefined}]} -> ?ERRORMATCHER; + {atomic,[{domain,_Dom,_Owner,Match}]} -> Match; _ -> ?ERRORMATCHER end, + io:format("About to load matcher ~p~n",[Matcher]), case application:load(Matcher) of ok -> start(Matcher); @@ -202,7 +203,7 @@ load_matcher(Domain) -> start(Matcher), Matcher; {error,_Why} -> - io:format("Matcher not loaded ~p",[Matcher]), + io:format("Matcher not loaded ~p~n",[Matcher]), ?ERRORMATCHER %flag an error? end. @@ -211,7 +212,7 @@ start(Matcher) -> ok -> Matcher; {error,{already_started,matcher}} -> Matcher; {error,_Why} -> - io:format("Matcher not started ~p",[Matcher]), + io:format("Matcher not started ~p~n",[Matcher]), ?ERRORMATCHER %flag an error? end. Reactor/src/core/domain_server.erl @@ -507,7 +507,8 @@ react(Adaptor,create,Resource,Request) -> {uri,Actor} end, case actor_server:lookup(qres(Resource,Request)) of - [] -> error(Adaptor,create,Resource,Request,"Cannot create resource as child of unknown resource/domain " ++ Resource); + [] -> + error(Adaptor,create,Resource,Request,"Cannot create resource as child of unknown resource/domain " ++ Resource); Qitem -> [Domain,Res] = string:tokens(Qitem,?DOMAINSEPERATOR), {Tags,A1} = get_option("tags",attributes('POST',Request)), Reactor/src/core/rest_server.erl @@ -225,7 +225,7 @@ retrieve(Domain, Item, [Attribute]) -> [] -> [] end. -%% TODO this is now broken since domain changes etc.. +%% TODO this is now broken since domain changes etc.. retrieve(Domain, Item, basic) -> q(Domain) -> do(qlc:q([Z#attribute.id || Z <- mnesia:table(attribute), Reactor/src/util/attribute.erl docs/Reactored.graffle 0a444eab5c0c47df02e001e55741ee87e6303b7e Alan Wood al@folknology.com http://github.com/folknology/reactored/commit/94992cc3179a68c7c3e4e9a28c31859cbc5569bf 94992cc3179a68c7c3e4e9a28c31859cbc5569bf 2008-07-18T12:20:53-07:00 2008-07-18T12:20:53-07:00 Added the append adaptor and a survey domain matcher, the conbination can catch and append parameters passed over REST creator 13eed6ae935ce0673ef12d50595a703ae64a33cc Alan Wood al@folknology.com