@@ -196,7 +196,12 @@ void xmlXPathFuncCallback(xmlXPathParserContextPtr ctxt, int nargs) s = xmlMemMalloc(term.size + 1); ei_decode_string(rbuf, &rindex, s); xmlDocPtr doc = xmlParseDoc((xmlChar *)s); - ret = xmlXPathNewNodeSet((xmlNode *)doc->children); + if (doc) + ret = xmlXPathNewNodeSet((xmlNode *)doc->children); + else + { + fprintf(stderr, "Callback result XML parsing error\n"); + } } else fprintf(stderr, "not really tree\n"); erlxslt.c @@ -101,11 +101,11 @@ handle_call({register_function, Xmlns, Name, Fun}, _From, %% Description: Handling cast messages %%-------------------------------------------------------------------- handle_cast({set_xslt, Uri, Xslt}, State = #state{port = Port}) -> - Buf = lists:append([[?CMD_SET_XSLT | Uri], [0], Xslt]), + Buf = [?CMD_SET_XSLT | Uri] ++ [0 | Xslt], port_command(Port, Buf), {noreply, State}; handle_cast({set_xml, Uri, Xml}, State = #state{port = Port}) -> - Buf = lists:append([[?CMD_SET_XML | Uri], [0], Xml]), + Buf = [?CMD_SET_XML | Uri] ++ [0 | Xml], port_command(Port, Buf), {noreply, State}; handle_cast({set_params, Params}, State = #state{port = Port}) -> @@ -173,13 +173,15 @@ call_function([Xmlns, Name | Args] = Call, [{Xmlns, Name, Fun} | Functions]) -> case erlang:fun_info(Fun, arity) of {arity, ArgsLen} -> Args2 = lists:reverse(Args), - try apply(Fun, Args2) of + error_logger:info_msg("Calling XSLT ext function with arguments:~n{~s}~s ~p ~p", + [Xmlns, Name, Fun, Args2]), + case (catch apply(Fun, Args2)) of + {'EXIT', Reason} -> + error_logger:error_msg("Error calling XSLT ext function with arguments:~n{~s}~s ~p ~p:~nReason: ~p~n", + [Xmlns, Name, Fun, Args2, Reason]), + ""; R -> R - catch _:Reason -> - error_logger:error_msg("Error calling XSLT ext function with arguments:~n~p ~p:~nReason: ~p~n", - [Fun, Args2, Reason]), - "" - end; + end; _ -> call_function(Call, Functions) end; erlxslt.erl 730e92782efa81a0bfb8587f42a317980df06bce 52080a496c1708eee1221b707b9b49bca78a4ad1 Astro astro@spaceboyz.net http://github.com/astro/erlxslt/commit/538add73bea42c0b9b92fd387b2d059612610a78 538add73bea42c0b9b92fd387b2d059612610a78 2008-11-19T05:32:56-08:00 2008-11-19T05:32:56-08:00 Merge branch 'master' of git@github.com:astro/erlxslt Conflicts: erlxslt.c 4f85e02774b97c364c3ad33eb9ff02498bc671d4 Astro astro@spaceboyz.net