svn commit: r669850 - in /incubator/couchdb/branches/runtimeconfig/src/couchdb: couch_config.erl couch_ft_query.erl

[ja...@apache.org]

Author: jan
Date: Fri Jun 20 03:59:04 2008
New Revision: 669850

URL: http://svn.apache.org/viewvc?rev=669850&view=rev
Log:
fix edoc comment
replace ?ERR_HANDLE constant with inline code because edoc complains. This is a sub-optimal solution and should be addressed in the future. We use this intermediate fix to keep the branch in a buildable state. 

Modified:
    incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_config.erl
    incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_ft_query.erl

Modified: incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_config.erl
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_config.erl?rev=669850&r1=669849&r2=669850&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_config.erl (original)
+++ incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_config.erl Fri Jun 20 03:59:04 2008
@@ -269,7 +269,7 @@
 commit(Config, File) ->
     couch_config_writer:save_config(Config, File).
 
-%% @spec load_ini_files([File::filenames()]) -> ok
+%% @spec load_ini_files([File::filename()]) -> ok
 %% @doc Stores the last ini file in Files to be the storage ini file and
 %%      iterates over all ini files and calls load_ini_file/1 with each.
 load_ini_files(IniFiles) ->

Modified: incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_ft_query.erl
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_ft_query.erl?rev=669850&r1=669849&r2=669850&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_ft_query.erl (original)
+++ incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_ft_query.erl Fri Jun 20 03:59:04 2008
@@ -36,7 +36,7 @@
     ok.
 
 handle_call({ft_query, Database, QueryText}, _From, Port) ->
-    %% send the database name
+    % send the database name
     true = port_command(Port, Database ++ "\n"),
     true = port_command(Port, QueryText ++ "\n"),
     case get_line(Port) of
@@ -63,7 +63,9 @@
     receive
     {Port, {data, {eol, Line}}} ->
         Line;
-    ?ERR_HANDLE
+    % would love to use ?ERR_HANDLE here, but edoc doesn't like it.
+    % TODO: find a way to skip that.
+    {Port, {exit_status, Status}} -> {stop, {unknown_error, Status}, {unknown_error, Status}, Port}
     end.
 
 handle_cast(_Whatever, State) ->