X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmetaproxy_prog.cpp;h=6b5d43740203d40cd9cf1a8184ee17c089862fa6;hb=85189f2d04df4cfc8b16ee78187fb89d00dfe3ff;hp=d2638b2aa52c3d2d5480ccb5182522341ed57c7c;hpb=240aff30845f7c20874ec9ee4115f3d7ea2a597e;p=metaproxy-moved-to-github.git

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index d2638b2..6b5d437 100644
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -1,13 +1,29 @@
-/* $Id: metaproxy_prog.cpp,v 1.8 2006-12-01 12:37:26 marc Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: metaproxy_prog.cpp,v 1.14 2008-02-20 15:07:52 adam Exp $
+   Copyright (c) 2005-2008, Index Data.
 
-   See the LICENSE file for details
+This file is part of Metaproxy.
+
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Metaproxy; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
  */
 
 #include "config.hpp"
 
-#include <boost/program_options.hpp>
-namespace po = boost::program_options;
+#include <yaz/log.h>
+#include <yaz/options.h>
+#include <yaz/daemon.h>
 
 #include <iostream>
 #include <stdexcept>
@@ -20,86 +36,93 @@ namespace po = boost::program_options;
 
 namespace mp = metaproxy_1;
 
+static void handler(void *data)
+{
+    mp::RouterFleXML *routerp = (mp::RouterFleXML*) data;
+
+    mp::Package pack;
+    pack.router(*routerp).move();
+}
+    
 int main(int argc, char **argv)
 {
     try 
     {
-        po::options_description desc("Allowed options");
-        desc.add_options()
-            ("help,h", "produce help message")
-            ("version,V", "show version")
-            ("config", po::value< std::vector<std::string> >(), "xml config")
-            ;
-        
-        po::positional_options_description p;
-        p.add("config", -1);
-        
-        po::variables_map vm;        
-        po::store(po::command_line_parser(argc, argv).
-                  options(desc).positional(p).run(), vm);
-        po::notify(vm);
-        
-        if (vm.count("help")) {
-            std::cout << desc << "\n";
-            return 1;
-        }
-        if (vm.count("version")) {
-            std::cout << "Metaproxy " VERSION "\n";
-            return 0;
-        }
-        xmlDocPtr doc = 0;
-        if (vm.count("config"))
-        {
-            std::vector<std::string> config_fnames = 
-                vm["config"].as< std::vector<std::string> >();
+        const char *fname = 0;
+        int ret;
+        char *arg;
+        unsigned mode = 0;
+        const char *pidfile = 0;
+        const char *uid = 0;
 
-            if (config_fnames.size() != 1)
-            {
-                std::cerr << "Only one configuration must be given\n";
-                std::exit(1);
-            }
-            
-            // need to parse with xinclude tags 
-            // XML_PARSE_XINCLUDE XML_PARSE_NOBLANKS  
-            // XML_PARSE_NSCLEAN XML_PARSE_NONET 
-            doc = xmlReadFile(config_fnames[0].c_str(), 
-                              NULL, 
-                              XML_PARSE_XINCLUDE + XML_PARSE_NOBLANKS
-                              + XML_PARSE_NSCLEAN + XML_PARSE_NONET );
-
-            if (!doc)
+        while ((ret = options("c{config}:Dh{help}l:p:u:V{version}X", 
+                              argv, argc, &arg)) != -2)
+        {
+            switch (ret)
             {
-                std::cerr << "XML parsing failed\n";
+            case 'c':
+                fname = arg;
+                break;
+            case 'D':
+                mode = YAZ_DAEMON_FORK|YAZ_DAEMON_KEEPALIVE;
+                break;
+            case 'h':
+                std::cerr << "metaproxy\n"
+                    " -h|--help     help\n"
+                    " -V|--version  version\n"
+                    " -c|--config f config filename\n"
+                    " -D            daemon and keepalive operation\n"
+                    " -l f          log file f\n"
+                    " -p f          pid file f\n"
+                    " -u id         change uid to id\n"
+                    " -X            debug mode (no fork/daemon mode)\n"
+                          << std::endl;
+                break;
+            case 'l':
+                yaz_log_init_file(arg);
+                yaz_log(YLOG_LOG, "Metaproxy " VERSION " started");
+                break;
+            case 'p':
+                pidfile = arg;
+                break;
+            case 'u':
+                uid = arg;
+                break;
+            case 'V':
+                std::cout << "Metaproxy " VERSION "\n";
+                break;
+            case 'X':
+                mode = YAZ_DAEMON_DEBUG;
+                break;
+            case -1:
+                std::cerr << "bad option: " << arg << std::endl;
                 std::exit(1);
             }
-            // and perform Xinclude then
-            if (xmlXIncludeProcess(doc) > 0) {
-                std::cerr << "processing XInclude directive\n";
-            }
         }
-        else
+        if (!fname)
         {
             std::cerr << "No configuration given\n";
             std::exit(1);
         }
-        if (doc)
+
+        xmlDocPtr doc = xmlReadFile(fname,
+                                    NULL, 
+                                    XML_PARSE_XINCLUDE + XML_PARSE_NOBLANKS
+                                    + XML_PARSE_NSCLEAN + XML_PARSE_NONET );
+        
+        if (!doc)
         {
-            try {
-                mp::FactoryStatic factory;
-                mp::RouterFleXML router(doc, factory);
-                mp::Package pack;
-                pack.router(router).move();
-            }
-            catch (std::runtime_error &e) {
-                std::cerr << "std::runtime error: " << e.what() << "\n";
-                std::exit(1);
-            }
-            xmlFreeDoc(doc);
+            std::cerr << "XML parsing failed\n";
+            std::exit(1);
         }
-    }
-    catch (po::unknown_option &e) {
-        std::cerr << e.what() << "; use --help for list of options\n";
-        std::exit(1);
+        // and perform Xinclude then
+        if (xmlXIncludeProcess(doc) > 0) {
+            std::cerr << "processing XInclude directive\n";
+        }
+        mp::FactoryStatic factory;
+        mp::RouterFleXML router(doc, factory, false);
+
+        yaz_daemon("metaproxy", mode, handler, &router, pidfile, uid);
     }
     catch (std::logic_error &e) {
         std::cerr << "std::logic error: " << e.what() << "\n";