Add shell script and .bat file to start crashdump_viewer

Since browsers no longer can provide the full path of a file selected
with a file-type input field (browse button), the input field for
loading a crashdump is now changed to a plain text input field. Since
this reduces the user-friendlyness, a shell script (and a .bat file)
has instead been added so the crashdump_viewer can be started directly
from the command line - and thus normal tab completion can be used for
selecting the crashdump file.

Usage: cdv file [ browser ]

5 files changed, 106 insertions, 30 deletions

diff --git a/lib/observer/priv/bin/cdv b/lib/observer/priv/bin/cdv
new file mode 100755
index 0000000000..1c44785ac2
--- /dev/null
+++ b/lib/observer/priv/bin/cdv
@@ -0,0 +1,4 @@
+#!/bin/sh 
+
+erl -sname cdv -noinput -s crashdump_viewer script_start $@
+
diff --git a/lib/observer/priv/bin/cdv.bat b/lib/observer/priv/bin/cdv.bat
new file mode 100644
index 0000000000..efa8bf8687
--- /dev/null
+++ b/lib/observer/priv/bin/cdv.bat
@@ -0,0 +1,2 @@
+@ECHO OFF
+CALL werl -sname cdv -s crashdump_viewer script_start %*
diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
index b4eb518dd7..2d06cb6bc4 100644
--- a/lib/observer/src/Makefile
+++ b/lib/observer/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2002-2009. All Rights Reserved.
+# Copyright Ericsson AB 2002-2011. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -59,8 +59,10 @@ BINDIR= $(PRIVDIR)/bin
 EXECUTABLES= \
 	$(BINDIR)/etop \
 	$(BINDIR)/getop \
+	$(BINDIR)/cdv \
 	$(BINDIR)/etop.bat \
-	$(BINDIR)/getop.bat
+	$(BINDIR)/getop.bat \
+	$(BINDIR)/cdv.bat
 CDVDIR= $(PRIVDIR)/crashdump_viewer
 GIF_FILES= \
 	$(CDVDIR)/collapsd.gif \
diff --git a/lib/observer/src/crashdump_viewer.erl b/lib/observer/src/crashdump_viewer.erl
index 8b96769224..29e24655eb 100644
--- a/lib/observer/src/crashdump_viewer.erl
+++ b/lib/observer/src/crashdump_viewer.erl
@@ -57,7 +57,7 @@
 %%
 
 %% User API
