head 1.19; access; symbols; locks; strict; comment @# @; 1.19 date 2009.10.06.17.59.07; author rse; state Exp; branches; next 1.18; commitid q6KqbdjLeeuj9v6u; 1.18 date 2009.07.26.17.08.19; author rse; state Exp; branches; next 1.17; commitid xDFHsfGA3YLnbfXt; 1.17 date 2009.05.25.06.00.20; author rse; state Exp; branches; next 1.16; commitid PEhpawsrWazMtdPt; 1.16 date 2009.05.19.06.22.55; author rse; state Exp; branches; next 1.15; commitid VykHwElJPwkuNrOt; 1.15 date 2009.04.10.20.58.26; author rse; state Exp; branches; next 1.14; commitid 88iVe55RunZyTvJt; 1.14 date 2009.03.24.19.02.30; author rse; state Exp; branches; next 1.13; commitid m0UxEImH7dfENjHt; 1.13 date 2009.03.17.15.34.23; author rse; state Exp; branches; next 1.12; commitid P7FBZjgQxaJdSoGt; 1.12 date 2009.03.01.20.25.53; author rse; state Exp; branches; next 1.11; commitid RnlEq3tv9fZ60nEt; 1.11 date 2008.11.25.20.45.47; author rse; state Exp; branches; next 1.10; commitid vPycKRKYNLJfc2st; 1.10 date 2008.06.21.15.57.57; author rse; state Exp; branches; next 1.9; commitid WzfuP8ABQ5HoEP7t; 1.9 date 2008.05.18.18.25.43; author rse; state Exp; branches; next 1.8; commitid uxypTZpyGcDQyt3t; 1.8 date 2008.04.28.06.58.24; author rse; state Exp; branches; next 1.7; commitid SEoqrp1gcpgUoQ0t; 1.7 date 2007.11.19.13.30.10; author rse; state Exp; branches; next 1.6; commitid NW0AJyK0fXzaKbGs; 1.6 date 2007.11.04.16.45.26; author rse; state Exp; branches; next 1.5; commitid HEJr7VNepj43jhEs; 1.5 date 2007.08.27.17.30.04; author rse; state Exp; branches; next 1.4; commitid qIB4ieYxhjoSLpvs; 1.4 date 2007.08.26.19.07.52; author rse; state Exp; branches; next 1.3; commitid yjhmqzqJTksqlivs; 1.3 date 2007.06.26.19.02.54; author rse; state Exp; branches; next 1.2; commitid 1BMoHdoMKfSghsns; 1.2 date 2007.04.15.08.06.19; author rse; state Exp; branches; next 1.1; commitid JxPjM0SxYihwX8es; 1.1 date 2007.03.26.12.57.49; author rse; state Exp; branches; next ; commitid 3rrxHijppDSndBbs; desc @@ 1.19 log @upgrading package: cego 2.3.10 -> 2.3.11 @ text @Index: cego/src/CegoClient.cc --- cego/src/CegoClient.cc.orig 2009-07-09 13:45:43 +0200 +++ cego/src/CegoClient.cc 2009-10-06 19:39:47 +0200 @@@@ -33,6 +33,7 @@@@ // /////////////////////////////////////////////////////////////////////////////// +#include #include #include #include Index: cego/src/CegoDistCursor.h --- cego/src/CegoDistCursor.h.orig 2009-08-03 21:03:34 +0200 +++ cego/src/CegoDistCursor.h 2009-10-06 19:50:35 +0200 @@@@ -68,8 +68,8 @@@@ private: void sysSetup(); - bool CegoDistCursor::evalCondition(ListT& fl); - bool CegoDistCursor::getTuple(ListT& fl); + bool evalCondition(ListT& fl); + bool getTuple(ListT& fl); CegoDistManager* _pGTM; Index: cego/src/CegoOutput.cc --- cego/src/CegoOutput.cc.orig 2009-06-10 10:52:57 +0200 +++ cego/src/CegoOutput.cc 2009-10-06 19:39:47 +0200 @@@@ -37,6 +37,7 @@@@ #include "Datetime.h" #include "Tokenizer.h" #include "XMLSuite.h" +#include "CegoDefs.h" #include "CegoOutput.h" #include "CegoDefs.h" @ 1.18 log @upgrading package: cego 2.3.8 -> 2.3.10 @ text @d3 1 a3 1 +++ cego/src/CegoClient.cc 2009-07-26 18:51:21 +0200 d13 3 a15 4 --- cego/src/CegoDistCursor.h.orig 2009-07-15 00:12:53 +0200 +++ cego/src/CegoDistCursor.h 2009-07-26 18:53:57 +0200 @@@@ -66,8 +66,8 @@@@ d18 1 d28 1 a28 1 +++ cego/src/CegoOutput.cc 2009-07-26 18:51:21 +0200 @ 1.17 log @upgrading package: cego 2.3.3 -> 2.3.4 @ text @d2 2 a3 2 --- cego/src/CegoClient.cc.orig 2009-05-24 13:34:58 +0200 +++ cego/src/CegoClient.cc 2009-05-25 07:21:01 +0200 d12 14 d27 3 a29 4 --- cego/src/CegoOutput.cc.orig 2009-05-24 13:52:38 +0200 +++ cego/src/CegoOutput.cc 2009-05-25 07:21:01 +0200 @@@@ -36,6 +36,7 @@@@ d31 1 @ 1.16 log @upgrading package: cego 2.3.2 -> 2.3.3 @ text @d2 2 a3 2 --- cego/src/CegoClient.cc.orig 2009-05-18 16:03:45 +0200 +++ cego/src/CegoClient.cc 2009-05-19 08:16:13 +0200 d13 2 a14 2 --- cego/src/CegoOutput.cc.orig 2009-04-11 14:19:00 +0200 +++ cego/src/CegoOutput.cc 2009-05-19 08:10:07 +0200 a22 12 Index: cego/src/CegoProcBlock.h --- cego/src/CegoProcBlock.h.orig 2009-05-08 15:52:44 +0200 +++ cego/src/CegoProcBlock.h 2009-05-19 08:10:07 +0200 @@@@ -80,7 +80,7 @@@@ Chain getExceptionMsg() const; ListT& getStmtList(); - const ListT& CegoProcBlock::getExceptionList() const; + const ListT& getExceptionList() const; private: @ 1.15 log @upgrading package: cego 2.2.7 -> 2.3.0 @ text @d1 11 d13 2 a14 2 --- cego/src/CegoOutput.cc.orig 2009-03-21 17:39:03 +0100 +++ cego/src/CegoOutput.cc 2009-03-24 19:32:38 +0100 d23 12 @ 1.14 log @upgrading package: cego 2.2.6 -> 2.2.7 @ text @a0 99 Index: cego/src/CegoAction.cc --- cego/src/CegoAction.cc.orig 2009-03-23 10:06:24 +0100 +++ cego/src/CegoAction.cc 2009-03-24 19:32:38 +0100 @@@@ -2489,9 +2489,9 @@@@ if ( _defaultValue.castTo(_dataType) == false ) throw Exception(EXLOC, Chain("Cannot cast from <") - + CEGO_TYPE_MAP[_defaultValue.getType()] + + CEGO_TYPE_MAP[_defaultValue.getType()].c_str() + Chain("> to <") - + CEGO_TYPE_MAP[_dataType] + + CEGO_TYPE_MAP[_dataType].c_str() + Chain(">")); _fieldList.Insert(CegoField(Chain(), Chain(), _fieldName, _dataType, _dataLen, _defaultValue, _isNullable)); @@@@ -2502,9 +2502,9 @@@@ { if ( _defaultValue.castTo(_dataType) == false ) throw Exception(EXLOC, Chain("Cannot cast from <") - + CEGO_TYPE_MAP[_defaultValue.getType()] + + CEGO_TYPE_MAP[_defaultValue.getType()].c_str() + Chain("> to <") - + CEGO_TYPE_MAP[_dataType] + + CEGO_TYPE_MAP[_dataType].c_str() + Chain(">")); _fieldList.Insert(CegoField(Chain(), Chain(), _fieldName, _dataType, _dataLen, _defaultValue, _isNullable)); Index: cego/src/CegoContentObject.cc --- cego/src/CegoContentObject.cc.orig 2009-03-23 09:57:01 +0100 +++ cego/src/CegoContentObject.cc 2009-03-24 19:32:38 +0100 @@@@ -303,7 +303,7 @@@@ s += Chain(" TableName: ") + pF->getTableName() + Chain("\n"); s += Chain(" TableAlias: ") + pF->getTableAlias() + Chain("\n"); s += Chain(" AttrName: ") + pF->getAttrName() + Chain("\n"); - s += Chain(" Type: ") + CEGO_TYPE_MAP[pF->getType()] + Chain("\n"); + s += Chain(" Type: ") + CEGO_TYPE_MAP[pF->getType()].c_str() + Chain("\n"); s += Chain(" Len: ") + Chain(pF->getLength()) + Chain("\n"); pF= _schema.Next(); Index: cego/src/CegoDataType.h --- cego/src/CegoDataType.h.orig 2009-03-23 10:07:03 +0100 +++ cego/src/CegoDataType.h 2009-03-24 19:32:38 +0100 @@@@ -55,7 +55,7 @@@@ // this must be correlated to the enum above -static char *CEGO_TYPE_MAP[] = +static const string CEGO_TYPE_MAP[] = { "int", "long", Index: cego/src/CegoField.cc --- cego/src/CegoField.cc.orig 2009-03-11 20:48:26 +0100 +++ cego/src/CegoField.cc 2009-03-24 19:32:38 +0100 @@@@ -205,12 +205,12 @@@@ case BIGINT_TYPE: case DECIMAL_TYPE: { - s = CEGO_TYPE_MAP[_type] + Chain("(") + Chain(_len) + Chain(")"); + s = CEGO_TYPE_MAP[_type].c_str() + Chain("(") + Chain(_len) + Chain(")"); break; } default: { - s = CEGO_TYPE_MAP[_type]; + s = CEGO_TYPE_MAP[_type].c_str(); break; } } Index: cego/src/CegoFieldValue.cc --- cego/src/CegoFieldValue.cc.orig 2009-03-21 19:18:44 +0100 +++ cego/src/CegoFieldValue.cc 2009-03-24 19:32:38 +0100 @@@@ -1607,12 +1607,12 @@@@ case BIGINT_TYPE: case DECIMAL_TYPE: { - s = CEGO_TYPE_MAP[_type] + Chain("(") + Chain(_len) + Chain(")"); + s = CEGO_TYPE_MAP[_type].c_str() + Chain("(") + Chain(_len) + Chain(")"); break; } default: { - s = CEGO_TYPE_MAP[_type]; + s = CEGO_TYPE_MAP[_type].c_str(); break; } } Index: cego/src/CegoJDBCInfo.cc --- cego/src/CegoJDBCInfo.cc.orig 2009-03-16 23:34:29 +0100 +++ cego/src/CegoJDBCInfo.cc 2009-03-24 19:32:38 +0100 @@@@ -566,7 +566,7 @@@@ f1.Insert( CegoFieldValue(VARCHAR_TYPE, *pTable)); f1.Insert( CegoFieldValue(VARCHAR_TYPE, pF->getAttrName())); f1.Insert( CegoFieldValue(INT_TYPE, CEGO_JAVATYPE_MAP[pF->getType()])); - f1.Insert( CegoFieldValue(VARCHAR_TYPE, CEGO_TYPE_MAP[pF->getType()])); + f1.Insert( CegoFieldValue(VARCHAR_TYPE, CEGO_TYPE_MAP[pF->getType()].c_str())); f1.Insert( CegoFieldValue(INT_TYPE, pF->getLength())); f1.Insert( CegoFieldValue()); // BUFFER_LENGTH not used f1.Insert( CegoFieldValue(INT_TYPE, 0 )); a11 76 Index: cego/src/CegoProcedure.cc --- cego/src/CegoProcedure.cc.orig 2009-03-01 12:58:53 +0100 +++ cego/src/CegoProcedure.cc 2009-03-24 19:32:38 +0100 @@@@ -112,10 +112,10 @@@@ if ( fv.castTo(pVar->getValue().getType()) == false ) { throw Exception(EXLOC, Chain("Mismatched datatype <") - + CEGO_TYPE_MAP[(int)fv.getType()] + + CEGO_TYPE_MAP[(int)fv.getType()].c_str() + Chain("> in value list for argument ") + Chain(pos) + " ( expected " - + CEGO_TYPE_MAP[(int)pVar->getValue().getType()] + " )"); + + CEGO_TYPE_MAP[(int)pVar->getValue().getType()].c_str() + " )"); } } Index: cego/src/CegoQueryHelper.cc --- cego/src/CegoQueryHelper.cc.orig 2009-03-14 14:40:48 +0100 +++ cego/src/CegoQueryHelper.cc 2009-03-24 19:32:38 +0100 @@@@ -672,7 +672,7 @@@@ } default: { - Chain msg = Chain("Aggregation not supported on datatype <") + CEGO_TYPE_MAP[ (int) fv.getType()] + Chain(">"); + Chain msg = Chain("Aggregation not supported on datatype <") + CEGO_TYPE_MAP[ (int) fv.getType()].c_str() + Chain(">"); throw Exception(EXLOC, msg); break; } @@@@ -756,10 +756,10 @@@@ if ( fv.castTo(pFV->getType()) == false ) { throw Exception(EXLOC, Chain("Mismatched datatype <") - + CEGO_TYPE_MAP[(int)fv.getType()] + + CEGO_TYPE_MAP[(int)fv.getType()].c_str() + Chain("> in value list for argument ") + Chain(pos) + " ( expected " - + CEGO_TYPE_MAP[(int)pFV->getType()] + " )"); + + CEGO_TYPE_MAP[(int)pFV->getType()].c_str() + " )"); } } Index: cego/src/CegoTableManager.cc --- cego/src/CegoTableManager.cc.orig 2009-03-23 09:54:42 +0100 +++ cego/src/CegoTableManager.cc 2009-03-24 19:32:38 +0100 @@@@ -2653,10 +2653,10 @@@@ if ( pD->getValue().getType() != pF->getValue().getType() ) { throw Exception(EXLOC, Chain("Mismatched data type <") - + CEGO_TYPE_MAP[(int)(pD->getValue().getType())] + + CEGO_TYPE_MAP[(int)(pD->getValue().getType())].c_str() + Chain("> for attribute ") + pF->getAttrName() + Chain(", expected type <") - + CEGO_TYPE_MAP[(int)(pF->getValue().getType())] + + CEGO_TYPE_MAP[(int)(pF->getValue().getType())].c_str() + Chain(">")); } Index: cego/src/Makefile.in --- cego/src/Makefile.in.orig 2009-03-21 18:38:09 +0100 +++ cego/src/Makefile.in 2009-03-24 19:52:23 +0100 @@@@ -207,7 +207,7 @@@@ libcego.a: $(LIBOBJECTS) $(AR) -r libcego.a $(LIBOBJECTS) - $(RANLIB) libCego.a + $(RANLIB) libcego.a libcgwrap.a: $(CGWRAPOBJECTS) $(AR) -r libcgwrap.a $(CGWRAPOBJECTS) @@@@ -328,4 +328,4 @@@@ CegoXMLHelper.o: CegoXMLHelper.cc CegoXMLHelper.h CegoXMLSpace.o: CegoXMLSpace.cc CegoXMLSpace.h CegoXPorter.o: CegoXPorter.cc CegoXPorter.h -cgwrap.o: cgwrap.cc \ No newline at end of file +cgwrap.o: cgwrap.cc @ 1.13 log @upgrading package: cego 2.2.5 -> 2.2.6 @ text @d1 27 d29 2 a30 2 --- cego/src/CegoContentObject.cc.orig 2009-03-14 14:36:25 +0100 +++ cego/src/CegoContentObject.cc 2009-03-17 08:31:29 +0100 d41 3 a43 3 --- cego/src/CegoDataType.h.orig 2008-09-30 09:52:34 +0200 +++ cego/src/CegoDataType.h 2009-03-17 08:31:29 +0100 @@@@ -54,7 +54,7 @@@@ d54 1 a54 1 +++ cego/src/CegoField.cc 2009-03-17 08:31:29 +0100 d71 3 a73 3 --- cego/src/CegoFieldValue.cc.orig 2009-03-13 15:24:08 +0100 +++ cego/src/CegoFieldValue.cc 2009-03-17 08:31:29 +0100 @@@@ -1583,12 +1583,12 @@@@ d89 2 a90 2 --- cego/src/CegoJDBCInfo.cc.orig 2009-03-11 22:00:17 +0100 +++ cego/src/CegoJDBCInfo.cc 2009-03-17 11:01:52 +0100 d101 2 a102 2 --- cego/src/CegoOutput.cc.orig 2009-03-11 21:08:40 +0100 +++ cego/src/CegoOutput.cc 2009-03-17 08:31:29 +0100 d113 1 a113 1 +++ cego/src/CegoProcedure.cc 2009-03-17 08:31:29 +0100 d129 1 a129 1 +++ cego/src/CegoQueryHelper.cc 2009-03-17 08:31:29 +0100 d153 3 a155 3 --- cego/src/CegoTableManager.cc.orig 2009-03-14 10:15:51 +0100 +++ cego/src/CegoTableManager.cc 2009-03-17 08:31:29 +0100 @@@@ -2631,10 +2631,10 @@@@ d168 19 @ 1.12 log @upgrading package: cego 2.1.3 -> 2.2.5 @ text @d2 3 a4 3 --- cego/src/CegoContentObject.cc.orig 2008-06-10 23:07:04 +0200 +++ cego/src/CegoContentObject.cc 2008-06-21 09:50:15 +0200 @@@@ -277,7 +277,7 @@@@ d8 3 a10 3 - s += Chain(" Type: ") + CEGO_TYPE_MAP[pF->getFieldValue().getType()] + Chain("\n"); + s += Chain(" Type: ") + CEGO_TYPE_MAP[pF->getFieldValue().getType()].c_str() + Chain("\n"); s += Chain(" Len: ") + Chain(pF->getFieldValue().getLength()) + Chain("\n"); d14 2 a15 2 --- cego/src/CegoDataType.h.orig 2007-12-16 12:01:09 +0100 +++ cego/src/CegoDataType.h 2008-06-21 09:50:15 +0200 d25 36 d62 3 a64 3 --- cego/src/CegoJDBCInfo.cc.orig 2008-04-28 15:18:43 +0200 +++ cego/src/CegoJDBCInfo.cc 2008-06-21 09:50:15 +0200 @@@@ -381,7 +381,7 @@@@ d67 4 a70 4 f1.Insert( CegoFieldValue(INT_TYPE, CEGO_JAVATYPE_MAP[pF->getFieldValue().getType()])); - f1.Insert( CegoFieldValue(VARCHAR_TYPE, CEGO_TYPE_MAP[pF->getFieldValue().getType()])); + f1.Insert( CegoFieldValue(VARCHAR_TYPE, CEGO_TYPE_MAP[pF->getFieldValue().getType()].c_str())); f1.Insert( CegoFieldValue(INT_TYPE, pF->getFieldValue().getLength())); d74 3 a76 3 --- cego/src/CegoOutput.cc.orig 2008-06-02 13:35:52 +0200 +++ cego/src/CegoOutput.cc 2008-06-21 09:50:15 +0200 @@@@ -35,6 +35,7 @@@@ d85 3 a87 3 --- cego/src/CegoProcedure.cc.orig 2007-09-21 19:06:07 +0200 +++ cego/src/CegoProcedure.cc 2008-06-21 09:50:15 +0200 @@@@ -113,10 +113,10 @@@@ d101 3 a103 3 --- cego/src/CegoQueryHelper.cc.orig 2008-06-08 15:28:58 +0200 +++ cego/src/CegoQueryHelper.cc 2008-06-21 09:50:15 +0200 @@@@ -666,7 +666,7 @@@@ d112 2 a113 2 @@@@ -754,10 +754,10 @@@@ if ( fv.castTo(pFV->getFieldValue().getType()) == false ) d120 2 a121 2 - + CEGO_TYPE_MAP[(int)pFV->getFieldValue().getType()] + " )"); + + CEGO_TYPE_MAP[(int)pFV->getFieldValue().getType()].c_str() + " )"); d124 1 a124 1 d126 4 a129 4 --- cego/src/CegoTableManager.cc.orig 2008-06-20 21:40:34 +0200 +++ cego/src/CegoTableManager.cc 2008-06-21 09:50:15 +0200 @@@@ -1882,10 +1882,10 @@@@ if ( pD->getFieldValue().getType() != pF->getFieldValue().getType() ) d132 2 a133 2 - + CEGO_TYPE_MAP[(int)(pD->getFieldValue().getType())] + + CEGO_TYPE_MAP[(int)(pD->getFieldValue().getType())].c_str() d136 2 a137 2 - + CEGO_TYPE_MAP[(int)(pF->getFieldValue().getType())] + + CEGO_TYPE_MAP[(int)(pF->getFieldValue().getType())].c_str() a140 40 Index: cego/src/CegoFieldValue.cc --- cego/src/CegoFieldValue.cc.orig 2008-09-30 09:46:44 +0200 +++ cego/src/CegoFieldValue.cc 2008-11-25 21:22:25 +0100 @@@@ -1555,12 +1555,12 @@@@ case BIGINT_TYPE: case DECIMAL_TYPE: { - s = CEGO_TYPE_MAP[_type] + Chain("(") + Chain(_len) + Chain(")"); + s = CEGO_TYPE_MAP[_type].c_str() + Chain("(") + Chain(_len) + Chain(")"); break; } default: { - s = CEGO_TYPE_MAP[_type]; + s = CEGO_TYPE_MAP[_type].c_str(); break; } } Index: cego/src/cgwtest.c --- cego/src/cgwtest.c.orig 2009-02-08 16:20:59 +0100 +++ cego/src/cgwtest.c 2009-03-01 20:59:51 +0100 @@@@ -26,6 +26,8 @@@@ /////////////////////////////////////////////////////////////////////////////// #include +#include +#include #include "cgwrap.h" void connect_test(); Index: cego/src/Makefile.in --- cego/src/Makefile.in.orig 2009-02-22 12:21:27 +0100 +++ cego/src/Makefile.in 2009-03-01 21:14:22 +0100 @@@@ -238,4 +238,4 @@@@ CegoXMLHelper.o: CegoXMLHelper.cc CegoXMLHelper.h CegoTypeConverter.o: CegoTypeConverter.cc CegoTypeConverter.h CegoCaseCond.o: CegoCaseCond.cc CegoCaseCond.h -cgwrap.o: cgwrap.c \ No newline at end of file +cgwrap.o: cgwrap.cc @ 1.11 log @upgrading package: cego 2.0.12 -> 2.1.1 @ text @d123 22 @ 1.10 log @upgrading package: cego 2.0.6 -> 2.0.7 @ text @d105 18 @ 1.9 log @upgrading package: cego 2.0.4 -> 2.0.5 @ text @d2 2 a3 2 --- cego/src/CegoContentObject.cc.orig 2007-09-10 08:36:41 +0200 +++ cego/src/CegoContentObject.cc 2008-05-18 20:14:32 +0200 d15 1 a15 1 +++ cego/src/CegoDataType.h 2008-05-18 20:14:32 +0200 d27 1 a27 1 +++ cego/src/CegoJDBCInfo.cc 2008-05-18 20:18:32 +0200 d38 2 a39 2 --- cego/src/CegoOutput.cc.orig 2007-12-02 14:59:34 +0100 +++ cego/src/CegoOutput.cc 2008-05-18 20:14:32 +0200 d50 1 a50 1 +++ cego/src/CegoProcedure.cc 2008-05-18 20:14:32 +0200 a63 12 Index: cego/src/CegoQuery.h --- cego/src/CegoQuery.h.orig 2008-05-03 14:05:30 +0200 +++ cego/src/CegoQuery.h 2008-05-18 20:14:32 +0200 @@@@ -59,7 +59,7 @@@@ ~CegoQuery(); - void CegoQuery::setBlock(CegoProcBlock *pBlock); + void setBlock(CegoProcBlock *pBlock); void execute(CegoProcBlock* pBlock = 0); d65 3 a67 3 --- cego/src/CegoQueryHelper.cc.orig 2008-05-03 15:23:54 +0200 +++ cego/src/CegoQueryHelper.cc 2008-05-18 20:14:32 +0200 @@@@ -665,7 +665,7 @@@@ d76 1 a76 1 @@@@ -746,10 +746,10 @@@@ d90 3 a92 3 --- cego/src/CegoTableManager.cc.orig 2008-05-16 15:48:05 +0200 +++ cego/src/CegoTableManager.cc 2008-05-18 20:14:32 +0200 @@@@ -1879,10 +1879,10 @@@@ @ 1.8 log @upgrading package: cego 2.0.3 -> 2.0.4 @ text @d3 1 a3 1 +++ cego/src/CegoContentObject.cc 2008-04-28 08:15:14 +0200 d15 1 a15 1 +++ cego/src/CegoDataType.h 2008-04-28 08:15:14 +0200 d25 12 d39 1 a39 1 +++ cego/src/CegoOutput.cc 2008-04-28 08:15:14 +0200 d50 1 a50 1 +++ cego/src/CegoProcedure.cc 2008-04-28 08:15:14 +0200 a63 16 Index: cego/src/CegoQuery.cc --- cego/src/CegoQuery.cc.orig 2008-03-04 17:39:21 +0100 +++ cego/src/CegoQuery.cc 2008-04-28 08:15:14 +0200 @@@@ -278,10 +278,10 @@@@ if ( fv.castTo(pFV->getFieldValue().getType()) == false ) { throw Exception(EXLOC, Chain("Mismatched datatype <") - + CEGO_TYPE_MAP[(int)fv.getType()] + + CEGO_TYPE_MAP[(int)fv.getType()].c_str() + Chain("> in value list for argument ") + Chain(pos) + " ( expected " - + CEGO_TYPE_MAP[(int)pFV->getFieldValue().getType()] + " )"); + + CEGO_TYPE_MAP[(int)pFV->getFieldValue().getType()].c_str()+ " )"); } } d65 3 a67 3 --- cego/src/CegoQuery.h.orig 2007-11-17 20:09:17 +0100 +++ cego/src/CegoQuery.h 2008-04-28 08:15:14 +0200 @@@@ -57,7 +57,7 @@@@ d77 3 a79 3 --- cego/src/CegoQueryHelper.cc.orig 2007-11-03 14:17:20 +0100 +++ cego/src/CegoQueryHelper.cc 2008-04-28 08:15:14 +0200 @@@@ -663,7 +663,7 @@@@ d88 13 d102 3 a104 3 --- cego/src/CegoTableManager.cc.orig 2008-02-16 16:58:33 +0100 +++ cego/src/CegoTableManager.cc 2008-04-28 08:24:58 +0200 @@@@ -1864,10 +1864,10 @@@@ @ 1.7 log @upgrading package: cego 2.0.1 -> 2.0.2 @ text @d3 1 a3 1 +++ cego/src/CegoContentObject.cc 2007-11-18 17:49:49 +0100 d14 2 a15 2 --- cego/src/CegoDataType.h.orig 2007-07-06 08:48:55 +0200 +++ cego/src/CegoDataType.h 2007-11-18 17:49:49 +0100 d26 2 a27 2 --- cego/src/CegoOutput.cc.orig 2007-09-15 21:18:00 +0200 +++ cego/src/CegoOutput.cc 2007-11-18 17:49:49 +0100 d38 1 a38 1 +++ cego/src/CegoProcedure.cc 2007-11-18 17:49:49 +0100 d53 3 a55 3 --- cego/src/CegoQuery.cc.orig 2007-11-17 20:08:13 +0100 +++ cego/src/CegoQuery.cc 2007-11-18 17:49:49 +0100 @@@@ -251,10 +251,10 @@@@ d67 1 a67 1 if ( pFV->getFieldValue().getType() == FIXED_TYPE ) d70 1 a70 1 +++ cego/src/CegoQuery.h 2007-11-18 17:49:49 +0100 d82 1 a82 1 +++ cego/src/CegoQueryHelper.cc 2007-11-18 17:49:49 +0100 d93 3 a95 3 --- cego/src/CegoTableManager.cc.orig 2007-11-18 12:16:10 +0100 +++ cego/src/CegoTableManager.cc 2007-11-19 14:21:30 +0100 @@@@ -1843,7 +1843,7 @@@@ d99 8 a106 3 - + CEGO_TYPE_MAP[(int)(pD->getFieldValue().getType())] + + + CEGO_TYPE_MAP[(int)(pD->getFieldValue().getType())].c_str() + Chain("> for attribute ") + pF->getAttrName()); a107 1 } @ 1.6 log @upgrading package: cego 2.0.0 -> 2.0.1 @ text @d3 1 a3 1 +++ cego/src/CegoContentObject.cc 2007-11-04 17:04:41 +0100 d15 1 a15 1 +++ cego/src/CegoDataType.h 2007-11-04 17:04:41 +0100 d27 1 a27 1 +++ cego/src/CegoOutput.cc 2007-11-04 17:04:41 +0100 d38 1 a38 1 +++ cego/src/CegoProcedure.cc 2007-11-04 17:32:32 +0100 d53 2 a54 2 --- cego/src/CegoQuery.cc.orig 2007-11-03 14:17:06 +0100 +++ cego/src/CegoQuery.cc 2007-11-04 17:04:41 +0100 d69 2 a70 2 --- cego/src/CegoQuery.h.orig 2007-11-03 13:47:31 +0100 +++ cego/src/CegoQuery.h 2007-11-04 17:04:41 +0100 d82 1 a82 1 +++ cego/src/CegoQueryHelper.cc 2007-11-04 17:30:33 +0100 d92 12 @ 1.5 log @modifying package: cego-1.3.3 20070826 -> 20070827 @ text @d1 24 d26 2 a27 2 --- cego/src/CegoOutput.cc.orig 2007-06-24 13:59:26 +0200 +++ cego/src/CegoOutput.cc 2007-06-26 08:08:20 +0200 d36 56 @ 1.4 log @upgrading package: cego 1.3.2 -> 1.3.3 @ text @a0 33 Index: base/src/NanoTimer.cc --- base/src/NanoTimer.cc.orig 2007-08-22 21:52:01 +0200 +++ base/src/NanoTimer.cc 2007-08-26 20:57:22 +0200 @@@@ -68,7 +68,7 @@@@ #ifdef HAVE_MINGW32 QueryPerformanceCounter((LARGE_INTEGER*)&_start); #else - _start = gethrtime(); + _start = time(NULL); #endif } @@@@ -79,7 +79,7 @@@@ QueryPerformanceCounter((LARGE_INTEGER*)&_end); _sum = _sum + ( _end - _start / ( ( 1000000000 / _freq ) + 1 )); #else - _end = gethrtime(); + _end = time(NULL); _sum = _sum + ( _end - _start ); Index: base/src/NanoTimer.h --- base/src/NanoTimer.h.orig 2007-08-22 18:44:21 +0200 +++ base/src/NanoTimer.h 2007-08-26 20:56:42 +0200 @@@@ -59,7 +59,7 @@@@ #ifdef HAVE_MINGW32 LONGLONG _start, _end, _sum, _freq; #else - hrtime_t _start, _end, _sum; + time_t _start, _end, _sum; #endif }; @ 1.3 log @upgrading package: cego 1.0.11 -> 1.1.1 @ text @d1 33 @ 1.2 log @upgrading package: cego 1.0.9 -> 1.0.11 @ text @d2 2 a3 2 --- cego/src/CegoOutput.cc.orig 2007-04-14 08:43:48 +0200 +++ cego/src/CegoOutput.cc 2007-04-15 10:01:57 +0200 a11 12 Index: cego/src/Makefile.in --- cego/src/Makefile.in.orig 2007-04-13 19:25:52 +0200 +++ cego/src/Makefile.in 2007-04-15 10:01:57 +0200 @@@@ -21,7 +21,7 @@@@ LIBS = -lXML -lBase @@LIBS@@ DEFS= @@DEFS@@ # LDFLAGS = -static-libgcc -LDFLAGS = -L$(LIBDIR) +LDFLAGS = -L$(LIBDIR) @@LDFLAGS@@ # CFLAGS = -I$(INCDIR) CFLAGS = -I$(INCDIR) @@CFLAGS@@ @@CPPFLAGS@@ RANLIB = @@RANLIB@@ @ 1.1 log @new package: cego 1.0.9 (Relational Database Management System (RDBMS)) @ text @d1 11 d13 3 a15 3 --- cego/src/Makefile.in.orig 2007-03-22 21:56:29 +0100 +++ cego/src/Makefile.in 2007-03-26 14:42:31 +0200 @@@@ -21,9 +21,9 @@@@ d21 2 a22 3 # CFLAGS = -I$(INCDIR) @@CFLAGS@@ -CFLAGS = -I$(INCDIR) -O3 +CFLAGS = -I$(INCDIR) @@CFLAGS@@ @@CPPFLAGS@@ a23 14 STRIP = @@STRIP@@ Index: xml/src/Makefile.in --- xml/src/Makefile.in.orig 2007-03-05 15:49:55 +0100 +++ xml/src/Makefile.in 2007-03-26 14:38:36 +0200 @@@@ -24,7 +24,7 @@@@ INCLUDEPREFIX = $(PREFIX)/include LIBPREFIX = $(PREFIX)/lib -CFLAGS = -I$(INCLUDEPREFIX) @@CFLAGS@@ +CFLAGS = -I$(INCLUDEPREFIX) @@CFLAGS@@ @@CPPFLAGS@@ .SUFFIXES: .cc .o @