From: Dennis Schafroth <dennis@indexdata.com>
Date: Thu, 3 Nov 2011 14:14:23 +0000 (+0100)
Subject: Merge branch 'bytarget_block' of ssh://git.indexdata.com/home/git/pub/pazpar2 into... 
X-Git-Tag: mobile-beta-1~25^2
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=950f9ae98a1342eba4845091cc65bdfc45dd275b;hp=-c;p=pazpar2-moved-to-github.git

Merge branch 'bytarget_block' of ssh://git.indexdata.com/home/git/pub/pazpar2 into bytarget_block
---

950f9ae98a1342eba4845091cc65bdfc45dd275b
diff --combined src/http_command.c
index e48d7f7,f25f478..8ba4b15
--- a/src/http_command.c
+++ b/src/http_command.c
@@@ -229,7 -229,7 +229,7 @@@ static const char *get_msg(enum pazpar2
          { PAZPAR2_RECORD_FAIL, "Record command failed"},
          { PAZPAR2_NOT_IMPLEMENTED, "Not implemented"},
          { PAZPAR2_NO_SERVICE, "No service"},
-         { PAZPAR2_ALREADY_BLOCKED, "Already blocked on command in session."},
+         { PAZPAR2_ALREADY_BLOCKED, "Already blocked in session on: "},
          { PAZPAR2_LAST_ERROR, "Last error"},
          { 0, 0 }
      };
@@@ -610,7 -610,8 +610,8 @@@ static void bytarget_response(struct ht
  
      ht = get_hitsbytarget(s->psession, &count, c->nmem);
      response_open(c, "bytarget");
- 
+     if (count == 0)
+         yaz_log(YLOG_WARN, "Empty bytarget Response. No targets found!");
      for (i = 0; i < count; i++)
      {
          wrbuf_puts(c->wrbuf, "\n<target>");
@@@ -653,7 -654,7 +654,7 @@@
  static void bytarget_result_ready(void *data)
  {
      struct http_channel *c = (struct http_channel *) data;
 -
 +    yaz_log(c->http_sessions->log_level, "bytarget watch released");
      bytarget_response(c);
  }
  
@@@ -674,6 -675,7 +675,7 @@@ static void cmd_bytarget(struct http_ch
          if (session_set_watch(s->psession, SESSION_WATCH_BYTARGET,
                                bytarget_result_ready, c, c) != 0)
          {
+             yaz_log(YLOG_WARN, "Attempt to block multiple times on bytarget block. Not supported!");
              error(rs, PAZPAR2_ALREADY_BLOCKED, "bytarget"); 
          }
          else
@@@ -1024,6 -1026,7 +1026,7 @@@ static void cmd_show(struct http_channe
              }
              else
              {
+                 yaz_log(YLOG_WARN, "Attempt to block multiple times on show (preferred targets) block. Not supported!");
                  error(rs, PAZPAR2_ALREADY_BLOCKED, "show (preferred targets)"); 
              }
              release_session(c, s);
@@@ -1036,6 -1039,7 +1039,7 @@@
              if (session_set_watch(s->psession, SESSION_WATCH_SHOW,
                                    show_records_ready, c, c) != 0)
              {
+                 yaz_log(YLOG_WARN, "Attempt to block multiple times on show block. Not supported!");
                  error(rs, PAZPAR2_ALREADY_BLOCKED, "show"); 
              }
              else