@@ -191,7 +191,7 @@ react_to('POST',?RESOURCES ++ Path,Request, DocRoot) -> _ -> Title end, - Attributes = [{"title",Title1},{"description",rest_helper:link(Title1,"/" ++ Link) ++ " uploaded resource "},{"type",rest_helper:safeUri(Type)}], + Attributes = [{"title",Title1},{"description",rest_helper:link(Title1,"/" ++ Link,"_blank") ++ " uploaded resource "},{"type",rest_helper:safeUri(Type)}], case actor_server:create(Credentials,?MODULE,Domain,Item,Attributes) of {ok,_Xref} -> Request:respond({200,[{"Content-Type","text/html"}],rest_helper:html("<h1>File uploaded</h1>")}); Reactor/src/core/rest_server.erl @@ -30,7 +30,7 @@ -include("system.hrl"). -include_lib("stdlib/include/qlc.hrl"). -export([respond/2,error/5,redirect/4,unauthorised/2,forbidden/3]). --export([a/1,qres/2,domain/1,attributes/2,safe_char_set/1,show_login_form/1,show_login_form/2,q/1,repack_acl/3,tag/5,html/1,split/1,item_to_url/1,title/1,safeUri/1,accepts/1,attributes_and_actor/2,credentials/1,cookie/3,cookie_options/2,save_session/2,remove_session/1,get_credentials/1,add_credentials/1,get_option/2,qualified/2,link/2]). +-export([a/1,qres/2,domain/1,attributes/2,safe_char_set/1,show_login_form/1,show_login_form/2,q/1,repack_acl/3,tag/5,html/1,split/1,item_to_url/1,title/1,safeUri/1,accepts/1,attributes_and_actor/2,credentials/1,cookie/3,cookie_options/2,save_session/2,remove_session/1,get_credentials/1,add_credentials/1,get_option/2,qualified/2,link/2,link/3]). %% Response support functions respond(Request,{ContentType,Body}) -> @@ -333,3 +333,6 @@ qualified(Domain,Item) -> link(Title,Link) -> "<a href=\"" ++ Link ++ "\" title=\"" ++ Title ++ "\">Download</a>". + +link(Title,Link,Target) -> + "<a href=\"" ++ Link ++ "\" title=\"" ++ Title ++ "\" target=\"" ++ Target ++ "\">Download</a>". Reactor/src/rest/rest_helper.erl @@ -267,7 +267,7 @@ q(Domain, qExp, Options) -> {error,"Not Implemented"}. graph(Domain,Uri,[{"related","all"}]) -> Item = item_id(Domain,Uri), F = fun() -> - lists:sort(lists:foldl(fun(I,Acc) -> related(Item,I,Acc) end,[],qlc:e(items(Domain)))) + lists:sort(fun({_,A},{_,B}) -> A#item.modified >= B#item.modified end,lists:foldl(fun(I,Acc) -> related(Item,I,Acc) end,[],qlc:e(items(Domain)))) end, mnesia:transaction(F); %% Useless as is @@ -275,7 +275,7 @@ graph(Domain,Uri,[{"status",Status}]) -> % children of Uri status = status Item = item_id(Domain,Uri), F = fun() -> - lists:sort(lists:foldl(fun(I,Acc) -> children(Item,{status,Status},I,Acc) end,[],qlc:e(items(Domain)))) + lists:sort(fun({_,A},{_,B}) -> A#item.modified >= B#item.modified end,lists:foldl(fun(I,Acc) -> children(Item,{status,Status},I,Acc) end,[],qlc:e(items(Domain)))) end, mnesia:transaction(F); graph(Domain,Uri,[{"from",From}]) -> @@ -283,7 +283,7 @@ graph(Domain,Uri,[{"from",From}]) -> After = date_to_integer(From), Item = item_id(Domain,Uri), F = fun() -> - lists:sort(lists:foldl(fun(I,Acc) -> children(Item,{modified,After},I,Acc) end,[],qlc:e(items(Domain)))) + lists:sort(fun({_,A},{_,B}) -> A#item.modified >= B#item.modified end,lists:foldl(fun(I,Acc) -> children(Item,{modified,After},I,Acc) end,[],qlc:e(items(Domain)))) end, mnesia:transaction(F); graph(Domain,Uri,[{"from",From},{"to",To}]) -> @@ -292,14 +292,14 @@ graph(Domain,Uri,[{"from",From},{"to",To}]) -> Before = date_to_integer(To), Item = item_id(Domain,Uri), F = fun() -> - lists:sort(lists:foldl(fun(I,Acc) -> children(Item,{modified,Before,After},I,Acc) end,[],qlc:e(items(Domain)))) + lists:sort(fun({_,A},{_,B}) -> A#item.modified >= B#item.modified end,lists:foldl(fun(I,Acc) -> children(Item,{modified,Before,After},I,Acc) end,[],qlc:e(items(Domain)))) end, mnesia:transaction(F); graph(Domain,Uri,[]) -> % all children of uri Item = item_id(Domain,Uri), F = fun() -> - lists:sort(lists:foldl(fun(I,Acc) -> children(Item,I,Acc) end,[],qlc:e(items(Domain)))) + lists:sort(fun({_,A},{_,B}) -> A#item.modified >= B#item.modified end,lists:foldl(fun(I,Acc) -> children(Item,I,Acc) end,[],qlc:e(items(Domain)))) end, mnesia:transaction(F); graph(Domain,Uri,Attributes) -> Reactor/src/util/attribute.erl fc85c62781f0e8888af8c25d8b7b42f30c90aeda Alan Wood al@folknology.com http://github.com/folknology/reactored/commit/015a4eb69d304071d6e25caf67fd668fc0251cce 015a4eb69d304071d6e25caf67fd668fc0251cce 2009-06-16T04:10:44-07:00 2009-06-16T04:10:44-07:00 Fixed sorting order, now sorts by modified d8d9ad6dc4de7af37f8b7333150525a4ff579bba Alan Wood al@folknology.com