Changes - j0ke.net Open Build Service

Changes of Revision 97

[-] [+]	Changed	cego.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jun 16 20:13:29 UTC 2014 - cs@linux-administrator.com + +- Update to version 2.20.10 + +------------------------------------------------------------------- Mon Apr 14 18:29:23 UTC 2014 - cs@linux-administrator.com - Update to version 2.20.9
[-] [+]	Changed	cego.spec ^
@@ -1,5 +1,5 @@ Name: cego -Version: 2.20.9 +Version: 2.20.10 Release: 1 Group: Productivity/Databases Summary: Cego relational database
[-] [+]	Changed	cego-2.20.10.tar.bz2/Makefile.in ^
@@ -242,6 +242,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MINGW32DEF = @MINGW32DEF@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@
[-] [+]	Changed	cego-2.20.10.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.9. +# Generated by GNU Autoconf 2.69 for Cego 2.20.10. # # 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.9' -PACKAGE_STRING='Cego 2.20.9' +PACKAGE_VERSION='2.20.10' +PACKAGE_STRING='Cego 2.20.10' PACKAGE_BUGREPORT='lemke@lemke-it.com' PACKAGE_URL='' @@ -652,6 +652,15 @@ LD FGREP SED +LIBTOOL +LIBOBJS +EGREP +GREP +LFC_LIBS +LFC_CFLAGS +HAS_MINGW32_FALSE +HAS_MINGW32_TRUE +MINGW32DEF host_os host_vendor host_cpu @@ -660,12 +669,6 @@ build_vendor build_cpu build -LIBTOOL -LIBOBJS -EGREP -GREP -LFC_LIBS -LFC_CFLAGS ac_ct_AR AR LN_S @@ -1326,7 +1329,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.9 to adapt to many kinds of systems. +\`configure' configures Cego 2.20.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1396,7 +1399,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short \| recursive ) echo "Configuration of Cego 2.20.9:";; + short \| recursive ) echo "Configuration of Cego 2.20.10:";; esac cat <<\_ACEOF @@ -1507,7 +1510,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Cego configure 2.20.9 +Cego configure 2.20.10 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2051,7 +2054,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.9, which was +It was created by Cego $as_me 2.20.10, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2914,7 +2917,7 @@ # Define the identity of the package. PACKAGE='cego' - VERSION='2.20.9' + VERSION='2.20.10' cat >>confdefs.h <<_ACEOF @@ -4833,6 +4836,100 @@ esac +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 \|\| + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` \|\| + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +--) ;; +) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $, +# except with old shells: +build_os=$ +IFS=$ac_save_IFS +case $build_os in \ ) build_os=`echo "$build_os" \| sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` \|\| + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +--) ;; +) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $, +# except with old shells: +host_os=$ +IFS=$ac_save_IFS +case $host_os in \ ) host_os=`echo "$host_os" \| sed 's/ /-/g'`;; esac + + + +case $host_os in + mingw32 ) MINGW32=yes;; + * ) MINGW32=no;; +esac + + +if [ "$MINGW32" = "yes" ] +then + MINGW32DEF="-DHAVE_MINGW32" + +fi + + if test "$MINGW32" = "yes"; then + HAS_MINGW32_TRUE= + HAS_MINGW32_FALSE='#' +else + HAS_MINGW32_TRUE='#' + HAS_MINGW32_FALSE= +fi + + + # Get lfcbase library and include locations # Check whether --with-lfc-include-path was given. @@ -5892,77 +5989,6 @@ ltmain="$ac_aux_dir/ltmain.sh" -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 \|\| - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` \|\| - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in ---) ;; -) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $, -# except with old shells: -build_os=$ -IFS=$ac_save_IFS -case $build_os in \ ) build_os=`echo "$build_os" \| sed 's/ /-/g'`;; esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` \|\| - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in ---) ;; -) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $, -# except with old shells: -host_os=$ -IFS=$ac_save_IFS -case $host_os in \ ) host_os=`echo "$host_os" \| sed 's/ /-/g'`;; esac - - # Backslashify metacharacters that are still active within # double-quoted strings. sed_quote_subst='s/$["`$\\]$/\\\1/g' @@ -16379,6 +16405,10 @@ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAS_MINGW32_TRUE}" && test -z "${HAS_MINGW32_FALSE}"; then + as_fn_error $? "conditional \"HAS_MINGW32\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -16776,7 +16806,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.9, which was +This file was extended by Cego $as_me 2.20.10, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16842,7 +16872,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.9 +Cego config.status 2.20.10 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\"
[-] [+]	Changed	cego-2.20.10.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.9], [lemke@lemke-it.com]) +AC_INIT([Cego], [2.20.10], [lemke@lemke-it.com]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADERS([config.h]) @@ -20,6 +20,17 @@ AM_PROG_AR +AC_CANONICAL_HOST +AC_MINGW32 + +if [[ "$MINGW32" = "yes" ]] +then + AC_SUBST(MINGW32DEF, "-DHAVE_MINGW32") +fi + +AM_CONDITIONAL([HAS_MINGW32], [test "$MINGW32" = "yes"]) + + # Get lfcbase library and include locations AC_ARG_WITH([lfc-include-path], [AS_HELP_STRING([--with-lfc-include-path],
[-] [+]	Changed	cego-2.20.10.tar.bz2/samples/cgplustest/Makefile ^
@@ -76,8 +76,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-apple-darwin13.1.0 -host_triplet = x86_64-apple-darwin13.1.0 +build_triplet = x86_64-apple-darwin13.2.0 +host_triplet = x86_64-apple-darwin13.2.0 bin_PROGRAMS = cgplustest$(EXEEXT) subdir = samples/cgplustest DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ @@ -164,13 +164,13 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /Users/lemke/work/cego-2.20.9/missing aclocal-1.14 +ACLOCAL = ${SHELL} /Users/lemke/work/cego-2.20.10/missing aclocal-1.14 AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 1 AR = ar -AUTOCONF = ${SHELL} /Users/lemke/work/cego-2.20.9/missing autoconf -AUTOHEADER = ${SHELL} /Users/lemke/work/cego-2.20.9/missing autoheader -AUTOMAKE = ${SHELL} /Users/lemke/work/cego-2.20.9/missing automake-1.14 +AUTOCONF = ${SHELL} /Users/lemke/work/cego-2.20.10/missing autoconf +AUTOHEADER = ${SHELL} /Users/lemke/work/cego-2.20.10/missing autoheader +AUTOMAKE = ${SHELL} /Users/lemke/work/cego-2.20.10/missing automake-1.14 AWK = awk CC = gcc CCDEPMODE = depmode=gcc3 @@ -180,7 +180,7 @@ CXX = g++ CXXCPP = g++ -E CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 +CXXFLAGS = -DCGDEBUG CYGPATH_W = echo DEFS = -DHAVE_CONFIG_H DEPDIR = .deps @@ -210,8 +210,9 @@ LIPO = lipo LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /Users/lemke/work/cego-2.20.9/missing makeinfo +MAKEINFO = ${SHELL} /Users/lemke/work/cego-2.20.10/missing makeinfo MANIFEST_TOOL = : +MINGW32DEF = MKDIR_P = ../.././install-sh -c -d NM = /usr/bin/nm NMEDIT = nmedit @@ -222,21 +223,21 @@ PACKAGE = cego PACKAGE_BUGREPORT = lemke@lemke-it.com PACKAGE_NAME = Cego -PACKAGE_STRING = Cego 2.20.9 +PACKAGE_STRING = Cego 2.20.10 PACKAGE_TARNAME = cego PACKAGE_URL = -PACKAGE_VERSION = 2.20.9 +PACKAGE_VERSION = 2.20.10 PATH_SEPARATOR = : RANLIB = ranlib SED = /usr/bin/sed SET_MAKE = SHELL = /bin/sh STRIP = strip -VERSION = 2.20.9 -abs_builddir = /Users/lemke/work/cego-2.20.9/samples/cgplustest -abs_srcdir = /Users/lemke/work/cego-2.20.9/samples/cgplustest -abs_top_builddir = /Users/lemke/work/cego-2.20.9 -abs_top_srcdir = /Users/lemke/work/cego-2.20.9 +VERSION = 2.20.10 +abs_builddir = /Users/lemke/work/cego-2.20.10/samples/cgplustest +abs_srcdir = /Users/lemke/work/cego-2.20.10/samples/cgplustest +abs_top_builddir = /Users/lemke/work/cego-2.20.10 +abs_top_srcdir = /Users/lemke/work/cego-2.20.10 ac_ct_AR = ar ac_ct_CC = gcc ac_ct_CXX = g++ @@ -247,10 +248,10 @@ am__tar = $${TAR-tar} chof - "$$tardir" am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = x86_64-apple-darwin13.1.0 +build = x86_64-apple-darwin13.2.0 build_alias = build_cpu = x86_64 -build_os = darwin13.1.0 +build_os = darwin13.2.0 build_vendor = apple builddir = . datadir = ${datarootdir} @@ -258,15 +259,15 @@ docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-apple-darwin13.1.0 +host = x86_64-apple-darwin13.2.0 host_alias = host_cpu = x86_64 -host_os = darwin13.1.0 +host_os = darwin13.2.0 host_vendor = apple htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /Users/lemke/work/cego-2.20.9/install-sh +install_sh = ${SHELL} /Users/lemke/work/cego-2.20.10/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale
[-] [+]	Changed	cego-2.20.10.tar.bz2/samples/cgplustest/Makefile.in ^
@@ -212,6 +212,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MINGW32DEF = @MINGW32DEF@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@
[-] [+]	Changed	cego-2.20.10.tar.bz2/samples/cgwraptest/Makefile ^
@@ -76,8 +76,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-apple-darwin13.1.0 -host_triplet = x86_64-apple-darwin13.1.0 +build_triplet = x86_64-apple-darwin13.2.0 +host_triplet = x86_64-apple-darwin13.2.0 bin_PROGRAMS = cgwtest$(EXEEXT) subdir = samples/cgwraptest DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ @@ -164,13 +164,13 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /Users/lemke/work/cego-2.20.9/missing aclocal-1.14 +ACLOCAL = ${SHELL} /Users/lemke/work/cego-2.20.10/missing aclocal-1.14 AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 1 AR = ar -AUTOCONF = ${SHELL} /Users/lemke/work/cego-2.20.9/missing autoconf -AUTOHEADER = ${SHELL} /Users/lemke/work/cego-2.20.9/missing autoheader -AUTOMAKE = ${SHELL} /Users/lemke/work/cego-2.20.9/missing automake-1.14 +AUTOCONF = ${SHELL} /Users/lemke/work/cego-2.20.10/missing autoconf +AUTOHEADER = ${SHELL} /Users/lemke/work/cego-2.20.10/missing autoheader +AUTOMAKE = ${SHELL} /Users/lemke/work/cego-2.20.10/missing automake-1.14 AWK = awk CC = gcc CCDEPMODE = depmode=gcc3 @@ -180,7 +180,7 @@ CXX = g++ CXXCPP = g++ -E CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 +CXXFLAGS = -DCGDEBUG CYGPATH_W = echo DEFS = -DHAVE_CONFIG_H DEPDIR = .deps @@ -210,8 +210,9 @@ LIPO = lipo LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /Users/lemke/work/cego-2.20.9/missing makeinfo +MAKEINFO = ${SHELL} /Users/lemke/work/cego-2.20.10/missing makeinfo MANIFEST_TOOL = : +MINGW32DEF = MKDIR_P = ../.././install-sh -c -d NM = /usr/bin/nm NMEDIT = nmedit @@ -222,21 +223,21 @@ PACKAGE = cego PACKAGE_BUGREPORT = lemke@lemke-it.com PACKAGE_NAME = Cego -PACKAGE_STRING = Cego 2.20.9 +PACKAGE_STRING = Cego 2.20.10 PACKAGE_TARNAME = cego PACKAGE_URL = -PACKAGE_VERSION = 2.20.9 +PACKAGE_VERSION = 2.20.10 PATH_SEPARATOR = : RANLIB = ranlib SED = /usr/bin/sed SET_MAKE = SHELL = /bin/sh STRIP = strip -VERSION = 2.20.9 -abs_builddir = /Users/lemke/work/cego-2.20.9/samples/cgwraptest -abs_srcdir = /Users/lemke/work/cego-2.20.9/samples/cgwraptest -abs_top_builddir = /Users/lemke/work/cego-2.20.9 -abs_top_srcdir = /Users/lemke/work/cego-2.20.9 +VERSION = 2.20.10 +abs_builddir = /Users/lemke/work/cego-2.20.10/samples/cgwraptest +abs_srcdir = /Users/lemke/work/cego-2.20.10/samples/cgwraptest +abs_top_builddir = /Users/lemke/work/cego-2.20.10 +abs_top_srcdir = /Users/lemke/work/cego-2.20.10 ac_ct_AR = ar ac_ct_CC = gcc ac_ct_CXX = g++ @@ -247,10 +248,10 @@ am__tar = $${TAR-tar} chof - "$$tardir" am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = x86_64-apple-darwin13.1.0 +build = x86_64-apple-darwin13.2.0 build_alias = build_cpu = x86_64 -build_os = darwin13.1.0 +build_os = darwin13.2.0 build_vendor = apple builddir = . datadir = ${datarootdir} @@ -258,15 +259,15 @@ docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-apple-darwin13.1.0 +host = x86_64-apple-darwin13.2.0 host_alias = host_cpu = x86_64 -host_os = darwin13.1.0 +host_os = darwin13.2.0 host_vendor = apple htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /Users/lemke/work/cego-2.20.9/install-sh +install_sh = ${SHELL} /Users/lemke/work/cego-2.20.10/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale
[-] [+]	Changed	cego-2.20.10.tar.bz2/samples/cgwraptest/Makefile.in ^
@@ -212,6 +212,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MINGW32DEF = @MINGW32DEF@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@
[-] [+]	Changed	cego-2.20.10.tar.bz2/samples/chkdb/mkdb ^
@@ -105,7 +105,7 @@ TMPSIZE=30000 LOGFILESIZE=1000000 LOGFILENUM=3 - APPSIZE=20000 + APPSIZE=2000 SORTAREASIZE=10000000 DBUSER=lemke DBPWD=lemke
[-] [+]	Changed	cego-2.20.10.tar.bz2/src/CegoDistCursor.cc ^
@@ -288,6 +288,7 @@ #ifdef CGDEBUG _pDBMng->log(_modId, Logger::DEBUG, Chain("Setting view condition ") + attrCond.toChain()); #endif + _pSelect->setViewCond(attrCond); _pSelect->setTabSetId(_tabSetId); _pSelect->prepare(); @@ -1123,7 +1124,17 @@ if ( _pCO->getType() == CegoObject::VIEW ) { pCursorPlan->setAttribute(XML_TABLETYPE_ATTR, XML_VIEW_VALUE); + +#ifdef CGDEBUG + _pDBMng->log(_modId, Logger::DEBUG, Chain("Getting view plan for ") + _tableAlias); +#endif + pCursorPlan->addContent( _pSelect->getPlan() ); + +#ifdef CGDEBUG + _pDBMng->log(_modId, Logger::DEBUG, Chain("View plan for ") + _tableAlias + Chain(" retrieved")); +#endif + } else if ( _pCO->getType() == CegoObject::TABLE ) { @@ -1140,7 +1151,7 @@ } else { - pCursorPlan->setAttribute(XML_JOINSTRAT_ATTR, Chain("full table scan")); + pCursorPlan->setAttribute(XML_JOINSTRAT_ATTR, Chain("full table scan using condition ") + _cursorCond.toChain()); } }
[-] [+]	Changed	cego-2.20.10.tar.bz2/src/CegoSelect.cc ^
@@ -660,55 +660,69 @@ Element* CegoSelect::getPlan() { + prepare(); + checkValidRef(); + setParentJoinBuf(); + Element pPlan = new Element(XML_PLAN_ELEMENT); - int joinLevel=0; - while ( joinLevel < _joinList.Size() ) + while ( _joinLevel < _joinList.Size() ) { #ifdef CGDEBUG - _pLogger->log(_modId, Logger::DEBUG, Chain("Creating cursor for ") + _joinList[joinLevel]->getTabName()); + _pLogger->log(_modId, Logger::DEBUG, Chain("Plan : Creating cursor for ") + _joinList[_joinLevel]->getTabName() + Chain(" on join level ") + Chain(_joinLevel)); #endif - _pTC[joinLevel] = - new CegoDistCursor(_pGTM,_joinList[joinLevel]); + _pTC[_joinLevel] = + new CegoDistCursor(_pGTM, _joinList[_joinLevel]); - _pTC[joinLevel]->checkType(); + _pTC[_joinLevel]->checkType(); - if ( _attrCondFlag[joinLevel] == true ) + if ( _attrCondFlag[_joinLevel] == true ) { #ifdef CGDEBUG - _pLogger->log(_modId, Logger::DEBUG, Chain("Setting attrcond = ") + _attrCond[joinLevel].toChain()); + _pLogger->log(_modId, Logger::DEBUG, Chain("Plan : Setting attrcond for ") + _joinList[_joinLevel]->getName() + Chain(" to ") + _attrCond[_joinLevel].toChain() + Chain(" on level") + Chain(_joinLevel)); #endif - if ( _attrCond[joinLevel].setup(_joinBuf, 0, _joinSize ) == false ) + if ( _attrCond[_joinLevel].setup(_joinBuf, 0, _joinSize ) == false ) { // attribute condition can not be resolved on this join level // for this reason, we disable for the future // since this condition is disabled, we also have to enable predicate check again // for the final evaluation - _attrCondFlag[joinLevel]=false; - if ( _attrPred[joinLevel] ) + +#ifdef CGDEBUG + _pLogger->log(_modId, Logger::DEBUG, Chain("Plan : Disabling condition flag for ") + _joinList[_joinLevel]->getName()); +#endif + + + _attrCondFlag[_joinLevel]=false; + if ( _attrPred[_joinLevel] ) { - _attrPred[joinLevel]->setChecked(false); + _attrPred[_joinLevel]->setChecked(false); } + } - _pTC[joinLevel]->distSetup(_attrCond[joinLevel]); + _pTC[_joinLevel]->distSetup(_attrCond[_joinLevel]); } else { - _pTC[joinLevel]->distSetup(); +#ifdef CGDEBUG + + _pLogger->log(_modId, Logger::DEBUG, Chain("Plan : Setting no attrcond for ") + _joinList[_joinLevel]->getName() + Chain(" on level ") + Chain(_joinLevel)); +#endif + _pTC[_joinLevel]->distSetup(); } - Element pCursorPlan = _pTC[joinLevel]->getPlan(); + Element* pCursorPlan = _pTC[_joinLevel]->getPlan(); pPlan->addContent(pCursorPlan); - joinLevel++; + _joinLevel++; } @@ -741,7 +755,6 @@ pPlan->addContent(_pUnionSelect->getPlan()); } - return pPlan; } @@ -1349,9 +1362,8 @@ if ( _attrCondFlag[_joinLevel] == true ) { - #ifdef CGDEBUG - _pLogger->log(_modId, Logger::DEBUG, Chain("Setting attrcond = ") + _attrCond[_joinLevel].toChain()); + _pLogger->log(_modId, Logger::DEBUG, Chain("Setting attrcond = ") + _attrCond[_joinLevel].toChain() + Chain(" on level ") + Chain(_joinLevel)); #endif bool doSetup = true; @@ -1377,7 +1389,7 @@ { #ifdef CGDEBUG - _pLogger->log(_modId, Logger::DEBUG, Chain("Setting attrcond = ") + _attrCond[_joinLevel].toChain()); + _pLogger->log(_modId, Logger::DEBUG, Chain("Cursor set up for attrcond = ") + _attrCond[_joinLevel].toChain()); #endif _pTC[_joinLevel]->distSetup(_attrCond[_joinLevel]); @@ -1772,7 +1784,7 @@ { #ifdef CGDEBUG - _pLogger->log(_modId, Logger::DEBUG, Chain("*** Building jon table list")); + _pLogger->log(_modId, Logger::DEBUG, Chain("Building join table list")); #endif // growStep is the number of tables to join with the next join step @@ -1975,7 +1987,7 @@ predChecked = true; #ifdef CGDEBUG - _pLogger->log(_modId, Logger::DEBUG, Chain("Detecting valid attr cond [ ") + ac.toChain() + Chain(" ]")); + _pLogger->log(_modId, Logger::DEBUG, Chain("Detecting valid attr cond [ ") + ac.toChain() + Chain(" ] on level ") + Chain(i)); #endif notFound = false;
[-] [+]	Changed	cego-2.20.10.tar.bz2/src/CegoXMLSpace.cc ^
@@ -1588,6 +1588,31 @@ P(); Element pRoot = _pDoc->getRootElement(); + if ( role != Chain(ROLE_ADMIN) ) + { + bool roleFound = false; + + ListT<Element> roleList = pRoot->getChildren(XML_ROLE_ELEMENT); + Element *pRE = roleList.First(); + while ( pRE && roleFound == false) + { + if ( (pRE)->getAttributeValue(XML_NAME_ATTR) == role ) + { + roleFound=true; + } + else + { + pRE = roleList.Next(); + } + } + if ( roleFound == false ) + { + V(); + Chain msg = Chain("Unknown role ") + role; + throw Exception(EXLOC, msg); + } + } + ListT<Element> userList = pRoot->getChildren(XML_USER_ELEMENT); Element pUE = userList.First(); while ( pUE ) @@ -1702,6 +1727,13 @@ void CegoXMLSpace::createRole(const Chain& role) { + + if ( role == Chain(ROLE_ADMIN) ) + { + Chain msg = Chain("Role admin cannot be created"); + throw Exception(EXLOC, msg); + } + P(); Element pRoot = _pDoc->getRootElement(); @@ -1834,6 +1866,12 @@ void CegoXMLSpace::setPerm(const Chain& role, const Chain& permid, const Chain& tableset, const Chain& filter, const Chain& perm) { + if ( role == Chain(ROLE_ADMIN) ) + { + Chain msg = Chain("Permission canot be added to admin role"); + throw Exception(EXLOC, msg); + } + Chain uperm = perm.toUpper(); if ( uperm != Chain("READ")
[-] [+]	Changed	cego-2.20.10.tar.bz2/src/Makefile.in ^
@@ -328,6 +328,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MINGW32DEF = @MINGW32DEF@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@