From: Dennis Schafroth <dennis@indexdata.com>
Date: Mon, 28 Mar 2011 08:57:48 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.5.5~4
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=5d7214f79a8cd1b8c8e71453d670fb58eb180d34;hp=-c;p=pazpar2-moved-to-github.git

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

5d7214f79a8cd1b8c8e71453d670fb58eb180d34
diff --combined src/pazpar2.c
index d6423a6,7f69902..84a3253
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@@ -35,11 -35,6 +35,11 @@@ Foundation, Inc., 51 Franklin St, Fift
  #include <yaz/options.h>
  #include <yaz/sc.h>
  
 +// #define MTRACE
 +#ifdef MTRACE
 +#include <mcheck.h>
 +#endif
 +
  static struct conf_config *sc_stop_config = 0;
  
  void child_handler(void *data)
@@@ -100,6 -95,7 +100,7 @@@ static int sc_main
      const char *uid = 0;
      const char *listener_override = 0;
      const char *config_fname = 0;
+     const char *record_fname = 0;
      struct conf_config *config = 0;
      int test_mode = 0;
  
@@@ -113,7 -109,7 +114,7 @@@
      yaz_log_init_prefix("pazpar2");
      yaz_log_xml_errors(0, YLOG_WARN);
  
-     while ((ret = options("dDf:h:l:p:tu:v:VX", argv, argc, &arg)) != -2)
+     while ((ret = options("dDf:h:l:p:R:tu:v:VX", argv, argc, &arg)) != -2)
      {
  	switch (ret)
          {
@@@ -136,6 -132,9 +137,9 @@@
          case 'p':
              pidfile = arg;
              break;
+         case 'R':
+             record_fname = arg;
+             break;
          case 't':
              test_mode = 1;
              break;
@@@ -158,6 -157,7 +162,7 @@@
                      "    -h [host:]port          Listener port\n"
                      "    -l file                 Log to file\n"
                      "    -p pidfile              PID file\n"
+                     "    -R recfile              HTTP recording file\n"
                      "    -t                      Test configuration\n"
                      "    -u uid                  Change user to uid\n"
                      "    -V                      Show version\n"
@@@ -202,7 -202,7 +207,7 @@@
                      "mode");
              return 1;
          }
-         ret = config_start_listeners(config, listener_override);
+         ret = config_start_listeners(config, listener_override, record_fname);
          if (ret)
              return ret; /* error starting http listener */
          
@@@ -227,20 -227,10 +232,20 @@@ int main(int argc, char **argv
  {
      int ret;
      yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar2");
 +    
 +#ifdef MTRACE
 +    mtrace();
 +#endif
  
      ret = yaz_sc_program(s, argc, argv, sc_main, sc_stop);
  
      yaz_sc_destroy(&s);
 +
 +#ifdef MTRACE
 +    muntrace();
 +#endif
 +
 +
      exit(ret);
  }