Changes - j0ke.net Open Build Service

Changes of Revision 93

[-] [+]	Changed	cego.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Feb 25 19:09:34 UTC 2014 - cs@linux-administrator.com + +- Update to version 2.20.6 + +------------------------------------------------------------------- Sun Feb 23 12:04:25 UTC 2014 - cs@linux-administrator.com - Update to version 2.20.5
[-] [+]	Changed	cego.spec ^
@@ -1,5 +1,5 @@ Name: cego -Version: 2.20.5 +Version: 2.20.6 Release: 1 Group: Productivity/Databases Summary: Cego relational database
[-] [+]	Deleted	cego-2.20.5.tar.bz2/samples/chkdb/x.sql ^
@@ -1,11 +0,0 @@ -drop if exists table t1; -create table t1( a int, b string(40)); -insert into t1 values ( 1, 'XXX'); -insert into t1 values ( 2, 'XXX'); -insert into t1 values ( 3, 'XXX'); - -create btree b1 on t1(a); - -alter table t1 rename column a to x; - -desc btree b1;
[-] [+]	Changed	cego-2.20.6.tar.bz2/configure ^
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Cego 2.20.5. +# Generated by GNU Autoconf 2.69 for Cego 2.20.6. # # Report bugs to <lemke@lemke-it.com>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='Cego' PACKAGE_TARNAME='cego' -PACKAGE_VERSION='2.20.5' -PACKAGE_STRING='Cego 2.20.5' +PACKAGE_VERSION='2.20.6' +PACKAGE_STRING='Cego 2.20.6' PACKAGE_BUGREPORT='lemke@lemke-it.com' PACKAGE_URL='' @@ -1326,7 +1326,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Cego 2.20.5 to adapt to many kinds of systems. +\`configure' configures Cego 2.20.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1396,7 +1396,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short \| recursive ) echo "Configuration of Cego 2.20.5:";; + short \| recursive ) echo "Configuration of Cego 2.20.6:";; esac cat <<\_ACEOF @@ -1507,7 +1507,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Cego configure 2.20.5 +Cego configure 2.20.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2051,7 +2051,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Cego $as_me 2.20.5, which was +It was created by Cego $as_me 2.20.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2914,7 +2914,7 @@ # Define the identity of the package. PACKAGE='cego' - VERSION='2.20.5' + VERSION='2.20.6' cat >>confdefs.h <<_ACEOF @@ -16776,7 +16776,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Cego $as_me 2.20.5, which was +This file was extended by Cego $as_me 2.20.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16842,7 +16842,7 @@ cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Cego config.status 2.20.5 +Cego config.status 2.20.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\"
[-] [+]	Changed	cego-2.20.6.tar.bz2/configure.ac ^
@@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([Cego], [2.20.5], [lemke@lemke-it.com]) +AC_INIT([Cego], [2.20.6], [lemke@lemke-it.com]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADERS([config.h])
[-] [+]	Changed	cego-2.20.6.tar.bz2/samples/cgplustest/Makefile ^
@@ -164,13 +164,13 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /Users/lemke/work/cego-2.20.5/missing aclocal-1.14 +ACLOCAL = ${SHELL} /Users/lemke/work/cego-2.20.6/missing aclocal-1.14 AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 1 AR = ar -AUTOCONF = ${SHELL} /Users/lemke/work/cego-2.20.5/missing autoconf -AUTOHEADER = ${SHELL} /Users/lemke/work/cego-2.20.5/missing autoheader -AUTOMAKE = ${SHELL} /Users/lemke/work/cego-2.20.5/missing automake-1.14 +AUTOCONF = ${SHELL} /Users/lemke/work/cego-2.20.6/missing autoconf +AUTOHEADER = ${SHELL} /Users/lemke/work/cego-2.20.6/missing autoheader +AUTOMAKE = ${SHELL} /Users/lemke/work/cego-2.20.6/missing automake-1.14 AWK = awk CC = gcc CCDEPMODE = depmode=gcc3 @@ -210,7 +210,7 @@ LIPO = lipo LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /Users/lemke/work/cego-2.20.5/missing makeinfo +MAKEINFO = ${SHELL} /Users/lemke/work/cego-2.20.6/missing makeinfo MANIFEST_TOOL = : MKDIR_P = ../.././install-sh -c -d NM = /usr/bin/nm @@ -222,21 +222,21 @@ PACKAGE = cego PACKAGE_BUGREPORT = lemke@lemke-it.com PACKAGE_NAME = Cego -PACKAGE_STRING = Cego 2.20.5 +PACKAGE_STRING = Cego 2.20.6 PACKAGE_TARNAME = cego PACKAGE_URL = -PACKAGE_VERSION = 2.20.5 +PACKAGE_VERSION = 2.20.6 PATH_SEPARATOR = : RANLIB = ranlib SED = /usr/bin/sed SET_MAKE = SHELL = /bin/sh STRIP = strip -VERSION = 2.20.5 -abs_builddir = /Users/lemke/work/cego-2.20.5/samples/cgplustest -abs_srcdir = /Users/lemke/work/cego-2.20.5/samples/cgplustest -abs_top_builddir = /Users/lemke/work/cego-2.20.5 -abs_top_srcdir = /Users/lemke/work/cego-2.20.5 +VERSION = 2.20.6 +abs_builddir = /Users/lemke/work/cego-2.20.6/samples/cgplustest +abs_srcdir = /Users/lemke/work/cego-2.20.6/samples/cgplustest +abs_top_builddir = /Users/lemke/work/cego-2.20.6 +abs_top_srcdir = /Users/lemke/work/cego-2.20.6 ac_ct_AR = ar ac_ct_CC = gcc ac_ct_CXX = g++ @@ -266,7 +266,7 @@ htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /Users/lemke/work/cego-2.20.5/install-sh +install_sh = ${SHELL} /Users/lemke/work/cego-2.20.6/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale
[-] [+]	Changed	cego-2.20.6.tar.bz2/samples/cgwraptest/Makefile ^
@@ -164,13 +164,13 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /Users/lemke/work/cego-2.20.5/missing aclocal-1.14 +ACLOCAL = ${SHELL} /Users/lemke/work/cego-2.20.6/missing aclocal-1.14 AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 1 AR = ar -AUTOCONF = ${SHELL} /Users/lemke/work/cego-2.20.5/missing autoconf -AUTOHEADER = ${SHELL} /Users/lemke/work/cego-2.20.5/missing autoheader -AUTOMAKE = ${SHELL} /Users/lemke/work/cego-2.20.5/missing automake-1.14 +AUTOCONF = ${SHELL} /Users/lemke/work/cego-2.20.6/missing autoconf +AUTOHEADER = ${SHELL} /Users/lemke/work/cego-2.20.6/missing autoheader +AUTOMAKE = ${SHELL} /Users/lemke/work/cego-2.20.6/missing automake-1.14 AWK = awk CC = gcc CCDEPMODE = depmode=gcc3 @@ -210,7 +210,7 @@ LIPO = lipo LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /Users/lemke/work/cego-2.20.5/missing makeinfo +MAKEINFO = ${SHELL} /Users/lemke/work/cego-2.20.6/missing makeinfo MANIFEST_TOOL = : MKDIR_P = ../.././install-sh -c -d NM = /usr/bin/nm @@ -222,21 +222,21 @@ PACKAGE = cego PACKAGE_BUGREPORT = lemke@lemke-it.com PACKAGE_NAME = Cego -PACKAGE_STRING = Cego 2.20.5 +PACKAGE_STRING = Cego 2.20.6 PACKAGE_TARNAME = cego PACKAGE_URL = -PACKAGE_VERSION = 2.20.5 +PACKAGE_VERSION = 2.20.6 PATH_SEPARATOR = : RANLIB = ranlib SED = /usr/bin/sed SET_MAKE = SHELL = /bin/sh STRIP = strip -VERSION = 2.20.5 -abs_builddir = /Users/lemke/work/cego-2.20.5/samples/cgwraptest -abs_srcdir = /Users/lemke/work/cego-2.20.5/samples/cgwraptest -abs_top_builddir = /Users/lemke/work/cego-2.20.5 -abs_top_srcdir = /Users/lemke/work/cego-2.20.5 +VERSION = 2.20.6 +abs_builddir = /Users/lemke/work/cego-2.20.6/samples/cgwraptest +abs_srcdir = /Users/lemke/work/cego-2.20.6/samples/cgwraptest +abs_top_builddir = /Users/lemke/work/cego-2.20.6 +abs_top_srcdir = /Users/lemke/work/cego-2.20.6 ac_ct_AR = ar ac_ct_CC = gcc ac_ct_CXX = g++ @@ -266,7 +266,7 @@ htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /Users/lemke/work/cego-2.20.5/install-sh +install_sh = ${SHELL} /Users/lemke/work/cego-2.20.6/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale
[-] [+]	Changed	cego-2.20.6.tar.bz2/src/CegoAction.cc ^
@@ -1414,18 +1414,18 @@ _pSelect->reset(false); } } - - try - { - moreTuple = _pSelect->nextTuple(fl); - } - catch ( Exception e ) + + try { - moreTuple=false; - output.abort(e.getBaseMsg()); - delete _pSelect; - return; + moreTuple = _pSelect->nextTuple(fl); } + catch ( Exception e ) + { + moreTuple=false; + output.abort(e.getBaseMsg()); + delete _pSelect; + return; + } }
[-] [+]	Changed	cego-2.20.6.tar.bz2/src/CegoClient.cc ^
@@ -958,6 +958,7 @@ output.tailOut(); msg=Chain(count) + Chain(" tuples"); } + if ( res == CegoDbHandler::DB_ERROR ) { msg = pSH->getMsg();
[-] [+]	Changed	cego-2.20.6.tar.bz2/src/CegoDbHandler.cc ^
@@ -942,7 +942,7 @@ void CegoDbHandler::sendFinishData() { - char c = QUERY_MOREDATA; + char c; if ( _protType == CegoDbHandler::XML ) { @@ -1009,7 +1009,19 @@ void CegoDbHandler::sendErrorData(const Chain& msg) { - char c = _pN->recvChar(); + char c; + + if ( _protType == CegoDbHandler::XML ) + { + c = _pN->recvChar(); + } + else + { + /* + if ( _serSync ) + c = _pN->recvChar(); + */ + } if ( c == QUERY_ABORT ) { @@ -2406,7 +2418,7 @@ { #ifdef CGDEBUG - _pModule->log(_modId, Logger::DEBUG, Chain("--- Ser ---")); + _pModule->log(_modId, Logger::DEBUG, Chain("--- SER ---")); _pModule->log(_modId, Logger::DEBUG, Chain(_pN->getMsg(), _pN->getMsgSize())); _pModule->log(_modId, Logger::DEBUG, Chain("--- --- ---")); #endif
[-] [+]	Changed	cego-2.20.6.tar.bz2/src/CegoFactor.cc ^
@@ -815,7 +815,7 @@ catch ( Exception e ) { _pSelect->cleanUp(); - throw Exception(EXLOC, Chain("Cannot eval field value"), e); + throw e; } } case CegoFactor::CASECOND:
[-] [+]	Changed	cego-2.20.6.tar.bz2/src/CegoFunction.cc ^
@@ -658,7 +658,21 @@ fv3 = (*pExpr3)->evalFieldValue(); len=fv3.valAsChain().asInteger(); } + + if ( start > s.length() ) + { + start = s.length(); + // throw Exception(EXLOC, "Start postion after end"); + } + + + if ( start+len-1 > s.length()) + { + len = s.length() - start; + // throw Exception(EXLOC, "End postion after end"); + } + Chain sub; if ( len > 0 ) {
[-] [+]	Changed	cego-2.20.6.tar.bz2/src/CegoMain.cc ^
@@ -56,7 +56,7 @@ Initialization: cego --mode=init --dbxml=<db xml> --dbname=<dbname>\n\ [ --hostname=<hostname> ] [ --pgsize=<page size> ]\n\ [ --dbport=<data port> ] [ --admport=<admin port> ] [ --logport=<log port ]\n\ - [ --pidfile=<pid file> ] [ --loglevel=<log level> ]\n\ + [ --pidfile=<pid file> ] [ --csmode=<ON\|OFF> ] [ --qescmode=<ON\|OFF> ] [ --loglevel=<log level> ]\n\ \n\ User setup: cego --mode=adduser --user=<user>/<password>\n\ --role=<role> --dbxml=<db xml>\n\ @@ -121,6 +121,9 @@ #define DEFAULTDBPORT 2200 #define DEFAULTADMPORT 2000 #define DEFAULTLOGPORT 3000 +#define DEFAULTCSMODE "OFF" +#define DEFAULTQESCMODE "ON" + #define DEFAULTLOGLEVEL "NOTICE" #define MAXCMDLEN 10000 @@ -168,6 +171,8 @@ longOpt.addOpt("admport", Chain(DEFAULTADMPORT)); longOpt.addOpt("logport", Chain(DEFAULTLOGPORT)); longOpt.addOpt("loglevel", Chain(DEFAULTLOGLEVEL)); + longOpt.addOpt("csmode", Chain(DEFAULTCSMODE)); + longOpt.addOpt("qescmode", Chain(DEFAULTQESCMODE)); longOpt.addOpt("tableset"); longOpt.addOpt("cleanup"); @@ -319,7 +324,7 @@ try { - Chain logFile = longOpt.getOptValue("logfile"); + Chain logFile = longOpt.getOptValue("logfile"); Chain lockFile = longOpt.getOptValue("lockfile"); Chain dbXML = longOpt.getOptValue("dbxml"); Chain dbName = longOpt.getOptValue("dbname"); @@ -330,6 +335,19 @@ Chain dbport = longOpt.getOptValue("dbport"); Chain admport = longOpt.getOptValue("admport"); Chain logport = longOpt.getOptValue("logport"); + + Chain csmode = longOpt.getOptValue("csmode"); + if ( csmode != Chain(XML_ON_VALUE) && csmode != Chain(XML_OFF_VALUE) ) + { + throw Exception(EXLOC, "Invalid value for csmode ( must be either ON or OFF)"); + } + + Chain qescmode = longOpt.getOptValue("qescmode"); + if ( qescmode != Chain(XML_ON_VALUE) && qescmode != Chain(XML_OFF_VALUE) ) + { + throw Exception(EXLOC, "Invalid value for qescmode ( must be either ON or OFF)"); + } + Chain logLevel = longOpt.getOptValue("loglevel"); @@ -353,7 +371,8 @@ pDBMng = new CegoDatabaseManager(dbXML, lockFile, logFile); - pDBMng->initXml(dbName, pgsize.asInteger(), hostname, dbport.asInteger(), admport.asInteger(), logport.asInteger(), pidfile, logLevel); + pDBMng->initXml(dbName, pgsize.asInteger(), hostname, dbport.asInteger(), admport.asInteger(), logport.asInteger(), pidfile, logLevel, + csmode == Chain(XML_ON_VALUE), qescmode == Chain(XML_ON_VALUE) ); delete pDBMng; }
[-] [+]	Changed	cego-2.20.6.tar.bz2/src/CegoOutput.cc ^
@@ -309,7 +309,6 @@ cout << endl; } } - } void CegoOutput::tailOut()
[-] [+]	Changed	cego-2.20.6.tar.bz2/src/CegoQueryHelper.cc ^
@@ -1756,7 +1756,7 @@ { (pExpr)->setFieldListArray( joinBuf, jbufSize); CegoField f = (pExpr)->evalField(); - f.setValue ( (pExpr)->evalFieldValue() ); + f.setValue ( (pExpr)->evalFieldValue() ); ol.Insert ( f ); } pExpr = exprList.Next();
[-] [+]	Changed	cego-2.20.6.tar.bz2/src/CegoSelect.cc ^
@@ -2582,6 +2582,8 @@ // the selection part. Either these are plain attributes, expressions or aggregation functions // the result is given in the outList parameter +/* moved to QueryHelper ... + void CegoSelect::evalSelection(ListT<CegoField>& ol) { @@ -2680,7 +2682,6 @@ (pExpr)->setFieldListArray( _joinBuf, _joinSize + _joinList[_joinLevel]->getSubCOList().Size()); CegoField f = (pExpr)->evalField(); f.setValue ( (pExpr)->evalFieldValue() ); - ol.Insert ( f ); } pExpr = _exprList.Next(); @@ -2691,6 +2692,7 @@ } +/ void CegoSelect::encode(char *buf) {
[-] [+]	Changed	cego-2.20.6.tar.bz2/src/CegoSelect.h ^
@@ -143,7 +143,7 @@ void filterCondRef(CegoCondDesc* pC, ListT<CegoField>& inSchema, ListT<CegoField>& outSchema); void filterAttrRef(CegoAttrDesc* pAttrDesc, ListT<CegoField>& inSchema, ListT<CegoField>& outSchema); - void evalSelection(ListT<CegoField>& ol); + // void evalSelection(ListT<CegoField>& ol); void buildJoinTables(); void buildJoinRefs();
[-] [+]	Changed	cego-2.20.6.tar.bz2/src/CegoXMLSpace.cc ^
@@ -434,6 +434,17 @@ return numLockTries; } +void CegoXMLSpace::setCaseSensitiveMode(bool m) +{ + P(); + if ( m ) + _pDoc->getRootElement()->setAttribute(XML_CSMODE_ATTR, XML_ON_VALUE); + else + _pDoc->getRootElement()->setAttribute(XML_CSMODE_ATTR, XML_OFF_VALUE); + V(); +} + + bool CegoXMLSpace::isCaseSensitiveMode() { P(); @@ -444,6 +455,16 @@ return false; } +void CegoXMLSpace::setQuoteEscapeMode(bool m) +{ + P(); + if ( m ) + _pDoc->getRootElement()->setAttribute(XML_QESCMODE_ATTR, XML_ON_VALUE); + else + _pDoc->getRootElement()->setAttribute(XML_QESCMODE_ATTR, XML_OFF_VALUE); + V(); +} + bool CegoXMLSpace::isQuoteEscapeMode() { P(); @@ -2319,7 +2340,7 @@ } -void CegoXMLSpace::initXml(const Chain& dbName, int pageSize, const Chain& hostName, int dbPort, int admPort, int logPort, const Chain& pidFile, const Chain& logLevel) +void CegoXMLSpace::initXml(const Chain& dbName, int pageSize, const Chain& hostName, int dbPort, int admPort, int logPort, const Chain& pidFile, const Chain& logLevel, bool csmode, bool qescmode) { P(); @@ -2341,6 +2362,16 @@ pElement->setAttribute(XML_LOGPORT_ATTR, Chain(logPort)); pElement->setAttribute(XML_PIDFILE_ATTR, pidFile); + if ( csmode ) + pElement->setAttribute(XML_CSMODE_ATTR, XML_ON_VALUE); + else + pElement->setAttribute(XML_CSMODE_ATTR, XML_OFF_VALUE); + + if ( qescmode ) + pElement->setAttribute(XML_QESCMODE_ATTR, XML_ON_VALUE); + else + pElement->setAttribute(XML_QESCMODE_ATTR, XML_OFF_VALUE); + Element *pLog = new Element(XML_MODULE_ELEMENT); pLog->setAttribute(XML_NAME_ATTR, Chain("ALL")); pLog->setAttribute(XML_LEVEL_ATTR, logLevel);
[-] [+]	Changed	cego-2.20.6.tar.bz2/src/CegoXMLSpace.h ^
@@ -73,7 +73,10 @@ int getPoolLockTimeout(); int getNumLockTries(); + void setCaseSensitiveMode(bool m); bool isCaseSensitiveMode(); + + void setQuoteEscapeMode(bool m); bool isQuoteEscapeMode(); Chain getDateFormatString(); @@ -172,7 +175,7 @@ void setXmlDef(const Chain& xmlDef); - void initXml(const Chain& dbName, int pageSize, const Chain& hostName, int dbPort, int admPort, int logPort, const Chain& pidFile, const Chain& logMode); + void initXml(const Chain& dbName, int pageSize, const Chain& hostName, int dbPort, int admPort, int logPort, const Chain& pidFile, const Chain& logMode, bool csmode, bool qescmode); void xml2Doc(); void doc2Xml(); void initDoc();