Set "dryrun" to true for XHTML copying routine. This suppresses

[lyx.git] / src / ServerSocket.cpp

diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp
index f3fb5cab3fbdeb5a9981cc04f5368b0c6859bf89..3d73a67ed6d955c08318323357856f5ec10aa8f9 100644 (file)
--- a/src/ServerSocket.cpp
+++ b/src/ServerSocket.cpp
@@ -16,9 +16,10 @@
 
 #include "ServerSocket.h"
 
+#include "DispatchResult.h"
 #include "FuncRequest.h"
+#include "LyX.h"
 #include "LyXAction.h"
-#include "LyXFunc.h"
 
 #include "frontends/Application.h"
 
@@ -27,7 +28,7 @@
 #include "support/FileName.h"
 #include "support/socktools.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
 
 #include <cerrno>
 #include <ostream>
@@ -37,17 +38,16 @@
 #endif
 
 using namespace std;
-using namespace std::tr1;
 using namespace lyx::support;
 
+
 namespace lyx {
 
 // Address is the unix address for the socket.
 // MAX_CLIENTS is the maximum number of clients
 // that can connect at the same time.
-ServerSocket::ServerSocket(LyXFunc * f, FileName const & addr)
-       : func(f),
-         fd_(socktools::listen(addr, 3)),
+ServerSocket::ServerSocket(FileName const & addr)
+       : fd_(socktools::listen(addr, 3)),
          address_(addr)
 {
        if (fd_ == -1) {
@@ -59,15 +59,15 @@ ServerSocket::ServerSocket(LyXFunc * f, FileName const & addr)
        // Needed by xdvi
        setEnv("XEDITOR", "lyxclient -g %f %l");
        // Needed by lyxclient
-       setEnv("LYXSOCKET", address_.absFilename());
+       setEnv("LYXSOCKET", address_.absFileName());
 
        theApp()->registerSocketCallback(
                fd_,
-               boost::bind(&ServerSocket::serverCallback, this)
+               bind(&ServerSocket::serverCallback, this)
                );
 
        LYXERR(Debug::LYXSERVER, "lyx: New server socket "
-                                << fd_ << ' ' << address_.absFilename());
+                                << fd_ << ' ' << address_.absFileName());
 }
 
 
@@ -89,7 +89,7 @@ ServerSocket::~ServerSocket()
 
 string const ServerSocket::address() const
 {
-       return address_.absFilename();
+       return address_.absFileName();
 }
 
 
@@ -114,7 +114,7 @@ void ServerSocket::serverCallback()
                shared_ptr<LyXDataSocket>(new LyXDataSocket(client_fd));
        theApp()->registerSocketCallback(
                client_fd,
-               boost::bind(&ServerSocket::dataCallback,
+               bind(&ServerSocket::dataCallback,
                            this, client_fd)
                );
 }
@@ -124,8 +124,10 @@ void ServerSocket::serverCallback()
 // if the connection has been closed
 void ServerSocket::dataCallback(int fd)
 {
-       shared_ptr<LyXDataSocket> client = clients[fd];
-
+       map<int, shared_ptr<LyXDataSocket> >::const_iterator it = clients.find(fd);
+       if (it == clients.end())
+               return;
+       shared_ptr<LyXDataSocket> client = it->second;
        string line;
        size_t pos;
        bool saidbye = false;
@@ -140,13 +142,15 @@ void ServerSocket::dataCallback(int fd)
                string const key = line.substr(0, pos);
                if (key == "LYXCMD") {
                        string const cmd = line.substr(pos + 1);
-                       func->dispatch(lyxaction.lookupFunc(cmd));
-                       string const rval = to_utf8(func->getMessage());
-                       if (func->errorStat()) {
+                       FuncRequest fr(lyxaction.lookupFunc(cmd));
+                       fr.setOrigin(FuncRequest::LYXSERVER);
+                       DispatchResult dr;
+                       theApp()->dispatch(fr, dr);
+                       string const rval = to_utf8(dr.message());
+                       if (dr.error())
                                client->writeln("ERROR:" + cmd + ':' + rval);
-                       } else {
+                       else
                                client->writeln("INFO:" + cmd + ':' + rval);
-                       }
                } else if (key == "HELLO") {
                        // no use for client name!
                        client->writeln("HELLO:");
@@ -188,7 +192,7 @@ void ServerSocket::writeln(string const & line)
 // void ServerSocket::dump() const
 // {
 //     lyxerr << "ServerSocket debug dump.\n"
-//          << "fd = " << fd_ << ", address = " << address_.absFilename() << ".\n"
+//          << "fd = " << fd_ << ", address = " << address_.absFileName() << ".\n"
 //          << "Clients: " << clients.size() << ".\n";
 //     map<int, shared_ptr<LyXDataSocket> >::const_iterator client = clients.begin();
 //     map<int, shared_ptr<LyXDataSocket> >::const_iterator end = clients.end();