OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Nov-2007 17:45:26
Branch: HEAD Handle: 2007110416452600
Modified files:
openpkg-src/cego cego.patch cego.spec
Log:
upgrading package: cego 2.0.0 -> 2.0.1
Summary:
Revision Changes Path
1.6 +82 -2 openpkg-src/cego/cego.patch
1.20 +1 -1 openpkg-src/cego/cego.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cego/cego.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 cego.patch
--- openpkg-src/cego/cego.patch 27 Aug 2007 17:30:04 -0000 1.5
+++ openpkg-src/cego/cego.patch 4 Nov 2007 16:45:26 -0000 1.6
@@ -1,6 +1,30 @@
+Index: cego/src/CegoContentObject.cc
+--- cego/src/CegoContentObject.cc.orig 2007-09-10 08:36:41 +0200
++++ cego/src/CegoContentObject.cc 2007-11-04 17:04:41 +0100
+@@ -277,7 +277,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->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");
+
+ pF= _schema.Next();
+Index: cego/src/CegoDataType.h
+--- cego/src/CegoDataType.h.orig 2007-07-06 08:48:55 +0200
++++ cego/src/CegoDataType.h 2007-11-04 17:04:41 +0100
+@@ -54,7 +54,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/CegoOutput.cc
---- cego/src/CegoOutput.cc.orig 2007-06-24 13:59:26 +0200
-+++ cego/src/CegoOutput.cc 2007-06-26 08:08:20 +0200
+--- cego/src/CegoOutput.cc.orig 2007-09-15 21:18:00 +0200
++++ cego/src/CegoOutput.cc 2007-11-04 17:04:41 +0100
@@ -35,6 +35,7 @@
#include "Datetime.h"
@@ -9,3 +33,59 @@
#include "CegoOutput.h"
#include "CegoDefs.h"
+Index: cego/src/CegoProcedure.cc
+--- cego/src/CegoProcedure.cc.orig 2007-09-21 19:06:07 +0200
++++ cego/src/CegoProcedure.cc 2007-11-04 17:32:32 +0100
+@@ -113,10 +113,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/CegoQuery.cc
+--- cego/src/CegoQuery.cc.orig 2007-11-03 14:17:06 +0100
++++ cego/src/CegoQuery.cc 2007-11-04 17:04:41 +0100
+@@ -251,10 +251,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()+ " )");
+ }
+ }
+ if ( pFV->getFieldValue().getType() == FIXED_TYPE )
+Index: cego/src/CegoQuery.h
+--- cego/src/CegoQuery.h.orig 2007-11-03 13:47:31 +0100
++++ cego/src/CegoQuery.h 2007-11-04 17:04:41 +0100
+@@ -57,7 +57,7 @@
+
+ ~CegoQuery();
+
+- void CegoQuery::setBlock(CegoProcBlock *pBlock);
++ void setBlock(CegoProcBlock *pBlock);
+
+ void execute(CegoProcBlock* pBlock = 0);
+
+Index: cego/src/CegoQueryHelper.cc
+--- cego/src/CegoQueryHelper.cc.orig 2007-11-03 14:17:20 +0100
++++ cego/src/CegoQueryHelper.cc 2007-11-04 17:30:33 +0100
+@@ -663,7 +663,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;
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cego/cego.spec
============================================================================
$ cvs diff -u -r1.19 -r1.20 cego.spec
--- openpkg-src/cego/cego.spec 4 Nov 2007 14:17:18 -0000 1.19
+++ openpkg-src/cego/cego.spec 4 Nov 2007 16:45:26 -0000 1.20
@@ -27,7 +27,7 @@
# package version
%define V_base 1.1.6
%define V_xml 1.0.11
-%define V_cego 2.0.0
+%define V_cego 2.0.1
# package information
Name: cego
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