--export([start/0,stop/0]).
+-export([start/0,stop/0,script_start/0,script_start/1]).
 
 %% Webtool API
 -export([configData/0,
@@ -117,7 +117,7 @@
 				% this, it must be explicitly expanded.
 -define(max_display_binary_size,50). % max size of a binary that will be
 				      % directly displayed.
--define(max_sort_process_num,1000). % Max number of processes that allows 
+-define(max_sort_process_num,10000). % Max number of processes that allows
 				    % sorting. If more than this number of 
 				    % processes exist, they will be displayed
 				    % in the order they are found in the log.
@@ -206,6 +206,85 @@ stop() ->
     webtool:stop().
 
 %%%-----------------------------------------------------------------
+%%% Start crashdump_viewer via the cdv script located in
+%%% $OBSERVER_PRIV_DIR/bin
+script_start() ->
+    usage().
+script_start([File]) ->
+    DefaultBrowser =
+	case os:type() of
+	    {win32,_} -> iexplore;
+	    _ -> firefox
+	end,
+    script_start([File,DefaultBrowser]);
+script_start([FileAtom,Browser]) ->
+    File = atom_to_list(FileAtom),
+    case filelib:is_regular(File) of
+	true ->
+	    io:format("Starting crashdump_viewer...\n"),
+	    start(),
+	    io:format("Reading crashdump..."),
+	    read_file(File),
+	    redirect([],[]),
+	    io:format("done\n"),
+	    start_browser(Browser);
+	false ->
+	    io:format("cdv error: the given file does not exist\n"),
+	    usage()
+    end.
+
+start_browser(Browser) ->
+    PortStr = integer_to_list(gen_server:call(web_tool,get_port)),
+    Url = "http://localhost:" ++ PortStr ++ ?START_PAGE,
+    {OSType,_} = os:type(),
+    case Browser of
+	none ->
+	    ok;
+	iexplore when OSType == win32->
+	    io:format("Starting internet explorer...\n"),
+	    {ok,R} = win32reg:open(""),
+	    Key="\\local_machine\\SOFTWARE\\Microsoft\\IE Setup\\Setup",
+	    win32reg:change_key(R,Key),
+	    {ok,Val} = win32reg:value(R,"Path"),
+	    IExplore=filename:join(win32reg:expand(Val),"iexplore.exe"),
+	    os:cmd("\"" ++ IExplore ++ "\" " ++ Url);
+	_ when OSType == win32 ->
+	    io:format("Starting ~w...\n",[Browser]),
+	    os:cmd("\"" ++ atom_to_list(Browser) ++ "\" " ++ Url);
+	B when B==firefox; B==mozilla ->
+	    io:format("Sending URL to ~w...",[Browser]),
+	    BStr = atom_to_list(Browser),
+	    SendCmd = BStr ++ " -raise -remote \'openUrl(" ++ Url ++ ")\'",
+	    Port = open_port({spawn,SendCmd},[exit_status]),
+	    receive
+		{Port,{exit_status,0}} ->
+		    io:format("done\n");
+		{Port,{exit_status,_Error}} ->
+		    io:format(" not running, starting ~w...\n",[Browser]),
+		    os:cmd(BStr ++ " " ++ Url)
+	    after 5000 ->
+		    io:format(" failed, starting ~w...\n",[Browser]),
+		    erlang:port_close(Port),
+		    os:cmd(BStr ++ " " ++ Url)
+	    end;
+	_ ->
+	    io:format("Starting ~w...\n",[Browser]),
+	    os:cmd(atom_to_list(Browser) ++ " " ++ Url)
+    end,
+    ok.
+
+usage() ->
+    io:format(
+      "\nusage: cdv file [ browser ]\n"
+      "\tThe \'file\' must be an existing erlang crash dump.\n"
+      "\tDefault browser is \'iexplore\' (Internet Explorer) on Windows\n"
+      "\tor else \'firefox\'.\n",
+      []).
+
+
+
+
+%%%-----------------------------------------------------------------
 %%% Return config data used by webtool
 configData() ->
     Dir = filename:join(code:priv_dir(observer),"crashdump_viewer"),
@@ -404,16 +483,7 @@ handle_call(start_page, _From, State) ->
     Reply = crashdump_viewer_html:start_page(),
     {reply,Reply,State};
 handle_call({read_file,Input}, _From, _State) ->
-    {ok,File0} = get_value("path",httpd:parse_query(Input)),
-    File = 
-	case File0 of
-	    [$"|FileAndSome] ->
-		%% Opera adds \"\" around the filename!
-		[$"|Elif] = lists:reverse(FileAndSome),
-		lists:reverse(Elif);
-	    _ ->
-		File0
-	end,
+    {ok,File} = get_value("path",httpd:parse_query(Input)),
     spawn_link(fun() -> read_file(File) end),
     Status = background_status(reading,File),
     Reply = crashdump_viewer_html:redirect(Status),
@@ -877,10 +947,12 @@ get_rest_of_line_1(Fd, <<$\n:8,Bin/binary>>, Acc) ->
     lists:reverse(Acc);
 get_rest_of_line_1(Fd, <<$\r:8,Rest/binary>>, Acc) ->
     get_rest_of_line_1(Fd, Rest, Acc);
-%% get_rest_of_line_1(Fd, <<$<:8,Rest/binary>>, Acc) ->
-%%     get_rest_of_line_1(Fd, Rest, [$;,$t,$l,$&|Acc]);
-%% get_rest_of_line_1(Fd, <<$>:8,Rest/binary>>, Acc) ->
-%%     get_rest_of_line_1(Fd, Rest, [$;,$t,$g,$&|Acc]);
+get_rest_of_line_1(Fd, <<$<:8,Rest/binary>>, Acc) ->
+    get_rest_of_line_1(Fd, Rest, [$;,$t,$l,$&|Acc]);
+get_rest_of_line_1(Fd, <<$>:8,Rest/binary>>, Acc) ->
+    get_rest_of_line_1(Fd, Rest, [$;,$t,$g,$&|Acc]);
+get_rest_of_line_1(Fd, <<$&:8,Rest/binary>>, Acc) ->
+    get_rest_of_line_1(Fd, Rest, [$;,$p,$m,$a,$&|Acc]);
 get_rest_of_line_1(Fd, <<Char:8,Rest/binary>>, Acc) ->
     get_rest_of_line_1(Fd, Rest, [Char|Acc]);
 get_rest_of_line_1(Fd, <<>>, Acc) ->
diff --git a/lib/observer/src/crashdump_viewer_html.erl b/lib/observer/src/crashdump_viewer_html.erl
index 0d70c9b86f..d49023f9f6 100644
--- a/lib/observer/src/crashdump_viewer_html.erl
+++ b/lib/observer/src/crashdump_viewer_html.erl
@@ -77,23 +77,20 @@ read_file_frame() ->
 
 
 read_file_frame_body() ->
-    Entry =
-	case webtool:is_localhost() of 
-	    true -> [input("TYPE=file NAME=browse SIZE=40"),
-		     input("TYPE=hidden NAME=path")];
-	    false -> input("TYPE=text NAME=path SIZE=60")
-	end,
+    %% Using a plain text input field instead of a file input field
+    %% (e.g. <INPUT TYPE=file NAME=pathj SIZE=40">) because most
+    %% browsers can not forward the full path from this dialog even if
+    %% the browser is running on localhost (Ref 'fakepath'-problem)
+    Entry = input("TYPE=text NAME=path SIZE=60"),
     Form = 
 	form(
-	  "NAME=read_file_form METHOD=post ACTION= \"./read_file\"",
+	  "NAME=read_file_form METHOD=post ACTION=\"./read_file\"",
 	  table(
 	    "BORDER=0",
 	    [tr(td("COLSPAN=2","Enter file to analyse")),
 	     tr(
 	       [td(Entry),
-		td("ALIGN=center",
-		   input("TYPE=submit onClick=\"path.value=browse.value;\""
-			 "VALUE=Ok"))])])),
+		td("ALIGN=center",input("TYPE=submit VALUE=Ok"))])])),
     table(
       "WIDTH=100% HEIGHT=60%",
       tr("VALIGN=middle",
@@ -961,8 +958,7 @@ frame(Args) ->
     ["<FRAME ",Args, ">\n"].
 
 start_visible_table() ->
-    start_table("BORDER=\"4\" CELLPADDING=\"4\" WIDTH=\"100%\"").
-%    start_table("BORDER=\"4\" CELLPADDING=\"4\"").
+    start_table("BORDER=\"4\" CELLPADDING=\"4\"").
 start_visible_table(ColTitles) ->
     [start_visible_table(),
      tr([th(ColTitle) || ColTitle <- ColTitles])].