From 787b867787a0a148f0192421b5df18989de41456 Mon Sep 17 00:00:00 2001 From: Cedric RICARD Date: Sun, 24 Feb 2008 18:18:10 +0000 Subject: [PATCH] Fix for TIMESTAMP field handling --- calexium_lib/net_services/CXM_generic_client.anubis | 4 ++-- calexium_lib/net_services/CXM_generic_protocol.anubis | 2 +- calexium_lib/web/CXM_multihost_http_server.anubis | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/calexium_lib/net_services/CXM_generic_client.anubis b/calexium_lib/net_services/CXM_generic_client.anubis index 16a7809..9daab56 100644 --- a/calexium_lib/net_services/CXM_generic_client.anubis +++ b/calexium_lib/net_services/CXM_generic_client.anubis @@ -62,7 +62,7 @@ public define Maybe(NetServiceAnswer) } }. -define Maybe($T) +public define Maybe($T) generic_handler ( MessageQueue queue, @@ -131,7 +131,7 @@ define Maybe($T) { failure then logger("["+queue.get_name(unique)+"]: requesting service RESULT not found");failure, success(result) then - with timestamp = if find_string(msg, "TIMESTAMP") is + with timestamp = if find_string(result, "TIMESTAMP") is { failure then logger("["+queue.get_name(unique)+"]: requesting service TIMESTAMP not found"); "", success(timestamp) then timestamp diff --git a/calexium_lib/net_services/CXM_generic_protocol.anubis b/calexium_lib/net_services/CXM_generic_protocol.anubis index 3b6b301..1fbbebe 100644 --- a/calexium_lib/net_services/CXM_generic_protocol.anubis +++ b/calexium_lib/net_services/CXM_generic_protocol.anubis @@ -17,7 +17,7 @@ read calexium_lib/CXM_message_constants.anubis public define Int32 _CXM_OK = 0. public define Int32 _CXM_ERROR = 1. public define Int32 _CXM_UNKNOW_CMD = 2. -public define Int32 _CXM_UNKNOW_SERVICE = 2. +public define Int32 _CXM_UNKNOW_SERVICE = 3. public type ProtocolResult: failure, diff --git a/calexium_lib/web/CXM_multihost_http_server.anubis b/calexium_lib/web/CXM_multihost_http_server.anubis index 0750205..17048f9 100644 --- a/calexium_lib/web/CXM_multihost_http_server.anubis +++ b/calexium_lib/web/CXM_multihost_http_server.anubis @@ -2070,7 +2070,7 @@ define One with nr = length(ba), // get the number of bytes read if reliable_write(connection,ba) is { - failure then log_journal_msg(desc,"Cannot write into connection.\n"), + failure then log_journal_msg(desc,"Cannot write into connection delirering '"+filename+"' (sent="+sent+"; size="+size+"; current="+nr+").\n"), success(nw) then send_file_body(desc,connection,file,size,sent+nw,filename) } -- libgit2 0.21.4