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: 18-May-2008 20:25:43
Branch: HEAD Handle: 2008051819254300
Modified files:
openpkg-src/cego cego.patch cego.spec
Log:
upgrading package: cego 2.0.4 -> 2.0.5
Summary:
Revision Changes Path
1.9 +38 -29 openpkg-src/cego/cego.patch
1.26 +2 -2 openpkg-src/cego/cego.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cego/cego.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 cego.patch
--- openpkg-src/cego/cego.patch 28 Apr 2008 06:58:24 -0000 1.8
+++ openpkg-src/cego/cego.patch 18 May 2008 18:25:43 -0000 1.9
@@ -1,6 +1,6 @@
Index: cego/src/CegoContentObject.cc
--- cego/src/CegoContentObject.cc.orig 2007-09-10 08:36:41 +0200
-+++ cego/src/CegoContentObject.cc 2008-04-28 08:15:14 +0200
++++ cego/src/CegoContentObject.cc 2008-05-18 20:14:32 +0200
@@ -277,7 +277,7 @@
s += Chain(" TableName: ") + pF->getTableName() + Chain("\n");
s += Chain(" TableAlias: ") + pF->getTableAlias() + Chain("\n");
@@ -12,7 +12,7 @@
pF= _schema.Next();
Index: cego/src/CegoDataType.h
--- cego/src/CegoDataType.h.orig 2007-12-16 12:01:09 +0100
-+++ cego/src/CegoDataType.h 2008-04-28 08:15:14 +0200
++++ cego/src/CegoDataType.h 2008-05-18 20:14:32 +0200
@@ -54,7 +54,7 @@
// this must be correlated to the enum above
@@ -22,9 +22,21 @@
{
"int",
"long",
+Index: cego/src/CegoJDBCInfo.cc
+--- cego/src/CegoJDBCInfo.cc.orig 2008-04-28 15:18:43 +0200
++++ cego/src/CegoJDBCInfo.cc 2008-05-18 20:18:32 +0200
+@@ -381,7 +381,7 @@
+ f1.Insert( CegoFieldValue(VARCHAR_TYPE, *pTable));
+ f1.Insert( CegoFieldValue(VARCHAR_TYPE, pF->getAttrName()));
+ 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()));
+ f1.Insert( CegoFieldValue()); // BUFFER_LENGTH not used
+ f1.Insert( CegoFieldValue(INT_TYPE, 0 ));
Index: cego/src/CegoOutput.cc
--- cego/src/CegoOutput.cc.orig 2007-12-02 14:59:34 +0100
-+++ cego/src/CegoOutput.cc 2008-04-28 08:15:14 +0200
++++ cego/src/CegoOutput.cc 2008-05-18 20:14:32 +0200
@@ -35,6 +35,7 @@
#include "Datetime.h"
@@ -35,7 +47,7 @@
Index: cego/src/CegoProcedure.cc
--- cego/src/CegoProcedure.cc.orig 2007-09-21 19:06:07 +0200
-+++ cego/src/CegoProcedure.cc 2008-04-28 08:15:14 +0200
++++ cego/src/CegoProcedure.cc 2008-05-18 20:14:32 +0200
@@ -113,10 +113,10 @@
if ( fv.castTo(pVar->getValue().getType()) == false )
{
@@ -49,26 +61,10 @@
}
}
-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()+ " )");
- }
- }
-
Index: cego/src/CegoQuery.h
---- 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 @@
+--- 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();
@@ -78,9 +74,9 @@
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 2008-04-28 08:15:14 +0200
-@@ -663,7 +663,7 @@
+--- 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 @@
}
default:
{
@@ -89,10 +85,23 @@
throw Exception(EXLOC, msg);
break;
}
+@@ -746,10 +746,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() + " )");
+ }
+ }
+
Index: cego/src/CegoTableManager.cc
---- 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 @@
+--- 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 @@
if ( pD->getFieldValue().getType() != pF->getFieldValue().getType()
)
{
throw Exception(EXLOC, Chain("Mismatched data type <")
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cego/cego.spec
============================================================================
$ cvs diff -u -r1.25 -r1.26 cego.spec
--- openpkg-src/cego/cego.spec 28 Apr 2008 06:58:24 -0000 1.25
+++ openpkg-src/cego/cego.spec 18 May 2008 18:25:43 -0000 1.26
@@ -26,7 +26,7 @@
# package version
%define V_base 1.1.6
%define V_xml 1.0.11
-%define V_cego 2.0.4
+%define V_cego 2.0.5
%define V_jdbc 1.2.9
# package information
@@ -40,7 +40,7 @@
Group: Database
License: GPL
Version: %{V_cego}
-Release: 20080428
+Release: 20080518
# package options
%option with_jdbc no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
