@@ -1,4 +1,4 @@ --record(wiki, {page, body, last_author}). +-record(wiki, {id, page, body, author, timestamp}). -record(user, {name, password_hash}). -record(role, {name, user}). -record(session, {id, user_name}). src/erliki_records.hrl @@ -7,28 +7,39 @@ -export([get_page/1, update_page/3, output_page/2, output/2]). -include("erliki_records.hrl"). +-include_lib("stdlib/include/qlc.hrl"). get_page(Page) -> mnesia:transaction(fun() -> - mnesia:select(wiki, - [{#wiki{page=Page, body='$1', last_author='$2'}, [], [{{Page, '$1', '$2'}}]}] - ) + qlc:e(qlc:q( + [W || W <- mnesia:table(wiki), + W#wiki.page =:= Page] + )) end). update_page(Page, Body, User_Name) -> TokenizedBody = wiki_tokenizer:tokenize(Body), {ok, Parsed} = wiki_parser:parse(TokenizedBody), + Timestamp = erlang:localtime(), case is_tuple(Parsed) of true -> - Record = #wiki{page=Page, - body=[Parsed], - last_author=User_Name}; + Record = #wiki{ + id={Page, Timestamp}, + page=Page, + body=[Parsed], + author=User_Name, + timestamp=Timestamp + }; _ -> - Record = #wiki{page=Page, - body=lists:flatten(Parsed), - last_author=User_Name} + Record = #wiki{ + id={Page, Timestamp}, + page=Page, + body=lists:flatten(Parsed), + author=User_Name, + timestamp=Timestamp + } end, case mnesia:transaction(fun() -> @@ -46,12 +57,19 @@ update_page(Page, Body, User_Name) -> output_page(Page, F) -> case wiki_model:get_page(Page) of - {atomic, [ {Page, Parsed, Last_Author} | _ ]} -> + {atomic, []} -> + io:format("Could find page: ~p ~n", [Page]), + {not_found, {Page}}; + + {atomic, Result_Set} -> + [ #wiki{id=Id, page=Page, body=Parsed, author=Last_Author, timestamp=Timestamp} | _ ] = lists:reverse(lists:keysort(2, Result_Set)), + io:format("Found record for ~p ~n", [Page]), {ok, {Page, F(Parsed), Last_Author}}; + Error -> - io:format("Error: ~p ~n", [Error]), + io:format("Could not get page: ~p ~n", [Error]), {not_found, {Page}} end. src/wiki_model.erl f13746c20c9deec93aafb5a72c188b52164cf16f Carlo Cabanilla carlo.cabanilla@gmail.com http://github.com/clofresh/erliki/commit/e7998f20f2530403f053d1b1b608a891a5debd84 e7998f20f2530403f053d1b1b608a891a5debd84 2009-06-20T21:58:42-07:00 2009-06-20T21:58:42-07:00 keep revision data for each wiki page 82b618e9ac33a2ec8cfe08005caae5cc9a6c9b5b Carlo Cabanilla carlo.cabanilla@gmail.com