lots of work towards flattening the records. stalled at ezic_rule:next_event/4

src/ezic_db.erl

@@ -1,13 +1,28 @@
-
 -module(ezic_db).
 -include("include/ezic.hrl").
 -include_lib("stdlib/include/qlc.hrl").
 
 
 -export([zones/1, rules/1]).
--export([wipe/0, init/0, insert_all/1, getall/1]).
+-export([wipe/0, init/0, insert_all/1, get_all/1]).
 
 
+-define(create(Record),
+	{atomic, ok} = mnesia:create_table(Record, 
+			   [{type, bag}
+			    , {disc_copies, [node()]}
+			    , {attributes, record_info(fields, Record)}
+			   ])).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% READ - db reading methods
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+
+% retrieve all zones by name
 zones(Name) ->
     F = fun()->
 		Q = qlc:q([Z || Z=#zone{name=N} <- mnesia:table(zone), N=:=Name]),
@@ -16,6 +31,7 @@ zones(Name) ->
     {atomic, Zones}= mnesia:transaction(F),
     Zones.
     
+% retrieve all rules by name
 rules(Name) ->
     F = fun()->
 		Q = qlc:q([R || R=#rule{name=N} <- mnesia:table(rule), N=:=Name]),
@@ -24,46 +40,22 @@ rules(Name) ->
     {atomic, Rules}= mnesia:transaction(F),
     Rules.
     
+% get all records from table
+get_all(Tab) when is_atom(Tab) ->
+    F = fun() ->
+		Q = qlc:q([R || R<- mnesia:table(Tab)]),
+		qlc:e(Q)
+	end,
+    {atomic, Ret}= mnesia:transaction(F),
+    Ret.
+    
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% WRITE - insertion/edit methods
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
 
-
-
--define(create(Record),
-	{atomic, ok} = mnesia:create_table(Record, [{type, bag}, {disc_copies, [node()]},{attributes, record_info(fields, Record)}])).
-
-
-init() ->
-    create_tabs(mnesia:create_schema([node()])),
-    mnesia:wait_for_tables([rule, zone, link, leap], 3000).
-
-wipe() ->
-    mnesia:stop(),
-    mnesia:delete_schema([node()]).
-
-
-create_tabs(ok) ->
-    mnesia:start(),
-
-    ?create(rule),
-    ?create(zone),
-    ?create(link),
-    ?create(leap),
-
-    %% {atomic, ok}= mnesia:create_table(rule, [{disc_copies, [node()]},{attributes, record_info(fields, rule)}]),
-    %% {atomic, ok}= mnesia:create_table(zone, [{disc_copies, [node()]},{attributes, record_info(fields, zone)}]),
-    %% {atomic, ok}= mnesia:create_table(leap, [{disc_copies, [node()]},{attributes, record_info(fields, leap)}]),
-    %% {atomic, ok}= mnesia:create_table(link, [{disc_copies, [node()]},{attributes, record_info(fields, link)}]);
-
-    ok;
-create_tabs({error, {_, {already_exists,_}}}) ->
-    mnesia:start(),
-    ok;
-create_tabs(E) ->
-    ?debug(E).
-
-
 insert_all(Records) ->
     mnesia:transaction(
       fun() ->
@@ -74,10 +66,40 @@ insert_all(Records) ->
 			       
 
 
-getall(Tab) when is_atom(Tab) ->
-    F = fun() ->
-		Q = qlc:q([R || R<- mnesia:table(Tab)]),
-		qlc:e(Q)
-	end,
-    mnesia:transaction(F).
-    
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% ADMIN - initialization and administration methods
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+% initialize the db
+init() ->
+    create_tabs(mnesia:create_schema([node()])),
+    mnesia:wait_for_tables([rule, zone, link, leap], 3000).
+
+
+% WARNING: deletes all db files
+wipe() ->
+    mnesia:stop(),
+    mnesia:delete_schema([node()]).
+
+
+create_tabs(ok) ->
+    mnesia:start(),
+
+    ?create(rule),
+    ?create(zone),
+    ?create(link),
+    ?create(leap),
+    ?create(flatzone),
+
+    ok;
+create_tabs({error, {_, {already_exists,_}}}) ->
+    mnesia:start(),
+    ok;
+create_tabs(E) ->
+    ?debug(E).
+
+
+
+