Project: erlyweb

Revision: 248

Author: yarivvv

Date: 31 May 2008 21:34:16

• /trunk/src/erlyweb/erlyweb_compile.erl

  ......	@@ -343,33 +343,30 @@
  343	343	when Name == before_return;
  344	344	Name == before_call;
  345	345	Name == module_info ->
  346		Acc1;
  347		({_, 0}, Acc1) ->
  348		Acc1;
  349		({Name, Arity}, Acc1) ->
  350		[{Name, Arity} | Acc1]
  351		end, [], Exports),
  352		{ActionName, _} = lists:split(length(BaseName) - 11, BaseName),
  353		{gb_trees:enter(
  354		ActionName, Exports1, ComponentTree),
  355		Models};
  356		{{ok, _Module}, model} ->
  357		{ComponentTree, [FileName | Models]};
  358		{{ok, _Module}, _} -> Acc;
  359		{ok, _} -> Acc;
  360		{Err, _} -> exit(Err)
  361		end.
  	346	Acc1;
  	347	({_, 0}, Acc1) ->
  	348	Acc1;
  	349	({Name, Arity}, Acc1) ->
  	350	[{Name, Arity} | Acc1]
  	351	end, [], Exports),
  	352	{ActionName, _} = lists:split(length(BaseName) - 11,
  	353	BaseName),
  	354	{gb_trees:enter(
  	355	ActionName, Exports1, ComponentTree),
  	356	Models};
  	357	{{ok, _Module}, model} ->
  	358	{ComponentTree, [FileName | Models]};
  	359	{{ok, _Module}, _} -> Acc;
  	360	{ok, _} -> Acc;
  	361	{Err, _} -> exit(Err)
  	362	end.
  362	363
  363		compile_file(_FileName, [$. | _] = BaseName, _Extension, _Type,
  	364	compile_file(_FileName, [$. | _] = BaseName, _Extension, _Type,
  364	365	_LastCompileTimeInSeconds, _Options, _IncludePaths) ->
  365	366	?Debug("Ignoring file ~p", [BaseName]),
  366	367	{ok, ignore};
  367	368	compile_file(FileName, BaseName, Extension, Type,
  368	369	LastCompileTimeInSeconds, Options, IncludePaths) ->
  369		%% ?Debug("Filename: ~p~nBaseName: ~p~nExtension: ~p~nType: ~p~n" ++
  370		%% "LastCompileTimeInSeconds: ~p~nOptions: ~p~nIncludePaths: ~p~n",
  371		%% [FileName, BaseName, Extension, Type,
  372		%% LastCompileTimeInSeconds, Options, IncludePaths]),
  373	370	case should_compile(FileName,BaseName,LastCompileTimeInSeconds) of
  374	371	true ->
  375	372	case Extension of

• /trunk/src/erlyweb/erlyweb_html.et

  ......	@@ -19,12 +19,9 @@
  19	19	join(Rest, [[First, $/] | Acc]).
  20	20	%>
  21	21
  22		<%@ a(PathElems, Text) %><a href="<% join(PathElems) %>"><% Text %></a>
  23		<%@ a(PathElems, Text, Props) %><a href="<% join(PathElems) %>"<%
  	22	<%@ a(PathElems, Text) %><a href="<% join(PathElems) %>"><% Text %></a><%@ a(PathElems, Text, Props) %><a href="<% join(PathElems) %>"<%
  24	23	[[" ", Name,<<"=\"">>,Value,<<"\"">>] || {Name, Value} <- Props] %>><%
  25		Text %></a>
  26
  27		<%@ table(Records) %>
  	24	Text %></a><%@ table(Records) %>
  28	25	<% table(Records, undefined) %>
  29	26
  30	27	<%@ table(Records, Headers) %>
  ......	@@ -76,4 +73,4 @@
  76	73	<%@ option(Name, _Val) %>
  77	74	<option><% Name %></option>
  78	75
  79		<%@ img(Src, Width, Height) %><img src="<% Src %>" width="<% Width %>" height="<% Height %>"/>
  80	76	\ No newline at end of file
  	77	<%@ img(Src, Width, Height) %><img src="<% Src %>" width="<% Width %>" height="<% Height %>"/>