From e223525ce20d4c7962994448d5ee632c4f229ec0 Mon Sep 17 00:00:00 2001
From: Peti Gomori <gomoripeti@gmail.com>
Date: Fri, 15 Jun 2012 20:26:33 +0200
Subject: Edit table row in a multiline text dialog

---
 lib/observer/src/observer_tv_table.erl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/observer/src/observer_tv_table.erl')

diff --git a/lib/observer/src/observer_tv_table.erl b/lib/observer/src/observer_tv_table.erl
index 3930f9ee26..231a4c3108 100644
--- a/lib/observer/src/observer_tv_table.erl
+++ b/lib/observer/src/observer_tv_table.erl
@@ -218,8 +218,8 @@ search_area(Parent) ->
 	    search=TC1,goto=TC2,radio={Nbtn,Pbtn,Cbtn}}.
 
 edit(Index, #state{pid=Pid, frame=Frame}) ->
-    Str = get_row(Pid, Index, all),
-    case observer_lib:user_term(Frame, "Edit object:", Str) of
+    Str = get_row(Pid, Index, all_multiline),
+    case observer_lib:user_term_multiline(Frame, "Edit object:", Str) of
 	cancel -> ok;
 	{ok, Term} -> Pid ! {edit, Index, Term};
 	Err = {error, _} -> self() ! Err
@@ -628,6 +628,8 @@ get_row(From, Row, Col, Table) ->
     case lists:nth(Row+1, Table) of
 	[Object|_] when Col =:= all ->
 	    From ! {self(), format(Object)};
+	[Object|_] when Col =:= all_multiline ->
+	    From ! {self(), io_lib:format("~p", [Object])};
 	[Object|_] when tuple_size(Object) >= Col ->
 	    From ! {self(), format(element(Col, Object))};
 	_ ->
-- 
cgit v1.2.3


From 913aba26f8ae6186b8ae73f3b59ba8736411f9d7 Mon Sep 17 00:00:00 2001
From: Peti Gomori <gomoripeti@gmail.com>
Date: Fri, 29 Jun 2012 18:25:59 +0200
Subject: Make Table Viewer search a bit faster

Conflicts:
	lib/observer/src/observer_tv_table.erl
---
 lib/observer/src/observer_tv_table.erl | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'lib/observer/src/observer_tv_table.erl')

diff --git a/lib/observer/src/observer_tv_table.erl b/lib/observer/src/observer_tv_table.erl
index 231a4c3108..835c7aafef 100644
--- a/lib/observer/src/observer_tv_table.erl
+++ b/lib/observer/src/observer_tv_table.erl
@@ -594,7 +594,7 @@ keysort(Col, Table) ->
     lists:sort(Sort, Table).
 
 search([Str, Row, Dir0, CaseSens],
-       S=#holder{parent=Parent, table=Table}) ->
+       S=#holder{parent=Parent, table=Table0}) ->
     Opt = case CaseSens of
 	      true -> [];
 	      false -> [caseless]
@@ -605,24 +605,28 @@ search([Str, Row, Dir0, CaseSens],
 	  end,
     Res = case re:compile(Str, Opt) of
 	      {ok, Re} ->
+		  Table =
+		      case Dir0 of
+			  true ->
+			      lists:nthtail(Row, Table0);
+			  false ->
+			      lists:reverse(lists:sublist(Table0, Row+1))
+		      end,
 		  search(Row, Dir, Re, Table);
 	      {error, _} -> false
 	  end,
     Parent ! {self(), Res},
     S#holder{search=Res}.
 
-search(Row, Dir, Re, Table) ->
-    Res = try lists:nth(Row+1, Table) of
-	      Term ->
-		  Str = format(Term),
-		  re:run(Str, Re)
-	  catch _:_ -> no_more
-	  end,
+search(Row, Dir, Re, [ [Term|_] |Table]) ->
+    Str = format(Term),
+    Res = re:run(Str, Re),
     case Res of
 	nomatch -> search(Row+Dir, Dir, Re, Table);
-	no_more -> false;
 	{match,_} -> Row
-    end.
+    end;
+search(_, _, _, []) ->
+    false.
 
 get_row(From, Row, Col, Table) ->
     case lists:nth(Row+1, Table) of
-- 
cgit v1.2.3