diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | raslib/error.cc | 25 | ||||
| -rw-r--r-- | raslib/error.hh | 7 | ||||
| -rw-r--r-- | raslib/rmdebug.cc | 2 | ||||
| -rw-r--r-- | raslib/rminit.cc | 2 | ||||
| -rw-r--r-- | servercomm/servercomm.cc | 3 | ||||
| -rw-r--r-- | servercomm/servercomm.hh | 5 |
8 files changed, 21 insertions, 30 deletions
diff --git a/Makefile.am b/Makefile.am index 257e396..6c45450 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,7 +44,7 @@ nobase_include_HEADERS=raslib/*.h raslib/*.hh raslib/*.icc raslib/*.cc \ SUBDIRS = relblobif relindexif relmddif relcatalogif reladminif relstorageif \ indexmgr catalogmgr tilemgr storagemgr compression commline network \ raslib clientcomm servercomm rasodmg qlparser conversion \ - mddmgr httpserver mymalloc time server rasmgr rascontrol rasdl \ + mddmgr httpserver mymalloc server rasmgr rascontrol rasdl \ applications bin insertutils manuals_and_examples include all: @@ -8790,7 +8790,7 @@ fi done -ac_config_files="$ac_config_files Makefile catalogmgr/Makefile relblobif/Makefile relindexif/Makefile relmddif/Makefile relcatalogif/Makefile reladminif/Makefile relstorageif/Makefile indexmgr/Makefile tilemgr/Makefile storagemgr/Makefile compression/Makefile commline/Makefile network/Makefile raslib/Makefile clientcomm/Makefile servercomm/Makefile rasodmg/Makefile qlparser/Makefile conversion/Makefile mddmgr/Makefile httpserver/Makefile mymalloc/Makefile time/Makefile server/Makefile rasmgr/Makefile rascontrol/Makefile rasdl/Makefile applications/Makefile applications/rasql/Makefile bin/Makefile manuals_and_examples/Makefile insertutils/Makefile include/Makefile" +ac_config_files="$ac_config_files Makefile catalogmgr/Makefile relblobif/Makefile relindexif/Makefile relmddif/Makefile relcatalogif/Makefile reladminif/Makefile relstorageif/Makefile indexmgr/Makefile tilemgr/Makefile storagemgr/Makefile compression/Makefile commline/Makefile network/Makefile raslib/Makefile clientcomm/Makefile servercomm/Makefile rasodmg/Makefile qlparser/Makefile conversion/Makefile mddmgr/Makefile httpserver/Makefile mymalloc/Makefile server/Makefile rasmgr/Makefile rascontrol/Makefile rasdl/Makefile applications/Makefile applications/rasql/Makefile bin/Makefile manuals_and_examples/Makefile insertutils/Makefile include/Makefile" # --------------- Header Template Definitions ---------------------- @@ -9565,7 +9565,7 @@ CXXFLAGS+=" -I$abs_top_srcdir -I$abs_top_srcdir/debug -I$abs_top_srcdir/include" CXXFLAGS="$CXXFLAGS -DSHARE_DATA_DIR=\\\"\$(pkgdatadir)/\\\"" CXXFLAGS="$CXXFLAGS -DCONFDIR=\\\"\$(sysconfdir)/\\\"" CXXFLAGS="$CXXFLAGS -DBINDIR=\\\"\$(bindir)/\\\"" -CXXFLAGS="$CXXFLAGS -DABSOLUTE_LOG_DIR=\\\"\$(logdir)/\\\"" +CXXFLAGS="$CXXFLAGS -DLOGDIR=\\\"\$(logdir)/\\\"" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -10327,7 +10327,6 @@ do "mddmgr/Makefile") CONFIG_FILES="$CONFIG_FILES mddmgr/Makefile" ;; "httpserver/Makefile") CONFIG_FILES="$CONFIG_FILES httpserver/Makefile" ;; "mymalloc/Makefile") CONFIG_FILES="$CONFIG_FILES mymalloc/Makefile" ;; - "time/Makefile") CONFIG_FILES="$CONFIG_FILES time/Makefile" ;; "server/Makefile") CONFIG_FILES="$CONFIG_FILES server/Makefile" ;; "rasmgr/Makefile") CONFIG_FILES="$CONFIG_FILES rasmgr/Makefile" ;; "rascontrol/Makefile") CONFIG_FILES="$CONFIG_FILES rascontrol/Makefile" ;; diff --git a/raslib/error.cc b/raslib/error.cc index 6647847..5e5bdbf 100644 --- a/raslib/error.cc +++ b/raslib/error.cc @@ -205,20 +205,17 @@ initTextTable() unsigned int numOfEntries = 0; int result; // sscanf() result - // determine file name; use path if env var is set - strcpy( errorFileName, "" ); - const char* rmanHome = getenv( RASDAMAN_PATH_VARNAME ); - if (rmanHome) - { - strcat(errorFileName, rmanHome); - strcat(errorFileName, ERRORTEXXT_PATH ); - strcat(errorFileName, "/" ); - } else { - strcat(errorFileName, SHARE_DATA_DIR); - strcat(errorFileName, "/"); - } - strcat(errorFileName, ERRORTEXT_FILE ); - // RMInit::logOut << "using error text file: " << errorFileName << endl; + // determine file path + name + int filenameLength = snprintf( errorFileName, FILENAME_MAX, "%s/%s", SHARE_DATA_DIR, ERRORTEXT_FILE ); + if (filenameLength < FILENAME_MAX ) + { + RMInit::logOut << "Using error text file: " << errorFileName << endl; + } + else + { + errorFileName[FILENAME_MAX-1] = '\0'; // force-terminate string before printing + cerr << "Warning: error text file path longer than allowed by OS, likely file will not be found: " << errorFileName << endl; + } // errortexts.open(errorFileName, ios::nocreate | ios::in); errortexts.open(errorFileName, ios::in); diff --git a/raslib/error.hh b/raslib/error.hh index 0042596..35c4e44 100644 --- a/raslib/error.hh +++ b/raslib/error.hh @@ -76,11 +76,8 @@ rasdaman GmbH. * error text file ------------------ */ -/// name of variable which should contain path to rasdaman home dir -#define RASDAMAN_PATH_VARNAME "RMANHOME" - -/// relative path to error text file, starting from $RMANHOME -#define ERRORTEXXT_PATH "/bin" +/// relative path to error text file, starting from rasdaman installation root +#define ERRORTEXT_PATH "/bin" /// error text file name #define ERRORTEXT_FILE "errtxts" diff --git a/raslib/rmdebug.cc b/raslib/rmdebug.cc index d047812..c0409c5 100644 --- a/raslib/rmdebug.cc +++ b/raslib/rmdebug.cc @@ -46,7 +46,7 @@ using namespace std; #include "raslib/odmgtypes.hh" int RManDebug = 0; // debug level (0-4), 0 means no debug info at all -int RManBenchmark = 0; // benchmark level (0-4) +int RManBenchmark = 4; // benchmark level (0-4) // initialization of static variables for RMDebug int RMDebug::level = 0; diff --git a/raslib/rminit.cc b/raslib/rminit.cc index 78c68cf..89802de 100644 --- a/raslib/rminit.cc +++ b/raslib/rminit.cc @@ -189,7 +189,7 @@ RMInit::RMInit( char initApplicationType ) else noTimeOut = 0; } - else + else // applicationType != 'C' (i.e.: =='S') { // default logOut.rdbuf(cout.rdbuf()); diff --git a/servercomm/servercomm.cc b/servercomm/servercomm.cc index 5982453..fbee2e3 100644 --- a/servercomm/servercomm.cc +++ b/servercomm/servercomm.cc @@ -117,7 +117,7 @@ static const char rcsid[] = "@(#)servercomm, ServerComm: $Id: servercomm.cc,v 1. using namespace std; // init globals for server initialization -// RMINITGLOBALS('S') +RMINITGLOBALS('S'); // Once again a function prototype. The first one is for the RPC dispatcher // function located in the server stub file rpcif_svc.c and the second one @@ -1241,7 +1241,6 @@ ServerComm::ClientTblElt::releaseTransferStructures() *** This class shouldn't be here, later it will be put in its own file ******************************************************************************************/ -// learned from license.cc #ifdef LINUX extern "C" { extern char *strptime __P ((__const char *__s, __const char *__fmt, struct tm *__tp)); diff --git a/servercomm/servercomm.hh b/servercomm/servercomm.hh index 2d34e69..460fc2c 100644 --- a/servercomm/servercomm.hh +++ b/servercomm/servercomm.hh @@ -64,7 +64,6 @@ class QtData; class MDDObj; class MDDCollIter; class MDDColl; -class RMTimer; class r_Parse_Params; //@ManMemo: Module: {\bf servercomm} @@ -1045,9 +1044,9 @@ class ServerComm void clientEndRequest(); - // constant for clientID + // constant for clientID static const char* HTTPCLIENT; - + private: /// copy constructor is private and therefore can not be used ServerComm( const ServerComm& );//and then why this? : clientTimeout(3600), garbageCollectionInterval(600){;}; |