Changes - j0ke.net Open Build Service

Changes of Revision 39

[-] [+]	Changed	cego.changes
@@ -1,7 +1,12 @@ ------------------------------------------------------------------- +Tue Sep 4 18:03:51 UTC 2012 - cs@linux-administrator.com + +- Update to version 2.13.10 + +------------------------------------------------------------------- Sun Sep 2 16:32:53 UTC 2012 - cs@linux-administrator.com -- Update to vrsion 2.13.9 +- Update to version 2.13.9 ------------------------------------------------------------------- Wed Aug 15 13:29:04 UTC 2012 - cs@linux-administrator.com
[-] [+]	Changed	cego.spec ^
@@ -1,5 +1,5 @@ Name: cego -Version: 2.13.9 +Version: 2.13.10 Release: 1 Group: Productivity/Databases Summary: Cego relational database
[-] [+]	Changed	cego-2.13.10.tar.bz2/README ^
@@ -4,7 +4,7 @@ ---- A relational and transactional database system - Version 2.13.9 + Version 2.13.10 (C)opyright 2006,2007,2008,2009,2010,2011,2012 by Bjoern Lemke
[-] [+]	Changed	cego-2.13.10.tar.bz2/samples/chkdb/chkadm ^
@@ -1,2 +1,2 @@ #!/bin/bash -../../src/cgadm --server=localhost --port=2000 --user=cgadm/cgadm $@ +../../src/cgadm --server=localhost --port=2000 --user=cgadm/lemke $@
[-] [+]	Changed	cego-2.13.10.tar.bz2/src/CegoAdm.cc ^
@@ -1989,222 +1989,222 @@ void CegoAdm::loadParser0() { _actionMap[340][SEMICOLON] = ActionEntry(REDUCE, 82); - _actionMap[335][SEMICOLON] = ActionEntry(REDUCE, 51); - _actionMap[336][SEMICOLON] = ActionEntry(REDUCE, 37); - _actionMap[337][SEMICOLON] = ActionEntry(REDUCE, 79); - _actionMap[338][NOLOGGING] = ActionEntry(SHIFT, 333); - _actionMap[338][SEMICOLON] = ActionEntry(REDUCE, 90); - _jumpMap[338][LogOpt] = 340; - _actionMap[339][SEMICOLON] = ActionEntry(REDUCE, 84); + _actionMap[335][SEMICOLON] = ActionEntry(REDUCE, 37); + _actionMap[336][SEMICOLON] = ActionEntry(REDUCE, 79); + _actionMap[337][NOLOGGING] = ActionEntry(SHIFT, 328); + _actionMap[337][SEMICOLON] = ActionEntry(REDUCE, 90); + _jumpMap[337][LogOpt] = 340; + _actionMap[338][SEMICOLON] = ActionEntry(REDUCE, 84); + _actionMap[339][SEMICOLON] = ActionEntry(REDUCE, 51); _actionMap[312][SEMICOLON] = ActionEntry(REDUCE, 62); _actionMap[313][IDENTIFIER] = ActionEntry(SHIFT, 335); - _actionMap[314][KSEP] = ActionEntry(REDUCE, 52); - _actionMap[314][TO] = ActionEntry(REDUCE, 52); - _actionMap[315][KSEP] = ActionEntry(REDUCE, 55); - _actionMap[315][TO] = ActionEntry(REDUCE, 55); - _actionMap[316][KSEP] = ActionEntry(REDUCE, 56); - _actionMap[316][TO] = ActionEntry(REDUCE, 56); - _actionMap[317][KSEP] = ActionEntry(REDUCE, 54); - _actionMap[317][TO] = ActionEntry(REDUCE, 54); - _actionMap[318][IDENTIFIER] = ActionEntry(SHIFT, 336); - _actionMap[319][SEMICOLON] = ActionEntry(REDUCE, 109); - _actionMap[319][PRIMARY] = ActionEntry(REDUCE, 109); - _actionMap[319][SECONDARY] = ActionEntry(REDUCE, 109); - _actionMap[319][SYSSIZE] = ActionEntry(REDUCE, 109); - _actionMap[319][TMPSIZE] = ActionEntry(REDUCE, 109); - _actionMap[319][LOGSIZE] = ActionEntry(REDUCE, 109); - _actionMap[319][LOGNUM] = ActionEntry(REDUCE, 109); - _actionMap[319][SORTAREASIZE] = ActionEntry(REDUCE, 109); - _actionMap[319][TSROOT] = ActionEntry(REDUCE, 109); - _actionMap[319][TSTICKET] = ActionEntry(REDUCE, 109); - _actionMap[320][SEMICOLON] = ActionEntry(REDUCE, 106); - _actionMap[320][PRIMARY] = ActionEntry(REDUCE, 106); - _actionMap[320][SECONDARY] = ActionEntry(REDUCE, 106); - _actionMap[320][SYSSIZE] = ActionEntry(REDUCE, 106); - _actionMap[320][TMPSIZE] = ActionEntry(REDUCE, 106); - _actionMap[320][LOGSIZE] = ActionEntry(REDUCE, 106); - _actionMap[320][LOGNUM] = ActionEntry(REDUCE, 106); - _actionMap[320][SORTAREASIZE] = ActionEntry(REDUCE, 106); - _actionMap[320][TSROOT] = ActionEntry(REDUCE, 106); - _actionMap[320][TSTICKET] = ActionEntry(REDUCE, 106); - _actionMap[321][SEMICOLON] = ActionEntry(REDUCE, 105); - _actionMap[321][PRIMARY] = ActionEntry(REDUCE, 105); - _actionMap[321][SECONDARY] = ActionEntry(REDUCE, 105); - _actionMap[321][SYSSIZE] = ActionEntry(REDUCE, 105); - _actionMap[321][TMPSIZE] = ActionEntry(REDUCE, 105); - _actionMap[321][LOGSIZE] = ActionEntry(REDUCE, 105); - _actionMap[321][LOGNUM] = ActionEntry(REDUCE, 105); - _actionMap[321][SORTAREASIZE] = ActionEntry(REDUCE, 105); - _actionMap[321][TSROOT] = ActionEntry(REDUCE, 105); - _actionMap[321][TSTICKET] = ActionEntry(REDUCE, 105); - _actionMap[322][SEMICOLON] = ActionEntry(REDUCE, 101); + _actionMap[314][SEMICOLON] = ActionEntry(REDUCE, 109); + _actionMap[314][PRIMARY] = ActionEntry(REDUCE, 109); + _actionMap[314][SECONDARY] = ActionEntry(REDUCE, 109); + _actionMap[314][SYSSIZE] = ActionEntry(REDUCE, 109); + _actionMap[314][TMPSIZE] = ActionEntry(REDUCE, 109); + _actionMap[314][LOGSIZE] = ActionEntry(REDUCE, 109); + _actionMap[314][LOGNUM] = ActionEntry(REDUCE, 109); + _actionMap[314][SORTAREASIZE] = ActionEntry(REDUCE, 109); + _actionMap[314][TSROOT] = ActionEntry(REDUCE, 109); + _actionMap[314][TSTICKET] = ActionEntry(REDUCE, 109); + _actionMap[315][SEMICOLON] = ActionEntry(REDUCE, 106); + _actionMap[315][PRIMARY] = ActionEntry(REDUCE, 106); + _actionMap[315][SECONDARY] = ActionEntry(REDUCE, 106); + _actionMap[315][SYSSIZE] = ActionEntry(REDUCE, 106); + _actionMap[315][TMPSIZE] = ActionEntry(REDUCE, 106); + _actionMap[315][LOGSIZE] = ActionEntry(REDUCE, 106); + _actionMap[315][LOGNUM] = ActionEntry(REDUCE, 106); + _actionMap[315][SORTAREASIZE] = ActionEntry(REDUCE, 106); + _actionMap[315][TSROOT] = ActionEntry(REDUCE, 106); + _actionMap[315][TSTICKET] = ActionEntry(REDUCE, 106); + _actionMap[316][SEMICOLON] = ActionEntry(REDUCE, 105); + _actionMap[316][PRIMARY] = ActionEntry(REDUCE, 105); + _actionMap[316][SECONDARY] = ActionEntry(REDUCE, 105); + _actionMap[316][SYSSIZE] = ActionEntry(REDUCE, 105); + _actionMap[316][TMPSIZE] = ActionEntry(REDUCE, 105); + _actionMap[316][LOGSIZE] = ActionEntry(REDUCE, 105); + _actionMap[316][LOGNUM] = ActionEntry(REDUCE, 105); + _actionMap[316][SORTAREASIZE] = ActionEntry(REDUCE, 105); + _actionMap[316][TSROOT] = ActionEntry(REDUCE, 105); + _actionMap[316][TSTICKET] = ActionEntry(REDUCE, 105); + _actionMap[317][SEMICOLON] = ActionEntry(REDUCE, 101); + _actionMap[317][PRIMARY] = ActionEntry(REDUCE, 101); + _actionMap[317][SECONDARY] = ActionEntry(REDUCE, 101); + _actionMap[317][SYSSIZE] = ActionEntry(REDUCE, 101); + _actionMap[317][TMPSIZE] = ActionEntry(REDUCE, 101); + _actionMap[317][LOGSIZE] = ActionEntry(REDUCE, 101); + _actionMap[317][LOGNUM] = ActionEntry(REDUCE, 101); + _actionMap[317][SORTAREASIZE] = ActionEntry(REDUCE, 101); + _actionMap[317][TSROOT] = ActionEntry(REDUCE, 101); + _actionMap[317][TSTICKET] = ActionEntry(REDUCE, 101); } void CegoAdm::loadParser1() { - _actionMap[322][PRIMARY] = ActionEntry(REDUCE, 101); - _actionMap[322][SECONDARY] = ActionEntry(REDUCE, 101); - _actionMap[322][SYSSIZE] = ActionEntry(REDUCE, 101); - _actionMap[322][TMPSIZE] = ActionEntry(REDUCE, 101); - _actionMap[322][LOGSIZE] = ActionEntry(REDUCE, 101); - _actionMap[322][LOGNUM] = ActionEntry(REDUCE, 101); - _actionMap[322][SORTAREASIZE] = ActionEntry(REDUCE, 101); - _actionMap[322][TSROOT] = ActionEntry(REDUCE, 101); - _actionMap[322][TSTICKET] = ActionEntry(REDUCE, 101); - _actionMap[323][SEMICOLON] = ActionEntry(REDUCE, 102); - _actionMap[323][PRIMARY] = ActionEntry(REDUCE, 102); - _actionMap[323][SECONDARY] = ActionEntry(REDUCE, 102); - _actionMap[323][SYSSIZE] = ActionEntry(REDUCE, 102); - _actionMap[323][TMPSIZE] = ActionEntry(REDUCE, 102); - _actionMap[323][LOGSIZE] = ActionEntry(REDUCE, 102); - _actionMap[323][LOGNUM] = ActionEntry(REDUCE, 102); - _actionMap[323][SORTAREASIZE] = ActionEntry(REDUCE, 102); - _actionMap[323][TSROOT] = ActionEntry(REDUCE, 102); - _actionMap[323][TSTICKET] = ActionEntry(REDUCE, 102); - _actionMap[324][SEMICOLON] = ActionEntry(REDUCE, 107); - _actionMap[324][PRIMARY] = ActionEntry(REDUCE, 107); - _actionMap[324][SECONDARY] = ActionEntry(REDUCE, 107); - _actionMap[324][SYSSIZE] = ActionEntry(REDUCE, 107); - _actionMap[324][TMPSIZE] = ActionEntry(REDUCE, 107); - _actionMap[324][LOGSIZE] = ActionEntry(REDUCE, 107); - _actionMap[324][LOGNUM] = ActionEntry(REDUCE, 107); - _actionMap[324][SORTAREASIZE] = ActionEntry(REDUCE, 107); - _actionMap[324][TSROOT] = ActionEntry(REDUCE, 107); - _actionMap[324][TSTICKET] = ActionEntry(REDUCE, 107); - _actionMap[325][SEMICOLON] = ActionEntry(REDUCE, 103); - _actionMap[325][PRIMARY] = ActionEntry(REDUCE, 103); - _actionMap[325][SECONDARY] = ActionEntry(REDUCE, 103); - _actionMap[325][SYSSIZE] = ActionEntry(REDUCE, 103); - _actionMap[325][TMPSIZE] = ActionEntry(REDUCE, 103); - _actionMap[325][LOGSIZE] = ActionEntry(REDUCE, 103); - _actionMap[325][LOGNUM] = ActionEntry(REDUCE, 103); - _actionMap[325][SORTAREASIZE] = ActionEntry(REDUCE, 103); - _actionMap[325][TSROOT] = ActionEntry(REDUCE, 103); - _actionMap[325][TSTICKET] = ActionEntry(REDUCE, 103); - _actionMap[326][SEMICOLON] = ActionEntry(REDUCE, 104); - _actionMap[326][PRIMARY] = ActionEntry(REDUCE, 104); - _actionMap[326][SECONDARY] = ActionEntry(REDUCE, 104); - _actionMap[326][SYSSIZE] = ActionEntry(REDUCE, 104); - _actionMap[326][TMPSIZE] = ActionEntry(REDUCE, 104); - _actionMap[326][LOGSIZE] = ActionEntry(REDUCE, 104); - _actionMap[326][LOGNUM] = ActionEntry(REDUCE, 104); - _actionMap[326][SORTAREASIZE] = ActionEntry(REDUCE, 104); - _actionMap[326][TSROOT] = ActionEntry(REDUCE, 104); - _actionMap[326][TSTICKET] = ActionEntry(REDUCE, 104); - _actionMap[327][SEMICOLON] = ActionEntry(REDUCE, 108); + _actionMap[318][SEMICOLON] = ActionEntry(REDUCE, 102); + _actionMap[318][PRIMARY] = ActionEntry(REDUCE, 102); + _actionMap[318][SECONDARY] = ActionEntry(REDUCE, 102); + _actionMap[318][SYSSIZE] = ActionEntry(REDUCE, 102); + _actionMap[318][TMPSIZE] = ActionEntry(REDUCE, 102); + _actionMap[318][LOGSIZE] = ActionEntry(REDUCE, 102); + _actionMap[318][LOGNUM] = ActionEntry(REDUCE, 102); + _actionMap[318][SORTAREASIZE] = ActionEntry(REDUCE, 102); + _actionMap[318][TSROOT] = ActionEntry(REDUCE, 102); + _actionMap[318][TSTICKET] = ActionEntry(REDUCE, 102); + _actionMap[319][SEMICOLON] = ActionEntry(REDUCE, 107); + _actionMap[319][PRIMARY] = ActionEntry(REDUCE, 107); + _actionMap[319][SECONDARY] = ActionEntry(REDUCE, 107); + _actionMap[319][SYSSIZE] = ActionEntry(REDUCE, 107); + _actionMap[319][TMPSIZE] = ActionEntry(REDUCE, 107); + _actionMap[319][LOGSIZE] = ActionEntry(REDUCE, 107); + _actionMap[319][LOGNUM] = ActionEntry(REDUCE, 107); + _actionMap[319][SORTAREASIZE] = ActionEntry(REDUCE, 107); + _actionMap[319][TSROOT] = ActionEntry(REDUCE, 107); + _actionMap[319][TSTICKET] = ActionEntry(REDUCE, 107); + _actionMap[320][SEMICOLON] = ActionEntry(REDUCE, 103); + _actionMap[320][PRIMARY] = ActionEntry(REDUCE, 103); + _actionMap[320][SECONDARY] = ActionEntry(REDUCE, 103); + _actionMap[320][SYSSIZE] = ActionEntry(REDUCE, 103); + _actionMap[320][TMPSIZE] = ActionEntry(REDUCE, 103); + _actionMap[320][LOGSIZE] = ActionEntry(REDUCE, 103); + _actionMap[320][LOGNUM] = ActionEntry(REDUCE, 103); + _actionMap[320][SORTAREASIZE] = ActionEntry(REDUCE, 103); + _actionMap[320][TSROOT] = ActionEntry(REDUCE, 103); + _actionMap[320][TSTICKET] = ActionEntry(REDUCE, 103); + _actionMap[321][SEMICOLON] = ActionEntry(REDUCE, 104); + _actionMap[321][PRIMARY] = ActionEntry(REDUCE, 104); + _actionMap[321][SECONDARY] = ActionEntry(REDUCE, 104); + _actionMap[321][SYSSIZE] = ActionEntry(REDUCE, 104); + _actionMap[321][TMPSIZE] = ActionEntry(REDUCE, 104); + _actionMap[321][LOGSIZE] = ActionEntry(REDUCE, 104); + _actionMap[321][LOGNUM] = ActionEntry(REDUCE, 104); + _actionMap[321][SORTAREASIZE] = ActionEntry(REDUCE, 104); + _actionMap[321][TSROOT] = ActionEntry(REDUCE, 104); + _actionMap[321][TSTICKET] = ActionEntry(REDUCE, 104); + _actionMap[322][SEMICOLON] = ActionEntry(REDUCE, 108); + _actionMap[322][PRIMARY] = ActionEntry(REDUCE, 108); + _actionMap[322][SECONDARY] = ActionEntry(REDUCE, 108); + _actionMap[322][SYSSIZE] = ActionEntry(REDUCE, 108); + _actionMap[322][TMPSIZE] = ActionEntry(REDUCE, 108); + _actionMap[322][LOGSIZE] = ActionEntry(REDUCE, 108); + _actionMap[322][LOGNUM] = ActionEntry(REDUCE, 108); + _actionMap[322][SORTAREASIZE] = ActionEntry(REDUCE, 108); + _actionMap[322][TSROOT] = ActionEntry(REDUCE, 108); + _actionMap[322][TSTICKET] = ActionEntry(REDUCE, 108); } void CegoAdm::loadParser2() { - _actionMap[327][PRIMARY] = ActionEntry(REDUCE, 108); - _actionMap[327][SECONDARY] = ActionEntry(REDUCE, 108); - _actionMap[327][SYSSIZE] = ActionEntry(REDUCE, 108); - _actionMap[327][TMPSIZE] = ActionEntry(REDUCE, 108); - _actionMap[327][LOGSIZE] = ActionEntry(REDUCE, 108); - _actionMap[327][LOGNUM] = ActionEntry(REDUCE, 108); - _actionMap[327][SORTAREASIZE] = ActionEntry(REDUCE, 108); - _actionMap[327][TSROOT] = ActionEntry(REDUCE, 108); - _actionMap[327][TSTICKET] = ActionEntry(REDUCE, 108); - _actionMap[328][STRINGVAL] = ActionEntry(SHIFT, 337); - _actionMap[329][SEMICOLON] = ActionEntry(REDUCE, 81); - _actionMap[330][STRINGVAL] = ActionEntry(SHIFT, 338); - _actionMap[331][NOLOGGING] = ActionEntry(SHIFT, 333); - _actionMap[331][SEMICOLON] = ActionEntry(REDUCE, 90); - _jumpMap[331][LogOpt] = 339; - _actionMap[332][SEMICOLON] = ActionEntry(REDUCE, 83); - _actionMap[333][SEMICOLON] = ActionEntry(REDUCE, 89); + _actionMap[323][STRINGVAL] = ActionEntry(SHIFT, 336); + _actionMap[324][SEMICOLON] = ActionEntry(REDUCE, 81); + _actionMap[325][STRINGVAL] = ActionEntry(SHIFT, 337); + _actionMap[326][NOLOGGING] = ActionEntry(SHIFT, 328); + _actionMap[326][SEMICOLON] = ActionEntry(REDUCE, 90); + _jumpMap[326][LogOpt] = 338; + _actionMap[327][SEMICOLON] = ActionEntry(REDUCE, 83); + _actionMap[328][SEMICOLON] = ActionEntry(REDUCE, 89); + _actionMap[329][IDENTIFIER] = ActionEntry(SHIFT, 339); + _actionMap[330][KSEP] = ActionEntry(REDUCE, 52); + _actionMap[330][TO] = ActionEntry(REDUCE, 52); + _actionMap[331][KSEP] = ActionEntry(REDUCE, 55); + _actionMap[331][TO] = ActionEntry(REDUCE, 55); + _actionMap[332][KSEP] = ActionEntry(REDUCE, 56); + _actionMap[332][TO] = ActionEntry(REDUCE, 56); + _actionMap[333][KSEP] = ActionEntry(REDUCE, 54); + _actionMap[333][TO] = ActionEntry(REDUCE, 54); _actionMap[334][SEMICOLON] = ActionEntry(REDUCE, 87); _actionMap[282][IDENTIFIER] = ActionEntry(SHIFT, 312); - _actionMap[283][ROLE] = ActionEntry(SHIFT, 313); - _actionMap[284][TABLESET] = ActionEntry(SHIFT, 237); - _actionMap[284][FILTER] = ActionEntry(SHIFT, 235); - _actionMap[284][RIGHT] = ActionEntry(SHIFT, 236); - _jumpMap[284][PermEntry] = 314; - _actionMap[285][STRINGVAL] = ActionEntry(SHIFT, 315); - _actionMap[286][IDENTIFIER] = ActionEntry(SHIFT, 316); - _actionMap[287][IDENTIFIER] = ActionEntry(SHIFT, 317); - _actionMap[288][SEMICOLON] = ActionEntry(REDUCE, 41); - _actionMap[289][TO] = ActionEntry(SHIFT, 318); - _actionMap[290][STRINGVAL] = ActionEntry(SHIFT, 319); + _actionMap[283][SEMICOLON] = ActionEntry(REDUCE, 41); + _actionMap[284][TO] = ActionEntry(SHIFT, 313); + _actionMap[285][STRINGVAL] = ActionEntry(SHIFT, 314); + _actionMap[286][INTVAL] = ActionEntry(SHIFT, 315); + _actionMap[287][INTVAL] = ActionEntry(SHIFT, 316); + _actionMap[288][STRINGVAL] = ActionEntry(SHIFT, 317); + _actionMap[289][STRINGVAL] = ActionEntry(SHIFT, 318); + _actionMap[290][INTVAL] = ActionEntry(SHIFT, 319); _actionMap[291][INTVAL] = ActionEntry(SHIFT, 320); _actionMap[292][INTVAL] = ActionEntry(SHIFT, 321); _actionMap[293][STRINGVAL] = ActionEntry(SHIFT, 322); - _actionMap[294][STRINGVAL] = ActionEntry(SHIFT, 323); - _actionMap[295][INTVAL] = ActionEntry(SHIFT, 324); - _actionMap[296][INTVAL] = ActionEntry(SHIFT, 325); - _actionMap[297][INTVAL] = ActionEntry(SHIFT, 326); - _actionMap[298][STRINGVAL] = ActionEntry(SHIFT, 327); - _actionMap[299][SEMICOLON] = ActionEntry(REDUCE, 85); - _actionMap[300][TO] = ActionEntry(SHIFT, 328); - _actionMap[301][STRINGVAL] = ActionEntry(SHIFT, 329); - _actionMap[302][SEMICOLON] = ActionEntry(REDUCE, 80); - _actionMap[303][FROM] = ActionEntry(SHIFT, 330); - _actionMap[304][STRINGVAL] = ActionEntry(SHIFT, 331); - _actionMap[305][NOLOGGING] = ActionEntry(SHIFT, 333); - _actionMap[305][SEMICOLON] = ActionEntry(REDUCE, 90); - _jumpMap[305][LogOpt] = 332; - _actionMap[306][SEMICOLON] = ActionEntry(REDUCE, 44); - _actionMap[307][SEMICOLON] = ActionEntry(REDUCE, 34); - _actionMap[308][SEMICOLON] = ActionEntry(REDUCE, 33); + _actionMap[294][SEMICOLON] = ActionEntry(REDUCE, 85); + _actionMap[295][TO] = ActionEntry(SHIFT, 323); + _actionMap[296][STRINGVAL] = ActionEntry(SHIFT, 324); + _actionMap[297][SEMICOLON] = ActionEntry(REDUCE, 80); + _actionMap[298][FROM] = ActionEntry(SHIFT, 325); + _actionMap[299][STRINGVAL] = ActionEntry(SHIFT, 326); + _actionMap[300][NOLOGGING] = ActionEntry(SHIFT, 328); + _actionMap[300][SEMICOLON] = ActionEntry(REDUCE, 90); + _jumpMap[300][LogOpt] = 327; + _actionMap[301][SEMICOLON] = ActionEntry(REDUCE, 44); + _actionMap[302][SEMICOLON] = ActionEntry(REDUCE, 34); + _actionMap[303][SEMICOLON] = ActionEntry(REDUCE, 33); + _actionMap[304][SEMICOLON] = ActionEntry(REDUCE, 57); + _actionMap[305][ROLE] = ActionEntry(SHIFT, 329); + _actionMap[306][TABLESET] = ActionEntry(SHIFT, 272); + _actionMap[306][FILTER] = ActionEntry(SHIFT, 270); + _actionMap[306][RIGHT] = ActionEntry(SHIFT, 271); + _jumpMap[306][PermEntry] = 330; + _actionMap[307][STRINGVAL] = ActionEntry(SHIFT, 331); + _actionMap[308][IDENTIFIER] = ActionEntry(SHIFT, 332); } void CegoAdm::loadParser3() { - _actionMap[309][SEMICOLON] = ActionEntry(REDUCE, 57); + _actionMap[309][IDENTIFIER] = ActionEntry(SHIFT, 333); _actionMap[310][SEMICOLON] = ActionEntry(REDUCE, 67); _actionMap[311][INTVAL] = ActionEntry(SHIFT, 334); _actionMap[232][TO] = ActionEntry(SHIFT, 282); - _actionMap[233][TO] = ActionEntry(SHIFT, 283); - _actionMap[233][KSEP] = ActionEntry(SHIFT, 284); - _actionMap[234][KSEP] = ActionEntry(REDUCE, 53); - _actionMap[234][TO] = ActionEntry(REDUCE, 53); - _actionMap[235][EQU] = ActionEntry(SHIFT, 285); - _actionMap[236][EQU] = ActionEntry(SHIFT, 286); - _actionMap[237][EQU] = ActionEntry(SHIFT, 287); - _actionMap[238][STRINGVAL] = ActionEntry(SHIFT, 288); - _actionMap[239][INTVAL] = ActionEntry(SHIFT, 289); - _actionMap[240][SEMICOLON] = ActionEntry(REDUCE, 45); - _actionMap[241][SEMICOLON] = ActionEntry(REDUCE, 99); - _actionMap[241][PRIMARY] = ActionEntry(REDUCE, 99); - _actionMap[241][SECONDARY] = ActionEntry(REDUCE, 99); - _actionMap[241][SYSSIZE] = ActionEntry(REDUCE, 99); - _actionMap[241][TMPSIZE] = ActionEntry(REDUCE, 99); - _actionMap[241][LOGSIZE] = ActionEntry(REDUCE, 99); - _actionMap[241][LOGNUM] = ActionEntry(REDUCE, 99); - _actionMap[241][SORTAREASIZE] = ActionEntry(REDUCE, 99); - _actionMap[241][TSROOT] = ActionEntry(REDUCE, 99); - _actionMap[241][TSTICKET] = ActionEntry(REDUCE, 99); + _actionMap[233][STRINGVAL] = ActionEntry(SHIFT, 283); + _actionMap[234][INTVAL] = ActionEntry(SHIFT, 284); + _actionMap[235][SEMICOLON] = ActionEntry(REDUCE, 45); + _actionMap[236][SEMICOLON] = ActionEntry(REDUCE, 99); + _actionMap[236][PRIMARY] = ActionEntry(REDUCE, 99); + _actionMap[236][SECONDARY] = ActionEntry(REDUCE, 99); + _actionMap[236][SYSSIZE] = ActionEntry(REDUCE, 99); + _actionMap[236][TMPSIZE] = ActionEntry(REDUCE, 99); + _actionMap[236][LOGSIZE] = ActionEntry(REDUCE, 99); + _actionMap[236][LOGNUM] = ActionEntry(REDUCE, 99); + _actionMap[236][SORTAREASIZE] = ActionEntry(REDUCE, 99); + _actionMap[236][TSROOT] = ActionEntry(REDUCE, 99); + _actionMap[236][TSTICKET] = ActionEntry(REDUCE, 99); + _actionMap[237][EQU] = ActionEntry(SHIFT, 285); + _actionMap[238][EQU] = ActionEntry(SHIFT, 286); + _actionMap[239][EQU] = ActionEntry(SHIFT, 287); + _actionMap[240][EQU] = ActionEntry(SHIFT, 288); + _actionMap[241][EQU] = ActionEntry(SHIFT, 289); _actionMap[242][EQU] = ActionEntry(SHIFT, 290); _actionMap[243][EQU] = ActionEntry(SHIFT, 291); _actionMap[244][EQU] = ActionEntry(SHIFT, 292); _actionMap[245][EQU] = ActionEntry(SHIFT, 293); - _actionMap[246][EQU] = ActionEntry(SHIFT, 294); - _actionMap[247][EQU] = ActionEntry(SHIFT, 295); - _actionMap[248][EQU] = ActionEntry(SHIFT, 296); - _actionMap[249][EQU] = ActionEntry(SHIFT, 297); - _actionMap[250][EQU] = ActionEntry(SHIFT, 298); - _actionMap[251][SEMICOLON] = ActionEntry(REDUCE, 117); - _actionMap[252][SEMICOLON] = ActionEntry(REDUCE, 116); - _actionMap[253][SEMICOLON] = ActionEntry(REDUCE, 65); - _actionMap[254][TSTICKET] = ActionEntry(SHIFT, 299); - _actionMap[255][IDENTIFIER] = ActionEntry(SHIFT, 300); - _actionMap[256][TO] = ActionEntry(SHIFT, 301); + _actionMap[246][SEMICOLON] = ActionEntry(REDUCE, 117); + _actionMap[247][SEMICOLON] = ActionEntry(REDUCE, 116); + _actionMap[248][SEMICOLON] = ActionEntry(REDUCE, 65); + _actionMap[249][TSTICKET] = ActionEntry(SHIFT, 294); + _actionMap[250][IDENTIFIER] = ActionEntry(SHIFT, 295); + _actionMap[251][TO] = ActionEntry(SHIFT, 296); + _actionMap[252][STRINGVAL] = ActionEntry(SHIFT, 297); + _actionMap[253][IDENTIFIER] = ActionEntry(SHIFT, 298); + _actionMap[254][FROM] = ActionEntry(SHIFT, 299); + _actionMap[255][STRINGVAL] = ActionEntry(SHIFT, 300); + _actionMap[256][STRINGVAL] = ActionEntry(SHIFT, 301); _actionMap[257][STRINGVAL] = ActionEntry(SHIFT, 302); - _actionMap[258][IDENTIFIER] = ActionEntry(SHIFT, 303); - _actionMap[259][FROM] = ActionEntry(SHIFT, 304); - _actionMap[260][STRINGVAL] = ActionEntry(SHIFT, 305); - _actionMap[261][STRINGVAL] = ActionEntry(SHIFT, 306); - _actionMap[262][STRINGVAL] = ActionEntry(SHIFT, 307); - _actionMap[263][STRINGVAL] = ActionEntry(SHIFT, 308); - _actionMap[264][SEMICOLON] = ActionEntry(REDUCE, 63); - _actionMap[265][IDENTIFIER] = ActionEntry(SHIFT, 309); - _actionMap[266][SEMICOLON] = ActionEntry(REDUCE, 46); - _actionMap[267][SEMICOLON] = ActionEntry(REDUCE, 110); + _actionMap[258][STRINGVAL] = ActionEntry(SHIFT, 303); + _actionMap[259][SEMICOLON] = ActionEntry(REDUCE, 63); + _actionMap[260][IDENTIFIER] = ActionEntry(SHIFT, 304); + _actionMap[261][SEMICOLON] = ActionEntry(REDUCE, 46); + _actionMap[262][SEMICOLON] = ActionEntry(REDUCE, 110); + _actionMap[263][SEMICOLON] = ActionEntry(REDUCE, 75); + _actionMap[264][SEMICOLON] = ActionEntry(REDUCE, 71); + _actionMap[265][SEMICOLON] = ActionEntry(REDUCE, 70); + _actionMap[266][SEMICOLON] = ActionEntry(REDUCE, 76); + _actionMap[267][SEMICOLON] = ActionEntry(REDUCE, 77); + _actionMap[268][TO] = ActionEntry(SHIFT, 305); + _actionMap[268][KSEP] = ActionEntry(SHIFT, 306); } void CegoAdm::loadParser4() { - _actionMap[268][SEMICOLON] = ActionEntry(REDUCE, 75); - _actionMap[269][SEMICOLON] = ActionEntry(REDUCE, 71); - _actionMap[270][SEMICOLON] = ActionEntry(REDUCE, 70); - _actionMap[271][SEMICOLON] = ActionEntry(REDUCE, 76); - _actionMap[272][SEMICOLON] = ActionEntry(REDUCE, 77); + _actionMap[269][KSEP] = ActionEntry(REDUCE, 53); + _actionMap[269][TO] = ActionEntry(REDUCE, 53); + _actionMap[270][EQU] = ActionEntry(SHIFT, 307); + _actionMap[271][EQU] = ActionEntry(SHIFT, 308); + _actionMap[272][EQU] = ActionEntry(SHIFT, 309); _actionMap[273][SEMICOLON] = ActionEntry(REDUCE, 78); _actionMap[274][SEMICOLON] = ActionEntry(REDUCE, 72); _actionMap[275][SEMICOLON] = ActionEntry(REDUCE, 73); @@ -2224,62 +2224,62 @@ _jumpMap[281][TimeoutOpt] = 310; _actionMap[182][SEMICOLON] = ActionEntry(REDUCE, 23); _actionMap[183][STRINGVAL] = ActionEntry(SHIFT, 232); - _actionMap[184][TABLESET] = ActionEntry(SHIFT, 237); - _actionMap[184][FILTER] = ActionEntry(SHIFT, 235); - _actionMap[184][RIGHT] = ActionEntry(SHIFT, 236); - _jumpMap[184][PermEntry] = 234; - _jumpMap[184][PermList] = 233; - _actionMap[185][BY] = ActionEntry(SHIFT, 238); - _actionMap[186][SIZE] = ActionEntry(SHIFT, 239); - _actionMap[187][IDENTIFIER] = ActionEntry(SHIFT, 240); - _actionMap[188][SEMICOLON] = ActionEntry(REDUCE, 64); - _actionMap[189][SEMICOLON] = ActionEntry(REDUCE, 25); - _actionMap[189][PRIMARY] = ActionEntry(SHIFT, 245); - _actionMap[189][SECONDARY] = ActionEntry(SHIFT, 246); - _actionMap[189][SYSSIZE] = ActionEntry(SHIFT, 248); - _actionMap[189][TMPSIZE] = ActionEntry(SHIFT, 249); - _actionMap[189][LOGSIZE] = ActionEntry(SHIFT, 244); - _actionMap[189][LOGNUM] = ActionEntry(SHIFT, 243); - _actionMap[189][SORTAREASIZE] = ActionEntry(SHIFT, 247); - _actionMap[189][TSROOT] = ActionEntry(SHIFT, 250); - _actionMap[189][TSTICKET] = ActionEntry(SHIFT, 242); - _jumpMap[189][Attr] = 241; - _actionMap[190][SEMICOLON] = ActionEntry(REDUCE, 61); - _actionMap[191][IDENTIFIER] = ActionEntry(SHIFT, 251); - _actionMap[192][IDENTIFIER] = ActionEntry(SHIFT, 252); - _actionMap[193][SEMICOLON] = ActionEntry(REDUCE, 60); - _actionMap[194][KEEP] = ActionEntry(SHIFT, 254); - _actionMap[194][SEMICOLON] = ActionEntry(REDUCE, 86); + _actionMap[184][BY] = ActionEntry(SHIFT, 233); + _actionMap[185][SIZE] = ActionEntry(SHIFT, 234); + _actionMap[186][IDENTIFIER] = ActionEntry(SHIFT, 235); + _actionMap[187][SEMICOLON] = ActionEntry(REDUCE, 64); + _actionMap[188][SEMICOLON] = ActionEntry(REDUCE, 25); + _actionMap[188][PRIMARY] = ActionEntry(SHIFT, 240); + _actionMap[188][SECONDARY] = ActionEntry(SHIFT, 241); + _actionMap[188][SYSSIZE] = ActionEntry(SHIFT, 243); + _actionMap[188][TMPSIZE] = ActionEntry(SHIFT, 244); + _actionMap[188][LOGSIZE] = ActionEntry(SHIFT, 239); + _actionMap[188][LOGNUM] = ActionEntry(SHIFT, 238); + _actionMap[188][SORTAREASIZE] = ActionEntry(SHIFT, 242); + _actionMap[188][TSROOT] = ActionEntry(SHIFT, 245); + _actionMap[188][TSTICKET] = ActionEntry(SHIFT, 237); + _jumpMap[188][Attr] = 236; + _actionMap[189][SEMICOLON] = ActionEntry(REDUCE, 61); + _actionMap[190][IDENTIFIER] = ActionEntry(SHIFT, 246); + _actionMap[191][IDENTIFIER] = ActionEntry(SHIFT, 247); + _actionMap[192][SEMICOLON] = ActionEntry(REDUCE, 60); + _actionMap[193][KEEP] = ActionEntry(SHIFT, 249); + _actionMap[193][SEMICOLON] = ActionEntry(REDUCE, 86); + _jumpMap[193][KeepTicketOpt] = 248; + _actionMap[194][FROM] = ActionEntry(SHIFT, 250); + _actionMap[195][IDENTIFIER] = ActionEntry(SHIFT, 251); + _actionMap[196][TO] = ActionEntry(SHIFT, 252); + _actionMap[197][TO] = ActionEntry(SHIFT, 253); } void CegoAdm::loadParser5() { - _jumpMap[194][KeepTicketOpt] = 253; - _actionMap[195][FROM] = ActionEntry(SHIFT, 255); - _actionMap[196][IDENTIFIER] = ActionEntry(SHIFT, 256); - _actionMap[197][TO] = ActionEntry(SHIFT, 257); - _actionMap[198][TO] = ActionEntry(SHIFT, 258); - _actionMap[199][IDENTIFIER] = ActionEntry(SHIFT, 259); - _actionMap[200][FROM] = ActionEntry(SHIFT, 260); - _actionMap[201][SEMICOLON] = ActionEntry(REDUCE, 9); - _actionMap[202][SEMICOLON] = ActionEntry(REDUCE, 14); - _actionMap[203][SEMICOLON] = ActionEntry(REDUCE, 8); - _actionMap[204][SEMICOLON] = ActionEntry(REDUCE, 10); - _actionMap[205][SEMICOLON] = ActionEntry(REDUCE, 11); - _actionMap[206][SEMICOLON] = ActionEntry(REDUCE, 22); - _actionMap[207][BY] = ActionEntry(SHIFT, 261); - _actionMap[208][TO] = ActionEntry(SHIFT, 262); - _actionMap[209][TO] = ActionEntry(SHIFT, 263); - _actionMap[210][IDENTIFIER] = ActionEntry(SHIFT, 264); - _actionMap[211][ROLE] = ActionEntry(SHIFT, 265); - _actionMap[212][IDENTIFIER] = ActionEntry(SHIFT, 266); - _actionMap[213][SEMICOLON] = ActionEntry(REDUCE, 68); - _actionMap[214][STRINGVAL] = ActionEntry(SHIFT, 267); - _actionMap[215][SEMICOLON] = ActionEntry(REDUCE, 24); - _actionMap[216][IDENTIFIER] = ActionEntry(SHIFT, 268); - _actionMap[217][IDENTIFIER] = ActionEntry(SHIFT, 269); - _actionMap[218][IDENTIFIER] = ActionEntry(SHIFT, 270); - _actionMap[219][IDENTIFIER] = ActionEntry(SHIFT, 271); - _actionMap[220][IDENTIFIER] = ActionEntry(SHIFT, 272); + _actionMap[198][IDENTIFIER] = ActionEntry(SHIFT, 254); + _actionMap[199][FROM] = ActionEntry(SHIFT, 255); + _actionMap[200][SEMICOLON] = ActionEntry(REDUCE, 9); + _actionMap[201][SEMICOLON] = ActionEntry(REDUCE, 14); + _actionMap[202][SEMICOLON] = ActionEntry(REDUCE, 8); + _actionMap[203][SEMICOLON] = ActionEntry(REDUCE, 10); + _actionMap[204][SEMICOLON] = ActionEntry(REDUCE, 11); + _actionMap[205][SEMICOLON] = ActionEntry(REDUCE, 22); + _actionMap[206][BY] = ActionEntry(SHIFT, 256); + _actionMap[207][TO] = ActionEntry(SHIFT, 257); + _actionMap[208][TO] = ActionEntry(SHIFT, 258); + _actionMap[209][IDENTIFIER] = ActionEntry(SHIFT, 259); + _actionMap[210][ROLE] = ActionEntry(SHIFT, 260); + _actionMap[211][IDENTIFIER] = ActionEntry(SHIFT, 261); + _actionMap[212][SEMICOLON] = ActionEntry(REDUCE, 68); + _actionMap[213][STRINGVAL] = ActionEntry(SHIFT, 262); + _actionMap[214][SEMICOLON] = ActionEntry(REDUCE, 24); + _actionMap[215][IDENTIFIER] = ActionEntry(SHIFT, 263); + _actionMap[216][IDENTIFIER] = ActionEntry(SHIFT, 264); + _actionMap[217][IDENTIFIER] = ActionEntry(SHIFT, 265); + _actionMap[218][IDENTIFIER] = ActionEntry(SHIFT, 266); + _actionMap[219][IDENTIFIER] = ActionEntry(SHIFT, 267); + _actionMap[220][TABLESET] = ActionEntry(SHIFT, 272); + _actionMap[220][FILTER] = ActionEntry(SHIFT, 270); + _actionMap[220][RIGHT] = ActionEntry(SHIFT, 271); + _jumpMap[220][PermEntry] = 269; + _jumpMap[220][PermList] = 268; _actionMap[221][IDENTIFIER] = ActionEntry(SHIFT, 273); _actionMap[222][IDENTIFIER] = ActionEntry(SHIFT, 274); _actionMap[223][IDENTIFIER] = ActionEntry(SHIFT, 275); @@ -2296,72 +2296,72 @@ _actionMap[231][SEMICOLON] = ActionEntry(REDUCE, 58); _actionMap[117][INTVAL] = ActionEntry(SHIFT, 182); _actionMap[118][PATH] = ActionEntry(SHIFT, 183); - _actionMap[119][WITH] = ActionEntry(SHIFT, 184); - _actionMap[120][IDENTIFIED] = ActionEntry(SHIFT, 185); - _actionMap[121][STRINGVAL] = ActionEntry(SHIFT, 186); - _actionMap[122][TO] = ActionEntry(SHIFT, 187); - _actionMap[123][IDENTIFIER] = ActionEntry(SHIFT, 188); - _actionMap[124][SEMICOLON] = ActionEntry(REDUCE, 38); - _actionMap[125][SEMICOLON] = ActionEntry(REDUCE, 115); + _actionMap[119][IDENTIFIED] = ActionEntry(SHIFT, 184); + _actionMap[120][STRINGVAL] = ActionEntry(SHIFT, 185); + _actionMap[121][TO] = ActionEntry(SHIFT, 186); + _actionMap[122][IDENTIFIER] = ActionEntry(SHIFT, 187); + _actionMap[123][SEMICOLON] = ActionEntry(REDUCE, 38); + _actionMap[124][SEMICOLON] = ActionEntry(REDUCE, 115); + _actionMap[125][SEMICOLON] = ActionEntry(REDUCE, 29); } void CegoAdm::loadParser6() { - _actionMap[126][SEMICOLON] = ActionEntry(REDUCE, 29); - _actionMap[127][SEMICOLON] = ActionEntry(REDUCE, 40); - _actionMap[128][SEMICOLON] = ActionEntry(REDUCE, 49); - _actionMap[129][SEMICOLON] = ActionEntry(REDUCE, 26); - _actionMap[130][PRIMARY] = ActionEntry(REDUCE, 100); - _actionMap[130][SECONDARY] = ActionEntry(REDUCE, 100); - _actionMap[130][SYSSIZE] = ActionEntry(REDUCE, 100); - _actionMap[130][TMPSIZE] = ActionEntry(REDUCE, 100); - _actionMap[130][LOGSIZE] = ActionEntry(REDUCE, 100); - _actionMap[130][LOGNUM] = ActionEntry(REDUCE, 100); - _actionMap[130][SORTAREASIZE] = ActionEntry(REDUCE, 100); - _actionMap[130][TSROOT] = ActionEntry(REDUCE, 100); - _actionMap[130][TSTICKET] = ActionEntry(REDUCE, 100); - _actionMap[130][SEMICOLON] = ActionEntry(REDUCE, 100); - _jumpMap[130][AttrList] = 189; - _actionMap[131][IDENTIFIER] = ActionEntry(SHIFT, 190); - _actionMap[132][SEMICOLON] = ActionEntry(REDUCE, 50); - _actionMap[133][SEMICOLON] = ActionEntry(REDUCE, 35); + _actionMap[126][SEMICOLON] = ActionEntry(REDUCE, 40); + _actionMap[127][SEMICOLON] = ActionEntry(REDUCE, 49); + _actionMap[128][SEMICOLON] = ActionEntry(REDUCE, 26); + _actionMap[129][PRIMARY] = ActionEntry(REDUCE, 100); + _actionMap[129][SECONDARY] = ActionEntry(REDUCE, 100); + _actionMap[129][SYSSIZE] = ActionEntry(REDUCE, 100); + _actionMap[129][TMPSIZE] = ActionEntry(REDUCE, 100); + _actionMap[129][LOGSIZE] = ActionEntry(REDUCE, 100); + _actionMap[129][LOGNUM] = ActionEntry(REDUCE, 100); + _actionMap[129][SORTAREASIZE] = ActionEntry(REDUCE, 100); + _actionMap[129][TSROOT] = ActionEntry(REDUCE, 100); + _actionMap[129][TSTICKET] = ActionEntry(REDUCE, 100); + _actionMap[129][SEMICOLON] = ActionEntry(REDUCE, 100); + _jumpMap[129][AttrList] = 188; + _actionMap[130][IDENTIFIER] = ActionEntry(SHIFT, 189); + _actionMap[131][SEMICOLON] = ActionEntry(REDUCE, 50); + _actionMap[132][SEMICOLON] = ActionEntry(REDUCE, 35); + _actionMap[133][FOR] = ActionEntry(SHIFT, 190); _actionMap[134][FOR] = ActionEntry(SHIFT, 191); - _actionMap[135][FOR] = ActionEntry(SHIFT, 192); + _actionMap[135][IDENTIFIER] = ActionEntry(SHIFT, 192); _actionMap[136][IDENTIFIER] = ActionEntry(SHIFT, 193); _actionMap[137][IDENTIFIER] = ActionEntry(SHIFT, 194); - _actionMap[138][IDENTIFIER] = ActionEntry(SHIFT, 195); + _actionMap[138][IDENTIFIER] = ActionEntry(SHIFT, 196); + _actionMap[138][STRUCTURE] = ActionEntry(SHIFT, 195); _actionMap[139][IDENTIFIER] = ActionEntry(SHIFT, 197); - _actionMap[139][STRUCTURE] = ActionEntry(SHIFT, 196); - _actionMap[140][IDENTIFIER] = ActionEntry(SHIFT, 198); + _actionMap[140][IDENTIFIER] = ActionEntry(SHIFT, 199); + _actionMap[140][STRUCTURE] = ActionEntry(SHIFT, 198); _actionMap[141][IDENTIFIER] = ActionEntry(SHIFT, 200); - _actionMap[141][STRUCTURE] = ActionEntry(SHIFT, 199); _actionMap[142][IDENTIFIER] = ActionEntry(SHIFT, 201); _actionMap[143][IDENTIFIER] = ActionEntry(SHIFT, 202); _actionMap[144][IDENTIFIER] = ActionEntry(SHIFT, 203); _actionMap[145][IDENTIFIER] = ActionEntry(SHIFT, 204); _actionMap[146][IDENTIFIER] = ActionEntry(SHIFT, 205); - _actionMap[147][IDENTIFIER] = ActionEntry(SHIFT, 206); - _actionMap[148][SEMICOLON] = ActionEntry(REDUCE, 6); - _actionMap[149][IDENTIFIED] = ActionEntry(SHIFT, 207); + _actionMap[147][SEMICOLON] = ActionEntry(REDUCE, 6); + _actionMap[148][IDENTIFIED] = ActionEntry(SHIFT, 206); + _actionMap[149][IDENTIFIER] = ActionEntry(SHIFT, 207); _actionMap[150][IDENTIFIER] = ActionEntry(SHIFT, 208); - _actionMap[151][IDENTIFIER] = ActionEntry(SHIFT, 209); + _actionMap[151][FROM] = ActionEntry(SHIFT, 209); _actionMap[152][FROM] = ActionEntry(SHIFT, 210); _actionMap[153][FROM] = ActionEntry(SHIFT, 211); - _actionMap[154][FROM] = ActionEntry(SHIFT, 212); - _actionMap[155][SEMICOLON] = ActionEntry(REDUCE, 36); - _actionMap[156][SEMICOLON] = ActionEntry(REDUCE, 43); - _actionMap[157][TO] = ActionEntry(SHIFT, 214); - _actionMap[157][SEMICOLON] = ActionEntry(REDUCE, 111); - _jumpMap[157][PitOption] = 213; - _actionMap[158][STRINGVAL] = ActionEntry(SHIFT, 215); + _actionMap[154][SEMICOLON] = ActionEntry(REDUCE, 36); + _actionMap[155][SEMICOLON] = ActionEntry(REDUCE, 43); + _actionMap[156][TO] = ActionEntry(SHIFT, 213); + _actionMap[156][SEMICOLON] = ActionEntry(REDUCE, 111); + _jumpMap[156][PitOption] = 212; + _actionMap[157][STRINGVAL] = ActionEntry(SHIFT, 214); + _actionMap[158][FOR] = ActionEntry(SHIFT, 215); _actionMap[159][FOR] = ActionEntry(SHIFT, 216); _actionMap[160][FOR] = ActionEntry(SHIFT, 217); - _actionMap[161][FOR] = ActionEntry(SHIFT, 218); + _actionMap[161][SEMICOLON] = ActionEntry(REDUCE, 69); } void CegoAdm::loadParser7() { - _actionMap[162][SEMICOLON] = ActionEntry(REDUCE, 69); + _actionMap[162][FOR] = ActionEntry(SHIFT, 218); _actionMap[163][FOR] = ActionEntry(SHIFT, 219); - _actionMap[164][FOR] = ActionEntry(SHIFT, 220); + _actionMap[164][WITH] = ActionEntry(SHIFT, 220); _actionMap[165][FOR] = ActionEntry(SHIFT, 221); _actionMap[166][FOR] = ActionEntry(SHIFT, 222); _actionMap[167][FOR] = ActionEntry(SHIFT, 223); @@ -2387,69 +2387,69 @@ _actionMap[39][THREAD] = ActionEntry(SHIFT, 117); _actionMap[40][IDENTIFIER] = ActionEntry(SHIFT, 118); _actionMap[41][IDENTIFIER] = ActionEntry(SHIFT, 119); - _actionMap[42][IDENTIFIER] = ActionEntry(SHIFT, 120); - _actionMap[43][DATAFILE] = ActionEntry(SHIFT, 121); - _actionMap[44][IDENTIFIER] = ActionEntry(SHIFT, 122); - _actionMap[45][FOR] = ActionEntry(SHIFT, 123); - _actionMap[46][IDENTIFIER] = ActionEntry(SHIFT, 124); - _actionMap[47][STRINGVAL] = ActionEntry(SHIFT, 125); + _actionMap[42][DATAFILE] = ActionEntry(SHIFT, 120); + _actionMap[43][IDENTIFIER] = ActionEntry(SHIFT, 121); + _actionMap[44][FOR] = ActionEntry(SHIFT, 122); + _actionMap[45][IDENTIFIER] = ActionEntry(SHIFT, 123); + _actionMap[46][STRINGVAL] = ActionEntry(SHIFT, 124); + _actionMap[47][IDENTIFIER] = ActionEntry(SHIFT, 125); _actionMap[48][IDENTIFIER] = ActionEntry(SHIFT, 126); _actionMap[49][IDENTIFIER] = ActionEntry(SHIFT, 127); _actionMap[50][IDENTIFIER] = ActionEntry(SHIFT, 128); _actionMap[51][IDENTIFIER] = ActionEntry(SHIFT, 129); - _actionMap[52][IDENTIFIER] = ActionEntry(SHIFT, 130); - _actionMap[53][FOR] = ActionEntry(SHIFT, 131); + _actionMap[52][FOR] = ActionEntry(SHIFT, 130); + _actionMap[53][IDENTIFIER] = ActionEntry(SHIFT, 131); _actionMap[54][IDENTIFIER] = ActionEntry(SHIFT, 132); _actionMap[55][IDENTIFIER] = ActionEntry(SHIFT, 133); _actionMap[56][IDENTIFIER] = ActionEntry(SHIFT, 134); - _actionMap[57][IDENTIFIER] = ActionEntry(SHIFT, 135); + _actionMap[57][FOR] = ActionEntry(SHIFT, 135); _actionMap[58][FOR] = ActionEntry(SHIFT, 136); - _actionMap[59][FOR] = ActionEntry(SHIFT, 137); - _actionMap[60][TABLESET] = ActionEntry(SHIFT, 139); - _actionMap[60][TABLE] = ActionEntry(SHIFT, 138); - _actionMap[61][TABLESET] = ActionEntry(REDUCE, 96); - _actionMap[61][TABLE] = ActionEntry(REDUCE, 96); + _actionMap[59][TABLESET] = ActionEntry(SHIFT, 138); + _actionMap[59][TABLE] = ActionEntry(SHIFT, 137); + _actionMap[60][TABLESET] = ActionEntry(REDUCE, 96); + _actionMap[60][TABLE] = ActionEntry(REDUCE, 96); + _actionMap[61][TABLESET] = ActionEntry(REDUCE, 97); } void CegoAdm::loadParser8() { - _actionMap[62][TABLESET] = ActionEntry(REDUCE, 97); - _actionMap[62][TABLE] = ActionEntry(REDUCE, 97); - _actionMap[63][TABLESET] = ActionEntry(REDUCE, 95); - _actionMap[63][TABLE] = ActionEntry(REDUCE, 95); - _actionMap[64][TABLESET] = ActionEntry(SHIFT, 141); - _actionMap[64][TABLE] = ActionEntry(SHIFT, 140); + _actionMap[61][TABLE] = ActionEntry(REDUCE, 97); + _actionMap[62][TABLESET] = ActionEntry(REDUCE, 95); + _actionMap[62][TABLE] = ActionEntry(REDUCE, 95); + _actionMap[63][TABLESET] = ActionEntry(SHIFT, 140); + _actionMap[63][TABLE] = ActionEntry(SHIFT, 139); + _actionMap[64][FOR] = ActionEntry(SHIFT, 141); _actionMap[65][FOR] = ActionEntry(SHIFT, 142); - _actionMap[66][FOR] = ActionEntry(SHIFT, 143); - _actionMap[67][SEMICOLON] = ActionEntry(REDUCE, 21); + _actionMap[66][SEMICOLON] = ActionEntry(REDUCE, 21); + _actionMap[67][FOR] = ActionEntry(SHIFT, 143); _actionMap[68][FOR] = ActionEntry(SHIFT, 144); - _actionMap[69][FOR] = ActionEntry(SHIFT, 145); - _actionMap[70][SEMICOLON] = ActionEntry(REDUCE, 12); - _actionMap[71][FOR] = ActionEntry(SHIFT, 146); - _actionMap[72][SEMICOLON] = ActionEntry(REDUCE, 3); - _actionMap[73][SEMICOLON] = ActionEntry(REDUCE, 47); - _actionMap[74][SEMICOLON] = ActionEntry(REDUCE, 13); - _actionMap[75][SEMICOLON] = ActionEntry(REDUCE, 7); - _actionMap[76][FOR] = ActionEntry(SHIFT, 147); - _actionMap[77][SEMICOLON] = ActionEntry(REDUCE, 42); - _actionMap[78][LOCK] = ActionEntry(SHIFT, 148); - _actionMap[79][IDENTIFIER] = ActionEntry(SHIFT, 149); - _actionMap[80][SEMICOLON] = ActionEntry(REDUCE, 5); - _actionMap[81][SEMICOLON] = ActionEntry(REDUCE, 4); + _actionMap[69][SEMICOLON] = ActionEntry(REDUCE, 12); + _actionMap[70][FOR] = ActionEntry(SHIFT, 145); + _actionMap[71][SEMICOLON] = ActionEntry(REDUCE, 3); + _actionMap[72][SEMICOLON] = ActionEntry(REDUCE, 47); + _actionMap[73][SEMICOLON] = ActionEntry(REDUCE, 13); + _actionMap[74][SEMICOLON] = ActionEntry(REDUCE, 7); + _actionMap[75][FOR] = ActionEntry(SHIFT, 146); + _actionMap[76][SEMICOLON] = ActionEntry(REDUCE, 42); + _actionMap[77][LOCK] = ActionEntry(SHIFT, 147); + _actionMap[78][IDENTIFIER] = ActionEntry(SHIFT, 148); + _actionMap[79][SEMICOLON] = ActionEntry(REDUCE, 5); + _actionMap[80][SEMICOLON] = ActionEntry(REDUCE, 4); + _actionMap[81][FOR] = ActionEntry(SHIFT, 149); _actionMap[82][FOR] = ActionEntry(SHIFT, 150); - _actionMap[83][FOR] = ActionEntry(SHIFT, 151); + _actionMap[83][IDENTIFIER] = ActionEntry(SHIFT, 151); _actionMap[84][IDENTIFIER] = ActionEntry(SHIFT, 152); _actionMap[85][IDENTIFIER] = ActionEntry(SHIFT, 153); _actionMap[86][IDENTIFIER] = ActionEntry(SHIFT, 154); _actionMap[87][IDENTIFIER] = ActionEntry(SHIFT, 155); _actionMap[88][IDENTIFIER] = ActionEntry(SHIFT, 156); - _actionMap[89][IDENTIFIER] = ActionEntry(SHIFT, 157); - _actionMap[90][FROM] = ActionEntry(SHIFT, 158); - _actionMap[91][STRINGVAL] = ActionEntry(SHIFT, 159); - _actionMap[92][INTVAL] = ActionEntry(SHIFT, 160); + _actionMap[89][FROM] = ActionEntry(SHIFT, 157); + _actionMap[90][STRINGVAL] = ActionEntry(SHIFT, 158); + _actionMap[91][INTVAL] = ActionEntry(SHIFT, 159); + _actionMap[92][STRINGVAL] = ActionEntry(SHIFT, 160); _actionMap[93][STRINGVAL] = ActionEntry(SHIFT, 161); - _actionMap[94][STRINGVAL] = ActionEntry(SHIFT, 162); + _actionMap[94][INTVAL] = ActionEntry(SHIFT, 162); _actionMap[95][INTVAL] = ActionEntry(SHIFT, 163); - _actionMap[96][INTVAL] = ActionEntry(SHIFT, 164); + _actionMap[96][IDENTIFIER] = ActionEntry(SHIFT, 164); _actionMap[97][INTVAL] = ActionEntry(SHIFT, 165); _actionMap[98][INTVAL] = ActionEntry(SHIFT, 166); _actionMap[99][INTVAL] = ActionEntry(SHIFT, 167); @@ -2476,79 +2476,79 @@ _actionMap[116][IDENTIFIER] = ActionEntry(SHIFT, 181); _actionMap[1][SEMICOLON] = ActionEntry(SHIFT, 38); _actionMap[2][DB] = ActionEntry(SHIFT, 39); - _actionMap[3][IDENTIFIER] = ActionEntry(SHIFT, 43); - _actionMap[3][USER] = ActionEntry(SHIFT, 42); - _actionMap[3][PERMISSION] = ActionEntry(SHIFT, 41); + _actionMap[3][IDENTIFIER] = ActionEntry(SHIFT, 42); + _actionMap[3][USER] = ActionEntry(SHIFT, 41); _actionMap[3][ARCHLOG] = ActionEntry(SHIFT, 40); - _actionMap[4][ROLE] = ActionEntry(SHIFT, 44); - _actionMap[5][BACKUP] = ActionEntry(SHIFT, 45); - _actionMap[6][TABLESET] = ActionEntry(SHIFT, 46); - _actionMap[7][TABLESET] = ActionEntry(SHIFT, 48); - _actionMap[7][FILE] = ActionEntry(SHIFT, 47); - _actionMap[8][TABLESET] = ActionEntry(SHIFT, 49); - _actionMap[9][TABLESET] = ActionEntry(SHIFT, 51); - _actionMap[9][ROLE] = ActionEntry(SHIFT, 50); - _actionMap[10][TABLESET] = ActionEntry(SHIFT, 52); - _actionMap[11][ARCHLOG] = ActionEntry(SHIFT, 53); - _actionMap[12][TABLESET] = ActionEntry(SHIFT, 55); - _actionMap[12][ROLE] = ActionEntry(SHIFT, 54); - _actionMap[13][TABLE] = ActionEntry(SHIFT, 57); - _actionMap[13][UINDEX] = ActionEntry(SHIFT, 56); - _actionMap[14][ARCHLOG] = ActionEntry(SHIFT, 58); - _actionMap[15][BACKUP] = ActionEntry(SHIFT, 59); - _actionMap[16][XML] = ActionEntry(SHIFT, 63); - _actionMap[16][BINARY] = ActionEntry(SHIFT, 61); - _actionMap[16][PLAIN] = ActionEntry(SHIFT, 62); + _actionMap[4][ROLE] = ActionEntry(SHIFT, 43); + _actionMap[5][BACKUP] = ActionEntry(SHIFT, 44); + _actionMap[6][TABLESET] = ActionEntry(SHIFT, 45); + _actionMap[7][TABLESET] = ActionEntry(SHIFT, 47); + _actionMap[7][FILE] = ActionEntry(SHIFT, 46); + _actionMap[8][TABLESET] = ActionEntry(SHIFT, 48); + _actionMap[9][TABLESET] = ActionEntry(SHIFT, 50); + _actionMap[9][ROLE] = ActionEntry(SHIFT, 49); + _actionMap[10][TABLESET] = ActionEntry(SHIFT, 51); + _actionMap[11][ARCHLOG] = ActionEntry(SHIFT, 52); + _actionMap[12][TABLESET] = ActionEntry(SHIFT, 54); + _actionMap[12][ROLE] = ActionEntry(SHIFT, 53); + _actionMap[13][TABLE] = ActionEntry(SHIFT, 56); + _actionMap[13][UINDEX] = ActionEntry(SHIFT, 55); + _actionMap[14][ARCHLOG] = ActionEntry(SHIFT, 57); + _actionMap[15][BACKUP] = ActionEntry(SHIFT, 58); + _actionMap[16][XML] = ActionEntry(SHIFT, 62); + _actionMap[16][BINARY] = ActionEntry(SHIFT, 60); + _actionMap[16][PLAIN] = ActionEntry(SHIFT, 61); _actionMap[16][TABLE] = ActionEntry(REDUCE, 98); _actionMap[16][TABLESET] = ActionEntry(REDUCE, 98); - _jumpMap[16][XPMode] = 60; + _jumpMap[16][XPMode] = 59; _actionMap[17][SEMICOLON] = ActionEntry(REDUCE, 112); _actionMap[18][SEMICOLON] = ActionEntry(REDUCE, 113); - _actionMap[19][XML] = ActionEntry(SHIFT, 63); - _actionMap[19][BINARY] = ActionEntry(SHIFT, 61); - _actionMap[19][PLAIN] = ActionEntry(SHIFT, 62); + _actionMap[19][XML] = ActionEntry(SHIFT, 62); + _actionMap[19][BINARY] = ActionEntry(SHIFT, 60); + _actionMap[19][PLAIN] = ActionEntry(SHIFT, 61); _actionMap[19][TABLE] = ActionEntry(REDUCE, 98); _actionMap[19][TABLESET] = ActionEntry(REDUCE, 98); - _jumpMap[19][XPMode] = 64; - _actionMap[20][POOL] = ActionEntry(SHIFT, 72); - _actionMap[20][IDENTIFIER] = ActionEntry(SHIFT, 78); - _actionMap[20][TABLESET] = ActionEntry(SHIFT, 75); - _actionMap[20][DATAFILE] = ActionEntry(SHIFT, 68); - _actionMap[20][ARCHLOG] = ActionEntry(SHIFT, 65); + _jumpMap[19][XPMode] = 63; + _actionMap[20][POOL] = ActionEntry(SHIFT, 71); + _actionMap[20][IDENTIFIER] = ActionEntry(SHIFT, 77); + _actionMap[20][TABLESET] = ActionEntry(SHIFT, 74); + _actionMap[20][DATAFILE] = ActionEntry(SHIFT, 67); + _actionMap[20][ARCHLOG] = ActionEntry(SHIFT, 64); + _actionMap[20][LOGFILE] = ActionEntry(SHIFT, 68); } void CegoAdm::loadParser10() { - _actionMap[20][LOGFILE] = ActionEntry(SHIFT, 69); - _actionMap[20][OBJECT] = ActionEntry(SHIFT, 71); - _actionMap[20][NODE] = ActionEntry(SHIFT, 70); - _actionMap[20][SESSION] = ActionEntry(SHIFT, 74); - _actionMap[20][BUFILE] = ActionEntry(SHIFT, 66); - _actionMap[20][COPY] = ActionEntry(SHIFT, 67); - _actionMap[20][TRANSACTION] = ActionEntry(SHIFT, 76); - _actionMap[20][USER] = ActionEntry(SHIFT, 77); - _actionMap[20][ROLE] = ActionEntry(SHIFT, 73); + _actionMap[20][OBJECT] = ActionEntry(SHIFT, 70); + _actionMap[20][NODE] = ActionEntry(SHIFT, 69); + _actionMap[20][SESSION] = ActionEntry(SHIFT, 73); + _actionMap[20][BUFILE] = ActionEntry(SHIFT, 65); + _actionMap[20][COPY] = ActionEntry(SHIFT, 66); + _actionMap[20][TRANSACTION] = ActionEntry(SHIFT, 75); + _actionMap[20][USER] = ActionEntry(SHIFT, 76); + _actionMap[20][ROLE] = ActionEntry(SHIFT, 72); _actionMap[21][SEMICOLON] = ActionEntry(REDUCE, 16); - _actionMap[22][USER] = ActionEntry(SHIFT, 79); - _actionMap[23][ON] = ActionEntry(SHIFT, 81); - _actionMap[23][OFF] = ActionEntry(SHIFT, 80); - _actionMap[24][SECONDARY] = ActionEntry(SHIFT, 83); - _actionMap[24][MEDIATOR] = ActionEntry(SHIFT, 82); - _actionMap[25][TABLESET] = ActionEntry(SHIFT, 87); - _actionMap[25][USER] = ActionEntry(SHIFT, 88); - _actionMap[25][ROLE] = ActionEntry(SHIFT, 86); - _actionMap[25][PERMISSION] = ActionEntry(SHIFT, 85); - _actionMap[25][ARCHLOG] = ActionEntry(SHIFT, 84); - _actionMap[26][TABLESET] = ActionEntry(SHIFT, 89); - _actionMap[27][TABLESET] = ActionEntry(SHIFT, 90); - _actionMap[28][LOGMNG] = ActionEntry(SHIFT, 94); - _actionMap[28][INITFILE] = ActionEntry(SHIFT, 93); - _actionMap[28][CHECKPOINT] = ActionEntry(SHIFT, 92); + _actionMap[22][USER] = ActionEntry(SHIFT, 78); + _actionMap[23][ON] = ActionEntry(SHIFT, 80); + _actionMap[23][OFF] = ActionEntry(SHIFT, 79); + _actionMap[24][SECONDARY] = ActionEntry(SHIFT, 82); + _actionMap[24][MEDIATOR] = ActionEntry(SHIFT, 81); + _actionMap[25][TABLESET] = ActionEntry(SHIFT, 86); + _actionMap[25][USER] = ActionEntry(SHIFT, 87); + _actionMap[25][ROLE] = ActionEntry(SHIFT, 85); + _actionMap[25][PERMISSION] = ActionEntry(SHIFT, 84); + _actionMap[25][ARCHLOG] = ActionEntry(SHIFT, 83); + _actionMap[26][TABLESET] = ActionEntry(SHIFT, 88); + _actionMap[27][TABLESET] = ActionEntry(SHIFT, 89); + _actionMap[28][PERMISSION] = ActionEntry(SHIFT, 96); + _actionMap[28][LOGMNG] = ActionEntry(SHIFT, 93); + _actionMap[28][INITFILE] = ActionEntry(SHIFT, 92); + _actionMap[28][CHECKPOINT] = ActionEntry(SHIFT, 91); _actionMap[28][SYSSIZE] = ActionEntry(SHIFT, 98); _actionMap[28][TMPSIZE] = ActionEntry(SHIFT, 99); _actionMap[28][TSROOT] = ActionEntry(SHIFT, 100); - _actionMap[28][TSTICKET] = ActionEntry(SHIFT, 91); - _actionMap[28][LOGNUM] = ActionEntry(SHIFT, 95); - _actionMap[28][LOGSIZE] = ActionEntry(SHIFT, 96); + _actionMap[28][TSTICKET] = ActionEntry(SHIFT, 90); + _actionMap[28][LOGNUM] = ActionEntry(SHIFT, 94); + _actionMap[28][LOGSIZE] = ActionEntry(SHIFT, 95); _actionMap[28][SORTAREASIZE] = ActionEntry(SHIFT, 97); _actionMap[29][IDENTIFIER] = ActionEntry(SHIFT, 101); _actionMap[30][POOL] = ActionEntry(SHIFT, 102); @@ -2592,6 +2592,7 @@ _actionMap[0][CORRECT] = ActionEntry(SHIFT, 8); _actionMap[0][PASSWD] = ActionEntry(SHIFT, 22); _actionMap[0][ASSIGN] = ActionEntry(SHIFT, 4); + _actionMap[0][SET] = ActionEntry(SHIFT, 28); _actionMap[0][TRACE] = ActionEntry(SHIFT, 36); _actionMap[0][ENABLE] = ActionEntry(SHIFT, 14); _actionMap[0][DISABLE] = ActionEntry(SHIFT, 11); @@ -2599,7 +2600,6 @@ _actionMap[0][END_TOKEN] = ActionEntry(SHIFT, 15); _actionMap[0][SYNC] = ActionEntry(SHIFT, 34); _actionMap[0][RECOVER] = ActionEntry(SHIFT, 26); - _actionMap[0][SET] = ActionEntry(SHIFT, 28); _actionMap[0][EXPORT] = ActionEntry(SHIFT, 16); _actionMap[0][IMPORT] = ActionEntry(SHIFT, 19); _actionMap[0][GETDBSPEC] = ActionEntry(SHIFT, 17); @@ -2981,7 +2981,7 @@ setTableSetPerm(); break; case 51: - addPermAction(); + setPermAction(); break; case 50: dropRoleAction();
[-] [+]	Changed	cego-2.13.10.tar.bz2/src/CegoAdm.def ^
@@ -190,7 +190,7 @@ Statement : SHOW ROLE IDENTIFIER ; showRoleAction Statement : CREATE ROLE IDENTIFIER ; createRoleAction Statement : DROP ROLE IDENTIFIER ; dropRoleAction -Statement : ADD PERMISSION IDENTIFIER WITH PermList TO ROLE IDENTIFIER ; addPermAction +Statement : SET PERMISSION IDENTIFIER WITH PermList TO ROLE IDENTIFIER ; setPermAction PermList : PermList KSEP PermEntry PermList : PermEntry PermEntry : TABLESET EQU IDENTIFIER ; setTableSetPerm
[-] [+]	Changed	cego-2.13.10.tar.bz2/src/CegoAdm.h ^
@@ -73,7 +73,7 @@ virtual void showRoleAction() = 0; virtual void createRoleAction() = 0; virtual void dropRoleAction() = 0; - virtual void addPermAction() = 0; + virtual void setPermAction() = 0; virtual void setTableSetPerm() = 0; virtual void setFilterPerm() = 0; virtual void setRightPerm() = 0;
[-] [+]	Changed	cego-2.13.10.tar.bz2/src/CegoAdmAction.cc ^
@@ -2113,7 +2113,7 @@ } -void CegoAdmAction::addPermAction() +void CegoAdmAction::setPermAction() { Chain role; Chain permid; @@ -2135,7 +2135,7 @@ CegoAdminHandler::ResultType res; - res = _pAH->medAddPermission(role, permid, _tsPerm, _filterPerm, _rightPerm); + res = _pAH->medSetPermission(role, permid, _tsPerm, _filterPerm, _rightPerm); handleMedResult(res); }
[-] [+]	Changed	cego-2.13.10.tar.bz2/src/CegoAdmAction.h ^
@@ -164,7 +164,7 @@ void showRoleAction(); void createRoleAction(); void dropRoleAction(); - void addPermAction(); + void setPermAction(); void setTableSetPerm(); void setFilterPerm();
[-] [+]	Changed	cego-2.13.10.tar.bz2/src/CegoAdmin.cc ^
@@ -544,7 +544,7 @@ cout << " [u5] list role" << endl; cout << " [u6] create role <role>" << endl; cout << " [u7] show role <role>" << endl; - cout << " [u8] add permission <perm> with <permlist> to role <role>" << endl; + cout << " [u8] set permission <perm> with <permlist> to role <role>" << endl; cout << " [u9] assign role <role> to <userid>" << endl; cout << " [u10] remove role <role> from user <userid>" << endl; cout << " [u11] drop role <role>" << endl; @@ -817,11 +817,13 @@ else if ( topic == Chain("u8")) { cout << endl; - cout << "add permission <permid> with <permlist> to role <role>" << endl; + cout << "set permission <permid> with <permlist> to role <role>" << endl; cout << "----------------------------------------------------" << endl; cout << endl; - cout << " Add a permission to the specified role" << endl; - cout << " The permission id (permid) is any valid ( role ) unique identifier" << endl; + cout << " Sets a permission to the specified role" << endl; + cout << " The permission id (permid) is any valid identifier" << endl; + cout << " If the permid already exits for the specified role, an update is performed" << endl; + cout << " Otherwise, a new permission entry is created" << endl; cout << " Permlist is a specification of the permission" << endl; cout << " It consists of a triple describing tableset, filter and right" << endl; cout << " The triple must be specified in a comma separated list" << endl;
[-] [+]	Changed	cego-2.13.10.tar.bz2/src/CegoAdminHandler.cc ^
@@ -679,9 +679,9 @@ { return CegoAdminHandler::MED_REMOVE_ROLE; } - else if ( docType == Chain(XML_MED_ADD_PERM_REQUEST) ) + else if ( docType == Chain(XML_MED_SET_PERM_REQUEST) ) { - return CegoAdminHandler::MED_ADD_PERM; + return CegoAdminHandler::MED_SET_PERM; } else if ( docType == Chain(XML_MED_REMOVE_PERM_REQUEST) ) { @@ -1684,7 +1684,7 @@ return sendReq(XML_MED_REMOVE_ROLE_REQUEST, pRoot); } -CegoAdminHandler::ResultType CegoAdminHandler::medAddPermission(const Chain& role, const Chain& permid, const Chain& tableSet, const Chain& filter, const Chain& perm) +CegoAdminHandler::ResultType CegoAdminHandler::medSetPermission(const Chain& role, const Chain& permid, const Chain& tableSet, const Chain& filter, const Chain& perm) { Element* pRoot = new Element(XML_FRAME_ELEMENT); pRoot->setAttribute(XML_ROLE_ATTR, role); @@ -1693,7 +1693,7 @@ pRoot->setAttribute(XML_FILTER_ATTR, filter); pRoot->setAttribute(XML_PERM_ATTR, perm); - return sendReq(XML_MED_ADD_PERM_REQUEST, pRoot); + return sendReq(XML_MED_SET_PERM_REQUEST, pRoot); }
[-] [+]	Changed	cego-2.13.10.tar.bz2/src/CegoAdminHandler.h ^
@@ -143,7 +143,7 @@ MED_CHANGE_PASSWD, MED_ASSIGN_ROLE, MED_REMOVE_ROLE, - MED_ADD_PERM, + MED_SET_PERM, MED_REMOVE_PERM, MED_CREATE_ROLE, MED_DROP_ROLE, @@ -325,7 +325,7 @@ ResultType medCreateRole(const Chain& role); ResultType medDropRole(const Chain& role); - ResultType medAddPermission(const Chain& role, const Chain& permid, const Chain& tableSet, const Chain& filter, const Chain& perm); + ResultType medSetPermission(const Chain& role, const Chain& permid, const Chain& tableSet, const Chain& filter, const Chain& perm); ResultType medRemovePermission(const Chain& role, const Chain& permid); ResultType medUserTrace(const Chain& user, bool isOn);
[-] [+]	Changed	cego-2.13.10.tar.bz2/src/CegoAdminThread.cc ^
@@ -781,9 +781,9 @@ medRemoveRole(pAH); break; } - case CegoAdminHandler::MED_ADD_PERM: + case CegoAdminHandler::MED_SET_PERM: { - medAddPerm(pAH); + medSetPerm(pAH); break; } case CegoAdminHandler::MED_REMOVE_PERM: @@ -3075,20 +3075,12 @@ if ( status != Chain(XML_DEFINED_VALUE) ) { Chain msg = Chain("Tableset ") + tableSet + Chain(" must be in status defined to be removed"); - - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); + throw Exception(EXLOC, msg); } if ( h.getName() != mediator ) { Chain msg = Chain("Invalid mediator host ") + h.getName() + Chain(" for tableset ") + tableSet; - - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - throw Exception(EXLOC, msg); } @@ -3112,12 +3104,15 @@ pPrimaryAH->getMsg(msg); closeSession(pPrimaryAH); - if ( pAH->syncWithInfo(Chain("primary"), primary, msg) == false ) - return; - if ( res != CegoAdminHandler::ADM_OK) - throw Exception(EXLOC, Chain("Admin action failed")); - + { + throw Exception(EXLOC, msg); + } + else + { + if ( pAH->syncWithInfo(Chain("primary"), primary, msg) == false ) + return; + } } if ( h.getName() != secondary ) @@ -3132,20 +3127,22 @@ pSecondaryAH->getMsg(msg); closeSession(pSecondaryAH); - if ( pAH->syncWithInfo(Chain("secondary"), secondary, msg) == false ) - return; - if ( res != CegoAdminHandler::ADM_OK) - throw Exception(EXLOC, Chain("Admin action failed")); + { + throw Exception(EXLOC, msg); + } + else + { + if ( pAH->syncWithInfo(Chain("secondary"), secondary, msg) == false ) + return; + } } _pDBMng->rmTableSetDef(tableSet); - if ( pAH->syncWithInfo(Chain("mediator"), h.getName(), Chain("Tableset ") + tableSet + Chain(" removed")) == false ) - return; - - pAH->sendResponse(Chain("Admin action successful")); + Chain msg = Chain("Tableset ") + tableSet + Chain(" removed"); + pAH->sendResponse(msg); } @@ -3175,28 +3172,20 @@ { Chain msg; e.pop(msg); - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - throw Exception(EXLOC, Chain("Admin action failed")); + throw Exception(EXLOC, msg); } if ( status != Chain(XML_DEFINED_VALUE) ) { Chain msg = Chain("Tableset ") + tableSet + Chain(" must be in status defined to be created"); - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - throw Exception(EXLOC, Chain("Admin action failed")); + throw Exception(EXLOC, msg); } if ( h.getName() != mediator ) { - Chain msg = Chain("Invalid mediator host ") + h.getName() + Chain(" for tableset ") + tableSet; - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); - + Chain msg = Chain("Invalid mediator host ") + h.getName() + Chain(" for tableset ") + tableSet; + throw Exception(EXLOC, msg); } Chain primaryStatus; @@ -3208,24 +3197,16 @@ catch ( Exception e ) { Chain msg; - e.pop(msg); - - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - throw Exception(EXLOC, Chain("Admin action failed")); + e.pop(msg); + throw Exception(EXLOC, msg); } if ( primaryStatus != Chain(XML_ONLINE_VALUE) ) { Chain msg = Chain("Primary host ") + primary + Chain(" not online"); - - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - throw Exception(EXLOC, Chain("Admin action failed")); + throw Exception(EXLOC, msg); } - - if ( mediator == primary ) { try @@ -3237,9 +3218,7 @@ { Chain msg; e.pop(msg); - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - throw Exception(EXLOC, Chain("Admin action failed")); + throw Exception(EXLOC, msg); } } else @@ -3335,10 +3314,9 @@ _pDBMng->setTableSetRunState(tableSet,XML_OFFLINE_VALUE); - if ( pAH->syncWithInfo(Chain("mediator"), mediator , Chain("Tableset ") + tableSet + Chain(" created")) == false ) - return; + Chain msg = Chain("Tableset ") + tableSet + Chain(" created"); - pAH->sendResponse(Chain("Admin action successful")); + pAH->sendResponse(msg); } @@ -3553,31 +3531,19 @@ { Chain msg; e.pop(msg); - - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); - + throw Exception(EXLOC, msg); } if ( status != Chain(XML_OFFLINE_VALUE) ) { - Chain msg = Chain("Tableset ") + tableSet + Chain(" must be\nin status offline to be dropped"); - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); + Chain msg = Chain("Tableset ") + tableSet + Chain(" must be in status offline to be dropped"); + throw Exception(EXLOC, msg); } if ( h.getName() != mediator ) { - Chain msg = Chain("Invalid mediator host ") + h.getName() + Chain("\nfor tableset ") + tableSet; - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); - + Chain msg = Chain("Invalid mediator host ") + h.getName() + Chain(" for tableset ") + tableSet; + throw Exception(EXLOC, msg); } Chain primaryStatus; @@ -3590,22 +3556,13 @@ { Chain msg; e.pop(msg); - - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); - + throw Exception(EXLOC, msg); } if ( primaryStatus != Chain(XML_ONLINE_VALUE) ) { - Chain msg = Chain("Primary host ") + primary + Chain(" not online"); - - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); + Chain msg = Chain("Primary host ") + primary + Chain(" not online"); + throw Exception(EXLOC, msg); } if ( mediator == primary ) @@ -3613,17 +3570,15 @@ // create local try { + _pTabMng->dropTableSet(tableSet); + } catch ( Exception e ) { Chain msg; e.pop(msg); - - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); + throw Exception(EXLOC, msg); } } else @@ -3656,20 +3611,21 @@ pSecondaryAH->getMsg(msg); closeSession(pSecondaryAH); - pAH->syncWithInfo(Chain("secondary"), secondary, msg); if ( res != CegoAdminHandler::ADM_OK) { - throw Exception(EXLOC, Chain("Admin action failed")); + throw Exception(EXLOC, msg); + } + else + { + pAH->syncWithInfo(Chain("secondary"), secondary, msg); } } } _pDBMng->setTableSetRunState(tableSet,XML_DEFINED_VALUE); - if ( pAH->syncWithInfo(Chain("mediator"), mediator, Chain("Tableset dropped")) == false ) - return; - - pAH->sendResponse("Admin action finished"); + Chain msg = Chain("Tableset ") + tableSet + Chain(" dropped"); + pAH->sendResponse(msg); } @@ -3697,22 +3653,14 @@ if ( status != Chain(XML_OFFLINE_VALUE) ) { - Chain msg = Chain("Tableset ") + tableSet + Chain(" must be in\nstatus offline to be started"); - - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); + Chain msg = Chain("Tableset ") + tableSet + Chain(" must be in status offline to be started"); + throw Exception(EXLOC, msg); } if ( h.getName() != mediator ) { Chain msg = Chain("Invalid mediator host ") + h.getName() + Chain("\nfor tableset ") + tableSet; - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); - + throw Exception(EXLOC, msg); } Chain primaryStatus; @@ -3723,20 +3671,14 @@ if ( primaryStatus != Chain(XML_ONLINE_VALUE) ) { - Chain msg = Chain("Primary host ") + primary + Chain(" not online"); - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); + Chain msg = Chain("Primary host ") + primary + Chain(" not online"); + throw Exception(EXLOC, msg); } if ( secondaryStatus != Chain(XML_ONLINE_VALUE) ) { - Chain msg = Chain("Secondary host ") + secondary + Chain(" not online"); - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); + Chain msg = Chain("Secondary host ") + secondary + Chain(" not online"); + throw Exception(EXLOC, msg); } if ( mediator == primary ) @@ -3755,11 +3697,8 @@ catch ( Exception e ) { Chain msg; - e.pop(msg); - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); + e.pop(msg); + throw Exception(EXLOC, msg); } } else @@ -3807,10 +3746,8 @@ _pDBMng->setTableSetRunState(tableSet, XML_ONLINE_VALUE); - if ( pAH->syncWithInfo(Chain("mediator"), mediator, Chain("Tableset ") + tableSet + Chain(" started")) == false ) - return; - - pAH->sendResponse("Admin action finished"); + Chain msg = Chain("Tableset ") + tableSet + Chain(" started"); + pAH->sendResponse(msg); } @@ -3842,36 +3779,21 @@ catch ( Exception e ) { Chain msg; - e.pop(msg); - - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); - + e.pop(msg); + throw Exception(EXLOC, msg); } if ( status != Chain(XML_ONLINE_VALUE) ) { Chain msg = Chain("Tableset ") + tableSet + Chain(" must be in status active to be stopped"); - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); - - + throw Exception(EXLOC, msg); } if ( h.getName() != mediator ) { - Chain msg = Chain("Invalid mediator host ") + h.getName() + Chain("\nfor tableset ") + tableSet; - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); - - + Chain msg = Chain("Invalid mediator host ") + h.getName() + Chain(" for tableset ") + tableSet; + throw Exception(EXLOC, msg); } Chain primaryStatus; @@ -3887,31 +3809,19 @@ { Chain msg; e.pop(msg); - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); - + throw Exception(EXLOC, msg); } if ( primaryStatus != Chain(XML_ONLINE_VALUE) ) { Chain msg = Chain("Primary host ") + primary + Chain(" not online"); - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); - + throw Exception(EXLOC, msg); } if ( secondaryStatus != Chain(XML_ONLINE_VALUE) ) { Chain msg = Chain("Secondary host ") + secondary + Chain(" not online"); - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); - + throw Exception(EXLOC, msg); } if ( mediator == primary ) @@ -3928,10 +3838,7 @@ { Chain msg; e.pop(msg); - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); + throw Exception(EXLOC, msg); } } else @@ -3979,11 +3886,8 @@ _pDBMng->setTableSetRunState(tableSet,XML_OFFLINE_VALUE); - - if ( pAH->syncWithInfo(Chain("mediator"), mediator, Chain("Tableset ") + tableSet +Chain(" stopped")) == false ) - return; - - pAH->sendResponse("Admin action finished"); + Chain msg = Chain("Tableset ") + tableSet + Chain(" stopped"); + pAH->sendResponse(msg); } @@ -4018,10 +3922,7 @@ { Chain msg; e.pop(msg); - - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - throw Exception(EXLOC, Chain("Admin action failed")); + throw Exception(EXLOC, msg); } @@ -4031,12 +3932,8 @@ if ( syncStatus != Chain(XML_SYNCHED_VALUE) ) { - Chain msg = Chain("Tableset ") + tableSet + Chain(" is not in sync"); - - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); + Chain msg = Chain("Tableset ") + tableSet + Chain(" is not in sync"); + throw Exception(EXLOC, msg); } @@ -4047,13 +3944,8 @@ if ( h.getName() != mediator ) { - Chain msg = Chain("Invalid mediator host ") + h.getName() + Chain(" for tableset ") + tableSet; - - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); - + Chain msg = Chain("Invalid mediator host ") + h.getName() + Chain(" for tableset ") + tableSet; + throw Exception(EXLOC, msg); } Chain primaryStatus; @@ -4069,42 +3961,22 @@ { Chain msg; e.pop(msg); - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); - + throw Exception(EXLOC, msg); } - if ( primary == secondary ) { Chain msg = Chain("Primary and secondary identical,\nswitch not useful"); - - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); - + throw Exception(EXLOC, msg); } - if ( secondaryStatus != Chain(XML_ONLINE_VALUE) ) { Chain msg = Chain("Secondary host ") + secondary + Chain(" not online"); - - - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - - throw Exception(EXLOC, Chain("Admin action failed")); - - + throw Exception(EXLOC, msg); } - // first step : make sure primary host is down - if ( mediator == primary ) { @@ -4127,9 +3999,7 @@ { Chain msg; e.pop(msg); - if ( pAH->syncWithInfo(Chain("mediator"), mediator, msg) == false ) - return; - throw Exception(EXLOC, Chain("Admin action failed")); + throw Exception(EXLOC, msg); } } } @@ -4151,11 +4021,10 @@ Chain msg; pPrimaryAH->getMsg(msg); - pAH->syncWithInfo(Chain("primary"), primary, msg); if ( res != CegoAdminHandler::ADM_OK) { closeSession(pPrimaryAH); - throw Exception(EXLOC, Chain("Admin action failed")); + throw Exception(EXLOC, msg); } } @@ -4164,10 +4033,9 @@ pPrimaryAH->getMsg(msg); closeSession(pPrimaryAH); - pAH->syncWithInfo(Chain("primary"), primary, msg); if ( res != CegoAdminHandler::ADM_OK) { - throw Exception(EXLOC, Chain("Admin action failed")); + throw Exception(EXLOC, msg); } } @@ -4228,11 +4096,14 @@ Chain msg; pSecondaryAH->getMsg(msg); - pAH->syncWithInfo(Chain("secondary"), secondary, msg); if ( res != CegoAdminHandler::ADM_OK) { closeSession(pSecondaryAH); - throw Exception(EXLOC, Chain("Admin action failed")); + throw Exception(EXLOC, msg); + } + else + { + pAH->syncWithInfo(Chain("secondary"), secondary, msg); } } @@ -4241,26 +4112,32 @@ Chain msg; pSecondaryAH->getMsg(msg); - pAH->syncWithInfo(Chain("secondary"), secondary, msg); if ( res != CegoAdminHandler::ADM_OK) { closeSession(pSecondaryAH); - throw Exception(EXLOC, Chain("Admin action failed")); + throw Exception(EXLOC, msg); + } + else + { + pAH->syncWithInfo(Chain("secondary"), secondary, msg); } - if ( isOnline ) { res = pSecondaryAH->reqStartTableSet(tableSet, false, false); Chain msg; pSecondaryAH->getMsg(msg); - pAH->syncWithInfo(Chain("secondary"), secondary, msg); if ( res != CegoAdminHandler::ADM_OK) { closeSession(pSecondaryAH); - throw Exception(EXLOC, Chain("Admin action failed")); + throw Exception(EXLOC, msg); } + else + { + pAH->syncWithInfo(Chain("secondary"), secondary, msg); + } + } if ( newPrimary != newSecondary ) @@ -4269,13 +4146,15 @@ Chain msg; pSecondaryAH->getMsg(msg); - pAH->syncWithInfo(Chain("secondary"), secondary, msg); if ( res != CegoAdminHandler::ADM_OK) { closeSession(pSecondaryAH); - throw Exception(EXLOC, Chain("Admin action failed")); + throw Exception(EXLOC, msg); + } + else + { + pAH->syncWithInfo(Chain("secondary"), secondary, msg); } - } else { @@ -4283,13 +4162,15 @@ Chain msg; pSecondaryAH->getMsg(msg); - pAH->syncWithInfo(Chain("secondary"), secondary, msg); if ( res != CegoAdminHandler::ADM_OK) { closeSession(pSecondaryAH); - throw Exception(EXLOC, Chain("Admin action failed")); + throw Exception(EXLOC, msg); + } + else + { + pAH->syncWithInfo(Chain("secondary"), secondary, msg); } - } closeSession(pSecondaryAH); @@ -4310,7 +4191,8 @@ if ( pAH->syncWithInfo(Chain("mediator"), mediator, Chain("Tableset switched")) == false ) return; - pAH->sendResponse("Admin action finished"); + Chain msg = Chain("Tableset ") + tableSet + Chain(" switched"); + pAH->sendResponse(msg); } @@ -5547,7 +5429,7 @@ } -void CegoAdminThread::medAddPerm(CegoAdminHandler pAH) +void CegoAdminThread::medSetPerm(CegoAdminHandler pAH) { Chain role; @@ -5565,13 +5447,12 @@ Chain permid; pAH->getPermId(permid); - - _pDBMng->addPerm(role, permid, tableSet, filter, perm); + _pDBMng->setPerm(role, permid, tableSet, filter, perm); Host h; Chain mediator = h.getName(); - if ( pAH->syncWithInfo(Chain("mediator"), mediator, Chain("Permission added")) == false ) + if ( pAH->syncWithInfo(Chain("mediator"), mediator, Chain("Permission set")) == false ) return; pAH->sendResponse(Chain("Admin action finished"));
[-] [+]	Changed	cego-2.13.10.tar.bz2/src/CegoAdminThread.h ^
@@ -177,7 +177,7 @@ void medAssignRole(CegoAdminHandler pAH); void medRemoveRole(CegoAdminHandler pAH); - void medAddPerm(CegoAdminHandler pAH); + void medSetPerm(CegoAdminHandler pAH); void medRemovePerm(CegoAdminHandler pAH); void medCreateRole(CegoAdminHandler pAH);
[-] [+]	Changed	cego-2.13.10.tar.bz2/src/CegoDefs.h ^
@@ -40,7 +40,7 @@ #endif #define CEGO_PRODUCT "Cego" -#define CEGO_VERSION "2.13.9" +#define CEGO_VERSION "2.13.10" #define CEGO_COPYRIGHT "Copyright (C) 2000-2012 by Bjoern Lemke. All rights reserved" /*******************************/
[-] [+]	Changed	cego-2.13.10.tar.bz2/src/CegoMain.cc ^
@@ -438,7 +438,7 @@ pDBMng->xml2Doc(); pDBMng->configureLogger(); - pDBMng->addPerm(role, permid, tableset, filter, perm); + pDBMng->setPerm(role, permid, tableset, filter, perm); pDBMng->doc2Xml();
[-] [+]	Changed	cego-2.13.10.tar.bz2/src/CegoXMLSpace.cc ^
@@ -1623,7 +1623,7 @@ } -void CegoXMLSpace::addPerm(const Chain& role, const Chain& permid, const Chain& tableset, const Chain& filter, const Chain& perm) +void CegoXMLSpace::setPerm(const Chain& role, const Chain& permid, const Chain& tableset, const Chain& filter, const Chain& perm) { Chain uperm = perm.toUpper(); @@ -1648,17 +1648,19 @@ { if ( (pRE)->getAttributeValue(XML_NAME_ATTR) == role ) { - ListT<Element> permList = (pRE)->getChildren(XML_PERM_ELEMENT); Element pPE = permList.First(); while ( pPE ) { if ( (pPE)->getAttributeValue(XML_PERMID_ATTR) == permid ) { - Chain msg = Chain("Permission entry already exists for role ") + role; + + (pPE)->setAttribute(XML_TABLESET_ATTR, tableset); + (pPE)->setAttribute(XML_FILTER_ATTR, filter); + (pPE)->setAttribute(XML_PERM_ATTR, uperm); + (pPE)->setAttribute(XML_PERMID_ATTR, permid); V(); - throw Exception(EXLOC, msg); - + return; } pPE = permList.Next(); }
[-] [+]	Changed	cego-2.13.10.tar.bz2/src/CegoXMLSpace.h ^
@@ -116,7 +116,7 @@ void dropRole(const Chain& role); Element* getPermInfo(const Chain& role); - void addPerm(const Chain& role, const Chain& permid, const Chain& tableset, const Chain& filter, const Chain& perm); + void setPerm(const Chain& role, const Chain& permid, const Chain& tableset, const Chain& filter, const Chain& perm); void removePerm(const Chain& role, const Chain& permid); Chain getUserRole(const Chain& user);
[-] [+]	Changed	cego-2.13.10.tar.bz2/src/CegoXMLdef.h ^
@@ -150,7 +150,7 @@ #define XML_MED_REMOVE_ROLE_REQUEST "MED_REMOVE_ROLE" #define XML_MED_CREATE_ROLE_REQUEST "MED_CREATE_ROLE" #define XML_MED_DROP_ROLE_REQUEST "MED_DROP_ROLE" -#define XML_MED_ADD_PERM_REQUEST "MED_ADD_PERM" +#define XML_MED_SET_PERM_REQUEST "MED_SET_PERM" #define XML_MED_REMOVE_PERM_REQUEST "MED_REMOVE_PERM" #define XML_MED_USER_TRACE_REQUEST "MED_USER_TRACE" #define XML_MED_BEGIN_BACKUP_REQUEST "MED_BEGIN_BACKUP"