Commit 5633bd8f authored by Marco De Marco's avatar Marco De Marco
Browse files

Makefile modified, minor changes

parent fa5803a1

Makefile

+16 −10
Original line number Diff line number Diff line
@@ -4,22 +4,28 @@ INST_NAME=test 
DEBUG_LEV=-v1

INSTALL_DIR=/usr/local/bin

#================================================================================

INC_DIR=/usr/local/omniORB-4.1.7/include \

	   /usr/local/zeromq-3.2.3/include/zmq \

	   /usr/local/tango-8.1.2/include/tango \

	   /usr/local/soci-3.2.1/include \

	   /usr/local/soci-3.2.1/include/soci \

INC_DIR=/usr/local/omniORB/include \

	   /usr/local/zeromq/include/zmq \

	   /usr/local/tango/include/tango \

	   /usr/local/boost/include \

	   /usr/local/soci/include \

	   /usr/local/soci/include/soci \

	   /usr/include/mysql \

	   /usr/local/CCfits/include \

	   /usr/local/cfitsio/include \

	   ./src

LIB_DIR=/usr/local/omniORB-4.1.7/lib \

	   /usr/local/zeromq-3.2.3/lib \

	   /usr/local/tango-8.1.2/lib \

	   /usr/local/soci-3.2.1/lib64

LIB_DIR=/usr/local/omniORB/lib \

	   /usr/local/zeromq/lib \

	   /usr/local/tango/lib \

	   /usr/local/boost/lib \

	   /usr/local/soci/lib64 \

	   /usr/local/CCfits/lib \

	   /usr/local/cfitsio/lib

#================================================================================

CC=g++

CXX_DEBUG_FLAGS=-g -DVERBOSE_DEBUG

CXX_RELEASE_FLAGS=-O3

CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++11 -std=gnu++11

CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++0x

LDFLAGS=-Wall -lomniORB4 -lomniDynamic4 -lCOS4 -lomnithread -ltango -llog4tango \

	-lsoci_core -lsoci_mysql -lCCfits -lboost_thread -lboost_filesystem \

	-lboost_system -lboost_iostreams -lboost_date_time -lboost_regex

src/FitsImporter.cpp

+3 −3
Original line number Diff line number Diff line
@@ -476,10 +476,10 @@ void FitsImporter::get_device_property() 
        if(watchPath.empty())

            throw(invalid_argument("WatchPath property is empty or not defined"));



        if(workerNumber<MIN_WORKER_NUMBER || workerNumber>MAX_WORKER_NUMBER)

        if(workerNumber<1 || workerNumber>MAX_WORKER_NUMBER)

            throw(invalid_argument("WorkerNumber property out of range or not defined"));



        if(connectionNumber<MIN_CONNECTION_NUMBER || connectionNumber>MAX_CONNECTION_NUMBER)

        if(connectionNumber<1 || connectionNumber>MAX_CONNECTION_NUMBER)

            throw(invalid_argument("ConnectionNumber property out of range or not defined"));



        if(eventList.empty())
@@ -518,7 +518,7 @@ void FitsImporter::get_device_property() 
        if(dMDBHost.empty())

            throw(invalid_argument("DMDBHost property is empty or not defined"));



        if(dMDBPort>MAX_DMDB_PORT)

        if(dMDBPort<1 || dMDBPort>MAX_DMDB_PORT)

            throw(invalid_argument("DMDB property out of range or not defined"));



        if(dMDBUser.empty())

src/FitsImporter.h

+30 −36
Original line number Diff line number Diff line
@@ -79,15 +79,9 @@ class FitsImporter : public TANGO_BASE_CLASS 
    //Error file counter synchronization

    boost::mutex m_errorCounterMutex;



    //Min number of worker thread allowed    

    static const unsigned int MIN_WORKER_NUMBER = 1;    

    

    //Max number of worker thread allowed

    static const unsigned int MAX_WORKER_NUMBER = 100;



    //Min number of connection per database allowed

    static const unsigned int MIN_CONNECTION_NUMBER = 1;    

    

    //Max number of connection per database allowed

    static const unsigned int MAX_CONNECTION_NUMBER = 10;