Changes - j0ke.net Open Build Service

Changes of Revision 14

[-] [+]	Changed	cego.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun Sep 11 16:02:50 UTC 2011 - cs@linux-administrator.com + +- Update to version 2.11.0 + +------------------------------------------------------------------- Sun Aug 7 15:48:35 UTC 2011 - cs@linux-administrator.com - Update to version 2.10.13
[-] [+]	Changed	cego.spec ^
@@ -1,5 +1,5 @@ Name: cego -Version: 2.10.13 +Version: 2.11.0 Release: 1 Group: Productivity/Databases Summary: Cego relational database
[-] [+]	Deleted	cego-2.10.13.tar.bz2/gates/C.sql~ ^
@@ -1,192 +0,0 @@ --- --- ### Gate C --- --- - - -create table t1 ( primary a int not null, b string(30) ); -create table t2 ( primary c int not null, d string(30)); - -insert into t1 values ( 1, 'hugo'); -insert into t1 values ( 2, 'hugo'); -insert into t1 values ( 3, 'walter'); -insert into t1 values ( 4, 'bert'); -insert into t1 values ( 5, 'bert'); -insert into t1 values ( 6, 'bert'); -insert into t1 values ( 7, 'bert'); -insert into t1 values ( 8, 'bert'); -insert into t1 values ( 9, 'bert'); -insert into t1 values ( 10, 'bert'); - - -insert into t2 values ( 1, 'hugo'); -insert into t2 values ( 2, 'hugo'); -insert into t2 values ( 3, 'walter'); -insert into t2 values ( 4, 'bert'); -insert into t2 values ( 5, 'bert'); -insert into t2 values ( 16, 'bert'); -insert into t2 values ( 17, 'bert'); -insert into t2 values ( 18, 'bert'); -insert into t2 values ( 19, 'bert'); -insert into t2 values ( 20, 'bert'); - -@ -create procedure checkSelect001(msg out string(20)) return string(10) -begin - var res string(10) = 'error'; - var i int; - - cursor xCur as select count() from t1 inner join t2 on t1.a = t2.c; - if fetch xCur into ( :i ) = true - then - if :i = 5 - then - :res = 'ok'; - end; - end; - close xCur; - - :msg = 'Inner join check'; - - return :res; -end; -@ - -@ -create procedure checkSelect002(msg out string(20)) return string(10) -begin - var res string(10) = 'error'; - var i int; - - cursor xCur as select count() from t1 left outer join t2 on t1.a = t2.c; - if fetch xCur into ( :i ) = true - then - if :i = 10 - then - :res = 'ok'; - end; - end; - close xCur; - - :msg = 'Left outer join check'; - - return :res; -end; -@ - - -@ -create procedure checkSelect003(msg out string(20)) return string(10) -begin - var res string(10) = 'error'; - var i int; - - cursor xCur as select count() from t1 left outer join t2 on t1.a = t2.c; - - if fetch xCur into ( :i ) = true - then - if :i = 10 - then - :res = 'ok'; - end; - end; - close xCur; - - :msg = 'Right outer join check'; - - return :res; -end; -@ - - -@ -create procedure checkSelect004(msg out string(20)) return string(10) -begin - var res string(10) = 'error'; - var i int; - - cursor xCur as select count() from t1 inner join t2 on t1.a = t2.c where a = 5 or a = 1; - - if fetch xCur into ( :i ) = true - then - if :i = 2 - then - :res = 'ok'; - end; - end; - close xCur; - - :msg = 'Inner join check with condition'; - - return :res; -end; -@ - - -@ -create procedure checkSelect005(msg out string(20)) return string(10) -begin - var res string(10) = 'error'; - var i int; - - cursor xCur as select count() from t1 left outer join t2 on t1.a = t2.c where a = 10; - - if fetch xCur into ( :i ) = true - then - if :i = 1 - then - :res = 'ok'; - end; - end; - close xCur; - - :msg = 'Left join check with condition'; - - return :res; -end; -@ - -@ -create procedure checkSelect006(msg out string(20)) return string(10) -begin - var res string(10) = 'error'; - var i int; - - cursor xCur as select count() from t1 right outer join t2 on t1.a = t2.c where c = 10; - - if fetch xCur into ( :i ) = true - then - if :i = 1 - then - :res = 'ok'; - end; - end; - close xCur; - - :msg = 'Left join check with condition'; - - return :res; -end; -@ - - -:r = call checkSelect001(:msg); -insert into checklog values ('C', :msg, :r); -:r = call checkSelect002(:msg); -insert into checklog values ('C', :msg, :r); -:r = call checkSelect003(:msg); -insert into checklog values ('C', :msg, :r); -:r = call checkSelect004(:msg); -insert into checklog values ('C', :msg, :r); -:r = call checkSelect005(:msg); -insert into checklog values ('C', :msg, :r); - -drop procedure checkSelect001; -drop procedure checkSelect002; -drop procedure checkSelect003; -drop procedure checkSelect004; -drop procedure checkSelect005; - -drop table t1; -drop table t2; -
[-] [+]	Deleted	cego-2.10.13.tar.bz2/tools/cgmkdb~ ^
@@ -1,176 +0,0 @@ -#!/bin/bash -# -# mkcgdb -# ------ -# Utility script to build up a cego database with one tableset -# -# (C)opyright 2010 by Bjoern Lemke -# -# The database and tableset parameters defined below -# should be edited and customized to appropriate values -# -# - -DEFCEGOROOT=/usr/local/cego - -printUsage() -{ - echo "Usage : $0 [ -r <root path>] [ -t <tableset> ] <dbname>" -} - -args=`getopt r:t: $*` - -if [ $? != 0 ] -then - printUsage - exit 2 -fi - -set -- $args - -for i -do - case "$i" - in - -r) - CEGOROOT=$2; shift; - shift;; - -t) - CEGOTABLESET=$2;shift; - shift;; - --) - DBNAME=$2 - shift; break;; - esac -done - -# path to the database root path, where the database should be created - -if [ -z "$CEGOROOT" ] -then - CEGOROOT=$DEFCEGOROOT -fi - - -if [ ! -d $CEGOROOT ] -then - echo "Root directory $CEGOROOT must exist" - exit 1 -fi - -DBROOT=$CEGOROOT/$DBNAME - -if [ -d $DBROOT ] -then - echo "Root directory $DBROOT/$DBNAME already exists" - echo "Must be removed manually to create database" - exit 1 -fi - -if [ -z "$CEGOTABLESET" ] -then - TS=${DBNAME} -else - TS=${CEGOTABLESET} -fi - -echo "Creating database in directory $DBROOT ..." - -# path to the cego executable -CEGO=cego -# name of the database xml file -DBXML=${DBROOT}/${DBNAME}.xml -# several database parameters -PAGESIZE=16384 -ADMPORT=2000 -DBPORT=2200 -LOGPORT=3000 -PIDFILE=${DBROOT}/pid -ADMINUSER=cgadm -ADMINPWD=cgadm -LOGFILE=${DBROOT}/cego.log - -# DEBUGLEVEL=DEBUG -DEBUGLEVEL=NOTICE - -# tableset defs -TSROOT=${DBROOT}/data -TSTICKET=${TSROOT}/tsticket.xml -SYSSIZE=100 -TMPSIZE=3000 -LOGFILESIZE=1000000 -LOGFILENUM=3 -SORTAREASIZE=10000000 -APPFILE=${TSROOT}/${TS}data01.dbf -APPSIZE=3000 -DBUSER=${DBNAME} -DBPWD=${DBNAME} - -########################## -### end of customizing ### -########################## - -# rm -rf ${TSROOT} - -mkdir ${DBROOT} -mkdir ${TSROOT} - -echo "Creating xml ..." -cat > $DBXML <<EOF -<?xml version="1.0" ?> -<!DOCTYPE CEGO_DB_SPEC> -<DATABASE NAME="$DBNAME" PAGESIZE="$PAGESIZE" -ADMINPORT="$ADMPORT" LOGPORT="$LOGPORT" DATAPORT="$DBPORT" -PIDFILE="$PIDFILE" MAXFID="1" MAXTSID="1" -NUMRECSEMA="1000" NUMSYSPAGESEMA="43" NUMDATAPAGESEMA="43" -NUMIDXPAGESEMA="43" NUMRBPAGESEMA="43" NUMDATAFILESEMA="11" -NUMBUFFERPOOLSEMA="11" MAXFIXTRIES="30" -CSMODE="ON" QESCMODE="ON" LOGMNGPROG="./cglogmng"> -<MODULE NAME="ALL" LEVEL="$DEBUGLEVEL"></MODULE> -</DATABASE> -EOF - -# <MODULE NAME="CegoTableManager" LEVEL="NOTICE"></MODULE> -# <MODULE NAME="CegoAdminThreadPool" LEVEL="NOTICE"></MODULE> -# <MODULE NAME="CegoSelect" LEVEL="NOTICE"></MODULE> - -/bin/echo -n "Creating admin user ..." -${CEGO} --mode=setadminuser --dbxml=${DBXML} --user=${ADMINUSER}/${ADMINPWD} --logfile=${LOGFILE} -if [ $? -eq 0 ] -then - echo "... operation ok" -else - echo "... operation failed" - exit 1 -fi - -/bin/echo -n "Defining tableset $TS1..." -${CEGO} --mode=define --tableset=${TS} -dbxml=${DBXML} --tsdef=tsroot:${TSROOT},tsticket:${TSTICKET},syssize:${SYSSIZE},tmpsize:${TMPSIZE},logfilesize:${LOGFILESIZE},logfilenum:${LOGFILENUM},appfile:${APPFILE},appsize:${APPSIZE},sortareasize=${SORTAREASIZE} --logfile=${LOGFILE} -if [ $? -eq 0 ] -then - echo "... operation ok" -else - echo "... operation failed" - exit 1 -fi - -/bin/echo -n "Creating database user for $TS1 ..." -${CEGO} --mode=setdbuser --tableset=${TS} --dbxml=${DBXML} --user=${DBUSER}/${DBPWD} --role=ALL --logfile=${LOGFILE} -if [ $? -eq 0 ] -then - echo "... operation ok" -else - echo "... operation failed" - exit 1 -fi - -/bin/echo -n "Creating tableset $TS1..." -${CEGO} --mode=create --dbxml=${DBXML} --tableset=${TS} --logfile=${LOGFILE} -if [ $? -eq 0 ] -then - echo "... operation ok" -else - echo "... operation failed" - exit 1 -fi -
	Added	cego-2.11.0.tar.bz2/.DS_Store ^
	Added	cego-2.11.0.tar.bz2/._.DS_Store ^
[-] [+]	Changed	cego-2.11.0.tar.bz2/README ^
@@ -4,7 +4,7 @@ ---- A relational and transactional database system - Version 2.10.13 + Version 2.11.0 (C)opyright 2006,2007,2008,2009,2010,2011 by Bjoern Lemke
[-] [+]	Changed	cego-2.11.0.tar.bz2/TODO ^
@@ -6,4 +6,3 @@ Idea : With session request append mode is set up - read performance can be improved by replacing XML protocol by native encoding model -
[-] [+]	Changed	cego-2.11.0.tar.bz2/gates/cegodb.xml ^
@@ -1,12 +1,14 @@ <?xml version="1.0" ?> <!DOCTYPE CEGO_DB_SPEC> <DATABASE NAME="cegodb" PAGESIZE="16384" ADMINPORT="2000" LOGPORT="3000" DATAPORT="2200" PIDFILE="./db/pid" MAXFID="32" MAXTSID="2" NUMRECSEMA="281" NUMSYSPAGESEMA="53" NUMDATAPAGESEMA="281" NUMIDXPAGESEMA="281" NUMRBPAGESEMA="281" NUMDATAFILESEMA="53" NUMBUFFERPOOLSEMA="31" CSMODE="ON"> <MODULE NAME="ALL" LEVEL="DEBUG"></MODULE> - <USER NAME="cgadm" PASSWD="f9d1bb5de113b12009fd4b1672a23cfe"></USER> + <USER NAME="cgadm" PASSWD="f9d1bb5de113b12009fd4b1672a23cfe" ROLE="admin"></USER> <TABLESET NAME="TS1" TSROOT="./db" PRIMARY="dude.local" SECONDARY="dude.local" MEDIATOR="dude.local" RUNSTATE="OFFLINE" SYNCSTATE="SYNCHED" TSTICKET="./db/tsticket.xml" TSID="2" TMPFID="31" SYSSIZE="100" TMPSIZE="100" SORTAREASIZE="10000000" LSN="240"> <LOGFILE NAME="./db/TS1redo0.log" SIZE="1000000" STATUS="FREE"></LOGFILE> <LOGFILE NAME="./db/TS1redo1.log" SIZE="1000000" STATUS="FREE"></LOGFILE> <LOGFILE NAME="./db/TS1redo2.log" SIZE="1000000" STATUS="ACTIVE"></LOGFILE> <DATAFILE TYPE="APP" FILEID="32" NAME="./db/data01.dbf" SIZE="1000"></DATAFILE> - <USER NAME="lemke" PASSWD="20eb196673144f5c299ef3d0d7a58bd9" ROLE="ALL"></USER> </TABLESET> + <USER NAME="lemke" PASSWD="20eb196673144f5c299ef3d0d7a58bd9" ROLE="ALL"></USER> + <ROLE NAME="ALL"> <PERM TABLESET="TS1" FILTER="ALL" PERM="ALL" PERMID="P1"></PERM> +</ROLE> <NODE HOSTNAME="dude.local" STATUS="ONLINE"></NODE> </DATABASE>
[-] [+]	Changed	cego-2.11.0.tar.bz2/gates/gatecheck ^
@@ -1,9 +1,9 @@ #!/bin/sh ./mkdb -../src/cego --mode=batch --batchfile=pre.sql --dbxml=cegodb.xml --poolsize=1000 --tableset=TS1 > check.log 2> error.log -../src/cego --mode=batch --batchfile=A.sql --dbxml=cegodb.xml --poolsize=1000 --tableset=TS1 > check.log 2> error.log -../src/cego --mode=batch --batchfile=B.sql --dbxml=cegodb.xml --poolsize=1000 --tableset=TS1 > check.log 2> error.log -../src/cego --mode=batch --batchfile=C.sql --dbxml=cegodb.xml --poolsize=1000 --tableset=TS1 > check.log 2> error.log -../src/cego --mode=batch --batchfile=post.sql --dbxml=cegodb.xml --poolsize=1000 --tableset=TS1 +../src/cego --mode=batch --batchfile=pre.sql --dbxml=cegodb.xml --user=lemke/lemke --poolsize=1000 --tableset=TS1 > check.log 2> error.log +../src/cego --mode=batch --batchfile=A.sql --dbxml=cegodb.xml --user=lemke/lemke --poolsize=1000 --tableset=TS1 > check.log 2> error.log +../src/cego --mode=batch --batchfile=B.sql --dbxml=cegodb.xml --user=lemke/lemke --poolsize=1000 --tableset=TS1 > check.log 2> error.log +../src/cego --mode=batch --batchfile=C.sql --dbxml=cegodb.xml --user=lemke/lemke --poolsize=1000 --tableset=TS1 > check.log 2> error.log +../src/cego --mode=batch --batchfile=post.sql --dbxml=cegodb.xml --user=lemke/lemke --poolsize=1000 --tableset=TS1
[-] [+]	Changed	cego-2.11.0.tar.bz2/gates/mkdb ^
@@ -50,7 +50,7 @@ EOF echo "Creating admin user ...\c" -$CEGO --mode=setadminuser --dbxml=${DBXML} --user=${ADMINUSER}/${ADMINPWD} +$CEGO --mode=adduser --dbxml=${DBXML} --user=${ADMINUSER}/${ADMINPWD} --role=admin if [ $? -eq 0 ] then echo "... operation ok" @@ -70,7 +70,7 @@ fi echo "Creating database user ...\c" -$CEGO --mode=setdbuser --tableset=${TS} --dbxml=${DBXML} --user=${DBUSER}/${DBPWD} --role=ALL +$CEGO --mode=adduser --tableset=${TS} --dbxml=${DBXML} --user=${DBUSER}/${DBPWD} --role=ALL if [ $? -eq 0 ] then echo "... operation ok" @@ -79,6 +79,27 @@ exit 1 fi +echo "Creating database role ...\c" +$CEGO --mode=addrole --dbxml=${DBXML} --role=ALL +if [ $? -eq 0 ] +then + echo "... operation ok" +else + echo "... operation failed" + exit 1 +fi + +echo "Creating database role permission ...\c" +$CEGO --mode=addperm --dbxml=${DBXML} --role=ALL --permid=P1 --tableset=${TS} --perm=ALL --filter=ALL +if [ $? -eq 0 ] +then + echo "... operation ok" +else + echo "... operation failed" + exit 1 +fi + + echo "Creating tableset ...\c" $CEGO --mode=create --dbxml=${DBXML} --tableset=${TS} if [ $? -eq 0 ]
[-] [+]	Changed	cego-2.11.0.tar.bz2/samples/cgplustest/Makefile ^
@@ -7,7 +7,7 @@ CC = gcc # Common prefix for installation directories -PREFIX = /Users/lemke +PREFIX = /usr/local BINDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/man INCDIR = $(PREFIX)/include
[-] [+]	Changed	cego-2.11.0.tar.bz2/samples/cgwtest/Makefile ^
@@ -7,7 +7,7 @@ CC = gcc # Common prefix for installation directories -PREFIX = /Users/lemke +PREFIX = /usr/local BINDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/man INCDIR = $(PREFIX)/include/lfc
[-] [+]	Changed	cego-2.11.0.tar.bz2/samples/chkdb/mkdb ^
@@ -49,7 +49,8 @@ # <MODULE NAME="CegoSelect" LEVEL="NOTICE"></MODULE> echo "Creating admin user ...\c" -../../src/cego --mode=setadminuser --dbxml=${DBXML} --user=${ADMINUSER}/${ADMINPWD} +../../src/cego --mode=adduser --dbxml=${DBXML} --user=${ADMINUSER}/${ADMINPWD} --role=admin + if [ $? -eq 0 ] then echo "... operation ok" @@ -58,6 +59,33 @@ exit 1 fi +echo "Creating role ...\c" +../../src/cego --mode=addrole --dbxml=${DBXML} --role=ALL + +if [ $? -eq 0 ] +then + echo "... operation ok" +else + echo "... operation failed" + exit 1 +fi + +for TS in $TSLIST +do + + echo "Creating role ...\c" + ../../src/cego --mode=addperm --dbxml=${DBXML} --permid=${TS}_P --role=ALL --tableset=$TS --filter="ALL" --perm="ALL" + + if [ $? -eq 0 ] + then + echo "... operation ok" + else + echo "... operation failed" + exit 1 + fi +done + + for TS in $TSLIST do @@ -85,7 +113,7 @@ fi echo "Creating database user for $TS ...\c" - ../../src/cego --mode=setdbuser --tableset=${TS} --dbxml=${DBXML} --user=${DBUSER}/${DBPWD} --role=ALL + ../../src/cego --mode=adduser --dbxml=${DBXML} --user=${DBUSER}/${DBPWD} --role=ALL if [ $? -eq 0 ] then echo "... operation ok"
[-] [+]	Changed	cego-2.11.0.tar.bz2/samples/chkdb/runCheck ^
@@ -33,7 +33,7 @@ then NAME=`cat $3 \| grep "###" \| sed 's/--//'` echo "Batch execute $3$NAME\c" - ../../src/cego --mode=batch --dbxml=chkdb.xml --poolsize=1000 --batchfile=$3 --tableset=$TS > check.log 2> error.log + ../../src/cego --mode=batch --dbxml=chkdb.xml --user=lemke/lemke --poolsize=1000 --batchfile=$3 --tableset=$TS > check.log 2> error.log retCode=$? elif [ $2 = "remote" ] then @@ -42,7 +42,7 @@ retCode=$? elif [ $2 = "direct" ] then - ../../src/cego --mode=batch --dbxml=chkdb.xml --poolsize=1000 --batchfile=$3 --tableset=$TS + ../../src/cego --mode=batch --dbxml=chkdb.xml --user=lemke/lemke --poolsize=1000 --batchfile=$3 --tableset=$TS exit $? else printUsage
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoAction.cc ^
@@ -95,17 +95,6 @@ delete _pMasterBlock; } -void CegoAction::addRole(CegoAction::ActionRole role) -{ - if ( _roleList.Find(role) == 0 ) - _roleList.Insert(role); -} - -void CegoAction::removeRole(CegoAction::ActionRole role) -{ - _roleList.Remove(role); -} - void CegoAction::setCommandChain(char pC) { _i = 0; @@ -1300,11 +1289,6 @@ void CegoAction::execSelect() { - if ( !_roleList.Find( READOBJ ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, "Query not allowed for user"); - } - if ( _pSelect ) { @@ -1435,11 +1419,6 @@ void CegoAction::execQuery() { - if ( !_roleList.Find( WRITEOBJ ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, Chain("Query not allowed for user")); - } - Chain msg; CegoOutput o; @@ -1466,10 +1445,6 @@ void CegoAction::execViewCreate() { - if ( !_roleList.Find( CREATEOBJ ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, Chain("Query not allowed for user")); - } Chain viewName; Chain tableSet; @@ -1547,10 +1522,6 @@ void CegoAction::execViewDrop() { - if ( !_roleList.Find( DROPOBJ ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, Chain("Query not allowed for user")); - } Chain viewName; Chain tableSet; @@ -1610,11 +1581,6 @@ void CegoAction::execProcCreate() { - if ( ! _roleList.Find( CREATEOBJ ) && !_roleList.Find( ALL) ) - { - throw Exception(EXLOC, Chain("Query not allowed for user")); - } - Chain procText = _pProc->toChain() + Chain(";"); Chain procName = _pProc->getName(); int tabSetId = _pTabMng->getDBMng()->getTabSetId(_procTableSet); @@ -1681,11 +1647,6 @@ void CegoAction::execProcCall() { - if ( !_roleList.Find( EXECPROC ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, Chain("Query not allowed for user")); - } - Chain procName; Chain tableSet; @@ -1771,11 +1732,6 @@ void CegoAction::execFuncCall() { - if ( !_roleList.Find( EXECPROC ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, "Query not allowed for user"); - } - Chain functionName; Chain tableSet; ListT<CegoExpr> exprList; @@ -1893,10 +1849,6 @@ void CegoAction::execUserTableCreate() { - if ( !_roleList.Find( CREATEOBJ ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, Chain("Query not allowed for user")); - } Chain tableName; Chain tableSet; @@ -1920,11 +1872,6 @@ void CegoAction::execPrimaryIndexCreate() { - - if ( !_roleList.Find( CREATEOBJ ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, Chain("Query not allowed for user")); - } Chain tableName; Chain tableSet; @@ -1952,11 +1899,6 @@ void CegoAction::execIndexCreate() { - - if ( !_roleList.Find( CREATEOBJ ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, Chain("Query not allowed for user")); - } Chain indexName; Chain tableName; @@ -2005,11 +1947,6 @@ void CegoAction::execTableDrop() { - if ( !_roleList.Find( DROPOBJ ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, Chain("Query not allowed for user")); - } - Chain tableName; Chain tableSet; @@ -2050,11 +1987,6 @@ void CegoAction::execIndexDrop() { - if ( !_roleList.Find( DROPOBJ ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, Chain("Query not allowed for user")); - } - Chain indexName; Chain tableSet; @@ -2095,11 +2027,6 @@ void CegoAction::execProcDrop() { - - if ( !_roleList.Find( DROPOBJ ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, Chain("Query not allowed for user")); - } Chain procName; Chain tableSet; @@ -2162,11 +2089,6 @@ void CegoAction::execFKeyDrop() { - if ( !_roleList.Find( DROPOBJ ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, Chain("Query not allowed for user")); - } - Chain keyName; Chain tableSet; @@ -2207,11 +2129,6 @@ void CegoAction::execCheckDrop() { - if ( !_roleList.Find( DROPOBJ ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, Chain("Query not allowed for user")); - } - Chain checkName; Chain tableSet; @@ -2261,11 +2178,6 @@ void CegoAction::execForeignKeyCreate() { - if ( !_roleList.Find( CREATEOBJ ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, Chain("Query not allowed for user")); - } - Chain refTable, fkey; Chain* pS = getTokenList().First(); @@ -2330,11 +2242,6 @@ CegoCondDesc pCondDesc; CegoPredDesc pPredDesc; - if ( !_roleList.Find( CREATEOBJ ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, Chain("Query not allowed for user")); - } - Chain* pS = getTokenList().First(); pS = getTokenList().Next(); Chain checkName = pS; @@ -2488,11 +2395,6 @@ void CegoAction::execCreateCounter() { - if ( !_roleList.Find( CREATEOBJ ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, Chain("Query not allowed for user")); - } - Chain counterName = Chain(_stringBuf); @@ -2519,12 +2421,6 @@ // TODO : make distribution ready void CegoAction::execDropCounter() { - - if ( !_roleList.Find( DROPOBJ ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, Chain("Query not allowed for user")); - } - bool doDrop=true; int tabSetId = _pTabMng->getDBMng()->getTabSetId(_tableSet); @@ -2571,11 +2467,6 @@ void CegoAction::execSetCounter() { - if ( !_roleList.Find( WRITEOBJ ) && !_roleList.Find( ALL )) - { - throw Exception(EXLOC, Chain("Query not allowed for user")); - } - int tabSetId = _pTabMng->getDBMng()->getTabSetId(_tableSet); CegoExpr pExpr;
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoAction.h ^
@@ -69,14 +69,10 @@ public: - enum ActionRole { ALL, READOBJ, WRITEOBJ, CREATEOBJ, DROPOBJ, EXECPROC }; CegoAction(CegoDistManager pTabMng, CegoDbThreadPool pDbPool = 0 ); ~CegoAction(); - void addRole(ActionRole role); - void removeRole(ActionRole role); - void setTableSet(const Chain& tableSet); const Chain& getTableSet(); @@ -484,7 +480,6 @@ ListT<CegoExpr> _exprList; ListT<ListT<CegoExpr> > _exprListArray; ListT<CegoReturnVar*> _returnVarList; - ListT<ActionRole> _roleList; // stack variables
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoAdm.cc ^
@@ -315,7 +315,7 @@ s3.addTransition(ScannerTransEntry(6 ,'g' ,7)); _scannerList.Insert(s3); - Scanner s4(BACKUP); + Scanner s4(ASSIGN); s4.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s4.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s4.addState(ScannerStateEntry(2 ,START)); @@ -323,45 +323,45 @@ s4.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s4.addState(ScannerStateEntry(5 ,INTERMEDIATE)); s4.addState(ScannerStateEntry(6 ,FINAL)); - s4.addTransition(ScannerTransEntry(0 ,'a' ,1)); - s4.addTransition(ScannerTransEntry(1 ,'c' ,3)); - s4.addTransition(ScannerTransEntry(2 ,'b' ,0)); - s4.addTransition(ScannerTransEntry(3 ,'k' ,4)); - s4.addTransition(ScannerTransEntry(4 ,'u' ,5)); - s4.addTransition(ScannerTransEntry(5 ,'p' ,6)); + s4.addTransition(ScannerTransEntry(0 ,'s' ,1)); + s4.addTransition(ScannerTransEntry(1 ,'s' ,3)); + s4.addTransition(ScannerTransEntry(2 ,'a' ,0)); + s4.addTransition(ScannerTransEntry(3 ,'i' ,4)); + s4.addTransition(ScannerTransEntry(4 ,'g' ,5)); + s4.addTransition(ScannerTransEntry(5 ,'n' ,6)); _scannerList.Insert(s4); - Scanner s5(BEGIN_TOKEN); + Scanner s5(BACKUP); s5.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s5.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s5.addState(ScannerStateEntry(2 ,START)); s5.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s5.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s5.addState(ScannerStateEntry(5 ,FINAL)); - s5.addTransition(ScannerTransEntry(0 ,'e' ,1)); - s5.addTransition(ScannerTransEntry(1 ,'g' ,3)); + s5.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s5.addState(ScannerStateEntry(6 ,FINAL)); + s5.addTransition(ScannerTransEntry(0 ,'a' ,1)); + s5.addTransition(ScannerTransEntry(1 ,'c' ,3)); s5.addTransition(ScannerTransEntry(2 ,'b' ,0)); - s5.addTransition(ScannerTransEntry(3 ,'i' ,4)); - s5.addTransition(ScannerTransEntry(4 ,'n' ,5)); + s5.addTransition(ScannerTransEntry(3 ,'k' ,4)); + s5.addTransition(ScannerTransEntry(4 ,'u' ,5)); + s5.addTransition(ScannerTransEntry(5 ,'p' ,6)); _scannerList.Insert(s5); - Scanner s6(BINARY); + Scanner s6(BEGIN_TOKEN); s6.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s6.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s6.addState(ScannerStateEntry(2 ,START)); s6.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s6.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s6.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s6.addState(ScannerStateEntry(6 ,FINAL)); - s6.addTransition(ScannerTransEntry(0 ,'i' ,1)); - s6.addTransition(ScannerTransEntry(1 ,'n' ,3)); + s6.addState(ScannerStateEntry(5 ,FINAL)); + s6.addTransition(ScannerTransEntry(0 ,'e' ,1)); + s6.addTransition(ScannerTransEntry(1 ,'g' ,3)); s6.addTransition(ScannerTransEntry(2 ,'b' ,0)); - s6.addTransition(ScannerTransEntry(3 ,'a' ,4)); - s6.addTransition(ScannerTransEntry(4 ,'r' ,5)); - s6.addTransition(ScannerTransEntry(5 ,'y' ,6)); + s6.addTransition(ScannerTransEntry(3 ,'i' ,4)); + s6.addTransition(ScannerTransEntry(4 ,'n' ,5)); _scannerList.Insert(s6); - Scanner s7(BUFILE); + Scanner s7(BINARY); s7.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s7.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s7.addState(ScannerStateEntry(2 ,START)); @@ -369,81 +369,73 @@ s7.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s7.addState(ScannerStateEntry(5 ,INTERMEDIATE)); s7.addState(ScannerStateEntry(6 ,FINAL)); - s7.addTransition(ScannerTransEntry(0 ,'u' ,1)); - s7.addTransition(ScannerTransEntry(1 ,'f' ,3)); + s7.addTransition(ScannerTransEntry(0 ,'i' ,1)); + s7.addTransition(ScannerTransEntry(1 ,'n' ,3)); s7.addTransition(ScannerTransEntry(2 ,'b' ,0)); - s7.addTransition(ScannerTransEntry(3 ,'i' ,4)); - s7.addTransition(ScannerTransEntry(4 ,'l' ,5)); - s7.addTransition(ScannerTransEntry(5 ,'e' ,6)); + s7.addTransition(ScannerTransEntry(3 ,'a' ,4)); + s7.addTransition(ScannerTransEntry(4 ,'r' ,5)); + s7.addTransition(ScannerTransEntry(5 ,'y' ,6)); _scannerList.Insert(s7); - Scanner s8(TSTICKET); + Scanner s8(BUFILE); s8.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s8.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s8.addState(ScannerStateEntry(2 ,START)); s8.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s8.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s8.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s8.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s8.addState(ScannerStateEntry(7 ,INTERMEDIATE)); - s8.addState(ScannerStateEntry(8 ,FINAL)); - s8.addTransition(ScannerTransEntry(0 ,'s' ,1)); - s8.addTransition(ScannerTransEntry(1 ,'t' ,3)); - s8.addTransition(ScannerTransEntry(2 ,'t' ,0)); + s8.addState(ScannerStateEntry(6 ,FINAL)); + s8.addTransition(ScannerTransEntry(0 ,'u' ,1)); + s8.addTransition(ScannerTransEntry(1 ,'f' ,3)); + s8.addTransition(ScannerTransEntry(2 ,'b' ,0)); s8.addTransition(ScannerTransEntry(3 ,'i' ,4)); - s8.addTransition(ScannerTransEntry(4 ,'c' ,5)); - s8.addTransition(ScannerTransEntry(5 ,'k' ,6)); - s8.addTransition(ScannerTransEntry(6 ,'e' ,7)); - s8.addTransition(ScannerTransEntry(7 ,'t' ,8)); + s8.addTransition(ScannerTransEntry(4 ,'l' ,5)); + s8.addTransition(ScannerTransEntry(5 ,'e' ,6)); _scannerList.Insert(s8); - Scanner s9(BY); + Scanner s9(TSTICKET); s9.addState(ScannerStateEntry(0 ,INTERMEDIATE)); - s9.addState(ScannerStateEntry(1 ,FINAL)); + s9.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s9.addState(ScannerStateEntry(2 ,START)); - s9.addTransition(ScannerTransEntry(0 ,'y' ,1)); - s9.addTransition(ScannerTransEntry(2 ,'b' ,0)); + s9.addState(ScannerStateEntry(3 ,INTERMEDIATE)); + s9.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s9.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s9.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s9.addState(ScannerStateEntry(7 ,INTERMEDIATE)); + s9.addState(ScannerStateEntry(8 ,FINAL)); + s9.addTransition(ScannerTransEntry(0 ,'s' ,1)); + s9.addTransition(ScannerTransEntry(1 ,'t' ,3)); + s9.addTransition(ScannerTransEntry(2 ,'t' ,0)); + s9.addTransition(ScannerTransEntry(3 ,'i' ,4)); + s9.addTransition(ScannerTransEntry(4 ,'c' ,5)); + s9.addTransition(ScannerTransEntry(5 ,'k' ,6)); + s9.addTransition(ScannerTransEntry(6 ,'e' ,7)); + s9.addTransition(ScannerTransEntry(7 ,'t' ,8)); _scannerList.Insert(s9); - Scanner s10(CHECK); + Scanner s10(BY); s10.addState(ScannerStateEntry(0 ,INTERMEDIATE)); - s10.addState(ScannerStateEntry(1 ,INTERMEDIATE)); + s10.addState(ScannerStateEntry(1 ,FINAL)); s10.addState(ScannerStateEntry(2 ,START)); - s10.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s10.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s10.addState(ScannerStateEntry(5 ,FINAL)); - s10.addTransition(ScannerTransEntry(0 ,'h' ,1)); - s10.addTransition(ScannerTransEntry(1 ,'e' ,3)); - s10.addTransition(ScannerTransEntry(2 ,'c' ,0)); - s10.addTransition(ScannerTransEntry(3 ,'c' ,4)); - s10.addTransition(ScannerTransEntry(4 ,'k' ,5)); + s10.addTransition(ScannerTransEntry(0 ,'y' ,1)); + s10.addTransition(ScannerTransEntry(2 ,'b' ,0)); _scannerList.Insert(s10); - Scanner s11(CHECKPOINT); + Scanner s11(CHECK); s11.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s11.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s11.addState(ScannerStateEntry(2 ,START)); s11.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s11.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s11.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s11.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s11.addState(ScannerStateEntry(7 ,INTERMEDIATE)); - s11.addState(ScannerStateEntry(8 ,INTERMEDIATE)); - s11.addState(ScannerStateEntry(9 ,INTERMEDIATE)); - s11.addState(ScannerStateEntry(10 ,FINAL)); + s11.addState(ScannerStateEntry(5 ,FINAL)); s11.addTransition(ScannerTransEntry(0 ,'h' ,1)); s11.addTransition(ScannerTransEntry(1 ,'e' ,3)); s11.addTransition(ScannerTransEntry(2 ,'c' ,0)); s11.addTransition(ScannerTransEntry(3 ,'c' ,4)); s11.addTransition(ScannerTransEntry(4 ,'k' ,5)); - s11.addTransition(ScannerTransEntry(5 ,'p' ,6)); - s11.addTransition(ScannerTransEntry(6 ,'o' ,7)); - s11.addTransition(ScannerTransEntry(7 ,'i' ,8)); - s11.addTransition(ScannerTransEntry(8 ,'n' ,9)); - s11.addTransition(ScannerTransEntry(9 ,'t' ,10)); _scannerList.Insert(s11); - Scanner s12(CLEANUP); + Scanner s12(CHECKPOINT); s12.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s12.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s12.addState(ScannerStateEntry(2 ,START)); @@ -451,279 +443,285 @@ s12.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s12.addState(ScannerStateEntry(5 ,INTERMEDIATE)); s12.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s12.addState(ScannerStateEntry(7 ,FINAL)); - s12.addTransition(ScannerTransEntry(0 ,'l' ,1)); + s12.addState(ScannerStateEntry(7 ,INTERMEDIATE)); + s12.addState(ScannerStateEntry(8 ,INTERMEDIATE)); + s12.addState(ScannerStateEntry(9 ,INTERMEDIATE)); + s12.addState(ScannerStateEntry(10 ,FINAL)); + s12.addTransition(ScannerTransEntry(0 ,'h' ,1)); s12.addTransition(ScannerTransEntry(1 ,'e' ,3)); s12.addTransition(ScannerTransEntry(2 ,'c' ,0)); - s12.addTransition(ScannerTransEntry(3 ,'a' ,4)); - s12.addTransition(ScannerTransEntry(4 ,'n' ,5)); - s12.addTransition(ScannerTransEntry(5 ,'u' ,6)); - s12.addTransition(ScannerTransEntry(6 ,'p' ,7)); + s12.addTransition(ScannerTransEntry(3 ,'c' ,4)); + s12.addTransition(ScannerTransEntry(4 ,'k' ,5)); + s12.addTransition(ScannerTransEntry(5 ,'p' ,6)); + s12.addTransition(ScannerTransEntry(6 ,'o' ,7)); + s12.addTransition(ScannerTransEntry(7 ,'i' ,8)); + s12.addTransition(ScannerTransEntry(8 ,'n' ,9)); + s12.addTransition(ScannerTransEntry(9 ,'t' ,10)); _scannerList.Insert(s12); - Scanner s13(CLOSE); + Scanner s13(CLEANUP); s13.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s13.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s13.addState(ScannerStateEntry(2 ,START)); s13.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s13.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s13.addState(ScannerStateEntry(5 ,FINAL)); + s13.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s13.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s13.addState(ScannerStateEntry(7 ,FINAL)); s13.addTransition(ScannerTransEntry(0 ,'l' ,1)); - s13.addTransition(ScannerTransEntry(1 ,'o' ,3)); + s13.addTransition(ScannerTransEntry(1 ,'e' ,3)); s13.addTransition(ScannerTransEntry(2 ,'c' ,0)); - s13.addTransition(ScannerTransEntry(3 ,'s' ,4)); - s13.addTransition(ScannerTransEntry(4 ,'e' ,5)); + s13.addTransition(ScannerTransEntry(3 ,'a' ,4)); + s13.addTransition(ScannerTransEntry(4 ,'n' ,5)); + s13.addTransition(ScannerTransEntry(5 ,'u' ,6)); + s13.addTransition(ScannerTransEntry(6 ,'p' ,7)); _scannerList.Insert(s13); - Scanner s14(CONNECT); + Scanner s14(CLOSE); s14.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s14.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s14.addState(ScannerStateEntry(2 ,START)); s14.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s14.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s14.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s14.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s14.addState(ScannerStateEntry(7 ,FINAL)); - s14.addTransition(ScannerTransEntry(0 ,'o' ,1)); - s14.addTransition(ScannerTransEntry(1 ,'n' ,3)); + s14.addState(ScannerStateEntry(5 ,FINAL)); + s14.addTransition(ScannerTransEntry(0 ,'l' ,1)); + s14.addTransition(ScannerTransEntry(1 ,'o' ,3)); s14.addTransition(ScannerTransEntry(2 ,'c' ,0)); - s14.addTransition(ScannerTransEntry(3 ,'n' ,4)); + s14.addTransition(ScannerTransEntry(3 ,'s' ,4)); s14.addTransition(ScannerTransEntry(4 ,'e' ,5)); - s14.addTransition(ScannerTransEntry(5 ,'c' ,6)); - s14.addTransition(ScannerTransEntry(6 ,'t' ,7)); _scannerList.Insert(s14); - Scanner s15(COPY); + Scanner s15(CONNECT); s15.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s15.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s15.addState(ScannerStateEntry(2 ,START)); s15.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s15.addState(ScannerStateEntry(4 ,FINAL)); + s15.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s15.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s15.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s15.addState(ScannerStateEntry(7 ,FINAL)); s15.addTransition(ScannerTransEntry(0 ,'o' ,1)); - s15.addTransition(ScannerTransEntry(1 ,'p' ,3)); + s15.addTransition(ScannerTransEntry(1 ,'n' ,3)); s15.addTransition(ScannerTransEntry(2 ,'c' ,0)); - s15.addTransition(ScannerTransEntry(3 ,'y' ,4)); + s15.addTransition(ScannerTransEntry(3 ,'n' ,4)); + s15.addTransition(ScannerTransEntry(4 ,'e' ,5)); + s15.addTransition(ScannerTransEntry(5 ,'c' ,6)); + s15.addTransition(ScannerTransEntry(6 ,'t' ,7)); _scannerList.Insert(s15); - Scanner s16(CORRECT); + Scanner s16(COPY); s16.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s16.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s16.addState(ScannerStateEntry(2 ,START)); s16.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s16.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s16.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s16.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s16.addState(ScannerStateEntry(7 ,FINAL)); + s16.addState(ScannerStateEntry(4 ,FINAL)); s16.addTransition(ScannerTransEntry(0 ,'o' ,1)); - s16.addTransition(ScannerTransEntry(1 ,'r' ,3)); + s16.addTransition(ScannerTransEntry(1 ,'p' ,3)); s16.addTransition(ScannerTransEntry(2 ,'c' ,0)); - s16.addTransition(ScannerTransEntry(3 ,'r' ,4)); - s16.addTransition(ScannerTransEntry(4 ,'e' ,5)); - s16.addTransition(ScannerTransEntry(5 ,'c' ,6)); - s16.addTransition(ScannerTransEntry(6 ,'t' ,7)); + s16.addTransition(ScannerTransEntry(3 ,'y' ,4)); _scannerList.Insert(s16); - Scanner s17(CREATE); + Scanner s17(CORRECT); s17.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s17.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s17.addState(ScannerStateEntry(2 ,START)); s17.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s17.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s17.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s17.addState(ScannerStateEntry(6 ,FINAL)); - s17.addTransition(ScannerTransEntry(0 ,'r' ,1)); - s17.addTransition(ScannerTransEntry(1 ,'e' ,3)); + s17.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s17.addState(ScannerStateEntry(7 ,FINAL)); + s17.addTransition(ScannerTransEntry(0 ,'o' ,1)); + s17.addTransition(ScannerTransEntry(1 ,'r' ,3)); s17.addTransition(ScannerTransEntry(2 ,'c' ,0)); - s17.addTransition(ScannerTransEntry(3 ,'a' ,4)); - s17.addTransition(ScannerTransEntry(4 ,'t' ,5)); - s17.addTransition(ScannerTransEntry(5 ,'e' ,6)); + s17.addTransition(ScannerTransEntry(3 ,'r' ,4)); + s17.addTransition(ScannerTransEntry(4 ,'e' ,5)); + s17.addTransition(ScannerTransEntry(5 ,'c' ,6)); + s17.addTransition(ScannerTransEntry(6 ,'t' ,7)); _scannerList.Insert(s17); - Scanner s18(DATAFILE); + Scanner s18(CREATE); s18.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s18.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s18.addState(ScannerStateEntry(2 ,START)); s18.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s18.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s18.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s18.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s18.addState(ScannerStateEntry(7 ,INTERMEDIATE)); - s18.addState(ScannerStateEntry(8 ,FINAL)); - s18.addTransition(ScannerTransEntry(0 ,'a' ,1)); - s18.addTransition(ScannerTransEntry(1 ,'t' ,3)); - s18.addTransition(ScannerTransEntry(2 ,'d' ,0)); + s18.addState(ScannerStateEntry(6 ,FINAL)); + s18.addTransition(ScannerTransEntry(0 ,'r' ,1)); + s18.addTransition(ScannerTransEntry(1 ,'e' ,3)); + s18.addTransition(ScannerTransEntry(2 ,'c' ,0)); s18.addTransition(ScannerTransEntry(3 ,'a' ,4)); - s18.addTransition(ScannerTransEntry(4 ,'f' ,5)); - s18.addTransition(ScannerTransEntry(5 ,'i' ,6)); - s18.addTransition(ScannerTransEntry(6 ,'l' ,7)); - s18.addTransition(ScannerTransEntry(7 ,'e' ,8)); + s18.addTransition(ScannerTransEntry(4 ,'t' ,5)); + s18.addTransition(ScannerTransEntry(5 ,'e' ,6)); _scannerList.Insert(s18); - Scanner s19(DB); + Scanner s19(DATAFILE); s19.addState(ScannerStateEntry(0 ,INTERMEDIATE)); - s19.addState(ScannerStateEntry(1 ,FINAL)); + s19.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s19.addState(ScannerStateEntry(2 ,START)); - s19.addTransition(ScannerTransEntry(0 ,'b' ,1)); + s19.addState(ScannerStateEntry(3 ,INTERMEDIATE)); + s19.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s19.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s19.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s19.addState(ScannerStateEntry(7 ,INTERMEDIATE)); + s19.addState(ScannerStateEntry(8 ,FINAL)); + s19.addTransition(ScannerTransEntry(0 ,'a' ,1)); + s19.addTransition(ScannerTransEntry(1 ,'t' ,3)); s19.addTransition(ScannerTransEntry(2 ,'d' ,0)); + s19.addTransition(ScannerTransEntry(3 ,'a' ,4)); + s19.addTransition(ScannerTransEntry(4 ,'f' ,5)); + s19.addTransition(ScannerTransEntry(5 ,'i' ,6)); + s19.addTransition(ScannerTransEntry(6 ,'l' ,7)); + s19.addTransition(ScannerTransEntry(7 ,'e' ,8)); _scannerList.Insert(s19); - Scanner s20(DEFINE); + Scanner s20(DB); s20.addState(ScannerStateEntry(0 ,INTERMEDIATE)); - s20.addState(ScannerStateEntry(1 ,INTERMEDIATE)); + s20.addState(ScannerStateEntry(1 ,FINAL)); s20.addState(ScannerStateEntry(2 ,START)); - s20.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s20.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s20.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s20.addState(ScannerStateEntry(6 ,FINAL)); - s20.addTransition(ScannerTransEntry(0 ,'e' ,1)); - s20.addTransition(ScannerTransEntry(1 ,'f' ,3)); + s20.addTransition(ScannerTransEntry(0 ,'b' ,1)); s20.addTransition(ScannerTransEntry(2 ,'d' ,0)); - s20.addTransition(ScannerTransEntry(3 ,'i' ,4)); - s20.addTransition(ScannerTransEntry(4 ,'n' ,5)); - s20.addTransition(ScannerTransEntry(5 ,'e' ,6)); _scannerList.Insert(s20); - Scanner s21(DISABLE); + Scanner s21(DEFINE); s21.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s21.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s21.addState(ScannerStateEntry(2 ,START)); s21.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s21.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s21.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s21.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s21.addState(ScannerStateEntry(7 ,FINAL)); - s21.addTransition(ScannerTransEntry(0 ,'i' ,1)); - s21.addTransition(ScannerTransEntry(1 ,'s' ,3)); + s21.addState(ScannerStateEntry(6 ,FINAL)); + s21.addTransition(ScannerTransEntry(0 ,'e' ,1)); + s21.addTransition(ScannerTransEntry(1 ,'f' ,3)); s21.addTransition(ScannerTransEntry(2 ,'d' ,0)); - s21.addTransition(ScannerTransEntry(3 ,'a' ,4)); - s21.addTransition(ScannerTransEntry(4 ,'b' ,5)); - s21.addTransition(ScannerTransEntry(5 ,'l' ,6)); - s21.addTransition(ScannerTransEntry(6 ,'e' ,7)); + s21.addTransition(ScannerTransEntry(3 ,'i' ,4)); + s21.addTransition(ScannerTransEntry(4 ,'n' ,5)); + s21.addTransition(ScannerTransEntry(5 ,'e' ,6)); _scannerList.Insert(s21); - Scanner s22(DROP); + Scanner s22(DISABLE); s22.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s22.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s22.addState(ScannerStateEntry(2 ,START)); s22.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s22.addState(ScannerStateEntry(4 ,FINAL)); - s22.addTransition(ScannerTransEntry(0 ,'r' ,1)); - s22.addTransition(ScannerTransEntry(1 ,'o' ,3)); + s22.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s22.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s22.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s22.addState(ScannerStateEntry(7 ,FINAL)); + s22.addTransition(ScannerTransEntry(0 ,'i' ,1)); + s22.addTransition(ScannerTransEntry(1 ,'s' ,3)); s22.addTransition(ScannerTransEntry(2 ,'d' ,0)); - s22.addTransition(ScannerTransEntry(3 ,'p' ,4)); + s22.addTransition(ScannerTransEntry(3 ,'a' ,4)); + s22.addTransition(ScannerTransEntry(4 ,'b' ,5)); + s22.addTransition(ScannerTransEntry(5 ,'l' ,6)); + s22.addTransition(ScannerTransEntry(6 ,'e' ,7)); _scannerList.Insert(s22); - Scanner s23(DUMP); + Scanner s23(DROP); s23.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s23.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s23.addState(ScannerStateEntry(2 ,START)); s23.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s23.addState(ScannerStateEntry(4 ,FINAL)); - s23.addTransition(ScannerTransEntry(0 ,'u' ,1)); - s23.addTransition(ScannerTransEntry(1 ,'m' ,3)); + s23.addTransition(ScannerTransEntry(0 ,'r' ,1)); + s23.addTransition(ScannerTransEntry(1 ,'o' ,3)); s23.addTransition(ScannerTransEntry(2 ,'d' ,0)); s23.addTransition(ScannerTransEntry(3 ,'p' ,4)); _scannerList.Insert(s23); - Scanner s24(ENABLE); + Scanner s24(DUMP); s24.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s24.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s24.addState(ScannerStateEntry(2 ,START)); s24.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s24.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s24.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s24.addState(ScannerStateEntry(6 ,FINAL)); - s24.addTransition(ScannerTransEntry(0 ,'n' ,1)); - s24.addTransition(ScannerTransEntry(1 ,'a' ,3)); - s24.addTransition(ScannerTransEntry(2 ,'e' ,0)); - s24.addTransition(ScannerTransEntry(3 ,'b' ,4)); - s24.addTransition(ScannerTransEntry(4 ,'l' ,5)); - s24.addTransition(ScannerTransEntry(5 ,'e' ,6)); + s24.addState(ScannerStateEntry(4 ,FINAL)); + s24.addTransition(ScannerTransEntry(0 ,'u' ,1)); + s24.addTransition(ScannerTransEntry(1 ,'m' ,3)); + s24.addTransition(ScannerTransEntry(2 ,'d' ,0)); + s24.addTransition(ScannerTransEntry(3 ,'p' ,4)); _scannerList.Insert(s24); - Scanner s25(END_TOKEN); + Scanner s25(ENABLE); s25.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s25.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s25.addState(ScannerStateEntry(2 ,START)); - s25.addState(ScannerStateEntry(3 ,FINAL)); + s25.addState(ScannerStateEntry(3 ,INTERMEDIATE)); + s25.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s25.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s25.addState(ScannerStateEntry(6 ,FINAL)); s25.addTransition(ScannerTransEntry(0 ,'n' ,1)); - s25.addTransition(ScannerTransEntry(1 ,'d' ,3)); + s25.addTransition(ScannerTransEntry(1 ,'a' ,3)); s25.addTransition(ScannerTransEntry(2 ,'e' ,0)); + s25.addTransition(ScannerTransEntry(3 ,'b' ,4)); + s25.addTransition(ScannerTransEntry(4 ,'l' ,5)); + s25.addTransition(ScannerTransEntry(5 ,'e' ,6)); _scannerList.Insert(s25); - Scanner s26(EXPORT); + Scanner s26(END_TOKEN); s26.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s26.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s26.addState(ScannerStateEntry(2 ,START)); - s26.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s26.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s26.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s26.addState(ScannerStateEntry(6 ,FINAL)); - s26.addTransition(ScannerTransEntry(0 ,'x' ,1)); - s26.addTransition(ScannerTransEntry(1 ,'p' ,3)); + s26.addState(ScannerStateEntry(3 ,FINAL)); + s26.addTransition(ScannerTransEntry(0 ,'n' ,1)); + s26.addTransition(ScannerTransEntry(1 ,'d' ,3)); s26.addTransition(ScannerTransEntry(2 ,'e' ,0)); - s26.addTransition(ScannerTransEntry(3 ,'o' ,4)); - s26.addTransition(ScannerTransEntry(4 ,'r' ,5)); - s26.addTransition(ScannerTransEntry(5 ,'t' ,6)); _scannerList.Insert(s26); - Scanner s27(FILE); + Scanner s27(EXPORT); s27.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s27.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s27.addState(ScannerStateEntry(2 ,START)); s27.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s27.addState(ScannerStateEntry(4 ,FINAL)); - s27.addTransition(ScannerTransEntry(0 ,'i' ,1)); - s27.addTransition(ScannerTransEntry(1 ,'l' ,3)); - s27.addTransition(ScannerTransEntry(2 ,'f' ,0)); - s27.addTransition(ScannerTransEntry(3 ,'e' ,4)); + s27.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s27.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s27.addState(ScannerStateEntry(6 ,FINAL)); + s27.addTransition(ScannerTransEntry(0 ,'x' ,1)); + s27.addTransition(ScannerTransEntry(1 ,'p' ,3)); + s27.addTransition(ScannerTransEntry(2 ,'e' ,0)); + s27.addTransition(ScannerTransEntry(3 ,'o' ,4)); + s27.addTransition(ScannerTransEntry(4 ,'r' ,5)); + s27.addTransition(ScannerTransEntry(5 ,'t' ,6)); _scannerList.Insert(s27); - Scanner s28(FOR); + Scanner s28(FILE); s28.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s28.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s28.addState(ScannerStateEntry(2 ,START)); - s28.addState(ScannerStateEntry(3 ,FINAL)); - s28.addTransition(ScannerTransEntry(0 ,'o' ,1)); - s28.addTransition(ScannerTransEntry(1 ,'r' ,3)); + s28.addState(ScannerStateEntry(3 ,INTERMEDIATE)); + s28.addState(ScannerStateEntry(4 ,FINAL)); + s28.addTransition(ScannerTransEntry(0 ,'i' ,1)); + s28.addTransition(ScannerTransEntry(1 ,'l' ,3)); s28.addTransition(ScannerTransEntry(2 ,'f' ,0)); + s28.addTransition(ScannerTransEntry(3 ,'e' ,4)); _scannerList.Insert(s28); - Scanner s29(FORCELOAD); + Scanner s29(FILTER); s29.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s29.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s29.addState(ScannerStateEntry(2 ,START)); s29.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s29.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s29.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s29.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s29.addState(ScannerStateEntry(7 ,INTERMEDIATE)); - s29.addState(ScannerStateEntry(8 ,INTERMEDIATE)); - s29.addState(ScannerStateEntry(9 ,FINAL)); - s29.addTransition(ScannerTransEntry(0 ,'o' ,1)); - s29.addTransition(ScannerTransEntry(1 ,'r' ,3)); + s29.addState(ScannerStateEntry(6 ,FINAL)); + s29.addTransition(ScannerTransEntry(0 ,'i' ,1)); + s29.addTransition(ScannerTransEntry(1 ,'l' ,3)); s29.addTransition(ScannerTransEntry(2 ,'f' ,0)); - s29.addTransition(ScannerTransEntry(3 ,'c' ,4)); + s29.addTransition(ScannerTransEntry(3 ,'t' ,4)); s29.addTransition(ScannerTransEntry(4 ,'e' ,5)); - s29.addTransition(ScannerTransEntry(5 ,'l' ,6)); - s29.addTransition(ScannerTransEntry(6 ,'o' ,7)); - s29.addTransition(ScannerTransEntry(7 ,'a' ,8)); - s29.addTransition(ScannerTransEntry(8 ,'d' ,9)); + s29.addTransition(ScannerTransEntry(5 ,'r' ,6)); _scannerList.Insert(s29); - Scanner s30(FROM); + Scanner s30(FOR); s30.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s30.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s30.addState(ScannerStateEntry(2 ,START)); - s30.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s30.addState(ScannerStateEntry(4 ,FINAL)); - s30.addTransition(ScannerTransEntry(0 ,'r' ,1)); - s30.addTransition(ScannerTransEntry(1 ,'o' ,3)); + s30.addState(ScannerStateEntry(3 ,FINAL)); + s30.addTransition(ScannerTransEntry(0 ,'o' ,1)); + s30.addTransition(ScannerTransEntry(1 ,'r' ,3)); s30.addTransition(ScannerTransEntry(2 ,'f' ,0)); - s30.addTransition(ScannerTransEntry(3 ,'m' ,4)); _scannerList.Insert(s30); - Scanner s31(GETDBSPEC); + Scanner s31(FORCELOAD); s31.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s31.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s31.addState(ScannerStateEntry(2 ,START)); @@ -734,40 +732,30 @@ s31.addState(ScannerStateEntry(7 ,INTERMEDIATE)); s31.addState(ScannerStateEntry(8 ,INTERMEDIATE)); s31.addState(ScannerStateEntry(9 ,FINAL)); - s31.addTransition(ScannerTransEntry(0 ,'e' ,1)); - s31.addTransition(ScannerTransEntry(1 ,'t' ,3)); - s31.addTransition(ScannerTransEntry(2 ,'g' ,0)); - s31.addTransition(ScannerTransEntry(3 ,'d' ,4)); - s31.addTransition(ScannerTransEntry(4 ,'b' ,5)); - s31.addTransition(ScannerTransEntry(5 ,'s' ,6)); - s31.addTransition(ScannerTransEntry(6 ,'p' ,7)); - s31.addTransition(ScannerTransEntry(7 ,'e' ,8)); - s31.addTransition(ScannerTransEntry(8 ,'c' ,9)); + s31.addTransition(ScannerTransEntry(0 ,'o' ,1)); + s31.addTransition(ScannerTransEntry(1 ,'r' ,3)); + s31.addTransition(ScannerTransEntry(2 ,'f' ,0)); + s31.addTransition(ScannerTransEntry(3 ,'c' ,4)); + s31.addTransition(ScannerTransEntry(4 ,'e' ,5)); + s31.addTransition(ScannerTransEntry(5 ,'l' ,6)); + s31.addTransition(ScannerTransEntry(6 ,'o' ,7)); + s31.addTransition(ScannerTransEntry(7 ,'a' ,8)); + s31.addTransition(ScannerTransEntry(8 ,'d' ,9)); _scannerList.Insert(s31); - Scanner s32(GETTSLIST); + Scanner s32(FROM); s32.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s32.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s32.addState(ScannerStateEntry(2 ,START)); s32.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s32.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s32.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s32.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s32.addState(ScannerStateEntry(7 ,INTERMEDIATE)); - s32.addState(ScannerStateEntry(8 ,INTERMEDIATE)); - s32.addState(ScannerStateEntry(9 ,FINAL)); - s32.addTransition(ScannerTransEntry(0 ,'e' ,1)); - s32.addTransition(ScannerTransEntry(1 ,'t' ,3)); - s32.addTransition(ScannerTransEntry(2 ,'g' ,0)); - s32.addTransition(ScannerTransEntry(3 ,'t' ,4)); - s32.addTransition(ScannerTransEntry(4 ,'s' ,5)); - s32.addTransition(ScannerTransEntry(5 ,'l' ,6)); - s32.addTransition(ScannerTransEntry(6 ,'i' ,7)); - s32.addTransition(ScannerTransEntry(7 ,'s' ,8)); - s32.addTransition(ScannerTransEntry(8 ,'t' ,9)); + s32.addState(ScannerStateEntry(4 ,FINAL)); + s32.addTransition(ScannerTransEntry(0 ,'r' ,1)); + s32.addTransition(ScannerTransEntry(1 ,'o' ,3)); + s32.addTransition(ScannerTransEntry(2 ,'f' ,0)); + s32.addTransition(ScannerTransEntry(3 ,'m' ,4)); _scannerList.Insert(s32); - Scanner s33(GETNODELIST); + Scanner s33(GETDBSPEC); s33.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s33.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s33.addState(ScannerStateEntry(2 ,START)); @@ -777,23 +765,19 @@ s33.addState(ScannerStateEntry(6 ,INTERMEDIATE)); s33.addState(ScannerStateEntry(7 ,INTERMEDIATE)); s33.addState(ScannerStateEntry(8 ,INTERMEDIATE)); - s33.addState(ScannerStateEntry(9 ,INTERMEDIATE)); - s33.addState(ScannerStateEntry(10 ,INTERMEDIATE)); - s33.addState(ScannerStateEntry(11 ,FINAL)); + s33.addState(ScannerStateEntry(9 ,FINAL)); s33.addTransition(ScannerTransEntry(0 ,'e' ,1)); s33.addTransition(ScannerTransEntry(1 ,'t' ,3)); s33.addTransition(ScannerTransEntry(2 ,'g' ,0)); - s33.addTransition(ScannerTransEntry(3 ,'n' ,4)); - s33.addTransition(ScannerTransEntry(4 ,'o' ,5)); - s33.addTransition(ScannerTransEntry(5 ,'d' ,6)); - s33.addTransition(ScannerTransEntry(6 ,'e' ,7)); - s33.addTransition(ScannerTransEntry(7 ,'l' ,8)); - s33.addTransition(ScannerTransEntry(8 ,'i' ,9)); - s33.addTransition(ScannerTransEntry(9 ,'s' ,10)); - s33.addTransition(ScannerTransEntry(10 ,'t' ,11)); + s33.addTransition(ScannerTransEntry(3 ,'d' ,4)); + s33.addTransition(ScannerTransEntry(4 ,'b' ,5)); + s33.addTransition(ScannerTransEntry(5 ,'s' ,6)); + s33.addTransition(ScannerTransEntry(6 ,'p' ,7)); + s33.addTransition(ScannerTransEntry(7 ,'e' ,8)); + s33.addTransition(ScannerTransEntry(8 ,'c' ,9)); _scannerList.Insert(s33); - Scanner s34(GETDBINFO); + Scanner s34(GETTSLIST); s34.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s34.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s34.addState(ScannerStateEntry(2 ,START)); @@ -807,31 +791,41 @@ s34.addTransition(ScannerTransEntry(0 ,'e' ,1)); s34.addTransition(ScannerTransEntry(1 ,'t' ,3)); s34.addTransition(ScannerTransEntry(2 ,'g' ,0)); - s34.addTransition(ScannerTransEntry(3 ,'d' ,4)); - s34.addTransition(ScannerTransEntry(4 ,'b' ,5)); - s34.addTransition(ScannerTransEntry(5 ,'i' ,6)); - s34.addTransition(ScannerTransEntry(6 ,'n' ,7)); - s34.addTransition(ScannerTransEntry(7 ,'f' ,8)); - s34.addTransition(ScannerTransEntry(8 ,'o' ,9)); + s34.addTransition(ScannerTransEntry(3 ,'t' ,4)); + s34.addTransition(ScannerTransEntry(4 ,'s' ,5)); + s34.addTransition(ScannerTransEntry(5 ,'l' ,6)); + s34.addTransition(ScannerTransEntry(6 ,'i' ,7)); + s34.addTransition(ScannerTransEntry(7 ,'s' ,8)); + s34.addTransition(ScannerTransEntry(8 ,'t' ,9)); _scannerList.Insert(s34); - Scanner s35(IMPORT); + Scanner s35(GETNODELIST); s35.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s35.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s35.addState(ScannerStateEntry(2 ,START)); s35.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s35.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s35.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s35.addState(ScannerStateEntry(6 ,FINAL)); - s35.addTransition(ScannerTransEntry(0 ,'m' ,1)); - s35.addTransition(ScannerTransEntry(1 ,'p' ,3)); - s35.addTransition(ScannerTransEntry(2 ,'i' ,0)); - s35.addTransition(ScannerTransEntry(3 ,'o' ,4)); - s35.addTransition(ScannerTransEntry(4 ,'r' ,5)); - s35.addTransition(ScannerTransEntry(5 ,'t' ,6)); + s35.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s35.addState(ScannerStateEntry(7 ,INTERMEDIATE)); + s35.addState(ScannerStateEntry(8 ,INTERMEDIATE)); + s35.addState(ScannerStateEntry(9 ,INTERMEDIATE)); + s35.addState(ScannerStateEntry(10 ,INTERMEDIATE)); + s35.addState(ScannerStateEntry(11 ,FINAL)); + s35.addTransition(ScannerTransEntry(0 ,'e' ,1)); + s35.addTransition(ScannerTransEntry(1 ,'t' ,3)); + s35.addTransition(ScannerTransEntry(2 ,'g' ,0)); + s35.addTransition(ScannerTransEntry(3 ,'n' ,4)); + s35.addTransition(ScannerTransEntry(4 ,'o' ,5)); + s35.addTransition(ScannerTransEntry(5 ,'d' ,6)); + s35.addTransition(ScannerTransEntry(6 ,'e' ,7)); + s35.addTransition(ScannerTransEntry(7 ,'l' ,8)); + s35.addTransition(ScannerTransEntry(8 ,'i' ,9)); + s35.addTransition(ScannerTransEntry(9 ,'s' ,10)); + s35.addTransition(ScannerTransEntry(10 ,'t' ,11)); _scannerList.Insert(s35); - Scanner s36(INITFILE); + Scanner s36(GETDBINFO); s36.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s36.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s36.addState(ScannerStateEntry(2 ,START)); @@ -840,104 +834,112 @@ s36.addState(ScannerStateEntry(5 ,INTERMEDIATE)); s36.addState(ScannerStateEntry(6 ,INTERMEDIATE)); s36.addState(ScannerStateEntry(7 ,INTERMEDIATE)); - s36.addState(ScannerStateEntry(8 ,FINAL)); - s36.addTransition(ScannerTransEntry(0 ,'n' ,1)); - s36.addTransition(ScannerTransEntry(1 ,'i' ,3)); - s36.addTransition(ScannerTransEntry(2 ,'i' ,0)); - s36.addTransition(ScannerTransEntry(3 ,'t' ,4)); - s36.addTransition(ScannerTransEntry(4 ,'f' ,5)); + s36.addState(ScannerStateEntry(8 ,INTERMEDIATE)); + s36.addState(ScannerStateEntry(9 ,FINAL)); + s36.addTransition(ScannerTransEntry(0 ,'e' ,1)); + s36.addTransition(ScannerTransEntry(1 ,'t' ,3)); + s36.addTransition(ScannerTransEntry(2 ,'g' ,0)); + s36.addTransition(ScannerTransEntry(3 ,'d' ,4)); + s36.addTransition(ScannerTransEntry(4 ,'b' ,5)); s36.addTransition(ScannerTransEntry(5 ,'i' ,6)); - s36.addTransition(ScannerTransEntry(6 ,'l' ,7)); - s36.addTransition(ScannerTransEntry(7 ,'e' ,8)); + s36.addTransition(ScannerTransEntry(6 ,'n' ,7)); + s36.addTransition(ScannerTransEntry(7 ,'f' ,8)); + s36.addTransition(ScannerTransEntry(8 ,'o' ,9)); _scannerList.Insert(s36); - Scanner s37(INTERVAL); + Scanner s37(IMPORT); s37.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s37.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s37.addState(ScannerStateEntry(2 ,START)); s37.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s37.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s37.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s37.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s37.addState(ScannerStateEntry(7 ,INTERMEDIATE)); - s37.addState(ScannerStateEntry(8 ,FINAL)); - s37.addTransition(ScannerTransEntry(0 ,'n' ,1)); - s37.addTransition(ScannerTransEntry(1 ,'t' ,3)); + s37.addState(ScannerStateEntry(6 ,FINAL)); + s37.addTransition(ScannerTransEntry(0 ,'m' ,1)); + s37.addTransition(ScannerTransEntry(1 ,'p' ,3)); s37.addTransition(ScannerTransEntry(2 ,'i' ,0)); - s37.addTransition(ScannerTransEntry(3 ,'e' ,4)); + s37.addTransition(ScannerTransEntry(3 ,'o' ,4)); s37.addTransition(ScannerTransEntry(4 ,'r' ,5)); - s37.addTransition(ScannerTransEntry(5 ,'v' ,6)); - s37.addTransition(ScannerTransEntry(6 ,'a' ,7)); - s37.addTransition(ScannerTransEntry(7 ,'l' ,8)); + s37.addTransition(ScannerTransEntry(5 ,'t' ,6)); _scannerList.Insert(s37); - Scanner s38(KEEP); + Scanner s38(INITFILE); s38.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s38.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s38.addState(ScannerStateEntry(2 ,START)); s38.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s38.addState(ScannerStateEntry(4 ,FINAL)); - s38.addTransition(ScannerTransEntry(0 ,'e' ,1)); - s38.addTransition(ScannerTransEntry(1 ,'e' ,3)); - s38.addTransition(ScannerTransEntry(2 ,'k' ,0)); - s38.addTransition(ScannerTransEntry(3 ,'p' ,4)); + s38.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s38.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s38.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s38.addState(ScannerStateEntry(7 ,INTERMEDIATE)); + s38.addState(ScannerStateEntry(8 ,FINAL)); + s38.addTransition(ScannerTransEntry(0 ,'n' ,1)); + s38.addTransition(ScannerTransEntry(1 ,'i' ,3)); + s38.addTransition(ScannerTransEntry(2 ,'i' ,0)); + s38.addTransition(ScannerTransEntry(3 ,'t' ,4)); + s38.addTransition(ScannerTransEntry(4 ,'f' ,5)); + s38.addTransition(ScannerTransEntry(5 ,'i' ,6)); + s38.addTransition(ScannerTransEntry(6 ,'l' ,7)); + s38.addTransition(ScannerTransEntry(7 ,'e' ,8)); _scannerList.Insert(s38); - Scanner s39(LIST); + Scanner s39(INTERVAL); s39.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s39.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s39.addState(ScannerStateEntry(2 ,START)); s39.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s39.addState(ScannerStateEntry(4 ,FINAL)); - s39.addTransition(ScannerTransEntry(0 ,'i' ,1)); - s39.addTransition(ScannerTransEntry(1 ,'s' ,3)); - s39.addTransition(ScannerTransEntry(2 ,'l' ,0)); - s39.addTransition(ScannerTransEntry(3 ,'t' ,4)); + s39.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s39.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s39.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s39.addState(ScannerStateEntry(7 ,INTERMEDIATE)); + s39.addState(ScannerStateEntry(8 ,FINAL)); + s39.addTransition(ScannerTransEntry(0 ,'n' ,1)); + s39.addTransition(ScannerTransEntry(1 ,'t' ,3)); + s39.addTransition(ScannerTransEntry(2 ,'i' ,0)); + s39.addTransition(ScannerTransEntry(3 ,'e' ,4)); + s39.addTransition(ScannerTransEntry(4 ,'r' ,5)); + s39.addTransition(ScannerTransEntry(5 ,'v' ,6)); + s39.addTransition(ScannerTransEntry(6 ,'a' ,7)); + s39.addTransition(ScannerTransEntry(7 ,'l' ,8)); _scannerList.Insert(s39); - Scanner s40(LOCK); + Scanner s40(KEEP); s40.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s40.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s40.addState(ScannerStateEntry(2 ,START)); s40.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s40.addState(ScannerStateEntry(4 ,FINAL)); - s40.addTransition(ScannerTransEntry(0 ,'o' ,1)); - s40.addTransition(ScannerTransEntry(1 ,'c' ,3)); - s40.addTransition(ScannerTransEntry(2 ,'l' ,0)); - s40.addTransition(ScannerTransEntry(3 ,'k' ,4)); + s40.addTransition(ScannerTransEntry(0 ,'e' ,1)); + s40.addTransition(ScannerTransEntry(1 ,'e' ,3)); + s40.addTransition(ScannerTransEntry(2 ,'k' ,0)); + s40.addTransition(ScannerTransEntry(3 ,'p' ,4)); _scannerList.Insert(s40); - Scanner s41(LOCKSTAT); + Scanner s41(LIST); s41.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s41.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s41.addState(ScannerStateEntry(2 ,START)); s41.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s41.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s41.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s41.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s41.addState(ScannerStateEntry(7 ,INTERMEDIATE)); - s41.addState(ScannerStateEntry(8 ,FINAL)); - s41.addTransition(ScannerTransEntry(0 ,'o' ,1)); - s41.addTransition(ScannerTransEntry(1 ,'c' ,3)); + s41.addState(ScannerStateEntry(4 ,FINAL)); + s41.addTransition(ScannerTransEntry(0 ,'i' ,1)); + s41.addTransition(ScannerTransEntry(1 ,'s' ,3)); s41.addTransition(ScannerTransEntry(2 ,'l' ,0)); - s41.addTransition(ScannerTransEntry(3 ,'k' ,4)); - s41.addTransition(ScannerTransEntry(4 ,'s' ,5)); - s41.addTransition(ScannerTransEntry(5 ,'t' ,6)); - s41.addTransition(ScannerTransEntry(6 ,'a' ,7)); - s41.addTransition(ScannerTransEntry(7 ,'t' ,8)); + s41.addTransition(ScannerTransEntry(3 ,'t' ,4)); _scannerList.Insert(s41); - Scanner s42(LOG); + Scanner s42(LOCK); s42.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s42.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s42.addState(ScannerStateEntry(2 ,START)); - s42.addState(ScannerStateEntry(3 ,FINAL)); + s42.addState(ScannerStateEntry(3 ,INTERMEDIATE)); + s42.addState(ScannerStateEntry(4 ,FINAL)); s42.addTransition(ScannerTransEntry(0 ,'o' ,1)); - s42.addTransition(ScannerTransEntry(1 ,'g' ,3)); + s42.addTransition(ScannerTransEntry(1 ,'c' ,3)); s42.addTransition(ScannerTransEntry(2 ,'l' ,0)); + s42.addTransition(ScannerTransEntry(3 ,'k' ,4)); _scannerList.Insert(s42); - Scanner s43(LOGFILE); + Scanner s43(LOCKSTAT); s43.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s43.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s43.addState(ScannerStateEntry(2 ,START)); @@ -945,151 +947,149 @@ s43.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s43.addState(ScannerStateEntry(5 ,INTERMEDIATE)); s43.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s43.addState(ScannerStateEntry(7 ,FINAL)); + s43.addState(ScannerStateEntry(7 ,INTERMEDIATE)); + s43.addState(ScannerStateEntry(8 ,FINAL)); s43.addTransition(ScannerTransEntry(0 ,'o' ,1)); - s43.addTransition(ScannerTransEntry(1 ,'g' ,3)); + s43.addTransition(ScannerTransEntry(1 ,'c' ,3)); s43.addTransition(ScannerTransEntry(2 ,'l' ,0)); - s43.addTransition(ScannerTransEntry(3 ,'f' ,4)); - s43.addTransition(ScannerTransEntry(4 ,'i' ,5)); - s43.addTransition(ScannerTransEntry(5 ,'l' ,6)); - s43.addTransition(ScannerTransEntry(6 ,'e' ,7)); + s43.addTransition(ScannerTransEntry(3 ,'k' ,4)); + s43.addTransition(ScannerTransEntry(4 ,'s' ,5)); + s43.addTransition(ScannerTransEntry(5 ,'t' ,6)); + s43.addTransition(ScannerTransEntry(6 ,'a' ,7)); + s43.addTransition(ScannerTransEntry(7 ,'t' ,8)); _scannerList.Insert(s43); - Scanner s44(LOGMNG); + Scanner s44(LOG); s44.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s44.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s44.addState(ScannerStateEntry(2 ,START)); - s44.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s44.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s44.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s44.addState(ScannerStateEntry(6 ,FINAL)); + s44.addState(ScannerStateEntry(3 ,FINAL)); s44.addTransition(ScannerTransEntry(0 ,'o' ,1)); s44.addTransition(ScannerTransEntry(1 ,'g' ,3)); s44.addTransition(ScannerTransEntry(2 ,'l' ,0)); - s44.addTransition(ScannerTransEntry(3 ,'m' ,4)); - s44.addTransition(ScannerTransEntry(4 ,'n' ,5)); - s44.addTransition(ScannerTransEntry(5 ,'g' ,6)); _scannerList.Insert(s44); - Scanner s45(LOGNUM); + Scanner s45(LOGFILE); s45.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s45.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s45.addState(ScannerStateEntry(2 ,START)); s45.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s45.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s45.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s45.addState(ScannerStateEntry(6 ,FINAL)); + s45.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s45.addState(ScannerStateEntry(7 ,FINAL)); s45.addTransition(ScannerTransEntry(0 ,'o' ,1)); s45.addTransition(ScannerTransEntry(1 ,'g' ,3)); s45.addTransition(ScannerTransEntry(2 ,'l' ,0)); - s45.addTransition(ScannerTransEntry(3 ,'n' ,4)); - s45.addTransition(ScannerTransEntry(4 ,'u' ,5)); - s45.addTransition(ScannerTransEntry(5 ,'m' ,6)); + s45.addTransition(ScannerTransEntry(3 ,'f' ,4)); + s45.addTransition(ScannerTransEntry(4 ,'i' ,5)); + s45.addTransition(ScannerTransEntry(5 ,'l' ,6)); + s45.addTransition(ScannerTransEntry(6 ,'e' ,7)); _scannerList.Insert(s45); - Scanner s46(LOGSIZE); + Scanner s46(LOGMNG); s46.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s46.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s46.addState(ScannerStateEntry(2 ,START)); s46.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s46.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s46.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s46.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s46.addState(ScannerStateEntry(7 ,FINAL)); + s46.addState(ScannerStateEntry(6 ,FINAL)); s46.addTransition(ScannerTransEntry(0 ,'o' ,1)); s46.addTransition(ScannerTransEntry(1 ,'g' ,3)); s46.addTransition(ScannerTransEntry(2 ,'l' ,0)); - s46.addTransition(ScannerTransEntry(3 ,'s' ,4)); - s46.addTransition(ScannerTransEntry(4 ,'i' ,5)); - s46.addTransition(ScannerTransEntry(5 ,'z' ,6)); - s46.addTransition(ScannerTransEntry(6 ,'e' ,7)); + s46.addTransition(ScannerTransEntry(3 ,'m' ,4)); + s46.addTransition(ScannerTransEntry(4 ,'n' ,5)); + s46.addTransition(ScannerTransEntry(5 ,'g' ,6)); _scannerList.Insert(s46); - Scanner s47(IDENTIFIED); + Scanner s47(LOGNUM); s47.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s47.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s47.addState(ScannerStateEntry(2 ,START)); s47.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s47.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s47.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s47.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s47.addState(ScannerStateEntry(7 ,INTERMEDIATE)); - s47.addState(ScannerStateEntry(8 ,INTERMEDIATE)); - s47.addState(ScannerStateEntry(9 ,INTERMEDIATE)); - s47.addState(ScannerStateEntry(10 ,FINAL)); - s47.addTransition(ScannerTransEntry(0 ,'d' ,1)); - s47.addTransition(ScannerTransEntry(1 ,'e' ,3)); - s47.addTransition(ScannerTransEntry(2 ,'i' ,0)); + s47.addState(ScannerStateEntry(6 ,FINAL)); + s47.addTransition(ScannerTransEntry(0 ,'o' ,1)); + s47.addTransition(ScannerTransEntry(1 ,'g' ,3)); + s47.addTransition(ScannerTransEntry(2 ,'l' ,0)); s47.addTransition(ScannerTransEntry(3 ,'n' ,4)); - s47.addTransition(ScannerTransEntry(4 ,'t' ,5)); - s47.addTransition(ScannerTransEntry(5 ,'i' ,6)); - s47.addTransition(ScannerTransEntry(6 ,'f' ,7)); - s47.addTransition(ScannerTransEntry(7 ,'i' ,8)); - s47.addTransition(ScannerTransEntry(8 ,'e' ,9)); - s47.addTransition(ScannerTransEntry(9 ,'d' ,10)); + s47.addTransition(ScannerTransEntry(4 ,'u' ,5)); + s47.addTransition(ScannerTransEntry(5 ,'m' ,6)); _scannerList.Insert(s47); - Scanner s48(UINDEX); + Scanner s48(LOGSIZE); s48.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s48.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s48.addState(ScannerStateEntry(2 ,START)); s48.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s48.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s48.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s48.addState(ScannerStateEntry(6 ,FINAL)); - s48.addTransition(ScannerTransEntry(0 ,'i' ,1)); - s48.addTransition(ScannerTransEntry(1 ,'n' ,3)); - s48.addTransition(ScannerTransEntry(2 ,'u' ,0)); - s48.addTransition(ScannerTransEntry(3 ,'d' ,4)); - s48.addTransition(ScannerTransEntry(4 ,'e' ,5)); - s48.addTransition(ScannerTransEntry(5 ,'x' ,6)); + s48.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s48.addState(ScannerStateEntry(7 ,FINAL)); + s48.addTransition(ScannerTransEntry(0 ,'o' ,1)); + s48.addTransition(ScannerTransEntry(1 ,'g' ,3)); + s48.addTransition(ScannerTransEntry(2 ,'l' ,0)); + s48.addTransition(ScannerTransEntry(3 ,'s' ,4)); + s48.addTransition(ScannerTransEntry(4 ,'i' ,5)); + s48.addTransition(ScannerTransEntry(5 ,'z' ,6)); + s48.addTransition(ScannerTransEntry(6 ,'e' ,7)); _scannerList.Insert(s48); - Scanner s49(INFO); + Scanner s49(IDENTIFIED); s49.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s49.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s49.addState(ScannerStateEntry(2 ,START)); s49.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s49.addState(ScannerStateEntry(4 ,FINAL)); - s49.addTransition(ScannerTransEntry(0 ,'n' ,1)); - s49.addTransition(ScannerTransEntry(1 ,'f' ,3)); + s49.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s49.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s49.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s49.addState(ScannerStateEntry(7 ,INTERMEDIATE)); + s49.addState(ScannerStateEntry(8 ,INTERMEDIATE)); + s49.addState(ScannerStateEntry(9 ,INTERMEDIATE)); + s49.addState(ScannerStateEntry(10 ,FINAL)); + s49.addTransition(ScannerTransEntry(0 ,'d' ,1)); + s49.addTransition(ScannerTransEntry(1 ,'e' ,3)); s49.addTransition(ScannerTransEntry(2 ,'i' ,0)); - s49.addTransition(ScannerTransEntry(3 ,'o' ,4)); + s49.addTransition(ScannerTransEntry(3 ,'n' ,4)); + s49.addTransition(ScannerTransEntry(4 ,'t' ,5)); + s49.addTransition(ScannerTransEntry(5 ,'i' ,6)); + s49.addTransition(ScannerTransEntry(6 ,'f' ,7)); + s49.addTransition(ScannerTransEntry(7 ,'i' ,8)); + s49.addTransition(ScannerTransEntry(8 ,'e' ,9)); + s49.addTransition(ScannerTransEntry(9 ,'d' ,10)); _scannerList.Insert(s49); - Scanner s50(MEDIATOR); + Scanner s50(UINDEX); s50.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s50.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s50.addState(ScannerStateEntry(2 ,START)); s50.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s50.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s50.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s50.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s50.addState(ScannerStateEntry(7 ,INTERMEDIATE)); - s50.addState(ScannerStateEntry(8 ,FINAL)); - s50.addTransition(ScannerTransEntry(0 ,'e' ,1)); - s50.addTransition(ScannerTransEntry(1 ,'d' ,3)); - s50.addTransition(ScannerTransEntry(2 ,'m' ,0)); - s50.addTransition(ScannerTransEntry(3 ,'i' ,4)); - s50.addTransition(ScannerTransEntry(4 ,'a' ,5)); - s50.addTransition(ScannerTransEntry(5 ,'t' ,6)); - s50.addTransition(ScannerTransEntry(6 ,'o' ,7)); - s50.addTransition(ScannerTransEntry(7 ,'r' ,8)); + s50.addState(ScannerStateEntry(6 ,FINAL)); + s50.addTransition(ScannerTransEntry(0 ,'i' ,1)); + s50.addTransition(ScannerTransEntry(1 ,'n' ,3)); + s50.addTransition(ScannerTransEntry(2 ,'u' ,0)); + s50.addTransition(ScannerTransEntry(3 ,'d' ,4)); + s50.addTransition(ScannerTransEntry(4 ,'e' ,5)); + s50.addTransition(ScannerTransEntry(5 ,'x' ,6)); _scannerList.Insert(s50); - Scanner s51(NODE); + Scanner s51(INFO); s51.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s51.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s51.addState(ScannerStateEntry(2 ,START)); s51.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s51.addState(ScannerStateEntry(4 ,FINAL)); - s51.addTransition(ScannerTransEntry(0 ,'o' ,1)); - s51.addTransition(ScannerTransEntry(1 ,'d' ,3)); - s51.addTransition(ScannerTransEntry(2 ,'n' ,0)); - s51.addTransition(ScannerTransEntry(3 ,'e' ,4)); + s51.addTransition(ScannerTransEntry(0 ,'n' ,1)); + s51.addTransition(ScannerTransEntry(1 ,'f' ,3)); + s51.addTransition(ScannerTransEntry(2 ,'i' ,0)); + s51.addTransition(ScannerTransEntry(3 ,'o' ,4)); _scannerList.Insert(s51); - Scanner s52(NOLOGGING); + Scanner s52(MEDIATOR); s52.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s52.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s52.addState(ScannerStateEntry(2 ,START)); @@ -1098,108 +1098,114 @@ s52.addState(ScannerStateEntry(5 ,INTERMEDIATE)); s52.addState(ScannerStateEntry(6 ,INTERMEDIATE)); s52.addState(ScannerStateEntry(7 ,INTERMEDIATE)); - s52.addState(ScannerStateEntry(8 ,INTERMEDIATE)); - s52.addState(ScannerStateEntry(9 ,FINAL)); - s52.addTransition(ScannerTransEntry(0 ,'o' ,1)); - s52.addTransition(ScannerTransEntry(1 ,'l' ,3)); - s52.addTransition(ScannerTransEntry(2 ,'n' ,0)); - s52.addTransition(ScannerTransEntry(3 ,'o' ,4)); - s52.addTransition(ScannerTransEntry(4 ,'g' ,5)); - s52.addTransition(ScannerTransEntry(5 ,'g' ,6)); - s52.addTransition(ScannerTransEntry(6 ,'i' ,7)); - s52.addTransition(ScannerTransEntry(7 ,'n' ,8)); - s52.addTransition(ScannerTransEntry(8 ,'g' ,9)); + s52.addState(ScannerStateEntry(8 ,FINAL)); + s52.addTransition(ScannerTransEntry(0 ,'e' ,1)); + s52.addTransition(ScannerTransEntry(1 ,'d' ,3)); + s52.addTransition(ScannerTransEntry(2 ,'m' ,0)); + s52.addTransition(ScannerTransEntry(3 ,'i' ,4)); + s52.addTransition(ScannerTransEntry(4 ,'a' ,5)); + s52.addTransition(ScannerTransEntry(5 ,'t' ,6)); + s52.addTransition(ScannerTransEntry(6 ,'o' ,7)); + s52.addTransition(ScannerTransEntry(7 ,'r' ,8)); _scannerList.Insert(s52); - Scanner s53(OBJECT); + Scanner s53(NODE); s53.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s53.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s53.addState(ScannerStateEntry(2 ,START)); s53.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s53.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s53.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s53.addState(ScannerStateEntry(6 ,FINAL)); - s53.addTransition(ScannerTransEntry(0 ,'b' ,1)); - s53.addTransition(ScannerTransEntry(1 ,'j' ,3)); - s53.addTransition(ScannerTransEntry(2 ,'o' ,0)); + s53.addState(ScannerStateEntry(4 ,FINAL)); + s53.addTransition(ScannerTransEntry(0 ,'o' ,1)); + s53.addTransition(ScannerTransEntry(1 ,'d' ,3)); + s53.addTransition(ScannerTransEntry(2 ,'n' ,0)); s53.addTransition(ScannerTransEntry(3 ,'e' ,4)); - s53.addTransition(ScannerTransEntry(4 ,'c' ,5)); - s53.addTransition(ScannerTransEntry(5 ,'t' ,6)); _scannerList.Insert(s53); - Scanner s54(OFF); + Scanner s54(NOLOGGING); s54.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s54.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s54.addState(ScannerStateEntry(2 ,START)); - s54.addState(ScannerStateEntry(3 ,FINAL)); - s54.addTransition(ScannerTransEntry(0 ,'f' ,1)); - s54.addTransition(ScannerTransEntry(1 ,'f' ,3)); - s54.addTransition(ScannerTransEntry(2 ,'o' ,0)); + s54.addState(ScannerStateEntry(3 ,INTERMEDIATE)); + s54.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s54.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s54.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s54.addState(ScannerStateEntry(7 ,INTERMEDIATE)); + s54.addState(ScannerStateEntry(8 ,INTERMEDIATE)); + s54.addState(ScannerStateEntry(9 ,FINAL)); + s54.addTransition(ScannerTransEntry(0 ,'o' ,1)); + s54.addTransition(ScannerTransEntry(1 ,'l' ,3)); + s54.addTransition(ScannerTransEntry(2 ,'n' ,0)); + s54.addTransition(ScannerTransEntry(3 ,'o' ,4)); + s54.addTransition(ScannerTransEntry(4 ,'g' ,5)); + s54.addTransition(ScannerTransEntry(5 ,'g' ,6)); + s54.addTransition(ScannerTransEntry(6 ,'i' ,7)); + s54.addTransition(ScannerTransEntry(7 ,'n' ,8)); + s54.addTransition(ScannerTransEntry(8 ,'g' ,9)); _scannerList.Insert(s54); - Scanner s55(ON); + Scanner s55(OBJECT); s55.addState(ScannerStateEntry(0 ,INTERMEDIATE)); - s55.addState(ScannerStateEntry(1 ,FINAL)); + s55.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s55.addState(ScannerStateEntry(2 ,START)); - s55.addTransition(ScannerTransEntry(0 ,'n' ,1)); + s55.addState(ScannerStateEntry(3 ,INTERMEDIATE)); + s55.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s55.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s55.addState(ScannerStateEntry(6 ,FINAL)); + s55.addTransition(ScannerTransEntry(0 ,'b' ,1)); + s55.addTransition(ScannerTransEntry(1 ,'j' ,3)); s55.addTransition(ScannerTransEntry(2 ,'o' ,0)); + s55.addTransition(ScannerTransEntry(3 ,'e' ,4)); + s55.addTransition(ScannerTransEntry(4 ,'c' ,5)); + s55.addTransition(ScannerTransEntry(5 ,'t' ,6)); _scannerList.Insert(s55); - Scanner s56(PATH); + Scanner s56(OFF); s56.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s56.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s56.addState(ScannerStateEntry(2 ,START)); - s56.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s56.addState(ScannerStateEntry(4 ,FINAL)); - s56.addTransition(ScannerTransEntry(0 ,'a' ,1)); - s56.addTransition(ScannerTransEntry(1 ,'t' ,3)); - s56.addTransition(ScannerTransEntry(2 ,'p' ,0)); - s56.addTransition(ScannerTransEntry(3 ,'h' ,4)); + s56.addState(ScannerStateEntry(3 ,FINAL)); + s56.addTransition(ScannerTransEntry(0 ,'f' ,1)); + s56.addTransition(ScannerTransEntry(1 ,'f' ,3)); + s56.addTransition(ScannerTransEntry(2 ,'o' ,0)); _scannerList.Insert(s56); - Scanner s57(PASSWD); + Scanner s57(ON); s57.addState(ScannerStateEntry(0 ,INTERMEDIATE)); - s57.addState(ScannerStateEntry(1 ,INTERMEDIATE)); + s57.addState(ScannerStateEntry(1 ,FINAL)); s57.addState(ScannerStateEntry(2 ,START)); - s57.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s57.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s57.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s57.addState(ScannerStateEntry(6 ,FINAL)); - s57.addTransition(ScannerTransEntry(0 ,'a' ,1)); - s57.addTransition(ScannerTransEntry(1 ,'s' ,3)); - s57.addTransition(ScannerTransEntry(2 ,'p' ,0)); - s57.addTransition(ScannerTransEntry(3 ,'s' ,4)); - s57.addTransition(ScannerTransEntry(4 ,'w' ,5)); - s57.addTransition(ScannerTransEntry(5 ,'d' ,6)); + s57.addTransition(ScannerTransEntry(0 ,'n' ,1)); + s57.addTransition(ScannerTransEntry(2 ,'o' ,0)); _scannerList.Insert(s57); - Scanner s58(PLAIN); + Scanner s58(PATH); s58.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s58.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s58.addState(ScannerStateEntry(2 ,START)); s58.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s58.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s58.addState(ScannerStateEntry(5 ,FINAL)); - s58.addTransition(ScannerTransEntry(0 ,'l' ,1)); - s58.addTransition(ScannerTransEntry(1 ,'a' ,3)); + s58.addState(ScannerStateEntry(4 ,FINAL)); + s58.addTransition(ScannerTransEntry(0 ,'a' ,1)); + s58.addTransition(ScannerTransEntry(1 ,'t' ,3)); s58.addTransition(ScannerTransEntry(2 ,'p' ,0)); - s58.addTransition(ScannerTransEntry(3 ,'i' ,4)); - s58.addTransition(ScannerTransEntry(4 ,'n' ,5)); + s58.addTransition(ScannerTransEntry(3 ,'h' ,4)); _scannerList.Insert(s58); - Scanner s59(POOL); + Scanner s59(PASSWD); s59.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s59.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s59.addState(ScannerStateEntry(2 ,START)); s59.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s59.addState(ScannerStateEntry(4 ,FINAL)); - s59.addTransition(ScannerTransEntry(0 ,'o' ,1)); - s59.addTransition(ScannerTransEntry(1 ,'o' ,3)); + s59.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s59.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s59.addState(ScannerStateEntry(6 ,FINAL)); + s59.addTransition(ScannerTransEntry(0 ,'a' ,1)); + s59.addTransition(ScannerTransEntry(1 ,'s' ,3)); s59.addTransition(ScannerTransEntry(2 ,'p' ,0)); - s59.addTransition(ScannerTransEntry(3 ,'l' ,4)); + s59.addTransition(ScannerTransEntry(3 ,'s' ,4)); + s59.addTransition(ScannerTransEntry(4 ,'w' ,5)); + s59.addTransition(ScannerTransEntry(5 ,'d' ,6)); _scannerList.Insert(s59); - Scanner s60(PRIMARY); + Scanner s60(PERMISSION); s60.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s60.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s60.addState(ScannerStateEntry(2 ,START)); @@ -1207,47 +1213,49 @@ s60.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s60.addState(ScannerStateEntry(5 ,INTERMEDIATE)); s60.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s60.addState(ScannerStateEntry(7 ,FINAL)); - s60.addTransition(ScannerTransEntry(0 ,'r' ,1)); - s60.addTransition(ScannerTransEntry(1 ,'i' ,3)); + s60.addState(ScannerStateEntry(7 ,INTERMEDIATE)); + s60.addState(ScannerStateEntry(8 ,INTERMEDIATE)); + s60.addState(ScannerStateEntry(9 ,INTERMEDIATE)); + s60.addState(ScannerStateEntry(10 ,FINAL)); + s60.addTransition(ScannerTransEntry(0 ,'e' ,1)); + s60.addTransition(ScannerTransEntry(1 ,'r' ,3)); s60.addTransition(ScannerTransEntry(2 ,'p' ,0)); s60.addTransition(ScannerTransEntry(3 ,'m' ,4)); - s60.addTransition(ScannerTransEntry(4 ,'a' ,5)); - s60.addTransition(ScannerTransEntry(5 ,'r' ,6)); - s60.addTransition(ScannerTransEntry(6 ,'y' ,7)); + s60.addTransition(ScannerTransEntry(4 ,'i' ,5)); + s60.addTransition(ScannerTransEntry(5 ,'s' ,6)); + s60.addTransition(ScannerTransEntry(6 ,'s' ,7)); + s60.addTransition(ScannerTransEntry(7 ,'i' ,8)); + s60.addTransition(ScannerTransEntry(8 ,'o' ,9)); + s60.addTransition(ScannerTransEntry(9 ,'n' ,10)); _scannerList.Insert(s60); - Scanner s61(QUIT); + Scanner s61(PLAIN); s61.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s61.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s61.addState(ScannerStateEntry(2 ,START)); s61.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s61.addState(ScannerStateEntry(4 ,FINAL)); - s61.addTransition(ScannerTransEntry(0 ,'u' ,1)); - s61.addTransition(ScannerTransEntry(1 ,'i' ,3)); - s61.addTransition(ScannerTransEntry(2 ,'q' ,0)); - s61.addTransition(ScannerTransEntry(3 ,'t' ,4)); + s61.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s61.addState(ScannerStateEntry(5 ,FINAL)); + s61.addTransition(ScannerTransEntry(0 ,'l' ,1)); + s61.addTransition(ScannerTransEntry(1 ,'a' ,3)); + s61.addTransition(ScannerTransEntry(2 ,'p' ,0)); + s61.addTransition(ScannerTransEntry(3 ,'i' ,4)); + s61.addTransition(ScannerTransEntry(4 ,'n' ,5)); _scannerList.Insert(s61); - Scanner s62(RAWMODE); + Scanner s62(POOL); s62.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s62.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s62.addState(ScannerStateEntry(2 ,START)); s62.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s62.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s62.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s62.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s62.addState(ScannerStateEntry(7 ,FINAL)); - s62.addTransition(ScannerTransEntry(0 ,'a' ,1)); - s62.addTransition(ScannerTransEntry(1 ,'w' ,3)); - s62.addTransition(ScannerTransEntry(2 ,'r' ,0)); - s62.addTransition(ScannerTransEntry(3 ,'m' ,4)); - s62.addTransition(ScannerTransEntry(4 ,'o' ,5)); - s62.addTransition(ScannerTransEntry(5 ,'d' ,6)); - s62.addTransition(ScannerTransEntry(6 ,'e' ,7)); + s62.addState(ScannerStateEntry(4 ,FINAL)); + s62.addTransition(ScannerTransEntry(0 ,'o' ,1)); + s62.addTransition(ScannerTransEntry(1 ,'o' ,3)); + s62.addTransition(ScannerTransEntry(2 ,'p' ,0)); + s62.addTransition(ScannerTransEntry(3 ,'l' ,4)); _scannerList.Insert(s62); - Scanner s63(RELOCATE); + Scanner s63(PRIMARY); s63.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s63.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s63.addState(ScannerStateEntry(2 ,START)); @@ -1255,35 +1263,29 @@ s63.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s63.addState(ScannerStateEntry(5 ,INTERMEDIATE)); s63.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s63.addState(ScannerStateEntry(7 ,INTERMEDIATE)); - s63.addState(ScannerStateEntry(8 ,FINAL)); - s63.addTransition(ScannerTransEntry(0 ,'e' ,1)); - s63.addTransition(ScannerTransEntry(1 ,'l' ,3)); - s63.addTransition(ScannerTransEntry(2 ,'r' ,0)); - s63.addTransition(ScannerTransEntry(3 ,'o' ,4)); - s63.addTransition(ScannerTransEntry(4 ,'c' ,5)); - s63.addTransition(ScannerTransEntry(5 ,'a' ,6)); - s63.addTransition(ScannerTransEntry(6 ,'t' ,7)); - s63.addTransition(ScannerTransEntry(7 ,'e' ,8)); + s63.addState(ScannerStateEntry(7 ,FINAL)); + s63.addTransition(ScannerTransEntry(0 ,'r' ,1)); + s63.addTransition(ScannerTransEntry(1 ,'i' ,3)); + s63.addTransition(ScannerTransEntry(2 ,'p' ,0)); + s63.addTransition(ScannerTransEntry(3 ,'m' ,4)); + s63.addTransition(ScannerTransEntry(4 ,'a' ,5)); + s63.addTransition(ScannerTransEntry(5 ,'r' ,6)); + s63.addTransition(ScannerTransEntry(6 ,'y' ,7)); _scannerList.Insert(s63); - Scanner s64(REMOVE); + Scanner s64(QUIT); s64.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s64.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s64.addState(ScannerStateEntry(2 ,START)); s64.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s64.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s64.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s64.addState(ScannerStateEntry(6 ,FINAL)); - s64.addTransition(ScannerTransEntry(0 ,'e' ,1)); - s64.addTransition(ScannerTransEntry(1 ,'m' ,3)); - s64.addTransition(ScannerTransEntry(2 ,'r' ,0)); - s64.addTransition(ScannerTransEntry(3 ,'o' ,4)); - s64.addTransition(ScannerTransEntry(4 ,'v' ,5)); - s64.addTransition(ScannerTransEntry(5 ,'e' ,6)); + s64.addState(ScannerStateEntry(4 ,FINAL)); + s64.addTransition(ScannerTransEntry(0 ,'u' ,1)); + s64.addTransition(ScannerTransEntry(1 ,'i' ,3)); + s64.addTransition(ScannerTransEntry(2 ,'q' ,0)); + s64.addTransition(ScannerTransEntry(3 ,'t' ,4)); _scannerList.Insert(s64); - Scanner s65(RECOVER); + Scanner s65(RAWMODE); s65.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s65.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s65.addState(ScannerStateEntry(2 ,START)); @@ -1292,16 +1294,16 @@ s65.addState(ScannerStateEntry(5 ,INTERMEDIATE)); s65.addState(ScannerStateEntry(6 ,INTERMEDIATE)); s65.addState(ScannerStateEntry(7 ,FINAL)); - s65.addTransition(ScannerTransEntry(0 ,'e' ,1)); - s65.addTransition(ScannerTransEntry(1 ,'c' ,3)); + s65.addTransition(ScannerTransEntry(0 ,'a' ,1)); + s65.addTransition(ScannerTransEntry(1 ,'w' ,3)); s65.addTransition(ScannerTransEntry(2 ,'r' ,0)); - s65.addTransition(ScannerTransEntry(3 ,'o' ,4)); - s65.addTransition(ScannerTransEntry(4 ,'v' ,5)); - s65.addTransition(ScannerTransEntry(5 ,'e' ,6)); - s65.addTransition(ScannerTransEntry(6 ,'r' ,7)); + s65.addTransition(ScannerTransEntry(3 ,'m' ,4)); + s65.addTransition(ScannerTransEntry(4 ,'o' ,5)); + s65.addTransition(ScannerTransEntry(5 ,'d' ,6)); + s65.addTransition(ScannerTransEntry(6 ,'e' ,7)); _scannerList.Insert(s65); - Scanner s66(RETRIEVE); + Scanner s66(RELOCATE); s66.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s66.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s66.addState(ScannerStateEntry(2 ,START)); @@ -1312,28 +1314,32 @@ s66.addState(ScannerStateEntry(7 ,INTERMEDIATE)); s66.addState(ScannerStateEntry(8 ,FINAL)); s66.addTransition(ScannerTransEntry(0 ,'e' ,1)); - s66.addTransition(ScannerTransEntry(1 ,'t' ,3)); + s66.addTransition(ScannerTransEntry(1 ,'l' ,3)); s66.addTransition(ScannerTransEntry(2 ,'r' ,0)); - s66.addTransition(ScannerTransEntry(3 ,'r' ,4)); - s66.addTransition(ScannerTransEntry(4 ,'i' ,5)); - s66.addTransition(ScannerTransEntry(5 ,'e' ,6)); - s66.addTransition(ScannerTransEntry(6 ,'v' ,7)); + s66.addTransition(ScannerTransEntry(3 ,'o' ,4)); + s66.addTransition(ScannerTransEntry(4 ,'c' ,5)); + s66.addTransition(ScannerTransEntry(5 ,'a' ,6)); + s66.addTransition(ScannerTransEntry(6 ,'t' ,7)); s66.addTransition(ScannerTransEntry(7 ,'e' ,8)); _scannerList.Insert(s66); - Scanner s67(ROLE); + Scanner s67(REMOVE); s67.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s67.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s67.addState(ScannerStateEntry(2 ,START)); s67.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s67.addState(ScannerStateEntry(4 ,FINAL)); - s67.addTransition(ScannerTransEntry(0 ,'o' ,1)); - s67.addTransition(ScannerTransEntry(1 ,'l' ,3)); + s67.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s67.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s67.addState(ScannerStateEntry(6 ,FINAL)); + s67.addTransition(ScannerTransEntry(0 ,'e' ,1)); + s67.addTransition(ScannerTransEntry(1 ,'m' ,3)); s67.addTransition(ScannerTransEntry(2 ,'r' ,0)); - s67.addTransition(ScannerTransEntry(3 ,'e' ,4)); + s67.addTransition(ScannerTransEntry(3 ,'o' ,4)); + s67.addTransition(ScannerTransEntry(4 ,'v' ,5)); + s67.addTransition(ScannerTransEntry(5 ,'e' ,6)); _scannerList.Insert(s67); - Scanner s68(SECONDARY); + Scanner s68(RECOVER); s68.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s68.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s68.addState(ScannerStateEntry(2 ,START)); @@ -1341,21 +1347,17 @@ s68.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s68.addState(ScannerStateEntry(5 ,INTERMEDIATE)); s68.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s68.addState(ScannerStateEntry(7 ,INTERMEDIATE)); - s68.addState(ScannerStateEntry(8 ,INTERMEDIATE)); - s68.addState(ScannerStateEntry(9 ,FINAL)); + s68.addState(ScannerStateEntry(7 ,FINAL)); s68.addTransition(ScannerTransEntry(0 ,'e' ,1)); s68.addTransition(ScannerTransEntry(1 ,'c' ,3)); - s68.addTransition(ScannerTransEntry(2 ,'s' ,0)); + s68.addTransition(ScannerTransEntry(2 ,'r' ,0)); s68.addTransition(ScannerTransEntry(3 ,'o' ,4)); - s68.addTransition(ScannerTransEntry(4 ,'n' ,5)); - s68.addTransition(ScannerTransEntry(5 ,'d' ,6)); - s68.addTransition(ScannerTransEntry(6 ,'a' ,7)); - s68.addTransition(ScannerTransEntry(7 ,'r' ,8)); - s68.addTransition(ScannerTransEntry(8 ,'y' ,9)); + s68.addTransition(ScannerTransEntry(4 ,'v' ,5)); + s68.addTransition(ScannerTransEntry(5 ,'e' ,6)); + s68.addTransition(ScannerTransEntry(6 ,'r' ,7)); _scannerList.Insert(s68); - Scanner s69(SESSION); + Scanner s69(RETRIEVE); s69.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s69.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s69.addState(ScannerStateEntry(2 ,START)); @@ -1363,69 +1365,67 @@ s69.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s69.addState(ScannerStateEntry(5 ,INTERMEDIATE)); s69.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s69.addState(ScannerStateEntry(7 ,FINAL)); + s69.addState(ScannerStateEntry(7 ,INTERMEDIATE)); + s69.addState(ScannerStateEntry(8 ,FINAL)); s69.addTransition(ScannerTransEntry(0 ,'e' ,1)); - s69.addTransition(ScannerTransEntry(1 ,'s' ,3)); - s69.addTransition(ScannerTransEntry(2 ,'s' ,0)); - s69.addTransition(ScannerTransEntry(3 ,'s' ,4)); + s69.addTransition(ScannerTransEntry(1 ,'t' ,3)); + s69.addTransition(ScannerTransEntry(2 ,'r' ,0)); + s69.addTransition(ScannerTransEntry(3 ,'r' ,4)); s69.addTransition(ScannerTransEntry(4 ,'i' ,5)); - s69.addTransition(ScannerTransEntry(5 ,'o' ,6)); - s69.addTransition(ScannerTransEntry(6 ,'n' ,7)); + s69.addTransition(ScannerTransEntry(5 ,'e' ,6)); + s69.addTransition(ScannerTransEntry(6 ,'v' ,7)); + s69.addTransition(ScannerTransEntry(7 ,'e' ,8)); _scannerList.Insert(s69); - Scanner s70(SET); + Scanner s70(RIGHT); s70.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s70.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s70.addState(ScannerStateEntry(2 ,START)); - s70.addState(ScannerStateEntry(3 ,FINAL)); - s70.addTransition(ScannerTransEntry(0 ,'e' ,1)); - s70.addTransition(ScannerTransEntry(1 ,'t' ,3)); - s70.addTransition(ScannerTransEntry(2 ,'s' ,0)); + s70.addState(ScannerStateEntry(3 ,INTERMEDIATE)); + s70.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s70.addState(ScannerStateEntry(5 ,FINAL)); + s70.addTransition(ScannerTransEntry(0 ,'i' ,1)); + s70.addTransition(ScannerTransEntry(1 ,'g' ,3)); + s70.addTransition(ScannerTransEntry(2 ,'r' ,0)); + s70.addTransition(ScannerTransEntry(3 ,'h' ,4)); + s70.addTransition(ScannerTransEntry(4 ,'t' ,5)); _scannerList.Insert(s70); - Scanner s71(SETTSNODEINFO); + Scanner s71(ROLE); s71.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s71.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s71.addState(ScannerStateEntry(2 ,START)); s71.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s71.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s71.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s71.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s71.addState(ScannerStateEntry(7 ,INTERMEDIATE)); - s71.addState(ScannerStateEntry(8 ,INTERMEDIATE)); - s71.addState(ScannerStateEntry(9 ,INTERMEDIATE)); - s71.addState(ScannerStateEntry(10 ,INTERMEDIATE)); - s71.addState(ScannerStateEntry(11 ,INTERMEDIATE)); - s71.addState(ScannerStateEntry(12 ,INTERMEDIATE)); - s71.addState(ScannerStateEntry(13 ,FINAL)); - s71.addTransition(ScannerTransEntry(0 ,'e' ,1)); - s71.addTransition(ScannerTransEntry(1 ,'t' ,3)); - s71.addTransition(ScannerTransEntry(2 ,'s' ,0)); - s71.addTransition(ScannerTransEntry(3 ,'t' ,4)); - s71.addTransition(ScannerTransEntry(4 ,'s' ,5)); - s71.addTransition(ScannerTransEntry(5 ,'n' ,6)); - s71.addTransition(ScannerTransEntry(6 ,'o' ,7)); - s71.addTransition(ScannerTransEntry(7 ,'d' ,8)); - s71.addTransition(ScannerTransEntry(8 ,'e' ,9)); - s71.addTransition(ScannerTransEntry(9 ,'i' ,10)); - s71.addTransition(ScannerTransEntry(10 ,'n' ,11)); - s71.addTransition(ScannerTransEntry(11 ,'f' ,12)); - s71.addTransition(ScannerTransEntry(12 ,'o' ,13)); + s71.addState(ScannerStateEntry(4 ,FINAL)); + s71.addTransition(ScannerTransEntry(0 ,'o' ,1)); + s71.addTransition(ScannerTransEntry(1 ,'l' ,3)); + s71.addTransition(ScannerTransEntry(2 ,'r' ,0)); + s71.addTransition(ScannerTransEntry(3 ,'e' ,4)); _scannerList.Insert(s71); - Scanner s72(SIZE); + Scanner s72(SECONDARY); s72.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s72.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s72.addState(ScannerStateEntry(2 ,START)); s72.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s72.addState(ScannerStateEntry(4 ,FINAL)); - s72.addTransition(ScannerTransEntry(0 ,'i' ,1)); - s72.addTransition(ScannerTransEntry(1 ,'z' ,3)); + s72.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s72.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s72.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s72.addState(ScannerStateEntry(7 ,INTERMEDIATE)); + s72.addState(ScannerStateEntry(8 ,INTERMEDIATE)); + s72.addState(ScannerStateEntry(9 ,FINAL)); + s72.addTransition(ScannerTransEntry(0 ,'e' ,1)); + s72.addTransition(ScannerTransEntry(1 ,'c' ,3)); s72.addTransition(ScannerTransEntry(2 ,'s' ,0)); - s72.addTransition(ScannerTransEntry(3 ,'e' ,4)); + s72.addTransition(ScannerTransEntry(3 ,'o' ,4)); + s72.addTransition(ScannerTransEntry(4 ,'n' ,5)); + s72.addTransition(ScannerTransEntry(5 ,'d' ,6)); + s72.addTransition(ScannerTransEntry(6 ,'a' ,7)); + s72.addTransition(ScannerTransEntry(7 ,'r' ,8)); + s72.addTransition(ScannerTransEntry(8 ,'y' ,9)); _scannerList.Insert(s72); - Scanner s73(SORTAREASIZE); + Scanner s73(SESSION); s73.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s73.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s73.addState(ScannerStateEntry(2 ,START)); @@ -1433,183 +1433,185 @@ s73.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s73.addState(ScannerStateEntry(5 ,INTERMEDIATE)); s73.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s73.addState(ScannerStateEntry(7 ,INTERMEDIATE)); - s73.addState(ScannerStateEntry(8 ,INTERMEDIATE)); - s73.addState(ScannerStateEntry(9 ,INTERMEDIATE)); - s73.addState(ScannerStateEntry(10 ,INTERMEDIATE)); - s73.addState(ScannerStateEntry(11 ,INTERMEDIATE)); - s73.addState(ScannerStateEntry(12 ,FINAL)); - s73.addTransition(ScannerTransEntry(0 ,'o' ,1)); - s73.addTransition(ScannerTransEntry(1 ,'r' ,3)); + s73.addState(ScannerStateEntry(7 ,FINAL)); + s73.addTransition(ScannerTransEntry(0 ,'e' ,1)); + s73.addTransition(ScannerTransEntry(1 ,'s' ,3)); s73.addTransition(ScannerTransEntry(2 ,'s' ,0)); - s73.addTransition(ScannerTransEntry(3 ,'t' ,4)); - s73.addTransition(ScannerTransEntry(4 ,'a' ,5)); - s73.addTransition(ScannerTransEntry(5 ,'r' ,6)); - s73.addTransition(ScannerTransEntry(6 ,'e' ,7)); - s73.addTransition(ScannerTransEntry(7 ,'a' ,8)); - s73.addTransition(ScannerTransEntry(8 ,'s' ,9)); - s73.addTransition(ScannerTransEntry(9 ,'i' ,10)); - s73.addTransition(ScannerTransEntry(10 ,'z' ,11)); - s73.addTransition(ScannerTransEntry(11 ,'e' ,12)); + s73.addTransition(ScannerTransEntry(3 ,'s' ,4)); + s73.addTransition(ScannerTransEntry(4 ,'i' ,5)); + s73.addTransition(ScannerTransEntry(5 ,'o' ,6)); + s73.addTransition(ScannerTransEntry(6 ,'n' ,7)); _scannerList.Insert(s73); - Scanner s74(STRUCTURE); + Scanner s74(SET); s74.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s74.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s74.addState(ScannerStateEntry(2 ,START)); - s74.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s74.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s74.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s74.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s74.addState(ScannerStateEntry(7 ,INTERMEDIATE)); - s74.addState(ScannerStateEntry(8 ,INTERMEDIATE)); - s74.addState(ScannerStateEntry(9 ,FINAL)); - s74.addTransition(ScannerTransEntry(0 ,'t' ,1)); - s74.addTransition(ScannerTransEntry(1 ,'r' ,3)); + s74.addState(ScannerStateEntry(3 ,FINAL)); + s74.addTransition(ScannerTransEntry(0 ,'e' ,1)); + s74.addTransition(ScannerTransEntry(1 ,'t' ,3)); s74.addTransition(ScannerTransEntry(2 ,'s' ,0)); - s74.addTransition(ScannerTransEntry(3 ,'u' ,4)); - s74.addTransition(ScannerTransEntry(4 ,'c' ,5)); - s74.addTransition(ScannerTransEntry(5 ,'t' ,6)); - s74.addTransition(ScannerTransEntry(6 ,'u' ,7)); - s74.addTransition(ScannerTransEntry(7 ,'r' ,8)); - s74.addTransition(ScannerTransEntry(8 ,'e' ,9)); _scannerList.Insert(s74); - Scanner s75(SHOW); + Scanner s75(SETTSNODEINFO); s75.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s75.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s75.addState(ScannerStateEntry(2 ,START)); s75.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s75.addState(ScannerStateEntry(4 ,FINAL)); - s75.addTransition(ScannerTransEntry(0 ,'h' ,1)); - s75.addTransition(ScannerTransEntry(1 ,'o' ,3)); + s75.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s75.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s75.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s75.addState(ScannerStateEntry(7 ,INTERMEDIATE)); + s75.addState(ScannerStateEntry(8 ,INTERMEDIATE)); + s75.addState(ScannerStateEntry(9 ,INTERMEDIATE)); + s75.addState(ScannerStateEntry(10 ,INTERMEDIATE)); + s75.addState(ScannerStateEntry(11 ,INTERMEDIATE)); + s75.addState(ScannerStateEntry(12 ,INTERMEDIATE)); + s75.addState(ScannerStateEntry(13 ,FINAL)); + s75.addTransition(ScannerTransEntry(0 ,'e' ,1)); + s75.addTransition(ScannerTransEntry(1 ,'t' ,3)); s75.addTransition(ScannerTransEntry(2 ,'s' ,0)); - s75.addTransition(ScannerTransEntry(3 ,'w' ,4)); + s75.addTransition(ScannerTransEntry(3 ,'t' ,4)); + s75.addTransition(ScannerTransEntry(4 ,'s' ,5)); + s75.addTransition(ScannerTransEntry(5 ,'n' ,6)); + s75.addTransition(ScannerTransEntry(6 ,'o' ,7)); + s75.addTransition(ScannerTransEntry(7 ,'d' ,8)); + s75.addTransition(ScannerTransEntry(8 ,'e' ,9)); + s75.addTransition(ScannerTransEntry(9 ,'i' ,10)); + s75.addTransition(ScannerTransEntry(10 ,'n' ,11)); + s75.addTransition(ScannerTransEntry(11 ,'f' ,12)); + s75.addTransition(ScannerTransEntry(12 ,'o' ,13)); _scannerList.Insert(s75); - Scanner s76(START_TOK); + Scanner s76(SIZE); s76.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s76.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s76.addState(ScannerStateEntry(2 ,START)); s76.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s76.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s76.addState(ScannerStateEntry(5 ,FINAL)); - s76.addTransition(ScannerTransEntry(0 ,'t' ,1)); - s76.addTransition(ScannerTransEntry(1 ,'a' ,3)); + s76.addState(ScannerStateEntry(4 ,FINAL)); + s76.addTransition(ScannerTransEntry(0 ,'i' ,1)); + s76.addTransition(ScannerTransEntry(1 ,'z' ,3)); s76.addTransition(ScannerTransEntry(2 ,'s' ,0)); - s76.addTransition(ScannerTransEntry(3 ,'r' ,4)); - s76.addTransition(ScannerTransEntry(4 ,'t' ,5)); + s76.addTransition(ScannerTransEntry(3 ,'e' ,4)); _scannerList.Insert(s76); - Scanner s77(STOP_TOK); + Scanner s77(SORTAREASIZE); s77.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s77.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s77.addState(ScannerStateEntry(2 ,START)); s77.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s77.addState(ScannerStateEntry(4 ,FINAL)); - s77.addTransition(ScannerTransEntry(0 ,'t' ,1)); - s77.addTransition(ScannerTransEntry(1 ,'o' ,3)); + s77.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s77.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s77.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s77.addState(ScannerStateEntry(7 ,INTERMEDIATE)); + s77.addState(ScannerStateEntry(8 ,INTERMEDIATE)); + s77.addState(ScannerStateEntry(9 ,INTERMEDIATE)); + s77.addState(ScannerStateEntry(10 ,INTERMEDIATE)); + s77.addState(ScannerStateEntry(11 ,INTERMEDIATE)); + s77.addState(ScannerStateEntry(12 ,FINAL)); + s77.addTransition(ScannerTransEntry(0 ,'o' ,1)); + s77.addTransition(ScannerTransEntry(1 ,'r' ,3)); s77.addTransition(ScannerTransEntry(2 ,'s' ,0)); - s77.addTransition(ScannerTransEntry(3 ,'p' ,4)); + s77.addTransition(ScannerTransEntry(3 ,'t' ,4)); + s77.addTransition(ScannerTransEntry(4 ,'a' ,5)); + s77.addTransition(ScannerTransEntry(5 ,'r' ,6)); + s77.addTransition(ScannerTransEntry(6 ,'e' ,7)); + s77.addTransition(ScannerTransEntry(7 ,'a' ,8)); + s77.addTransition(ScannerTransEntry(8 ,'s' ,9)); + s77.addTransition(ScannerTransEntry(9 ,'i' ,10)); + s77.addTransition(ScannerTransEntry(10 ,'z' ,11)); + s77.addTransition(ScannerTransEntry(11 ,'e' ,12)); _scannerList.Insert(s77); - Scanner s78(SWITCH); + Scanner s78(STRUCTURE); s78.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s78.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s78.addState(ScannerStateEntry(2 ,START)); s78.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s78.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s78.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s78.addState(ScannerStateEntry(6 ,FINAL)); - s78.addTransition(ScannerTransEntry(0 ,'w' ,1)); - s78.addTransition(ScannerTransEntry(1 ,'i' ,3)); + s78.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s78.addState(ScannerStateEntry(7 ,INTERMEDIATE)); + s78.addState(ScannerStateEntry(8 ,INTERMEDIATE)); + s78.addState(ScannerStateEntry(9 ,FINAL)); + s78.addTransition(ScannerTransEntry(0 ,'t' ,1)); + s78.addTransition(ScannerTransEntry(1 ,'r' ,3)); s78.addTransition(ScannerTransEntry(2 ,'s' ,0)); - s78.addTransition(ScannerTransEntry(3 ,'t' ,4)); + s78.addTransition(ScannerTransEntry(3 ,'u' ,4)); s78.addTransition(ScannerTransEntry(4 ,'c' ,5)); - s78.addTransition(ScannerTransEntry(5 ,'h' ,6)); + s78.addTransition(ScannerTransEntry(5 ,'t' ,6)); + s78.addTransition(ScannerTransEntry(6 ,'u' ,7)); + s78.addTransition(ScannerTransEntry(7 ,'r' ,8)); + s78.addTransition(ScannerTransEntry(8 ,'e' ,9)); _scannerList.Insert(s78); - Scanner s79(SYNC); + Scanner s79(SHOW); s79.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s79.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s79.addState(ScannerStateEntry(2 ,START)); s79.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s79.addState(ScannerStateEntry(4 ,FINAL)); - s79.addTransition(ScannerTransEntry(0 ,'y' ,1)); - s79.addTransition(ScannerTransEntry(1 ,'n' ,3)); + s79.addTransition(ScannerTransEntry(0 ,'h' ,1)); + s79.addTransition(ScannerTransEntry(1 ,'o' ,3)); s79.addTransition(ScannerTransEntry(2 ,'s' ,0)); - s79.addTransition(ScannerTransEntry(3 ,'c' ,4)); + s79.addTransition(ScannerTransEntry(3 ,'w' ,4)); _scannerList.Insert(s79); - Scanner s80(SYSSIZE); + Scanner s80(START_TOK); s80.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s80.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s80.addState(ScannerStateEntry(2 ,START)); s80.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s80.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s80.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s80.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s80.addState(ScannerStateEntry(7 ,FINAL)); - s80.addTransition(ScannerTransEntry(0 ,'y' ,1)); - s80.addTransition(ScannerTransEntry(1 ,'s' ,3)); + s80.addState(ScannerStateEntry(5 ,FINAL)); + s80.addTransition(ScannerTransEntry(0 ,'t' ,1)); + s80.addTransition(ScannerTransEntry(1 ,'a' ,3)); s80.addTransition(ScannerTransEntry(2 ,'s' ,0)); - s80.addTransition(ScannerTransEntry(3 ,'s' ,4)); - s80.addTransition(ScannerTransEntry(4 ,'i' ,5)); - s80.addTransition(ScannerTransEntry(5 ,'z' ,6)); - s80.addTransition(ScannerTransEntry(6 ,'e' ,7)); + s80.addTransition(ScannerTransEntry(3 ,'r' ,4)); + s80.addTransition(ScannerTransEntry(4 ,'t' ,5)); _scannerList.Insert(s80); - Scanner s81(TABLE); + Scanner s81(STOP_TOK); s81.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s81.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s81.addState(ScannerStateEntry(2 ,START)); s81.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s81.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s81.addState(ScannerStateEntry(5 ,FINAL)); - s81.addTransition(ScannerTransEntry(0 ,'a' ,1)); - s81.addTransition(ScannerTransEntry(1 ,'b' ,3)); - s81.addTransition(ScannerTransEntry(2 ,'t' ,0)); - s81.addTransition(ScannerTransEntry(3 ,'l' ,4)); - s81.addTransition(ScannerTransEntry(4 ,'e' ,5)); + s81.addState(ScannerStateEntry(4 ,FINAL)); + s81.addTransition(ScannerTransEntry(0 ,'t' ,1)); + s81.addTransition(ScannerTransEntry(1 ,'o' ,3)); + s81.addTransition(ScannerTransEntry(2 ,'s' ,0)); + s81.addTransition(ScannerTransEntry(3 ,'p' ,4)); _scannerList.Insert(s81); - Scanner s82(TABLESET); + Scanner s82(SWITCH); s82.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s82.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s82.addState(ScannerStateEntry(2 ,START)); s82.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s82.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s82.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s82.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s82.addState(ScannerStateEntry(7 ,INTERMEDIATE)); - s82.addState(ScannerStateEntry(8 ,FINAL)); - s82.addTransition(ScannerTransEntry(0 ,'a' ,1)); - s82.addTransition(ScannerTransEntry(1 ,'b' ,3)); - s82.addTransition(ScannerTransEntry(2 ,'t' ,0)); - s82.addTransition(ScannerTransEntry(3 ,'l' ,4)); - s82.addTransition(ScannerTransEntry(4 ,'e' ,5)); - s82.addTransition(ScannerTransEntry(5 ,'s' ,6)); - s82.addTransition(ScannerTransEntry(6 ,'e' ,7)); - s82.addTransition(ScannerTransEntry(7 ,'t' ,8)); + s82.addState(ScannerStateEntry(6 ,FINAL)); + s82.addTransition(ScannerTransEntry(0 ,'w' ,1)); + s82.addTransition(ScannerTransEntry(1 ,'i' ,3)); + s82.addTransition(ScannerTransEntry(2 ,'s' ,0)); + s82.addTransition(ScannerTransEntry(3 ,'t' ,4)); + s82.addTransition(ScannerTransEntry(4 ,'c' ,5)); + s82.addTransition(ScannerTransEntry(5 ,'h' ,6)); _scannerList.Insert(s82); - Scanner s83(TICKET); + Scanner s83(SYNC); s83.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s83.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s83.addState(ScannerStateEntry(2 ,START)); s83.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s83.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s83.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s83.addState(ScannerStateEntry(6 ,FINAL)); - s83.addTransition(ScannerTransEntry(0 ,'i' ,1)); - s83.addTransition(ScannerTransEntry(1 ,'c' ,3)); - s83.addTransition(ScannerTransEntry(2 ,'t' ,0)); - s83.addTransition(ScannerTransEntry(3 ,'k' ,4)); - s83.addTransition(ScannerTransEntry(4 ,'e' ,5)); - s83.addTransition(ScannerTransEntry(5 ,'t' ,6)); + s83.addState(ScannerStateEntry(4 ,FINAL)); + s83.addTransition(ScannerTransEntry(0 ,'y' ,1)); + s83.addTransition(ScannerTransEntry(1 ,'n' ,3)); + s83.addTransition(ScannerTransEntry(2 ,'s' ,0)); + s83.addTransition(ScannerTransEntry(3 ,'c' ,4)); _scannerList.Insert(s83); - Scanner s84(TIMEOUT); + Scanner s84(SYSSIZE); s84.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s84.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s84.addState(ScannerStateEntry(2 ,START)); @@ -1618,32 +1620,30 @@ s84.addState(ScannerStateEntry(5 ,INTERMEDIATE)); s84.addState(ScannerStateEntry(6 ,INTERMEDIATE)); s84.addState(ScannerStateEntry(7 ,FINAL)); - s84.addTransition(ScannerTransEntry(0 ,'i' ,1)); - s84.addTransition(ScannerTransEntry(1 ,'m' ,3)); - s84.addTransition(ScannerTransEntry(2 ,'t' ,0)); - s84.addTransition(ScannerTransEntry(3 ,'e' ,4)); - s84.addTransition(ScannerTransEntry(4 ,'o' ,5)); - s84.addTransition(ScannerTransEntry(5 ,'u' ,6)); - s84.addTransition(ScannerTransEntry(6 ,'t' ,7)); + s84.addTransition(ScannerTransEntry(0 ,'y' ,1)); + s84.addTransition(ScannerTransEntry(1 ,'s' ,3)); + s84.addTransition(ScannerTransEntry(2 ,'s' ,0)); + s84.addTransition(ScannerTransEntry(3 ,'s' ,4)); + s84.addTransition(ScannerTransEntry(4 ,'i' ,5)); + s84.addTransition(ScannerTransEntry(5 ,'z' ,6)); + s84.addTransition(ScannerTransEntry(6 ,'e' ,7)); _scannerList.Insert(s84); - Scanner s85(THREAD); + Scanner s85(TABLE); s85.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s85.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s85.addState(ScannerStateEntry(2 ,START)); s85.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s85.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s85.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s85.addState(ScannerStateEntry(6 ,FINAL)); - s85.addTransition(ScannerTransEntry(0 ,'h' ,1)); - s85.addTransition(ScannerTransEntry(1 ,'r' ,3)); + s85.addState(ScannerStateEntry(5 ,FINAL)); + s85.addTransition(ScannerTransEntry(0 ,'a' ,1)); + s85.addTransition(ScannerTransEntry(1 ,'b' ,3)); s85.addTransition(ScannerTransEntry(2 ,'t' ,0)); - s85.addTransition(ScannerTransEntry(3 ,'e' ,4)); - s85.addTransition(ScannerTransEntry(4 ,'a' ,5)); - s85.addTransition(ScannerTransEntry(5 ,'d' ,6)); + s85.addTransition(ScannerTransEntry(3 ,'l' ,4)); + s85.addTransition(ScannerTransEntry(4 ,'e' ,5)); _scannerList.Insert(s85); - Scanner s86(THREADINFO); + Scanner s86(TABLESET); s86.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s86.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s86.addState(ScannerStateEntry(2 ,START)); @@ -1652,62 +1652,68 @@ s86.addState(ScannerStateEntry(5 ,INTERMEDIATE)); s86.addState(ScannerStateEntry(6 ,INTERMEDIATE)); s86.addState(ScannerStateEntry(7 ,INTERMEDIATE)); - s86.addState(ScannerStateEntry(8 ,INTERMEDIATE)); - s86.addState(ScannerStateEntry(9 ,INTERMEDIATE)); - s86.addState(ScannerStateEntry(10 ,FINAL)); - s86.addTransition(ScannerTransEntry(0 ,'h' ,1)); - s86.addTransition(ScannerTransEntry(1 ,'r' ,3)); + s86.addState(ScannerStateEntry(8 ,FINAL)); + s86.addTransition(ScannerTransEntry(0 ,'a' ,1)); + s86.addTransition(ScannerTransEntry(1 ,'b' ,3)); s86.addTransition(ScannerTransEntry(2 ,'t' ,0)); - s86.addTransition(ScannerTransEntry(3 ,'e' ,4)); - s86.addTransition(ScannerTransEntry(4 ,'a' ,5)); - s86.addTransition(ScannerTransEntry(5 ,'d' ,6)); - s86.addTransition(ScannerTransEntry(6 ,'i' ,7)); - s86.addTransition(ScannerTransEntry(7 ,'n' ,8)); - s86.addTransition(ScannerTransEntry(8 ,'f' ,9)); - s86.addTransition(ScannerTransEntry(9 ,'o' ,10)); + s86.addTransition(ScannerTransEntry(3 ,'l' ,4)); + s86.addTransition(ScannerTransEntry(4 ,'e' ,5)); + s86.addTransition(ScannerTransEntry(5 ,'s' ,6)); + s86.addTransition(ScannerTransEntry(6 ,'e' ,7)); + s86.addTransition(ScannerTransEntry(7 ,'t' ,8)); _scannerList.Insert(s86); - Scanner s87(TMPSIZE); + Scanner s87(TICKET); s87.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s87.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s87.addState(ScannerStateEntry(2 ,START)); s87.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s87.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s87.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s87.addState(ScannerStateEntry(6 ,INTERMEDIATE)); - s87.addState(ScannerStateEntry(7 ,FINAL)); - s87.addTransition(ScannerTransEntry(0 ,'m' ,1)); - s87.addTransition(ScannerTransEntry(1 ,'p' ,3)); + s87.addState(ScannerStateEntry(6 ,FINAL)); + s87.addTransition(ScannerTransEntry(0 ,'i' ,1)); + s87.addTransition(ScannerTransEntry(1 ,'c' ,3)); s87.addTransition(ScannerTransEntry(2 ,'t' ,0)); - s87.addTransition(ScannerTransEntry(3 ,'s' ,4)); - s87.addTransition(ScannerTransEntry(4 ,'i' ,5)); - s87.addTransition(ScannerTransEntry(5 ,'z' ,6)); - s87.addTransition(ScannerTransEntry(6 ,'e' ,7)); + s87.addTransition(ScannerTransEntry(3 ,'k' ,4)); + s87.addTransition(ScannerTransEntry(4 ,'e' ,5)); + s87.addTransition(ScannerTransEntry(5 ,'t' ,6)); _scannerList.Insert(s87); - Scanner s88(TO); + Scanner s88(TIMEOUT); s88.addState(ScannerStateEntry(0 ,INTERMEDIATE)); - s88.addState(ScannerStateEntry(1 ,FINAL)); + s88.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s88.addState(ScannerStateEntry(2 ,START)); - s88.addTransition(ScannerTransEntry(0 ,'o' ,1)); + s88.addState(ScannerStateEntry(3 ,INTERMEDIATE)); + s88.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s88.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s88.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s88.addState(ScannerStateEntry(7 ,FINAL)); + s88.addTransition(ScannerTransEntry(0 ,'i' ,1)); + s88.addTransition(ScannerTransEntry(1 ,'m' ,3)); s88.addTransition(ScannerTransEntry(2 ,'t' ,0)); + s88.addTransition(ScannerTransEntry(3 ,'e' ,4)); + s88.addTransition(ScannerTransEntry(4 ,'o' ,5)); + s88.addTransition(ScannerTransEntry(5 ,'u' ,6)); + s88.addTransition(ScannerTransEntry(6 ,'t' ,7)); _scannerList.Insert(s88); - Scanner s89(TRACE); + Scanner s89(THREAD); s89.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s89.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s89.addState(ScannerStateEntry(2 ,START)); s89.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s89.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s89.addState(ScannerStateEntry(5 ,FINAL)); - s89.addTransition(ScannerTransEntry(0 ,'r' ,1)); - s89.addTransition(ScannerTransEntry(1 ,'a' ,3)); + s89.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s89.addState(ScannerStateEntry(6 ,FINAL)); + s89.addTransition(ScannerTransEntry(0 ,'h' ,1)); + s89.addTransition(ScannerTransEntry(1 ,'r' ,3)); s89.addTransition(ScannerTransEntry(2 ,'t' ,0)); - s89.addTransition(ScannerTransEntry(3 ,'c' ,4)); - s89.addTransition(ScannerTransEntry(4 ,'e' ,5)); + s89.addTransition(ScannerTransEntry(3 ,'e' ,4)); + s89.addTransition(ScannerTransEntry(4 ,'a' ,5)); + s89.addTransition(ScannerTransEntry(5 ,'d' ,6)); _scannerList.Insert(s89); - Scanner s90(TRANSACTION); + Scanner s90(THREADINFO); s90.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s90.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s90.addState(ScannerStateEntry(2 ,START)); @@ -1718,860 +1724,975 @@ s90.addState(ScannerStateEntry(7 ,INTERMEDIATE)); s90.addState(ScannerStateEntry(8 ,INTERMEDIATE)); s90.addState(ScannerStateEntry(9 ,INTERMEDIATE)); - s90.addState(ScannerStateEntry(10 ,INTERMEDIATE)); - s90.addState(ScannerStateEntry(11 ,FINAL)); - s90.addTransition(ScannerTransEntry(0 ,'r' ,1)); - s90.addTransition(ScannerTransEntry(1 ,'a' ,3)); + s90.addState(ScannerStateEntry(10 ,FINAL)); + s90.addTransition(ScannerTransEntry(0 ,'h' ,1)); + s90.addTransition(ScannerTransEntry(1 ,'r' ,3)); s90.addTransition(ScannerTransEntry(2 ,'t' ,0)); - s90.addTransition(ScannerTransEntry(3 ,'n' ,4)); - s90.addTransition(ScannerTransEntry(4 ,'s' ,5)); - s90.addTransition(ScannerTransEntry(5 ,'a' ,6)); - s90.addTransition(ScannerTransEntry(6 ,'c' ,7)); - s90.addTransition(ScannerTransEntry(7 ,'t' ,8)); - s90.addTransition(ScannerTransEntry(8 ,'i' ,9)); + s90.addTransition(ScannerTransEntry(3 ,'e' ,4)); + s90.addTransition(ScannerTransEntry(4 ,'a' ,5)); + s90.addTransition(ScannerTransEntry(5 ,'d' ,6)); + s90.addTransition(ScannerTransEntry(6 ,'i' ,7)); + s90.addTransition(ScannerTransEntry(7 ,'n' ,8)); + s90.addTransition(ScannerTransEntry(8 ,'f' ,9)); s90.addTransition(ScannerTransEntry(9 ,'o' ,10)); - s90.addTransition(ScannerTransEntry(10 ,'n' ,11)); _scannerList.Insert(s90); - Scanner s91(TSROOT); + Scanner s91(TMPSIZE); s91.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s91.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s91.addState(ScannerStateEntry(2 ,START)); s91.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s91.addState(ScannerStateEntry(4 ,INTERMEDIATE)); s91.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s91.addState(ScannerStateEntry(6 ,FINAL)); - s91.addTransition(ScannerTransEntry(0 ,'s' ,1)); - s91.addTransition(ScannerTransEntry(1 ,'r' ,3)); + s91.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s91.addState(ScannerStateEntry(7 ,FINAL)); + s91.addTransition(ScannerTransEntry(0 ,'m' ,1)); + s91.addTransition(ScannerTransEntry(1 ,'p' ,3)); s91.addTransition(ScannerTransEntry(2 ,'t' ,0)); - s91.addTransition(ScannerTransEntry(3 ,'o' ,4)); - s91.addTransition(ScannerTransEntry(4 ,'o' ,5)); - s91.addTransition(ScannerTransEntry(5 ,'t' ,6)); + s91.addTransition(ScannerTransEntry(3 ,'s' ,4)); + s91.addTransition(ScannerTransEntry(4 ,'i' ,5)); + s91.addTransition(ScannerTransEntry(5 ,'z' ,6)); + s91.addTransition(ScannerTransEntry(6 ,'e' ,7)); _scannerList.Insert(s91); - Scanner s92(USER); + Scanner s92(TO); s92.addState(ScannerStateEntry(0 ,INTERMEDIATE)); - s92.addState(ScannerStateEntry(1 ,INTERMEDIATE)); + s92.addState(ScannerStateEntry(1 ,FINAL)); s92.addState(ScannerStateEntry(2 ,START)); - s92.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s92.addState(ScannerStateEntry(4 ,FINAL)); - s92.addTransition(ScannerTransEntry(0 ,'s' ,1)); - s92.addTransition(ScannerTransEntry(1 ,'e' ,3)); - s92.addTransition(ScannerTransEntry(2 ,'u' ,0)); - s92.addTransition(ScannerTransEntry(3 ,'r' ,4)); + s92.addTransition(ScannerTransEntry(0 ,'o' ,1)); + s92.addTransition(ScannerTransEntry(2 ,'t' ,0)); _scannerList.Insert(s92); - Scanner s93(VERIFY); + Scanner s93(TRACE); s93.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s93.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s93.addState(ScannerStateEntry(2 ,START)); s93.addState(ScannerStateEntry(3 ,INTERMEDIATE)); s93.addState(ScannerStateEntry(4 ,INTERMEDIATE)); - s93.addState(ScannerStateEntry(5 ,INTERMEDIATE)); - s93.addState(ScannerStateEntry(6 ,FINAL)); - s93.addTransition(ScannerTransEntry(0 ,'e' ,1)); - s93.addTransition(ScannerTransEntry(1 ,'r' ,3)); - s93.addTransition(ScannerTransEntry(2 ,'v' ,0)); - s93.addTransition(ScannerTransEntry(3 ,'i' ,4)); - s93.addTransition(ScannerTransEntry(4 ,'f' ,5)); - s93.addTransition(ScannerTransEntry(5 ,'y' ,6)); + s93.addState(ScannerStateEntry(5 ,FINAL)); + s93.addTransition(ScannerTransEntry(0 ,'r' ,1)); + s93.addTransition(ScannerTransEntry(1 ,'a' ,3)); + s93.addTransition(ScannerTransEntry(2 ,'t' ,0)); + s93.addTransition(ScannerTransEntry(3 ,'c' ,4)); + s93.addTransition(ScannerTransEntry(4 ,'e' ,5)); _scannerList.Insert(s93); - Scanner s94(WITH); + Scanner s94(TRANSACTION); s94.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s94.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s94.addState(ScannerStateEntry(2 ,START)); s94.addState(ScannerStateEntry(3 ,INTERMEDIATE)); - s94.addState(ScannerStateEntry(4 ,FINAL)); - s94.addTransition(ScannerTransEntry(0 ,'i' ,1)); - s94.addTransition(ScannerTransEntry(1 ,'t' ,3)); - s94.addTransition(ScannerTransEntry(2 ,'w' ,0)); - s94.addTransition(ScannerTransEntry(3 ,'h' ,4)); + s94.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s94.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s94.addState(ScannerStateEntry(6 ,INTERMEDIATE)); + s94.addState(ScannerStateEntry(7 ,INTERMEDIATE)); + s94.addState(ScannerStateEntry(8 ,INTERMEDIATE)); + s94.addState(ScannerStateEntry(9 ,INTERMEDIATE)); + s94.addState(ScannerStateEntry(10 ,INTERMEDIATE)); + s94.addState(ScannerStateEntry(11 ,FINAL)); + s94.addTransition(ScannerTransEntry(0 ,'r' ,1)); + s94.addTransition(ScannerTransEntry(1 ,'a' ,3)); + s94.addTransition(ScannerTransEntry(2 ,'t' ,0)); + s94.addTransition(ScannerTransEntry(3 ,'n' ,4)); + s94.addTransition(ScannerTransEntry(4 ,'s' ,5)); + s94.addTransition(ScannerTransEntry(5 ,'a' ,6)); + s94.addTransition(ScannerTransEntry(6 ,'c' ,7)); + s94.addTransition(ScannerTransEntry(7 ,'t' ,8)); + s94.addTransition(ScannerTransEntry(8 ,'i' ,9)); + s94.addTransition(ScannerTransEntry(9 ,'o' ,10)); + s94.addTransition(ScannerTransEntry(10 ,'n' ,11)); _scannerList.Insert(s94); - Scanner s95(XML); + Scanner s95(TSROOT); s95.addState(ScannerStateEntry(0 ,INTERMEDIATE)); s95.addState(ScannerStateEntry(1 ,INTERMEDIATE)); s95.addState(ScannerStateEntry(2 ,START)); - s95.addState(ScannerStateEntry(3 ,FINAL)); - s95.addTransition(ScannerTransEntry(0 ,'m' ,1)); - s95.addTransition(ScannerTransEntry(1 ,'l' ,3)); - s95.addTransition(ScannerTransEntry(2 ,'x' ,0)); + s95.addState(ScannerStateEntry(3 ,INTERMEDIATE)); + s95.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s95.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s95.addState(ScannerStateEntry(6 ,FINAL)); + s95.addTransition(ScannerTransEntry(0 ,'s' ,1)); + s95.addTransition(ScannerTransEntry(1 ,'r' ,3)); + s95.addTransition(ScannerTransEntry(2 ,'t' ,0)); + s95.addTransition(ScannerTransEntry(3 ,'o' ,4)); + s95.addTransition(ScannerTransEntry(4 ,'o' ,5)); + s95.addTransition(ScannerTransEntry(5 ,'t' ,6)); _scannerList.Insert(s95); - Scanner s96(KSEP); - s96.addState(ScannerStateEntry(0 ,START)); - s96.addState(ScannerStateEntry(1 ,FINAL)); - s96.addTransition(ScannerTransEntry(0 ,',' ,1)); + Scanner s96(USER); + s96.addState(ScannerStateEntry(0 ,INTERMEDIATE)); + s96.addState(ScannerStateEntry(1 ,INTERMEDIATE)); + s96.addState(ScannerStateEntry(2 ,START)); + s96.addState(ScannerStateEntry(3 ,INTERMEDIATE)); + s96.addState(ScannerStateEntry(4 ,FINAL)); + s96.addTransition(ScannerTransEntry(0 ,'s' ,1)); + s96.addTransition(ScannerTransEntry(1 ,'e' ,3)); + s96.addTransition(ScannerTransEntry(2 ,'u' ,0)); + s96.addTransition(ScannerTransEntry(3 ,'r' ,4)); _scannerList.Insert(s96); - Scanner s97(SEMICOLON); - s97.addState(ScannerStateEntry(0 ,START)); - s97.addState(ScannerStateEntry(1 ,FINAL)); - s97.addTransition(ScannerTransEntry(0 ,';' ,1)); + Scanner s97(VERIFY); + s97.addState(ScannerStateEntry(0 ,INTERMEDIATE)); + s97.addState(ScannerStateEntry(1 ,INTERMEDIATE)); + s97.addState(ScannerStateEntry(2 ,START)); + s97.addState(ScannerStateEntry(3 ,INTERMEDIATE)); + s97.addState(ScannerStateEntry(4 ,INTERMEDIATE)); + s97.addState(ScannerStateEntry(5 ,INTERMEDIATE)); + s97.addState(ScannerStateEntry(6 ,FINAL)); + s97.addTransition(ScannerTransEntry(0 ,'e' ,1)); + s97.addTransition(ScannerTransEntry(1 ,'r' ,3)); + s97.addTransition(ScannerTransEntry(2 ,'v' ,0)); + s97.addTransition(ScannerTransEntry(3 ,'i' ,4)); + s97.addTransition(ScannerTransEntry(4 ,'f' ,5)); + s97.addTransition(ScannerTransEntry(5 ,'y' ,6)); _scannerList.Insert(s97); - Scanner s98(EQU); - s98.addState(ScannerStateEntry(0 ,START)); - s98.addState(ScannerStateEntry(1 ,FINAL)); - s98.addTransition(ScannerTransEntry(0 ,'=' ,1)); + Scanner s98(WITH); + s98.addState(ScannerStateEntry(0 ,INTERMEDIATE)); + s98.addState(ScannerStateEntry(1 ,INTERMEDIATE)); + s98.addState(ScannerStateEntry(2 ,START)); + s98.addState(ScannerStateEntry(3 ,INTERMEDIATE)); + s98.addState(ScannerStateEntry(4 ,FINAL)); + s98.addTransition(ScannerTransEntry(0 ,'i' ,1)); + s98.addTransition(ScannerTransEntry(1 ,'t' ,3)); + s98.addTransition(ScannerTransEntry(2 ,'w' ,0)); + s98.addTransition(ScannerTransEntry(3 ,'h' ,4)); _scannerList.Insert(s98); - Scanner s99(INTVAL); - s99.addState(ScannerStateEntry(0 ,START)); - s99.addState(ScannerStateEntry(1 ,FINAL)); - s99.addState(ScannerStateEntry(2 ,FINAL)); - s99.addTransition(ScannerTransEntry(0 ,'1' ,1)); - s99.addTransition(ScannerTransEntry(0 ,'2' ,1)); - s99.addTransition(ScannerTransEntry(0 ,'3' ,1)); - s99.addTransition(ScannerTransEntry(0 ,'4' ,1)); - s99.addTransition(ScannerTransEntry(0 ,'5' ,1)); - s99.addTransition(ScannerTransEntry(0 ,'6' ,1)); - s99.addTransition(ScannerTransEntry(0 ,'7' ,1)); - s99.addTransition(ScannerTransEntry(0 ,'8' ,1)); - s99.addTransition(ScannerTransEntry(0 ,'9' ,1)); - s99.addTransition(ScannerTransEntry(0 ,'0' ,2)); - s99.addTransition(ScannerTransEntry(1 ,'0' ,1)); - s99.addTransition(ScannerTransEntry(1 ,'1' ,1)); - s99.addTransition(ScannerTransEntry(1 ,'2' ,1)); - s99.addTransition(ScannerTransEntry(1 ,'3' ,1)); - s99.addTransition(ScannerTransEntry(1 ,'4' ,1)); - s99.addTransition(ScannerTransEntry(1 ,'5' ,1)); - s99.addTransition(ScannerTransEntry(1 ,'6' ,1)); - s99.addTransition(ScannerTransEntry(1 ,'7' ,1)); - s99.addTransition(ScannerTransEntry(1 ,'8' ,1)); - s99.addTransition(ScannerTransEntry(1 ,'9' ,1)); + Scanner s99(XML); + s99.addState(ScannerStateEntry(0 ,INTERMEDIATE)); + s99.addState(ScannerStateEntry(1 ,INTERMEDIATE)); + s99.addState(ScannerStateEntry(2 ,START)); + s99.addState(ScannerStateEntry(3 ,FINAL)); + s99.addTransition(ScannerTransEntry(0 ,'m' ,1)); + s99.addTransition(ScannerTransEntry(1 ,'l' ,3)); + s99.addTransition(ScannerTransEntry(2 ,'x' ,0)); _scannerList.Insert(s99); - Scanner s100(IDENTIFIER); + Scanner s100(KSEP); s100.addState(ScannerStateEntry(0 ,START)); s100.addState(ScannerStateEntry(1 ,FINAL)); - s100.addTransition(ScannerTransEntry(0 ,'A' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'B' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'C' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'D' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'E' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'F' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'G' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'H' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'I' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'J' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'K' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'L' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'M' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'N' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'O' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'P' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'Q' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'R' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'S' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'T' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'U' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'V' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'W' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'X' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'Y' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'Z' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'a' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'b' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'c' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'d' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'e' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'f' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'g' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'h' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'i' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'j' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'k' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'l' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'m' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'n' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'o' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'p' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'q' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'r' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'s' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'t' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'u' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'v' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'w' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'x' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'y' ,1)); - s100.addTransition(ScannerTransEntry(0 ,'z' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'0' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'1' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'2' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'3' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'4' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'5' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'6' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'7' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'8' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'9' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'A' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'B' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'C' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'D' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'E' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'F' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'G' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'H' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'I' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'J' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'K' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'L' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'M' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'N' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'O' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'P' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'Q' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'R' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'S' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'T' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'U' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'V' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'W' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'X' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'Y' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'Z' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'_' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'a' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'b' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'c' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'d' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'e' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'f' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'g' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'h' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'i' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'j' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'k' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'l' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'m' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'n' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'o' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'p' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'q' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'r' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'s' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'t' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'u' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'v' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'w' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'x' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'y' ,1)); - s100.addTransition(ScannerTransEntry(1 ,'z' ,1)); + s100.addTransition(ScannerTransEntry(0 ,',' ,1)); _scannerList.Insert(s100); + Scanner s101(SEMICOLON); + s101.addState(ScannerStateEntry(0 ,START)); + s101.addState(ScannerStateEntry(1 ,FINAL)); + s101.addTransition(ScannerTransEntry(0 ,';' ,1)); + _scannerList.Insert(s101); + + Scanner s102(EQU); + s102.addState(ScannerStateEntry(0 ,START)); + s102.addState(ScannerStateEntry(1 ,FINAL)); + s102.addTransition(ScannerTransEntry(0 ,'=' ,1)); + _scannerList.Insert(s102); + + Scanner s103(INTVAL); + s103.addState(ScannerStateEntry(0 ,START)); + s103.addState(ScannerStateEntry(1 ,FINAL)); + s103.addState(ScannerStateEntry(2 ,FINAL)); + s103.addTransition(ScannerTransEntry(0 ,'1' ,1)); + s103.addTransition(ScannerTransEntry(0 ,'2' ,1)); + s103.addTransition(ScannerTransEntry(0 ,'3' ,1)); + s103.addTransition(ScannerTransEntry(0 ,'4' ,1)); + s103.addTransition(ScannerTransEntry(0 ,'5' ,1)); + s103.addTransition(ScannerTransEntry(0 ,'6' ,1)); + s103.addTransition(ScannerTransEntry(0 ,'7' ,1)); + s103.addTransition(ScannerTransEntry(0 ,'8' ,1)); + s103.addTransition(ScannerTransEntry(0 ,'9' ,1)); + s103.addTransition(ScannerTransEntry(0 ,'0' ,2)); + s103.addTransition(ScannerTransEntry(1 ,'0' ,1)); + s103.addTransition(ScannerTransEntry(1 ,'1' ,1)); + s103.addTransition(ScannerTransEntry(1 ,'2' ,1)); + s103.addTransition(ScannerTransEntry(1 ,'3' ,1)); + s103.addTransition(ScannerTransEntry(1 ,'4' ,1)); + s103.addTransition(ScannerTransEntry(1 ,'5' ,1)); + s103.addTransition(ScannerTransEntry(1 ,'6' ,1)); + s103.addTransition(ScannerTransEntry(1 ,'7' ,1)); + s103.addTransition(ScannerTransEntry(1 ,'8' ,1)); + s103.addTransition(ScannerTransEntry(1 ,'9' ,1)); + _scannerList.Insert(s103); + + Scanner s104(IDENTIFIER); + s104.addState(ScannerStateEntry(0 ,START)); + s104.addState(ScannerStateEntry(1 ,FINAL)); + s104.addTransition(ScannerTransEntry(0 ,'A' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'B' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'C' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'D' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'E' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'F' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'G' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'H' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'I' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'J' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'K' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'L' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'M' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'N' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'O' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'P' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'Q' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'R' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'S' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'T' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'U' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'V' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'W' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'X' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'Y' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'Z' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'a' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'b' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'c' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'d' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'e' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'f' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'g' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'h' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'i' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'j' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'k' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'l' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'m' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'n' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'o' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'p' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'q' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'r' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'s' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'t' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'u' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'v' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'w' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'x' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'y' ,1)); + s104.addTransition(ScannerTransEntry(0 ,'z' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'0' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'1' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'2' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'3' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'4' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'5' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'6' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'7' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'8' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'9' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'A' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'B' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'C' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'D' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'E' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'F' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'G' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'H' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'I' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'J' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'K' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'L' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'M' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'N' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'O' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'P' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'Q' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'R' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'S' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'T' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'U' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'V' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'W' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'X' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'Y' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'Z' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'_' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'a' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'b' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'c' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'d' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'e' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'f' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'g' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'h' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'i' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'j' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'k' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'l' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'m' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'n' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'o' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'p' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'q' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'r' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'s' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'t' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'u' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'v' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'w' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'x' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'y' ,1)); + s104.addTransition(ScannerTransEntry(1 ,'z' ,1)); + _scannerList.Insert(s104); + } void CegoAdm::loadParser0() { - _actionMap[299][SEMICOLON] = ActionEntry(REDUCE, 64); - _actionMap[291][SEMICOLON] = ActionEntry(REDUCE, 61); - _actionMap[292][NOLOGGING] = ActionEntry(SHIFT, 274); - _actionMap[292][SEMICOLON] = ActionEntry(REDUCE, 72); - _jumpMap[292][LogOpt] = 299; - _actionMap[293][SEMICOLON] = ActionEntry(REDUCE, 66); - _actionMap[294][SEMICOLON] = ActionEntry(REDUCE, 45); - _actionMap[295][SEMICOLON] = ActionEntry(REDUCE, 41); - _actionMap[296][SEMICOLON] = ActionEntry(REDUCE, 37); - _actionMap[297][SEMICOLON] = ActionEntry(REDUCE, 44); - _actionMap[298][SEMICOLON] = ActionEntry(REDUCE, 46); - _actionMap[269][STRINGVAL] = ActionEntry(SHIFT, 291); - _actionMap[270][SEMICOLON] = ActionEntry(REDUCE, 63); - _actionMap[271][STRINGVAL] = ActionEntry(SHIFT, 292); - _actionMap[272][NOLOGGING] = ActionEntry(SHIFT, 274); - _actionMap[272][SEMICOLON] = ActionEntry(REDUCE, 72); - _jumpMap[272][LogOpt] = 293; - _actionMap[273][SEMICOLON] = ActionEntry(REDUCE, 65); - _actionMap[274][SEMICOLON] = ActionEntry(REDUCE, 71); - _actionMap[275][SEMICOLON] = ActionEntry(REDUCE, 51); - _actionMap[276][IDENTIFIER] = ActionEntry(SHIFT, 294); - _actionMap[277][IDENTIFIER] = ActionEntry(SHIFT, 295); - _actionMap[278][IDENTIFIER] = ActionEntry(SHIFT, 296); - _actionMap[279][SEMICOLON] = ActionEntry(REDUCE, 91); - _actionMap[279][PRIMARY] = ActionEntry(REDUCE, 91); - _actionMap[279][SECONDARY] = ActionEntry(REDUCE, 91); - _actionMap[279][SYSSIZE] = ActionEntry(REDUCE, 91); - _actionMap[279][TMPSIZE] = ActionEntry(REDUCE, 91); - _actionMap[279][LOGSIZE] = ActionEntry(REDUCE, 91); - _actionMap[279][LOGNUM] = ActionEntry(REDUCE, 91); - _actionMap[279][SORTAREASIZE] = ActionEntry(REDUCE, 91); - _actionMap[279][TSROOT] = ActionEntry(REDUCE, 91); - _actionMap[279][TSTICKET] = ActionEntry(REDUCE, 91); - _actionMap[280][SEMICOLON] = ActionEntry(REDUCE, 88); - _actionMap[280][PRIMARY] = ActionEntry(REDUCE, 88); - _actionMap[280][SECONDARY] = ActionEntry(REDUCE, 88); - _actionMap[280][SYSSIZE] = ActionEntry(REDUCE, 88); - _actionMap[280][TMPSIZE] = ActionEntry(REDUCE, 88); - _actionMap[280][LOGSIZE] = ActionEntry(REDUCE, 88); - _actionMap[280][LOGNUM] = ActionEntry(REDUCE, 88); - _actionMap[280][SORTAREASIZE] = ActionEntry(REDUCE, 88); - _actionMap[280][TSROOT] = ActionEntry(REDUCE, 88); - _actionMap[280][TSTICKET] = ActionEntry(REDUCE, 88); - _actionMap[281][SEMICOLON] = ActionEntry(REDUCE, 87); - _actionMap[281][PRIMARY] = ActionEntry(REDUCE, 87); - _actionMap[281][SECONDARY] = ActionEntry(REDUCE, 87); - _actionMap[281][SYSSIZE] = ActionEntry(REDUCE, 87); - _actionMap[281][TMPSIZE] = ActionEntry(REDUCE, 87); - _actionMap[281][LOGSIZE] = ActionEntry(REDUCE, 87); - _actionMap[281][LOGNUM] = ActionEntry(REDUCE, 87); + _actionMap[317][SEMICOLON] = ActionEntry(REDUCE, 75); + _actionMap[312][SEMICOLON] = ActionEntry(REDUCE, 72); + _actionMap[313][NOLOGGING] = ActionEntry(SHIFT, 294); + _actionMap[313][SEMICOLON] = ActionEntry(REDUCE, 83); + _jumpMap[313][LogOpt] = 317; + _actionMap[314][SEMICOLON] = ActionEntry(REDUCE, 77); + _actionMap[315][SEMICOLON] = ActionEntry(REDUCE, 51); + _actionMap[316][SEMICOLON] = ActionEntry(REDUCE, 37); + _actionMap[289][STRINGVAL] = ActionEntry(SHIFT, 312); + _actionMap[290][SEMICOLON] = ActionEntry(REDUCE, 74); + _actionMap[291][STRINGVAL] = ActionEntry(SHIFT, 313); + _actionMap[292][NOLOGGING] = ActionEntry(SHIFT, 294); + _actionMap[292][SEMICOLON] = ActionEntry(REDUCE, 83); + _jumpMap[292][LogOpt] = 314; + _actionMap[293][SEMICOLON] = ActionEntry(REDUCE, 76); + _actionMap[294][SEMICOLON] = ActionEntry(REDUCE, 82); + _actionMap[295][SEMICOLON] = ActionEntry(REDUCE, 62); + _actionMap[296][IDENTIFIER] = ActionEntry(SHIFT, 315); + _actionMap[297][KSEP] = ActionEntry(REDUCE, 52); + _actionMap[297][TO] = ActionEntry(REDUCE, 52); + _actionMap[298][KSEP] = ActionEntry(REDUCE, 55); + _actionMap[298][TO] = ActionEntry(REDUCE, 55); + _actionMap[299][KSEP] = ActionEntry(REDUCE, 56); + _actionMap[299][TO] = ActionEntry(REDUCE, 56); + _actionMap[300][KSEP] = ActionEntry(REDUCE, 54); + _actionMap[300][TO] = ActionEntry(REDUCE, 54); + _actionMap[301][IDENTIFIER] = ActionEntry(SHIFT, 316); + _actionMap[302][SEMICOLON] = ActionEntry(REDUCE, 102); + _actionMap[302][PRIMARY] = ActionEntry(REDUCE, 102); + _actionMap[302][SECONDARY] = ActionEntry(REDUCE, 102); + _actionMap[302][SYSSIZE] = ActionEntry(REDUCE, 102); + _actionMap[302][TMPSIZE] = ActionEntry(REDUCE, 102); + _actionMap[302][LOGSIZE] = ActionEntry(REDUCE, 102); + _actionMap[302][LOGNUM] = ActionEntry(REDUCE, 102); + _actionMap[302][SORTAREASIZE] = ActionEntry(REDUCE, 102); + _actionMap[302][TSROOT] = ActionEntry(REDUCE, 102); + _actionMap[302][TSTICKET] = ActionEntry(REDUCE, 102); + _actionMap[303][SEMICOLON] = ActionEntry(REDUCE, 99); + _actionMap[303][PRIMARY] = ActionEntry(REDUCE, 99); + _actionMap[303][SECONDARY] = ActionEntry(REDUCE, 99); + _actionMap[303][SYSSIZE] = ActionEntry(REDUCE, 99); + _actionMap[303][TMPSIZE] = ActionEntry(REDUCE, 99); + _actionMap[303][LOGSIZE] = ActionEntry(REDUCE, 99); + _actionMap[303][LOGNUM] = ActionEntry(REDUCE, 99); + _actionMap[303][SORTAREASIZE] = ActionEntry(REDUCE, 99); + _actionMap[303][TSROOT] = ActionEntry(REDUCE, 99); + _actionMap[303][TSTICKET] = ActionEntry(REDUCE, 99); + _actionMap[304][SEMICOLON] = ActionEntry(REDUCE, 98); + _actionMap[304][PRIMARY] = ActionEntry(REDUCE, 98); + _actionMap[304][SECONDARY] = ActionEntry(REDUCE, 98); } void CegoAdm::loadParser1() { - _actionMap[281][SORTAREASIZE] = ActionEntry(REDUCE, 87); - _actionMap[281][TSROOT] = ActionEntry(REDUCE, 87); - _actionMap[281][TSTICKET] = ActionEntry(REDUCE, 87); - _actionMap[282][SEMICOLON] = ActionEntry(REDUCE, 83); - _actionMap[282][PRIMARY] = ActionEntry(REDUCE, 83); - _actionMap[282][SECONDARY] = ActionEntry(REDUCE, 83); - _actionMap[282][SYSSIZE] = ActionEntry(REDUCE, 83); - _actionMap[282][TMPSIZE] = ActionEntry(REDUCE, 83); - _actionMap[282][LOGSIZE] = ActionEntry(REDUCE, 83); - _actionMap[282][LOGNUM] = ActionEntry(REDUCE, 83); - _actionMap[282][SORTAREASIZE] = ActionEntry(REDUCE, 83); - _actionMap[282][TSROOT] = ActionEntry(REDUCE, 83); - _actionMap[282][TSTICKET] = ActionEntry(REDUCE, 83); - _actionMap[283][SEMICOLON] = ActionEntry(REDUCE, 84); - _actionMap[283][PRIMARY] = ActionEntry(REDUCE, 84); - _actionMap[283][SECONDARY] = ActionEntry(REDUCE, 84); - _actionMap[283][SYSSIZE] = ActionEntry(REDUCE, 84); - _actionMap[283][TMPSIZE] = ActionEntry(REDUCE, 84); - _actionMap[283][LOGSIZE] = ActionEntry(REDUCE, 84); - _actionMap[283][LOGNUM] = ActionEntry(REDUCE, 84); - _actionMap[283][SORTAREASIZE] = ActionEntry(REDUCE, 84); - _actionMap[283][TSROOT] = ActionEntry(REDUCE, 84); - _actionMap[283][TSTICKET] = ActionEntry(REDUCE, 84); - _actionMap[284][SEMICOLON] = ActionEntry(REDUCE, 89); - _actionMap[284][PRIMARY] = ActionEntry(REDUCE, 89); - _actionMap[284][SECONDARY] = ActionEntry(REDUCE, 89); - _actionMap[284][SYSSIZE] = ActionEntry(REDUCE, 89); - _actionMap[284][TMPSIZE] = ActionEntry(REDUCE, 89); - _actionMap[284][LOGSIZE] = ActionEntry(REDUCE, 89); - _actionMap[284][LOGNUM] = ActionEntry(REDUCE, 89); - _actionMap[284][SORTAREASIZE] = ActionEntry(REDUCE, 89); - _actionMap[284][TSROOT] = ActionEntry(REDUCE, 89); - _actionMap[284][TSTICKET] = ActionEntry(REDUCE, 89); - _actionMap[285][SEMICOLON] = ActionEntry(REDUCE, 85); - _actionMap[285][PRIMARY] = ActionEntry(REDUCE, 85); - _actionMap[285][SECONDARY] = ActionEntry(REDUCE, 85); - _actionMap[285][SYSSIZE] = ActionEntry(REDUCE, 85); - _actionMap[285][TMPSIZE] = ActionEntry(REDUCE, 85); - _actionMap[285][LOGSIZE] = ActionEntry(REDUCE, 85); - _actionMap[285][LOGNUM] = ActionEntry(REDUCE, 85); - _actionMap[285][SORTAREASIZE] = ActionEntry(REDUCE, 85); - _actionMap[285][TSROOT] = ActionEntry(REDUCE, 85); - _actionMap[285][TSTICKET] = ActionEntry(REDUCE, 85); - _actionMap[286][SEMICOLON] = ActionEntry(REDUCE, 86); - _actionMap[286][PRIMARY] = ActionEntry(REDUCE, 86); - _actionMap[286][SECONDARY] = ActionEntry(REDUCE, 86); - _actionMap[286][SYSSIZE] = ActionEntry(REDUCE, 86); - _actionMap[286][TMPSIZE] = ActionEntry(REDUCE, 86); - _actionMap[286][LOGSIZE] = ActionEntry(REDUCE, 86); - _actionMap[286][LOGNUM] = ActionEntry(REDUCE, 86); + _actionMap[304][SYSSIZE] = ActionEntry(REDUCE, 98); + _actionMap[304][TMPSIZE] = ActionEntry(REDUCE, 98); + _actionMap[304][LOGSIZE] = ActionEntry(REDUCE, 98); + _actionMap[304][LOGNUM] = ActionEntry(REDUCE, 98); + _actionMap[304][SORTAREASIZE] = ActionEntry(REDUCE, 98); + _actionMap[304][TSROOT] = ActionEntry(REDUCE, 98); + _actionMap[304][TSTICKET] = ActionEntry(REDUCE, 98); + _actionMap[305][SEMICOLON] = ActionEntry(REDUCE, 94); + _actionMap[305][PRIMARY] = ActionEntry(REDUCE, 94); + _actionMap[305][SECONDARY] = ActionEntry(REDUCE, 94); + _actionMap[305][SYSSIZE] = ActionEntry(REDUCE, 94); + _actionMap[305][TMPSIZE] = ActionEntry(REDUCE, 94); + _actionMap[305][LOGSIZE] = ActionEntry(REDUCE, 94); + _actionMap[305][LOGNUM] = ActionEntry(REDUCE, 94); + _actionMap[305][SORTAREASIZE] = ActionEntry(REDUCE, 94); + _actionMap[305][TSROOT] = ActionEntry(REDUCE, 94); + _actionMap[305][TSTICKET] = ActionEntry(REDUCE, 94); + _actionMap[306][SEMICOLON] = ActionEntry(REDUCE, 95); + _actionMap[306][PRIMARY] = ActionEntry(REDUCE, 95); + _actionMap[306][SECONDARY] = ActionEntry(REDUCE, 95); + _actionMap[306][SYSSIZE] = ActionEntry(REDUCE, 95); + _actionMap[306][TMPSIZE] = ActionEntry(REDUCE, 95); + _actionMap[306][LOGSIZE] = ActionEntry(REDUCE, 95); + _actionMap[306][LOGNUM] = ActionEntry(REDUCE, 95); + _actionMap[306][SORTAREASIZE] = ActionEntry(REDUCE, 95); + _actionMap[306][TSROOT] = ActionEntry(REDUCE, 95); + _actionMap[306][TSTICKET] = ActionEntry(REDUCE, 95); + _actionMap[307][SEMICOLON] = ActionEntry(REDUCE, 100); + _actionMap[307][PRIMARY] = ActionEntry(REDUCE, 100); + _actionMap[307][SECONDARY] = ActionEntry(REDUCE, 100); + _actionMap[307][SYSSIZE] = ActionEntry(REDUCE, 100); + _actionMap[307][TMPSIZE] = ActionEntry(REDUCE, 100); + _actionMap[307][LOGSIZE] = ActionEntry(REDUCE, 100); + _actionMap[307][LOGNUM] = ActionEntry(REDUCE, 100); + _actionMap[307][SORTAREASIZE] = ActionEntry(REDUCE, 100); + _actionMap[307][TSROOT] = ActionEntry(REDUCE, 100); + _actionMap[307][TSTICKET] = ActionEntry(REDUCE, 100); + _actionMap[308][SEMICOLON] = ActionEntry(REDUCE, 96); + _actionMap[308][PRIMARY] = ActionEntry(REDUCE, 96); + _actionMap[308][SECONDARY] = ActionEntry(REDUCE, 96); + _actionMap[308][SYSSIZE] = ActionEntry(REDUCE, 96); + _actionMap[308][TMPSIZE] = ActionEntry(REDUCE, 96); + _actionMap[308][LOGSIZE] = ActionEntry(REDUCE, 96); + _actionMap[308][LOGNUM] = ActionEntry(REDUCE, 96); + _actionMap[308][SORTAREASIZE] = ActionEntry(REDUCE, 96); + _actionMap[308][TSROOT] = ActionEntry(REDUCE, 96); + _actionMap[308][TSTICKET] = ActionEntry(REDUCE, 96); + _actionMap[309][SEMICOLON] = ActionEntry(REDUCE, 97); + _actionMap[309][PRIMARY] = ActionEntry(REDUCE, 97); + _actionMap[309][SECONDARY] = ActionEntry(REDUCE, 97); } void CegoAdm::loadParser2() { - _actionMap[286][SORTAREASIZE] = ActionEntry(REDUCE, 86); - _actionMap[286][TSROOT] = ActionEntry(REDUCE, 86); - _actionMap[286][TSTICKET] = ActionEntry(REDUCE, 86); - _actionMap[287][SEMICOLON] = ActionEntry(REDUCE, 90); - _actionMap[287][PRIMARY] = ActionEntry(REDUCE, 90); - _actionMap[287][SECONDARY] = ActionEntry(REDUCE, 90); - _actionMap[287][SYSSIZE] = ActionEntry(REDUCE, 90); - _actionMap[287][TMPSIZE] = ActionEntry(REDUCE, 90); - _actionMap[287][LOGSIZE] = ActionEntry(REDUCE, 90); - _actionMap[287][LOGNUM] = ActionEntry(REDUCE, 90); - _actionMap[287][SORTAREASIZE] = ActionEntry(REDUCE, 90); - _actionMap[287][TSROOT] = ActionEntry(REDUCE, 90); - _actionMap[287][TSTICKET] = ActionEntry(REDUCE, 90); - _actionMap[288][IDENTIFIER] = ActionEntry(SHIFT, 297); - _actionMap[289][IDENTIFIER] = ActionEntry(SHIFT, 298); - _actionMap[290][SEMICOLON] = ActionEntry(REDUCE, 69); - _actionMap[241][TO] = ActionEntry(SHIFT, 269); - _actionMap[242][STRINGVAL] = ActionEntry(SHIFT, 270); - _actionMap[243][SEMICOLON] = ActionEntry(REDUCE, 62); - _actionMap[244][FROM] = ActionEntry(SHIFT, 271); - _actionMap[245][STRINGVAL] = ActionEntry(SHIFT, 272); - _actionMap[246][NOLOGGING] = ActionEntry(SHIFT, 274); - _actionMap[246][SEMICOLON] = ActionEntry(REDUCE, 72); - _jumpMap[246][LogOpt] = 273; - _actionMap[247][IDENTIFIER] = ActionEntry(SHIFT, 275); - _actionMap[248][FOR] = ActionEntry(SHIFT, 276); - _actionMap[249][TO] = ActionEntry(SHIFT, 277); - _actionMap[250][TO] = ActionEntry(SHIFT, 278); - _actionMap[251][STRINGVAL] = ActionEntry(SHIFT, 279); - _actionMap[252][INTVAL] = ActionEntry(SHIFT, 280); - _actionMap[253][INTVAL] = ActionEntry(SHIFT, 281); - _actionMap[254][STRINGVAL] = ActionEntry(SHIFT, 282); - _actionMap[255][STRINGVAL] = ActionEntry(SHIFT, 283); - _actionMap[256][INTVAL] = ActionEntry(SHIFT, 284); - _actionMap[257][INTVAL] = ActionEntry(SHIFT, 285); - _actionMap[258][INTVAL] = ActionEntry(SHIFT, 286); - _actionMap[259][STRINGVAL] = ActionEntry(SHIFT, 287); - _actionMap[260][SEMICOLON] = ActionEntry(REDUCE, 67); - _actionMap[261][TO] = ActionEntry(SHIFT, 288); - _actionMap[262][SEMICOLON] = ActionEntry(REDUCE, 34); - _actionMap[263][SEMICOLON] = ActionEntry(REDUCE, 33); - _actionMap[264][FOR] = ActionEntry(SHIFT, 289); - _actionMap[265][SEMICOLON] = ActionEntry(REDUCE, 56); - _actionMap[266][INTVAL] = ActionEntry(SHIFT, 290); - _actionMap[267][SEMICOLON] = ActionEntry(REDUCE, 48); - _actionMap[268][SEMICOLON] = ActionEntry(REDUCE, 47); - _actionMap[201][IDENTIFIER] = ActionEntry(SHIFT, 241); - _actionMap[202][TO] = ActionEntry(SHIFT, 242); - _actionMap[203][STRINGVAL] = ActionEntry(SHIFT, 243); - _actionMap[204][IDENTIFIER] = ActionEntry(SHIFT, 244); + _actionMap[309][SYSSIZE] = ActionEntry(REDUCE, 97); + _actionMap[309][TMPSIZE] = ActionEntry(REDUCE, 97); + _actionMap[309][LOGSIZE] = ActionEntry(REDUCE, 97); + _actionMap[309][LOGNUM] = ActionEntry(REDUCE, 97); + _actionMap[309][SORTAREASIZE] = ActionEntry(REDUCE, 97); + _actionMap[309][TSROOT] = ActionEntry(REDUCE, 97); + _actionMap[309][TSTICKET] = ActionEntry(REDUCE, 97); + _actionMap[310][SEMICOLON] = ActionEntry(REDUCE, 101); + _actionMap[310][PRIMARY] = ActionEntry(REDUCE, 101); + _actionMap[310][SECONDARY] = ActionEntry(REDUCE, 101); + _actionMap[310][SYSSIZE] = ActionEntry(REDUCE, 101); + _actionMap[310][TMPSIZE] = ActionEntry(REDUCE, 101); + _actionMap[310][LOGSIZE] = ActionEntry(REDUCE, 101); + _actionMap[310][LOGNUM] = ActionEntry(REDUCE, 101); + _actionMap[310][SORTAREASIZE] = ActionEntry(REDUCE, 101); + _actionMap[310][TSROOT] = ActionEntry(REDUCE, 101); + _actionMap[310][TSTICKET] = ActionEntry(REDUCE, 101); + _actionMap[311][SEMICOLON] = ActionEntry(REDUCE, 80); + _actionMap[257][TO] = ActionEntry(SHIFT, 289); + _actionMap[258][STRINGVAL] = ActionEntry(SHIFT, 290); + _actionMap[259][SEMICOLON] = ActionEntry(REDUCE, 73); + _actionMap[260][FROM] = ActionEntry(SHIFT, 291); + _actionMap[261][STRINGVAL] = ActionEntry(SHIFT, 292); + _actionMap[262][NOLOGGING] = ActionEntry(SHIFT, 294); + _actionMap[262][SEMICOLON] = ActionEntry(REDUCE, 83); + _jumpMap[262][LogOpt] = 293; + _actionMap[263][IDENTIFIER] = ActionEntry(SHIFT, 295); + _actionMap[264][ROLE] = ActionEntry(SHIFT, 296); + _actionMap[265][TABLESET] = ActionEntry(SHIFT, 223); + _actionMap[265][FILTER] = ActionEntry(SHIFT, 221); + _actionMap[265][RIGHT] = ActionEntry(SHIFT, 222); + _jumpMap[265][PermEntry] = 297; + _actionMap[266][STRINGVAL] = ActionEntry(SHIFT, 298); + _actionMap[267][IDENTIFIER] = ActionEntry(SHIFT, 299); + _actionMap[268][IDENTIFIER] = ActionEntry(SHIFT, 300); + _actionMap[269][SEMICOLON] = ActionEntry(REDUCE, 41); + _actionMap[270][TO] = ActionEntry(SHIFT, 301); + _actionMap[271][STRINGVAL] = ActionEntry(SHIFT, 302); + _actionMap[272][INTVAL] = ActionEntry(SHIFT, 303); + _actionMap[273][INTVAL] = ActionEntry(SHIFT, 304); + _actionMap[274][STRINGVAL] = ActionEntry(SHIFT, 305); + _actionMap[275][STRINGVAL] = ActionEntry(SHIFT, 306); + _actionMap[276][INTVAL] = ActionEntry(SHIFT, 307); + _actionMap[277][INTVAL] = ActionEntry(SHIFT, 308); + _actionMap[278][INTVAL] = ActionEntry(SHIFT, 309); + _actionMap[279][STRINGVAL] = ActionEntry(SHIFT, 310); + _actionMap[280][SEMICOLON] = ActionEntry(REDUCE, 78); + _actionMap[281][SEMICOLON] = ActionEntry(REDUCE, 44); + _actionMap[282][SEMICOLON] = ActionEntry(REDUCE, 34); + _actionMap[283][SEMICOLON] = ActionEntry(REDUCE, 33); } void CegoAdm::loadParser3() { - _actionMap[205][FROM] = ActionEntry(SHIFT, 245); - _actionMap[206][STRINGVAL] = ActionEntry(SHIFT, 246); - _actionMap[207][TO] = ActionEntry(SHIFT, 247); - _actionMap[208][IDENTIFIER] = ActionEntry(SHIFT, 248); - _actionMap[209][STRINGVAL] = ActionEntry(SHIFT, 249); - _actionMap[210][INTVAL] = ActionEntry(SHIFT, 250); - _actionMap[211][SEMICOLON] = ActionEntry(REDUCE, 60); - _actionMap[212][SEMICOLON] = ActionEntry(REDUCE, 81); - _actionMap[212][PRIMARY] = ActionEntry(REDUCE, 81); - _actionMap[212][SECONDARY] = ActionEntry(REDUCE, 81); - _actionMap[212][SYSSIZE] = ActionEntry(REDUCE, 81); - _actionMap[212][TMPSIZE] = ActionEntry(REDUCE, 81); - _actionMap[212][LOGSIZE] = ActionEntry(REDUCE, 81); - _actionMap[212][LOGNUM] = ActionEntry(REDUCE, 81); - _actionMap[212][SORTAREASIZE] = ActionEntry(REDUCE, 81); - _actionMap[212][TSROOT] = ActionEntry(REDUCE, 81); - _actionMap[212][TSTICKET] = ActionEntry(REDUCE, 81); - _actionMap[213][EQU] = ActionEntry(SHIFT, 251); - _actionMap[214][EQU] = ActionEntry(SHIFT, 252); - _actionMap[215][EQU] = ActionEntry(SHIFT, 253); - _actionMap[216][EQU] = ActionEntry(SHIFT, 254); - _actionMap[217][EQU] = ActionEntry(SHIFT, 255); - _actionMap[218][EQU] = ActionEntry(SHIFT, 256); - _actionMap[219][EQU] = ActionEntry(SHIFT, 257); - _actionMap[220][EQU] = ActionEntry(SHIFT, 258); - _actionMap[221][EQU] = ActionEntry(SHIFT, 259); - _actionMap[222][SEMICOLON] = ActionEntry(REDUCE, 99); - _actionMap[223][SEMICOLON] = ActionEntry(REDUCE, 98); - _actionMap[224][SEMICOLON] = ActionEntry(REDUCE, 54); - _actionMap[225][TICKET] = ActionEntry(SHIFT, 260); - _actionMap[226][STRINGVAL] = ActionEntry(SHIFT, 261); - _actionMap[227][STRINGVAL] = ActionEntry(SHIFT, 262); - _actionMap[228][STRINGVAL] = ActionEntry(SHIFT, 263); - _actionMap[229][SEMICOLON] = ActionEntry(REDUCE, 52); - _actionMap[230][IDENTIFIER] = ActionEntry(SHIFT, 264); - _actionMap[231][SEMICOLON] = ActionEntry(REDUCE, 43); - _actionMap[232][SEMICOLON] = ActionEntry(REDUCE, 92); - _actionMap[233][SEMICOLON] = ActionEntry(REDUCE, 59); - _actionMap[234][SEMICOLON] = ActionEntry(REDUCE, 96); - _actionMap[235][SEMICOLON] = ActionEntry(REDUCE, 73); - _actionMap[235][CLEANUP] = ActionEntry(REDUCE, 73); - _actionMap[235][FORCELOAD] = ActionEntry(REDUCE, 73); - _actionMap[236][SEMICOLON] = ActionEntry(REDUCE, 75); - _actionMap[236][CLEANUP] = ActionEntry(REDUCE, 75); - _actionMap[236][FORCELOAD] = ActionEntry(REDUCE, 75); - _actionMap[237][SEMICOLON] = ActionEntry(REDUCE, 76); - _actionMap[237][CLEANUP] = ActionEntry(REDUCE, 76); - _actionMap[237][FORCELOAD] = ActionEntry(REDUCE, 76); - _actionMap[238][TIMEOUT] = ActionEntry(SHIFT, 266); - _actionMap[238][SEMICOLON] = ActionEntry(REDUCE, 70); + _actionMap[284][SEMICOLON] = ActionEntry(REDUCE, 57); + _actionMap[285][SEMICOLON] = ActionEntry(REDUCE, 67); + _actionMap[286][INTVAL] = ActionEntry(SHIFT, 311); + _actionMap[287][SEMICOLON] = ActionEntry(REDUCE, 59); + _actionMap[288][SEMICOLON] = ActionEntry(REDUCE, 58); + _actionMap[212][IDENTIFIER] = ActionEntry(SHIFT, 257); + _actionMap[213][TO] = ActionEntry(SHIFT, 258); + _actionMap[214][STRINGVAL] = ActionEntry(SHIFT, 259); + _actionMap[215][IDENTIFIER] = ActionEntry(SHIFT, 260); + _actionMap[216][FROM] = ActionEntry(SHIFT, 261); + _actionMap[217][STRINGVAL] = ActionEntry(SHIFT, 262); + _actionMap[218][TO] = ActionEntry(SHIFT, 263); + _actionMap[219][TO] = ActionEntry(SHIFT, 264); + _actionMap[219][KSEP] = ActionEntry(SHIFT, 265); + _actionMap[220][KSEP] = ActionEntry(REDUCE, 53); + _actionMap[220][TO] = ActionEntry(REDUCE, 53); + _actionMap[221][EQU] = ActionEntry(SHIFT, 266); + _actionMap[222][EQU] = ActionEntry(SHIFT, 267); + _actionMap[223][EQU] = ActionEntry(SHIFT, 268); + _actionMap[224][STRINGVAL] = ActionEntry(SHIFT, 269); + _actionMap[225][INTVAL] = ActionEntry(SHIFT, 270); + _actionMap[226][SEMICOLON] = ActionEntry(REDUCE, 45); + _actionMap[227][SEMICOLON] = ActionEntry(REDUCE, 71); + _actionMap[228][SEMICOLON] = ActionEntry(REDUCE, 92); + _actionMap[228][PRIMARY] = ActionEntry(REDUCE, 92); + _actionMap[228][SECONDARY] = ActionEntry(REDUCE, 92); + _actionMap[228][SYSSIZE] = ActionEntry(REDUCE, 92); + _actionMap[228][TMPSIZE] = ActionEntry(REDUCE, 92); + _actionMap[228][LOGSIZE] = ActionEntry(REDUCE, 92); + _actionMap[228][LOGNUM] = ActionEntry(REDUCE, 92); + _actionMap[228][SORTAREASIZE] = ActionEntry(REDUCE, 92); + _actionMap[228][TSROOT] = ActionEntry(REDUCE, 92); + _actionMap[228][TSTICKET] = ActionEntry(REDUCE, 92); + _actionMap[229][EQU] = ActionEntry(SHIFT, 271); + _actionMap[230][EQU] = ActionEntry(SHIFT, 272); + _actionMap[231][EQU] = ActionEntry(SHIFT, 273); + _actionMap[232][EQU] = ActionEntry(SHIFT, 274); + _actionMap[233][EQU] = ActionEntry(SHIFT, 275); + _actionMap[234][EQU] = ActionEntry(SHIFT, 276); + _actionMap[235][EQU] = ActionEntry(SHIFT, 277); + _actionMap[236][EQU] = ActionEntry(SHIFT, 278); + _actionMap[237][EQU] = ActionEntry(SHIFT, 279); + _actionMap[238][SEMICOLON] = ActionEntry(REDUCE, 110); + _actionMap[239][SEMICOLON] = ActionEntry(REDUCE, 109); + _actionMap[240][SEMICOLON] = ActionEntry(REDUCE, 65); + _actionMap[241][TICKET] = ActionEntry(SHIFT, 280); + _actionMap[242][STRINGVAL] = ActionEntry(SHIFT, 281); + _actionMap[243][STRINGVAL] = ActionEntry(SHIFT, 282); + _actionMap[244][STRINGVAL] = ActionEntry(SHIFT, 283); + _actionMap[245][SEMICOLON] = ActionEntry(REDUCE, 63); } void CegoAdm::loadParser4() { - _jumpMap[238][TimeoutOpt] = 265; - _actionMap[239][IDENTIFIER] = ActionEntry(SHIFT, 267); - _actionMap[240][IDENTIFIER] = ActionEntry(SHIFT, 268); - _actionMap[158][FROM] = ActionEntry(SHIFT, 201); - _actionMap[159][IDENTIFIER] = ActionEntry(SHIFT, 202); - _actionMap[160][TO] = ActionEntry(SHIFT, 203); - _actionMap[161][TO] = ActionEntry(SHIFT, 204); - _actionMap[162][IDENTIFIER] = ActionEntry(SHIFT, 205); - _actionMap[163][FROM] = ActionEntry(SHIFT, 206); - _actionMap[164][SEMICOLON] = ActionEntry(REDUCE, 23); - _actionMap[165][STRINGVAL] = ActionEntry(SHIFT, 207); - _actionMap[166][USER] = ActionEntry(SHIFT, 208); - _actionMap[167][BY] = ActionEntry(SHIFT, 209); - _actionMap[168][SIZE] = ActionEntry(SHIFT, 210); - _actionMap[169][SEMICOLON] = ActionEntry(REDUCE, 53); - _actionMap[170][IDENTIFIER] = ActionEntry(SHIFT, 211); - _actionMap[171][SEMICOLON] = ActionEntry(REDUCE, 25); - _actionMap[171][PRIMARY] = ActionEntry(SHIFT, 216); - _actionMap[171][SECONDARY] = ActionEntry(SHIFT, 217); - _actionMap[171][SYSSIZE] = ActionEntry(SHIFT, 219); - _actionMap[171][TMPSIZE] = ActionEntry(SHIFT, 220); - _actionMap[171][LOGSIZE] = ActionEntry(SHIFT, 215); - _actionMap[171][LOGNUM] = ActionEntry(SHIFT, 214); - _actionMap[171][SORTAREASIZE] = ActionEntry(SHIFT, 218); - _actionMap[171][TSROOT] = ActionEntry(SHIFT, 221); - _actionMap[171][TSTICKET] = ActionEntry(SHIFT, 213); - _jumpMap[171][Attr] = 212; - _actionMap[172][SEMICOLON] = ActionEntry(REDUCE, 50); - _actionMap[173][IDENTIFIER] = ActionEntry(SHIFT, 222); - _actionMap[174][IDENTIFIER] = ActionEntry(SHIFT, 223); - _actionMap[175][SEMICOLON] = ActionEntry(REDUCE, 49); - _actionMap[176][KEEP] = ActionEntry(SHIFT, 225); - _actionMap[176][SEMICOLON] = ActionEntry(REDUCE, 68); - _jumpMap[176][KeepTicketOpt] = 224; - _actionMap[177][SEMICOLON] = ActionEntry(REDUCE, 8); - _actionMap[178][SEMICOLON] = ActionEntry(REDUCE, 13); - _actionMap[179][SEMICOLON] = ActionEntry(REDUCE, 7); - _actionMap[180][SEMICOLON] = ActionEntry(REDUCE, 9); - _actionMap[181][SEMICOLON] = ActionEntry(REDUCE, 10); - _actionMap[182][SEMICOLON] = ActionEntry(REDUCE, 22); - _actionMap[183][SEMICOLON] = ActionEntry(REDUCE, 42); - _actionMap[184][BY] = ActionEntry(SHIFT, 226); - _actionMap[185][TO] = ActionEntry(SHIFT, 227); - _actionMap[186][TO] = ActionEntry(SHIFT, 228); - _actionMap[187][IDENTIFIER] = ActionEntry(SHIFT, 229); - _actionMap[188][USER] = ActionEntry(SHIFT, 230); - _actionMap[189][IDENTIFIER] = ActionEntry(SHIFT, 231); - _actionMap[190][SEMICOLON] = ActionEntry(REDUCE, 57); - _actionMap[191][STRINGVAL] = ActionEntry(SHIFT, 232); - _actionMap[192][SEMICOLON] = ActionEntry(REDUCE, 24); + _actionMap[246][IDENTIFIER] = ActionEntry(SHIFT, 284); + _actionMap[247][SEMICOLON] = ActionEntry(REDUCE, 46); + _actionMap[248][SEMICOLON] = ActionEntry(REDUCE, 103); + _actionMap[249][SEMICOLON] = ActionEntry(REDUCE, 70); + _actionMap[250][SEMICOLON] = ActionEntry(REDUCE, 107); + _actionMap[251][SEMICOLON] = ActionEntry(REDUCE, 84); + _actionMap[251][CLEANUP] = ActionEntry(REDUCE, 84); + _actionMap[251][FORCELOAD] = ActionEntry(REDUCE, 84); + _actionMap[252][SEMICOLON] = ActionEntry(REDUCE, 86); + _actionMap[252][CLEANUP] = ActionEntry(REDUCE, 86); + _actionMap[252][FORCELOAD] = ActionEntry(REDUCE, 86); + _actionMap[253][SEMICOLON] = ActionEntry(REDUCE, 87); + _actionMap[253][CLEANUP] = ActionEntry(REDUCE, 87); + _actionMap[253][FORCELOAD] = ActionEntry(REDUCE, 87); + _actionMap[254][TIMEOUT] = ActionEntry(SHIFT, 286); + _actionMap[254][SEMICOLON] = ActionEntry(REDUCE, 81); + _jumpMap[254][TimeoutOpt] = 285; + _actionMap[255][IDENTIFIER] = ActionEntry(SHIFT, 287); + _actionMap[256][IDENTIFIER] = ActionEntry(SHIFT, 288); + _actionMap[169][FROM] = ActionEntry(SHIFT, 212); + _actionMap[170][IDENTIFIER] = ActionEntry(SHIFT, 213); + _actionMap[171][TO] = ActionEntry(SHIFT, 214); + _actionMap[172][TO] = ActionEntry(SHIFT, 215); + _actionMap[173][IDENTIFIER] = ActionEntry(SHIFT, 216); + _actionMap[174][FROM] = ActionEntry(SHIFT, 217); + _actionMap[175][SEMICOLON] = ActionEntry(REDUCE, 23); + _actionMap[176][STRINGVAL] = ActionEntry(SHIFT, 218); + _actionMap[177][TABLESET] = ActionEntry(SHIFT, 223); + _actionMap[177][FILTER] = ActionEntry(SHIFT, 221); + _actionMap[177][RIGHT] = ActionEntry(SHIFT, 222); + _jumpMap[177][PermEntry] = 220; + _jumpMap[177][PermList] = 219; + _actionMap[178][BY] = ActionEntry(SHIFT, 224); + _actionMap[179][SIZE] = ActionEntry(SHIFT, 225); + _actionMap[180][IDENTIFIER] = ActionEntry(SHIFT, 226); + _actionMap[181][SEMICOLON] = ActionEntry(REDUCE, 64); + _actionMap[182][IDENTIFIER] = ActionEntry(SHIFT, 227); + _actionMap[183][SEMICOLON] = ActionEntry(REDUCE, 25); + _actionMap[183][PRIMARY] = ActionEntry(SHIFT, 232); + _actionMap[183][SECONDARY] = ActionEntry(SHIFT, 233); + _actionMap[183][SYSSIZE] = ActionEntry(SHIFT, 235); + _actionMap[183][TMPSIZE] = ActionEntry(SHIFT, 236); + _actionMap[183][LOGSIZE] = ActionEntry(SHIFT, 231); + _actionMap[183][LOGNUM] = ActionEntry(SHIFT, 230); + _actionMap[183][SORTAREASIZE] = ActionEntry(SHIFT, 234); + _actionMap[183][TSROOT] = ActionEntry(SHIFT, 237); + _actionMap[183][TSTICKET] = ActionEntry(SHIFT, 229); + _jumpMap[183][Attr] = 228; + _actionMap[184][SEMICOLON] = ActionEntry(REDUCE, 61); + _actionMap[185][IDENTIFIER] = ActionEntry(SHIFT, 238); } void CegoAdm::loadParser5() { - _actionMap[193][IDENTIFIER] = ActionEntry(SHIFT, 233); - _actionMap[194][IDENTIFIER] = ActionEntry(SHIFT, 234); - _actionMap[195][SEMICOLON] = ActionEntry(REDUCE, 27); - _actionMap[195][CLEANUP] = ActionEntry(SHIFT, 236); - _actionMap[195][FORCELOAD] = ActionEntry(SHIFT, 237); - _jumpMap[195][StartOpt] = 235; - _actionMap[196][SEMICOLON] = ActionEntry(REDUCE, 32); - _actionMap[197][SEMICOLON] = ActionEntry(REDUCE, 31); - _actionMap[198][STRINGVAL] = ActionEntry(SHIFT, 238); - _actionMap[199][FOR] = ActionEntry(SHIFT, 239); - _actionMap[200][FOR] = ActionEntry(SHIFT, 240); - _actionMap[104][IDENTIFIER] = ActionEntry(SHIFT, 158); - _actionMap[105][IDENTIFIER] = ActionEntry(SHIFT, 160); - _actionMap[105][STRUCTURE] = ActionEntry(SHIFT, 159); - _actionMap[106][IDENTIFIER] = ActionEntry(SHIFT, 161); - _actionMap[107][IDENTIFIER] = ActionEntry(SHIFT, 163); - _actionMap[107][STRUCTURE] = ActionEntry(SHIFT, 162); - _actionMap[108][INTVAL] = ActionEntry(SHIFT, 164); - _actionMap[109][PATH] = ActionEntry(SHIFT, 165); - _actionMap[110][TO] = ActionEntry(SHIFT, 166); - _actionMap[111][IDENTIFIED] = ActionEntry(SHIFT, 167); - _actionMap[112][STRINGVAL] = ActionEntry(SHIFT, 168); - _actionMap[113][IDENTIFIER] = ActionEntry(SHIFT, 169); - _actionMap[114][SEMICOLON] = ActionEntry(REDUCE, 38); - _actionMap[115][FOR] = ActionEntry(SHIFT, 170); - _actionMap[116][SEMICOLON] = ActionEntry(REDUCE, 97); - _actionMap[117][SEMICOLON] = ActionEntry(REDUCE, 29); - _actionMap[118][SEMICOLON] = ActionEntry(REDUCE, 40); - _actionMap[119][SEMICOLON] = ActionEntry(REDUCE, 26); - _actionMap[120][PRIMARY] = ActionEntry(REDUCE, 82); - _actionMap[120][SECONDARY] = ActionEntry(REDUCE, 82); - _actionMap[120][SYSSIZE] = ActionEntry(REDUCE, 82); - _actionMap[120][TMPSIZE] = ActionEntry(REDUCE, 82); - _actionMap[120][LOGSIZE] = ActionEntry(REDUCE, 82); - _actionMap[120][LOGNUM] = ActionEntry(REDUCE, 82); - _actionMap[120][SORTAREASIZE] = ActionEntry(REDUCE, 82); - _actionMap[120][TSROOT] = ActionEntry(REDUCE, 82); - _actionMap[120][TSTICKET] = ActionEntry(REDUCE, 82); - _actionMap[120][SEMICOLON] = ActionEntry(REDUCE, 82); - _jumpMap[120][AttrList] = 171; - _actionMap[121][IDENTIFIER] = ActionEntry(SHIFT, 172); - _actionMap[122][SEMICOLON] = ActionEntry(REDUCE, 35); - _actionMap[123][FOR] = ActionEntry(SHIFT, 173); - _actionMap[124][FOR] = ActionEntry(SHIFT, 174); - _actionMap[125][IDENTIFIER] = ActionEntry(SHIFT, 175); - _actionMap[126][IDENTIFIER] = ActionEntry(SHIFT, 176); - _actionMap[127][IDENTIFIER] = ActionEntry(SHIFT, 177); - _actionMap[128][IDENTIFIER] = ActionEntry(SHIFT, 178); - _actionMap[129][IDENTIFIER] = ActionEntry(SHIFT, 179); - _actionMap[130][IDENTIFIER] = ActionEntry(SHIFT, 180); + _actionMap[186][IDENTIFIER] = ActionEntry(SHIFT, 239); + _actionMap[187][SEMICOLON] = ActionEntry(REDUCE, 60); + _actionMap[188][KEEP] = ActionEntry(SHIFT, 241); + _actionMap[188][SEMICOLON] = ActionEntry(REDUCE, 79); + _jumpMap[188][KeepTicketOpt] = 240; + _actionMap[189][SEMICOLON] = ActionEntry(REDUCE, 8); + _actionMap[190][SEMICOLON] = ActionEntry(REDUCE, 13); + _actionMap[191][SEMICOLON] = ActionEntry(REDUCE, 7); + _actionMap[192][SEMICOLON] = ActionEntry(REDUCE, 9); + _actionMap[193][SEMICOLON] = ActionEntry(REDUCE, 10); + _actionMap[194][SEMICOLON] = ActionEntry(REDUCE, 22); + _actionMap[195][BY] = ActionEntry(SHIFT, 242); + _actionMap[196][TO] = ActionEntry(SHIFT, 243); + _actionMap[197][TO] = ActionEntry(SHIFT, 244); + _actionMap[198][IDENTIFIER] = ActionEntry(SHIFT, 245); + _actionMap[199][ROLE] = ActionEntry(SHIFT, 246); + _actionMap[200][IDENTIFIER] = ActionEntry(SHIFT, 247); + _actionMap[201][SEMICOLON] = ActionEntry(REDUCE, 68); + _actionMap[202][STRINGVAL] = ActionEntry(SHIFT, 248); + _actionMap[203][SEMICOLON] = ActionEntry(REDUCE, 24); + _actionMap[204][IDENTIFIER] = ActionEntry(SHIFT, 249); + _actionMap[205][IDENTIFIER] = ActionEntry(SHIFT, 250); + _actionMap[206][SEMICOLON] = ActionEntry(REDUCE, 27); + _actionMap[206][CLEANUP] = ActionEntry(SHIFT, 252); + _actionMap[206][FORCELOAD] = ActionEntry(SHIFT, 253); + _jumpMap[206][StartOpt] = 251; + _actionMap[207][SEMICOLON] = ActionEntry(REDUCE, 32); + _actionMap[208][SEMICOLON] = ActionEntry(REDUCE, 31); + _actionMap[209][STRINGVAL] = ActionEntry(SHIFT, 254); + _actionMap[210][FOR] = ActionEntry(SHIFT, 255); + _actionMap[211][FOR] = ActionEntry(SHIFT, 256); + _actionMap[111][IDENTIFIER] = ActionEntry(SHIFT, 169); + _actionMap[112][IDENTIFIER] = ActionEntry(SHIFT, 171); + _actionMap[112][STRUCTURE] = ActionEntry(SHIFT, 170); + _actionMap[113][IDENTIFIER] = ActionEntry(SHIFT, 172); + _actionMap[114][IDENTIFIER] = ActionEntry(SHIFT, 174); + _actionMap[114][STRUCTURE] = ActionEntry(SHIFT, 173); + _actionMap[115][INTVAL] = ActionEntry(SHIFT, 175); + _actionMap[116][PATH] = ActionEntry(SHIFT, 176); + _actionMap[117][WITH] = ActionEntry(SHIFT, 177); + _actionMap[118][IDENTIFIED] = ActionEntry(SHIFT, 178); + _actionMap[119][STRINGVAL] = ActionEntry(SHIFT, 179); + _actionMap[120][TO] = ActionEntry(SHIFT, 180); + _actionMap[121][IDENTIFIER] = ActionEntry(SHIFT, 181); + _actionMap[122][SEMICOLON] = ActionEntry(REDUCE, 38); + _actionMap[123][FOR] = ActionEntry(SHIFT, 182); + _actionMap[124][SEMICOLON] = ActionEntry(REDUCE, 108); + _actionMap[125][SEMICOLON] = ActionEntry(REDUCE, 29); + _actionMap[126][SEMICOLON] = ActionEntry(REDUCE, 40); + _actionMap[127][SEMICOLON] = ActionEntry(REDUCE, 49); } void CegoAdm::loadParser6() { - _actionMap[131][IDENTIFIER] = ActionEntry(SHIFT, 181); - _actionMap[132][IDENTIFIER] = ActionEntry(SHIFT, 182); - _actionMap[133][IDENTIFIER] = ActionEntry(SHIFT, 183); - _actionMap[134][SEMICOLON] = ActionEntry(REDUCE, 5); - _actionMap[135][SEMICOLON] = ActionEntry(REDUCE, 14); - _actionMap[136][IDENTIFIED] = ActionEntry(SHIFT, 184); - _actionMap[137][IDENTIFIER] = ActionEntry(SHIFT, 185); - _actionMap[138][IDENTIFIER] = ActionEntry(SHIFT, 186); - _actionMap[139][FROM] = ActionEntry(SHIFT, 187); - _actionMap[140][FROM] = ActionEntry(SHIFT, 188); - _actionMap[141][SEMICOLON] = ActionEntry(REDUCE, 36); - _actionMap[142][FROM] = ActionEntry(SHIFT, 189); - _actionMap[143][TO] = ActionEntry(SHIFT, 191); - _actionMap[143][SEMICOLON] = ActionEntry(REDUCE, 93); - _jumpMap[143][PitOption] = 190; - _actionMap[144][STRINGVAL] = ActionEntry(SHIFT, 192); - _actionMap[145][FOR] = ActionEntry(SHIFT, 193); - _actionMap[146][SEMICOLON] = ActionEntry(REDUCE, 58); - _actionMap[147][IDENTIFIER] = ActionEntry(SHIFT, 194); - _actionMap[148][CLEANUP] = ActionEntry(REDUCE, 74); - _actionMap[148][FORCELOAD] = ActionEntry(REDUCE, 74); - _actionMap[148][SEMICOLON] = ActionEntry(REDUCE, 74); - _jumpMap[148][StartOptList] = 195; - _actionMap[149][SEMICOLON] = ActionEntry(REDUCE, 28); - _actionMap[150][IDENTIFIER] = ActionEntry(SHIFT, 196); - _actionMap[151][IDENTIFIER] = ActionEntry(SHIFT, 197); - _actionMap[152][SEMICOLON] = ActionEntry(REDUCE, 30); - _actionMap[153][SEMICOLON] = ActionEntry(REDUCE, 55); - _actionMap[153][WITH] = ActionEntry(SHIFT, 198); - _actionMap[154][SEMICOLON] = ActionEntry(REDUCE, 18); - _actionMap[155][IDENTIFIER] = ActionEntry(SHIFT, 199); - _actionMap[156][IDENTIFIER] = ActionEntry(SHIFT, 200); - _actionMap[157][SEMICOLON] = ActionEntry(REDUCE, 39); - _actionMap[41][TABLESET] = ActionEntry(SHIFT, 105); - _actionMap[41][TABLE] = ActionEntry(SHIFT, 104); - _actionMap[42][TABLESET] = ActionEntry(SHIFT, 107); - _actionMap[42][TABLE] = ActionEntry(SHIFT, 106); - _actionMap[43][ENDTOKEN] = ActionEntry(ACCEPT, 0); - _actionMap[44][THREAD] = ActionEntry(SHIFT, 108); - _actionMap[45][IDENTIFIER] = ActionEntry(SHIFT, 109); - _actionMap[46][IDENTIFIER] = ActionEntry(SHIFT, 110); - _actionMap[47][IDENTIFIER] = ActionEntry(SHIFT, 111); - _actionMap[48][DATAFILE] = ActionEntry(SHIFT, 112); - _actionMap[49][FOR] = ActionEntry(SHIFT, 113); - _actionMap[50][IDENTIFIER] = ActionEntry(SHIFT, 114); - _actionMap[51][INTVAL] = ActionEntry(SHIFT, 115); - _actionMap[52][STRINGVAL] = ActionEntry(SHIFT, 116); - _actionMap[53][IDENTIFIER] = ActionEntry(SHIFT, 117); - _actionMap[54][IDENTIFIER] = ActionEntry(SHIFT, 118); - _actionMap[55][IDENTIFIER] = ActionEntry(SHIFT, 119); + _actionMap[128][SEMICOLON] = ActionEntry(REDUCE, 26); + _actionMap[129][PRIMARY] = ActionEntry(REDUCE, 93); + _actionMap[129][SECONDARY] = ActionEntry(REDUCE, 93); + _actionMap[129][SYSSIZE] = ActionEntry(REDUCE, 93); + _actionMap[129][TMPSIZE] = ActionEntry(REDUCE, 93); + _actionMap[129][LOGSIZE] = ActionEntry(REDUCE, 93); + _actionMap[129][LOGNUM] = ActionEntry(REDUCE, 93); + _actionMap[129][SORTAREASIZE] = ActionEntry(REDUCE, 93); + _actionMap[129][TSROOT] = ActionEntry(REDUCE, 93); + _actionMap[129][TSTICKET] = ActionEntry(REDUCE, 93); + _actionMap[129][SEMICOLON] = ActionEntry(REDUCE, 93); + _jumpMap[129][AttrList] = 183; + _actionMap[130][IDENTIFIER] = ActionEntry(SHIFT, 184); + _actionMap[131][SEMICOLON] = ActionEntry(REDUCE, 50); + _actionMap[132][SEMICOLON] = ActionEntry(REDUCE, 35); + _actionMap[133][FOR] = ActionEntry(SHIFT, 185); + _actionMap[134][FOR] = ActionEntry(SHIFT, 186); + _actionMap[135][IDENTIFIER] = ActionEntry(SHIFT, 187); + _actionMap[136][IDENTIFIER] = ActionEntry(SHIFT, 188); + _actionMap[137][IDENTIFIER] = ActionEntry(SHIFT, 189); + _actionMap[138][IDENTIFIER] = ActionEntry(SHIFT, 190); + _actionMap[139][IDENTIFIER] = ActionEntry(SHIFT, 191); + _actionMap[140][IDENTIFIER] = ActionEntry(SHIFT, 192); + _actionMap[141][IDENTIFIER] = ActionEntry(SHIFT, 193); + _actionMap[142][IDENTIFIER] = ActionEntry(SHIFT, 194); + _actionMap[143][SEMICOLON] = ActionEntry(REDUCE, 5); + _actionMap[144][SEMICOLON] = ActionEntry(REDUCE, 14); + _actionMap[145][IDENTIFIED] = ActionEntry(SHIFT, 195); + _actionMap[146][IDENTIFIER] = ActionEntry(SHIFT, 196); + _actionMap[147][IDENTIFIER] = ActionEntry(SHIFT, 197); + _actionMap[148][FROM] = ActionEntry(SHIFT, 198); + _actionMap[149][FROM] = ActionEntry(SHIFT, 199); + _actionMap[150][FROM] = ActionEntry(SHIFT, 200); + _actionMap[151][SEMICOLON] = ActionEntry(REDUCE, 36); + _actionMap[152][SEMICOLON] = ActionEntry(REDUCE, 43); + _actionMap[153][TO] = ActionEntry(SHIFT, 202); + _actionMap[153][SEMICOLON] = ActionEntry(REDUCE, 104); + _jumpMap[153][PitOption] = 201; + _actionMap[154][STRINGVAL] = ActionEntry(SHIFT, 203); + _actionMap[155][FOR] = ActionEntry(SHIFT, 204); + _actionMap[156][SEMICOLON] = ActionEntry(REDUCE, 69); + _actionMap[157][IDENTIFIER] = ActionEntry(SHIFT, 205); + _actionMap[158][SEMICOLON] = ActionEntry(REDUCE, 48); + _actionMap[159][CLEANUP] = ActionEntry(REDUCE, 85); + _actionMap[159][FORCELOAD] = ActionEntry(REDUCE, 85); + _actionMap[159][SEMICOLON] = ActionEntry(REDUCE, 85); + _jumpMap[159][StartOptList] = 206; + _actionMap[160][SEMICOLON] = ActionEntry(REDUCE, 28); + _actionMap[161][IDENTIFIER] = ActionEntry(SHIFT, 207); + _actionMap[162][IDENTIFIER] = ActionEntry(SHIFT, 208); } void CegoAdm::loadParser7() { - _actionMap[56][IDENTIFIER] = ActionEntry(SHIFT, 120); - _actionMap[57][FOR] = ActionEntry(SHIFT, 121); - _actionMap[58][IDENTIFIER] = ActionEntry(SHIFT, 122); - _actionMap[59][IDENTIFIER] = ActionEntry(SHIFT, 123); - _actionMap[60][IDENTIFIER] = ActionEntry(SHIFT, 124); - _actionMap[61][FOR] = ActionEntry(SHIFT, 125); - _actionMap[62][FOR] = ActionEntry(SHIFT, 126); - _actionMap[63][FOR] = ActionEntry(SHIFT, 127); - _actionMap[64][FOR] = ActionEntry(SHIFT, 128); - _actionMap[65][SEMICOLON] = ActionEntry(REDUCE, 21); - _actionMap[66][FOR] = ActionEntry(SHIFT, 129); - _actionMap[67][FOR] = ActionEntry(SHIFT, 130); - _actionMap[68][SEMICOLON] = ActionEntry(REDUCE, 11); - _actionMap[69][FOR] = ActionEntry(SHIFT, 131); - _actionMap[70][SEMICOLON] = ActionEntry(REDUCE, 2); - _actionMap[71][SEMICOLON] = ActionEntry(REDUCE, 12); - _actionMap[72][SEMICOLON] = ActionEntry(REDUCE, 6); - _actionMap[73][FOR] = ActionEntry(SHIFT, 132); - _actionMap[74][FOR] = ActionEntry(SHIFT, 133); - _actionMap[75][LOCK] = ActionEntry(SHIFT, 134); - _actionMap[76][IDENTIFIER] = ActionEntry(SHIFT, 135); - _actionMap[77][IDENTIFIER] = ActionEntry(SHIFT, 136); - _actionMap[78][SEMICOLON] = ActionEntry(REDUCE, 4); - _actionMap[79][SEMICOLON] = ActionEntry(REDUCE, 3); - _actionMap[80][FOR] = ActionEntry(SHIFT, 137); - _actionMap[81][FOR] = ActionEntry(SHIFT, 138); - _actionMap[82][IDENTIFIER] = ActionEntry(SHIFT, 139); - _actionMap[83][IDENTIFIER] = ActionEntry(SHIFT, 140); - _actionMap[84][IDENTIFIER] = ActionEntry(SHIFT, 141); - _actionMap[85][IDENTIFIER] = ActionEntry(SHIFT, 142); - _actionMap[86][IDENTIFIER] = ActionEntry(SHIFT, 143); - _actionMap[87][FROM] = ActionEntry(SHIFT, 144); - _actionMap[88][STRINGVAL] = ActionEntry(SHIFT, 145); - _actionMap[89][STRINGVAL] = ActionEntry(SHIFT, 146); - _actionMap[90][IDENTIFIER] = ActionEntry(SHIFT, 147); - _actionMap[91][SEMICOLON] = ActionEntry(REDUCE, 1); - _actionMap[92][IDENTIFIER] = ActionEntry(SHIFT, 148); - _actionMap[93][IDENTIFIER] = ActionEntry(SHIFT, 149); - _actionMap[94][FOR] = ActionEntry(SHIFT, 150); - _actionMap[95][FOR] = ActionEntry(SHIFT, 151); - _actionMap[96][IDENTIFIER] = ActionEntry(SHIFT, 152); - _actionMap[97][IDENTIFIER] = ActionEntry(SHIFT, 153); - _actionMap[98][SEMICOLON] = ActionEntry(REDUCE, 19); - _actionMap[99][INTVAL] = ActionEntry(SHIFT, 154); - _actionMap[99][SEMICOLON] = ActionEntry(REDUCE, 17); - _actionMap[100][SEMICOLON] = ActionEntry(REDUCE, 20); - _actionMap[101][USER] = ActionEntry(SHIFT, 155); - _actionMap[102][USER] = ActionEntry(SHIFT, 156); - _actionMap[103][IDENTIFIER] = ActionEntry(SHIFT, 157); - _actionMap[1][EXPORT] = ActionEntry(SHIFT, 41); + _actionMap[163][SEMICOLON] = ActionEntry(REDUCE, 30); + _actionMap[164][SEMICOLON] = ActionEntry(REDUCE, 66); + _actionMap[164][WITH] = ActionEntry(SHIFT, 209); + _actionMap[165][SEMICOLON] = ActionEntry(REDUCE, 18); + _actionMap[166][IDENTIFIER] = ActionEntry(SHIFT, 210); + _actionMap[167][IDENTIFIER] = ActionEntry(SHIFT, 211); + _actionMap[168][SEMICOLON] = ActionEntry(REDUCE, 39); + _actionMap[42][TABLESET] = ActionEntry(SHIFT, 112); + _actionMap[42][TABLE] = ActionEntry(SHIFT, 111); + _actionMap[43][TABLESET] = ActionEntry(SHIFT, 114); + _actionMap[43][TABLE] = ActionEntry(SHIFT, 113); + _actionMap[44][ENDTOKEN] = ActionEntry(ACCEPT, 0); + _actionMap[45][THREAD] = ActionEntry(SHIFT, 115); + _actionMap[46][IDENTIFIER] = ActionEntry(SHIFT, 116); + _actionMap[47][IDENTIFIER] = ActionEntry(SHIFT, 117); + _actionMap[48][IDENTIFIER] = ActionEntry(SHIFT, 118); + _actionMap[49][DATAFILE] = ActionEntry(SHIFT, 119); + _actionMap[50][IDENTIFIER] = ActionEntry(SHIFT, 120); + _actionMap[51][FOR] = ActionEntry(SHIFT, 121); + _actionMap[52][IDENTIFIER] = ActionEntry(SHIFT, 122); + _actionMap[53][INTVAL] = ActionEntry(SHIFT, 123); + _actionMap[54][STRINGVAL] = ActionEntry(SHIFT, 124); + _actionMap[55][IDENTIFIER] = ActionEntry(SHIFT, 125); + _actionMap[56][IDENTIFIER] = ActionEntry(SHIFT, 126); + _actionMap[57][IDENTIFIER] = ActionEntry(SHIFT, 127); + _actionMap[58][IDENTIFIER] = ActionEntry(SHIFT, 128); + _actionMap[59][IDENTIFIER] = ActionEntry(SHIFT, 129); + _actionMap[60][FOR] = ActionEntry(SHIFT, 130); + _actionMap[61][IDENTIFIER] = ActionEntry(SHIFT, 131); + _actionMap[62][IDENTIFIER] = ActionEntry(SHIFT, 132); + _actionMap[63][IDENTIFIER] = ActionEntry(SHIFT, 133); + _actionMap[64][IDENTIFIER] = ActionEntry(SHIFT, 134); + _actionMap[65][FOR] = ActionEntry(SHIFT, 135); + _actionMap[66][FOR] = ActionEntry(SHIFT, 136); + _actionMap[67][FOR] = ActionEntry(SHIFT, 137); + _actionMap[68][FOR] = ActionEntry(SHIFT, 138); + _actionMap[69][SEMICOLON] = ActionEntry(REDUCE, 21); + _actionMap[70][FOR] = ActionEntry(SHIFT, 139); + _actionMap[71][FOR] = ActionEntry(SHIFT, 140); + _actionMap[72][SEMICOLON] = ActionEntry(REDUCE, 11); + _actionMap[73][FOR] = ActionEntry(SHIFT, 141); + _actionMap[74][SEMICOLON] = ActionEntry(REDUCE, 2); + _actionMap[75][SEMICOLON] = ActionEntry(REDUCE, 47); + _actionMap[76][SEMICOLON] = ActionEntry(REDUCE, 12); + _actionMap[77][SEMICOLON] = ActionEntry(REDUCE, 6); + _actionMap[78][FOR] = ActionEntry(SHIFT, 142); + _actionMap[79][SEMICOLON] = ActionEntry(REDUCE, 42); + _actionMap[80][LOCK] = ActionEntry(SHIFT, 143); + _actionMap[81][IDENTIFIER] = ActionEntry(SHIFT, 144); + _actionMap[82][IDENTIFIER] = ActionEntry(SHIFT, 145); } void CegoAdm::loadParser8() { - _actionMap[1][IMPORT] = ActionEntry(SHIFT, 42); - _actionMap[2][SEMICOLON] = ActionEntry(SHIFT, 43); - _actionMap[3][DB] = ActionEntry(SHIFT, 44); - _actionMap[4][IDENTIFIER] = ActionEntry(SHIFT, 48); - _actionMap[4][USER] = ActionEntry(SHIFT, 47); - _actionMap[4][ROLE] = ActionEntry(SHIFT, 46); - _actionMap[4][ARCHLOG] = ActionEntry(SHIFT, 45); - _actionMap[5][BACKUP] = ActionEntry(SHIFT, 49); - _actionMap[6][IMPORT] = ActionEntry(REDUCE, 78); - _actionMap[6][EXPORT] = ActionEntry(REDUCE, 78); - _actionMap[7][TABLESET] = ActionEntry(SHIFT, 50); - _actionMap[8][INTERVAL] = ActionEntry(SHIFT, 51); - _actionMap[9][TABLESET] = ActionEntry(SHIFT, 53); - _actionMap[9][FILE] = ActionEntry(SHIFT, 52); - _actionMap[10][TABLESET] = ActionEntry(SHIFT, 54); - _actionMap[11][TABLESET] = ActionEntry(SHIFT, 55); - _actionMap[12][TABLESET] = ActionEntry(SHIFT, 56); - _actionMap[13][ARCHLOG] = ActionEntry(SHIFT, 57); - _actionMap[14][TABLESET] = ActionEntry(SHIFT, 58); - _actionMap[15][TABLE] = ActionEntry(SHIFT, 60); - _actionMap[15][UINDEX] = ActionEntry(SHIFT, 59); - _actionMap[16][ARCHLOG] = ActionEntry(SHIFT, 61); - _actionMap[17][BACKUP] = ActionEntry(SHIFT, 62); - _actionMap[18][SEMICOLON] = ActionEntry(REDUCE, 94); - _actionMap[19][SEMICOLON] = ActionEntry(REDUCE, 95); - _actionMap[20][POOL] = ActionEntry(SHIFT, 70); - _actionMap[20][IDENTIFIER] = ActionEntry(SHIFT, 75); - _actionMap[20][TABLESET] = ActionEntry(SHIFT, 72); - _actionMap[20][DATAFILE] = ActionEntry(SHIFT, 66); - _actionMap[20][ARCHLOG] = ActionEntry(SHIFT, 63); - _actionMap[20][LOGFILE] = ActionEntry(SHIFT, 67); - _actionMap[20][OBJECT] = ActionEntry(SHIFT, 69); - _actionMap[20][NODE] = ActionEntry(SHIFT, 68); - _actionMap[20][SESSION] = ActionEntry(SHIFT, 71); - _actionMap[20][BUFILE] = ActionEntry(SHIFT, 64); - _actionMap[20][COPY] = ActionEntry(SHIFT, 65); - _actionMap[20][TRANSACTION] = ActionEntry(SHIFT, 73); - _actionMap[20][USER] = ActionEntry(SHIFT, 74); - _actionMap[21][SEMICOLON] = ActionEntry(REDUCE, 16); - _actionMap[22][TABLESET] = ActionEntry(SHIFT, 76); - _actionMap[23][USER] = ActionEntry(SHIFT, 77); - _actionMap[24][IMPORT] = ActionEntry(REDUCE, 79); - _actionMap[24][EXPORT] = ActionEntry(REDUCE, 79); - _actionMap[25][ON] = ActionEntry(SHIFT, 79); - _actionMap[25][OFF] = ActionEntry(SHIFT, 78); - _actionMap[26][SECONDARY] = ActionEntry(SHIFT, 81); - _actionMap[26][MEDIATOR] = ActionEntry(SHIFT, 80); - _actionMap[27][TABLESET] = ActionEntry(SHIFT, 84); - _actionMap[27][USER] = ActionEntry(SHIFT, 85); - _actionMap[27][ROLE] = ActionEntry(SHIFT, 83); + _actionMap[83][SEMICOLON] = ActionEntry(REDUCE, 4); + _actionMap[84][SEMICOLON] = ActionEntry(REDUCE, 3); + _actionMap[85][FOR] = ActionEntry(SHIFT, 146); + _actionMap[86][FOR] = ActionEntry(SHIFT, 147); + _actionMap[87][IDENTIFIER] = ActionEntry(SHIFT, 148); + _actionMap[88][IDENTIFIER] = ActionEntry(SHIFT, 149); + _actionMap[89][IDENTIFIER] = ActionEntry(SHIFT, 150); + _actionMap[90][IDENTIFIER] = ActionEntry(SHIFT, 151); + _actionMap[91][IDENTIFIER] = ActionEntry(SHIFT, 152); + _actionMap[92][IDENTIFIER] = ActionEntry(SHIFT, 153); + _actionMap[93][FROM] = ActionEntry(SHIFT, 154); + _actionMap[94][STRINGVAL] = ActionEntry(SHIFT, 155); + _actionMap[95][STRINGVAL] = ActionEntry(SHIFT, 156); + _actionMap[96][IDENTIFIER] = ActionEntry(SHIFT, 157); + _actionMap[97][SEMICOLON] = ActionEntry(REDUCE, 1); + _actionMap[98][IDENTIFIER] = ActionEntry(SHIFT, 158); + _actionMap[99][IDENTIFIER] = ActionEntry(SHIFT, 159); + _actionMap[100][IDENTIFIER] = ActionEntry(SHIFT, 160); + _actionMap[101][FOR] = ActionEntry(SHIFT, 161); + _actionMap[102][FOR] = ActionEntry(SHIFT, 162); + _actionMap[103][IDENTIFIER] = ActionEntry(SHIFT, 163); + _actionMap[104][IDENTIFIER] = ActionEntry(SHIFT, 164); + _actionMap[105][SEMICOLON] = ActionEntry(REDUCE, 19); + _actionMap[106][INTVAL] = ActionEntry(SHIFT, 165); + _actionMap[106][SEMICOLON] = ActionEntry(REDUCE, 17); + _actionMap[107][SEMICOLON] = ActionEntry(REDUCE, 20); + _actionMap[108][USER] = ActionEntry(SHIFT, 166); + _actionMap[109][USER] = ActionEntry(SHIFT, 167); + _actionMap[110][IDENTIFIER] = ActionEntry(SHIFT, 168); + _actionMap[1][EXPORT] = ActionEntry(SHIFT, 42); + _actionMap[1][IMPORT] = ActionEntry(SHIFT, 43); + _actionMap[2][SEMICOLON] = ActionEntry(SHIFT, 44); + _actionMap[3][DB] = ActionEntry(SHIFT, 45); + _actionMap[4][IDENTIFIER] = ActionEntry(SHIFT, 49); + _actionMap[4][USER] = ActionEntry(SHIFT, 48); + _actionMap[4][PERMISSION] = ActionEntry(SHIFT, 47); + _actionMap[4][ARCHLOG] = ActionEntry(SHIFT, 46); + _actionMap[5][ROLE] = ActionEntry(SHIFT, 50); + _actionMap[6][BACKUP] = ActionEntry(SHIFT, 51); + _actionMap[7][IMPORT] = ActionEntry(REDUCE, 89); + _actionMap[7][EXPORT] = ActionEntry(REDUCE, 89); + _actionMap[8][TABLESET] = ActionEntry(SHIFT, 52); + _actionMap[9][INTERVAL] = ActionEntry(SHIFT, 53); + _actionMap[10][TABLESET] = ActionEntry(SHIFT, 55); + _actionMap[10][FILE] = ActionEntry(SHIFT, 54); + _actionMap[11][TABLESET] = ActionEntry(SHIFT, 56); + _actionMap[12][TABLESET] = ActionEntry(SHIFT, 58); + _actionMap[12][ROLE] = ActionEntry(SHIFT, 57); + _actionMap[13][TABLESET] = ActionEntry(SHIFT, 59); + _actionMap[14][ARCHLOG] = ActionEntry(SHIFT, 60); } void CegoAdm::loadParser9() { - _actionMap[27][ARCHLOG] = ActionEntry(SHIFT, 82); - _actionMap[28][TABLESET] = ActionEntry(SHIFT, 86); - _actionMap[29][TABLESET] = ActionEntry(SHIFT, 87); - _actionMap[30][LOGMNG] = ActionEntry(SHIFT, 89); - _actionMap[30][INITFILE] = ActionEntry(SHIFT, 88); - _actionMap[31][IDENTIFIER] = ActionEntry(SHIFT, 90); - _actionMap[32][POOL] = ActionEntry(SHIFT, 91); - _actionMap[33][TABLESET] = ActionEntry(SHIFT, 92); - _actionMap[34][TABLESET] = ActionEntry(SHIFT, 93); - _actionMap[35][TABLESET] = ActionEntry(SHIFT, 96); - _actionMap[35][SECONDARY] = ActionEntry(SHIFT, 95); - _actionMap[35][MEDIATOR] = ActionEntry(SHIFT, 94); - _actionMap[36][TABLESET] = ActionEntry(SHIFT, 97); - _actionMap[37][SEMICOLON] = ActionEntry(REDUCE, 15); - _actionMap[37][DB] = ActionEntry(SHIFT, 99); - _actionMap[37][ADM] = ActionEntry(SHIFT, 98); - _actionMap[37][LOG] = ActionEntry(SHIFT, 100); - _actionMap[38][ON] = ActionEntry(SHIFT, 102); - _actionMap[38][OFF] = ActionEntry(SHIFT, 101); - _actionMap[39][TABLESET] = ActionEntry(SHIFT, 103); - _actionMap[40][IMPORT] = ActionEntry(REDUCE, 77); - _actionMap[40][EXPORT] = ActionEntry(REDUCE, 77); - _actionMap[0][XML] = ActionEntry(SHIFT, 40); - _actionMap[0][BINARY] = ActionEntry(SHIFT, 6); - _actionMap[0][PLAIN] = ActionEntry(SHIFT, 24); - _actionMap[0][IMPORT] = ActionEntry(REDUCE, 80); - _actionMap[0][EXPORT] = ActionEntry(REDUCE, 80); - _actionMap[0][SHOW] = ActionEntry(SHIFT, 32); - _actionMap[0][LIST] = ActionEntry(SHIFT, 20); - _actionMap[0][RAWMODE] = ActionEntry(SHIFT, 25); - _actionMap[0][INFO] = ActionEntry(SHIFT, 22); - _actionMap[0][THREADINFO] = ActionEntry(SHIFT, 37); - _actionMap[0][LOCKSTAT] = ActionEntry(SHIFT, 21); - _actionMap[0][ABORT] = ActionEntry(SHIFT, 3); - _actionMap[0][RETRIEVE] = ActionEntry(SHIFT, 29); - _actionMap[0][DEFINE] = ActionEntry(SHIFT, 12); - _actionMap[0][CREATE] = ActionEntry(SHIFT, 11); - _actionMap[0][START_TOK] = ActionEntry(SHIFT, 33); - _actionMap[0][STOP_TOK] = ActionEntry(SHIFT, 34); - _actionMap[0][COPY] = ActionEntry(SHIFT, 9); - _actionMap[0][SWITCH] = ActionEntry(SHIFT, 35); - _actionMap[0][RELOCATE] = ActionEntry(SHIFT, 26); - _actionMap[0][DROP] = ActionEntry(SHIFT, 14); - _actionMap[0][REMOVE] = ActionEntry(SHIFT, 27); - _actionMap[0][ADD] = ActionEntry(SHIFT, 4); - _actionMap[0][CHECK] = ActionEntry(SHIFT, 7); - _actionMap[0][VERIFY] = ActionEntry(SHIFT, 39); - _actionMap[0][CORRECT] = ActionEntry(SHIFT, 10); - _actionMap[0][PASSWD] = ActionEntry(SHIFT, 23); - _actionMap[0][TRACE] = ActionEntry(SHIFT, 38); + _actionMap[15][TABLESET] = ActionEntry(SHIFT, 62); + _actionMap[15][ROLE] = ActionEntry(SHIFT, 61); + _actionMap[16][TABLE] = ActionEntry(SHIFT, 64); + _actionMap[16][UINDEX] = ActionEntry(SHIFT, 63); + _actionMap[17][ARCHLOG] = ActionEntry(SHIFT, 65); + _actionMap[18][BACKUP] = ActionEntry(SHIFT, 66); + _actionMap[19][SEMICOLON] = ActionEntry(REDUCE, 105); + _actionMap[20][SEMICOLON] = ActionEntry(REDUCE, 106); + _actionMap[21][POOL] = ActionEntry(SHIFT, 74); + _actionMap[21][IDENTIFIER] = ActionEntry(SHIFT, 80); + _actionMap[21][TABLESET] = ActionEntry(SHIFT, 77); + _actionMap[21][DATAFILE] = ActionEntry(SHIFT, 70); + _actionMap[21][ARCHLOG] = ActionEntry(SHIFT, 67); + _actionMap[21][LOGFILE] = ActionEntry(SHIFT, 71); + _actionMap[21][OBJECT] = ActionEntry(SHIFT, 73); + _actionMap[21][NODE] = ActionEntry(SHIFT, 72); + _actionMap[21][SESSION] = ActionEntry(SHIFT, 76); + _actionMap[21][BUFILE] = ActionEntry(SHIFT, 68); + _actionMap[21][COPY] = ActionEntry(SHIFT, 69); + _actionMap[21][TRANSACTION] = ActionEntry(SHIFT, 78); + _actionMap[21][USER] = ActionEntry(SHIFT, 79); + _actionMap[21][ROLE] = ActionEntry(SHIFT, 75); + _actionMap[22][SEMICOLON] = ActionEntry(REDUCE, 16); + _actionMap[23][TABLESET] = ActionEntry(SHIFT, 81); + _actionMap[24][USER] = ActionEntry(SHIFT, 82); + _actionMap[25][IMPORT] = ActionEntry(REDUCE, 90); + _actionMap[25][EXPORT] = ActionEntry(REDUCE, 90); + _actionMap[26][ON] = ActionEntry(SHIFT, 84); + _actionMap[26][OFF] = ActionEntry(SHIFT, 83); + _actionMap[27][SECONDARY] = ActionEntry(SHIFT, 86); + _actionMap[27][MEDIATOR] = ActionEntry(SHIFT, 85); + _actionMap[28][TABLESET] = ActionEntry(SHIFT, 90); + _actionMap[28][USER] = ActionEntry(SHIFT, 91); + _actionMap[28][ROLE] = ActionEntry(SHIFT, 89); + _actionMap[28][PERMISSION] = ActionEntry(SHIFT, 88); + _actionMap[28][ARCHLOG] = ActionEntry(SHIFT, 87); + _actionMap[29][TABLESET] = ActionEntry(SHIFT, 92); + _actionMap[30][TABLESET] = ActionEntry(SHIFT, 93); + _actionMap[31][LOGMNG] = ActionEntry(SHIFT, 95); + _actionMap[31][INITFILE] = ActionEntry(SHIFT, 94); + _actionMap[32][IDENTIFIER] = ActionEntry(SHIFT, 96); + _actionMap[33][POOL] = ActionEntry(SHIFT, 97); + _actionMap[33][ROLE] = ActionEntry(SHIFT, 98); + _actionMap[34][TABLESET] = ActionEntry(SHIFT, 99); + _actionMap[35][TABLESET] = ActionEntry(SHIFT, 100); + _actionMap[36][TABLESET] = ActionEntry(SHIFT, 103); + _actionMap[36][SECONDARY] = ActionEntry(SHIFT, 102); + _actionMap[36][MEDIATOR] = ActionEntry(SHIFT, 101); + _actionMap[37][TABLESET] = ActionEntry(SHIFT, 104); + _actionMap[38][SEMICOLON] = ActionEntry(REDUCE, 15); } void CegoAdm::loadParser10() { - _actionMap[0][ENABLE] = ActionEntry(SHIFT, 16); - _actionMap[0][DISABLE] = ActionEntry(SHIFT, 13); - _actionMap[0][BEGIN_TOKEN] = ActionEntry(SHIFT, 5); - _actionMap[0][END_TOKEN] = ActionEntry(SHIFT, 17); - _actionMap[0][SYNC] = ActionEntry(SHIFT, 36); - _actionMap[0][RECOVER] = ActionEntry(SHIFT, 28); - _actionMap[0][SET] = ActionEntry(SHIFT, 30); - _actionMap[0][CHECKPOINT] = ActionEntry(SHIFT, 8); - _actionMap[0][GETDBSPEC] = ActionEntry(SHIFT, 18); - _actionMap[0][GETDBINFO] = ActionEntry(SHIFT, 19); - _actionMap[0][SETTSNODEINFO] = ActionEntry(SHIFT, 31); - _actionMap[0][DUMP] = ActionEntry(SHIFT, 15); + _actionMap[38][DB] = ActionEntry(SHIFT, 106); + _actionMap[38][ADM] = ActionEntry(SHIFT, 105); + _actionMap[38][LOG] = ActionEntry(SHIFT, 107); + _actionMap[39][ON] = ActionEntry(SHIFT, 109); + _actionMap[39][OFF] = ActionEntry(SHIFT, 108); + _actionMap[40][TABLESET] = ActionEntry(SHIFT, 110); + _actionMap[41][IMPORT] = ActionEntry(REDUCE, 88); + _actionMap[41][EXPORT] = ActionEntry(REDUCE, 88); + _actionMap[0][XML] = ActionEntry(SHIFT, 41); + _actionMap[0][BINARY] = ActionEntry(SHIFT, 7); + _actionMap[0][PLAIN] = ActionEntry(SHIFT, 25); + _actionMap[0][IMPORT] = ActionEntry(REDUCE, 91); + _actionMap[0][EXPORT] = ActionEntry(REDUCE, 91); + _actionMap[0][SHOW] = ActionEntry(SHIFT, 33); + _actionMap[0][LIST] = ActionEntry(SHIFT, 21); + _actionMap[0][RAWMODE] = ActionEntry(SHIFT, 26); + _actionMap[0][INFO] = ActionEntry(SHIFT, 23); + _actionMap[0][THREADINFO] = ActionEntry(SHIFT, 38); + _actionMap[0][LOCKSTAT] = ActionEntry(SHIFT, 22); + _actionMap[0][ABORT] = ActionEntry(SHIFT, 3); + _actionMap[0][RETRIEVE] = ActionEntry(SHIFT, 30); + _actionMap[0][DEFINE] = ActionEntry(SHIFT, 13); + _actionMap[0][CREATE] = ActionEntry(SHIFT, 12); + _actionMap[0][START_TOK] = ActionEntry(SHIFT, 34); + _actionMap[0][STOP_TOK] = ActionEntry(SHIFT, 35); + _actionMap[0][COPY] = ActionEntry(SHIFT, 10); + _actionMap[0][SWITCH] = ActionEntry(SHIFT, 36); + _actionMap[0][RELOCATE] = ActionEntry(SHIFT, 27); + _actionMap[0][DROP] = ActionEntry(SHIFT, 15); + _actionMap[0][REMOVE] = ActionEntry(SHIFT, 28); + _actionMap[0][ADD] = ActionEntry(SHIFT, 4); + _actionMap[0][CHECK] = ActionEntry(SHIFT, 8); + _actionMap[0][VERIFY] = ActionEntry(SHIFT, 40); + _actionMap[0][CORRECT] = ActionEntry(SHIFT, 11); + _actionMap[0][PASSWD] = ActionEntry(SHIFT, 24); + _actionMap[0][ASSIGN] = ActionEntry(SHIFT, 5); + _actionMap[0][TRACE] = ActionEntry(SHIFT, 39); + _actionMap[0][ENABLE] = ActionEntry(SHIFT, 17); + _actionMap[0][DISABLE] = ActionEntry(SHIFT, 14); + _actionMap[0][BEGIN_TOKEN] = ActionEntry(SHIFT, 6); + _actionMap[0][END_TOKEN] = ActionEntry(SHIFT, 18); + _actionMap[0][SYNC] = ActionEntry(SHIFT, 37); + _actionMap[0][RECOVER] = ActionEntry(SHIFT, 29); + _actionMap[0][SET] = ActionEntry(SHIFT, 31); + _actionMap[0][CHECKPOINT] = ActionEntry(SHIFT, 9); + _actionMap[0][GETDBSPEC] = ActionEntry(SHIFT, 19); + _actionMap[0][GETDBINFO] = ActionEntry(SHIFT, 20); + _actionMap[0][SETTSNODEINFO] = ActionEntry(SHIFT, 32); + _actionMap[0][DUMP] = ActionEntry(SHIFT, 16); _jumpMap[0][Statement] = 2; - _jumpMap[0][XPMode] = 1; } void CegoAdm::loadParser11() { - _prodInfo.Insert(ProdEntry(99, Statement, 5)); - _prodInfo.Insert(ProdEntry(98, Statement, 5)); - _prodInfo.Insert(ProdEntry(97, Statement, 3)); - _prodInfo.Insert(ProdEntry(96, Statement, 5)); - _prodInfo.Insert(ProdEntry(95, Statement, 1)); - _prodInfo.Insert(ProdEntry(94, Statement, 1)); - _prodInfo.Insert(ProdEntry(93, PitOption, 0)); - _prodInfo.Insert(ProdEntry(92, PitOption, 2)); - _prodInfo.Insert(ProdEntry(91, Attr, 3)); - _prodInfo.Insert(ProdEntry(90, Attr, 3)); - _prodInfo.Insert(ProdEntry(89, Attr, 3)); - _prodInfo.Insert(ProdEntry(88, Attr, 3)); - _prodInfo.Insert(ProdEntry(87, Attr, 3)); - _prodInfo.Insert(ProdEntry(86, Attr, 3)); - _prodInfo.Insert(ProdEntry(85, Attr, 3)); - _prodInfo.Insert(ProdEntry(84, Attr, 3)); - _prodInfo.Insert(ProdEntry(83, Attr, 3)); - _prodInfo.Insert(ProdEntry(82, AttrList, 0)); - _prodInfo.Insert(ProdEntry(81, AttrList, 2)); - _prodInfo.Insert(ProdEntry(80, XPMode, 0)); - _prodInfo.Insert(ProdEntry(79, XPMode, 1)); - _prodInfo.Insert(ProdEntry(78, XPMode, 1)); - _prodInfo.Insert(ProdEntry(77, XPMode, 1)); - _prodInfo.Insert(ProdEntry(76, StartOpt, 1)); - _prodInfo.Insert(ProdEntry(75, StartOpt, 1)); - _prodInfo.Insert(ProdEntry(74, StartOptList, 0)); - _prodInfo.Insert(ProdEntry(73, StartOptList, 2)); - _prodInfo.Insert(ProdEntry(72, LogOpt, 0)); - _prodInfo.Insert(ProdEntry(71, LogOpt, 1)); - _prodInfo.Insert(ProdEntry(70, TimeoutOpt, 0)); - _prodInfo.Insert(ProdEntry(69, TimeoutOpt, 2)); - _prodInfo.Insert(ProdEntry(68, KeepTicketOpt, 0)); - _prodInfo.Insert(ProdEntry(67, KeepTicketOpt, 2)); - _prodInfo.Insert(ProdEntry(66, Statement, 8)); - _prodInfo.Insert(ProdEntry(65, Statement, 7)); - _prodInfo.Insert(ProdEntry(64, Statement, 9)); - _prodInfo.Insert(ProdEntry(63, Statement, 7)); - _prodInfo.Insert(ProdEntry(62, Statement, 6)); - _prodInfo.Insert(ProdEntry(61, Statement, 8)); - _prodInfo.Insert(ProdEntry(60, Statement, 5)); - _prodInfo.Insert(ProdEntry(59, Statement, 5)); - _prodInfo.Insert(ProdEntry(58, Statement, 3)); - _prodInfo.Insert(ProdEntry(57, Statement, 4)); - _prodInfo.Insert(ProdEntry(56, Statement, 6)); - _prodInfo.Insert(ProdEntry(55, Statement, 3)); - _prodInfo.Insert(ProdEntry(54, Statement, 5)); - _prodInfo.Insert(ProdEntry(53, Statement, 4)); - _prodInfo.Insert(ProdEntry(52, Statement, 5)); - _prodInfo.Insert(ProdEntry(51, Statement, 7)); - _prodInfo.Insert(ProdEntry(50, Statement, 4)); - _prodInfo.Insert(ProdEntry(49, Statement, 4)); - _prodInfo.Insert(ProdEntry(48, Statement, 6)); - _prodInfo.Insert(ProdEntry(47, Statement, 6)); - _prodInfo.Insert(ProdEntry(46, Statement, 8)); - _prodInfo.Insert(ProdEntry(45, Statement, 8)); - _prodInfo.Insert(ProdEntry(44, Statement, 8)); - _prodInfo.Insert(ProdEntry(43, Statement, 5)); - _prodInfo.Insert(ProdEntry(42, Statement, 4)); - _prodInfo.Insert(ProdEntry(41, Statement, 8)); + _jumpMap[0][XPMode] = 1; +} +void CegoAdm::loadParser12() +{ + _prodInfo.Insert(ProdEntry(110, Statement, 5)); + _prodInfo.Insert(ProdEntry(109, Statement, 5)); + _prodInfo.Insert(ProdEntry(108, Statement, 3)); + _prodInfo.Insert(ProdEntry(107, Statement, 5)); + _prodInfo.Insert(ProdEntry(106, Statement, 1)); + _prodInfo.Insert(ProdEntry(105, Statement, 1)); + _prodInfo.Insert(ProdEntry(104, PitOption, 0)); + _prodInfo.Insert(ProdEntry(103, PitOption, 2)); + _prodInfo.Insert(ProdEntry(102, Attr, 3)); + _prodInfo.Insert(ProdEntry(101, Attr, 3)); + _prodInfo.Insert(ProdEntry(100, Attr, 3)); + _prodInfo.Insert(ProdEntry(99, Attr, 3)); + _prodInfo.Insert(ProdEntry(98, Attr, 3)); + _prodInfo.Insert(ProdEntry(97, Attr, 3)); + _prodInfo.Insert(ProdEntry(96, Attr, 3)); + _prodInfo.Insert(ProdEntry(95, Attr, 3)); + _prodInfo.Insert(ProdEntry(94, Attr, 3)); + _prodInfo.Insert(ProdEntry(93, AttrList, 0)); + _prodInfo.Insert(ProdEntry(92, AttrList, 2)); + _prodInfo.Insert(ProdEntry(91, XPMode, 0)); + _prodInfo.Insert(ProdEntry(90, XPMode, 1)); + _prodInfo.Insert(ProdEntry(89, XPMode, 1)); + _prodInfo.Insert(ProdEntry(88, XPMode, 1)); + _prodInfo.Insert(ProdEntry(87, StartOpt, 1)); + _prodInfo.Insert(ProdEntry(86, StartOpt, 1)); + _prodInfo.Insert(ProdEntry(85, StartOptList, 0)); + _prodInfo.Insert(ProdEntry(84, StartOptList, 2)); + _prodInfo.Insert(ProdEntry(83, LogOpt, 0)); + _prodInfo.Insert(ProdEntry(82, LogOpt, 1)); + _prodInfo.Insert(ProdEntry(81, TimeoutOpt, 0)); + _prodInfo.Insert(ProdEntry(80, TimeoutOpt, 2)); + _prodInfo.Insert(ProdEntry(79, KeepTicketOpt, 0)); + _prodInfo.Insert(ProdEntry(78, KeepTicketOpt, 2)); + _prodInfo.Insert(ProdEntry(77, Statement, 8)); + _prodInfo.Insert(ProdEntry(76, Statement, 7)); + _prodInfo.Insert(ProdEntry(75, Statement, 9)); + _prodInfo.Insert(ProdEntry(74, Statement, 7)); + _prodInfo.Insert(ProdEntry(73, Statement, 6)); + _prodInfo.Insert(ProdEntry(72, Statement, 8)); + _prodInfo.Insert(ProdEntry(71, Statement, 5)); + _prodInfo.Insert(ProdEntry(70, Statement, 5)); + _prodInfo.Insert(ProdEntry(69, Statement, 3)); + _prodInfo.Insert(ProdEntry(68, Statement, 4)); + _prodInfo.Insert(ProdEntry(67, Statement, 6)); + _prodInfo.Insert(ProdEntry(66, Statement, 3)); + _prodInfo.Insert(ProdEntry(65, Statement, 5)); + _prodInfo.Insert(ProdEntry(64, Statement, 4)); + _prodInfo.Insert(ProdEntry(63, Statement, 5)); + _prodInfo.Insert(ProdEntry(62, Statement, 7)); + _prodInfo.Insert(ProdEntry(61, Statement, 4)); + _prodInfo.Insert(ProdEntry(60, Statement, 4)); + _prodInfo.Insert(ProdEntry(59, Statement, 6)); + _prodInfo.Insert(ProdEntry(58, Statement, 6)); + _prodInfo.Insert(ProdEntry(57, Statement, 6)); + _prodInfo.Insert(ProdEntry(56, PermEntry, 3)); + _prodInfo.Insert(ProdEntry(55, PermEntry, 3)); + _prodInfo.Insert(ProdEntry(54, PermEntry, 3)); + _prodInfo.Insert(ProdEntry(53, PermList, 1)); + _prodInfo.Insert(ProdEntry(52, PermList, 3)); + _prodInfo.Insert(ProdEntry(51, Statement, 8)); + _prodInfo.Insert(ProdEntry(50, Statement, 3)); + _prodInfo.Insert(ProdEntry(49, Statement, 3)); + _prodInfo.Insert(ProdEntry(48, Statement, 3)); + _prodInfo.Insert(ProdEntry(47, Statement, 2)); + _prodInfo.Insert(ProdEntry(46, Statement, 5)); + _prodInfo.Insert(ProdEntry(45, Statement, 5)); + _prodInfo.Insert(ProdEntry(44, Statement, 6)); + _prodInfo.Insert(ProdEntry(43, Statement, 3)); + _prodInfo.Insert(ProdEntry(42, Statement, 2)); + _prodInfo.Insert(ProdEntry(41, Statement, 6)); _prodInfo.Insert(ProdEntry(40, Statement, 3)); _prodInfo.Insert(ProdEntry(39, Statement, 3)); _prodInfo.Insert(ProdEntry(38, Statement, 3)); @@ -2618,12 +2739,12 @@ CegoAdm::CegoAdm() { loadScanner(); - for ( int i=0; i < 300; i++) + for ( int i=0; i < 318; i++) { int j; - for ( j = 0; j < 103; j++) + for ( j = 0; j < 107; j++) _actionMap[i][j] = ActionEntry(); - for ( j = 0; j < 12; j++) + for ( j = 0; j < 14; j++) _jumpMap[i][j] = -1; } loadParser0(); @@ -2638,6 +2759,7 @@ loadParser9(); loadParser10(); loadParser11(); + loadParser12(); _isReserved = false; } @@ -2699,143 +2821,170 @@ } switch (num) { - case 99: + case 110: dumpUIndex(); break; - case 98: + case 109: dumpTable(); break; - case 97: + case 108: copyFileAction(); break; - case 96: + case 107: setTableSetNodeAction(); break; - case 95: + case 106: getDbInfoAction(); break; - case 94: + case 105: getDbSpecAction(); break; - case 92: + case 103: storePit(); break; - case 91: + case 102: storeTSTicketAttr(); break; - case 90: + case 101: storeTSRootAttr(); break; - case 89: + case 100: storeSortAreaAttr(); break; - case 88: + case 99: storeLogNumAttr(); break; - case 87: + case 98: storeLogSizeAttr(); break; - case 86: + case 97: storeTmpSizeAttr(); break; - case 85: + case 96: storeSysSizeAttr(); break; - case 84: + case 95: storeSecondaryAttr(); break; - case 83: + case 94: storePrimaryAttr(); break; - case 79: + case 90: plainModeAction(); break; - case 78: + case 89: binModeAction(); break; - case 77: + case 88: xmlModeAction(); break; - case 76: + case 87: forceloadAction(); break; - case 75: + case 86: cleanupAction(); break; - case 71: + case 82: nologAction(); break; - case 69: + case 80: timeoutAction(); break; - case 67: + case 78: keepTicketAction(); break; - case 66: + case 77: importTableSetStructureAction(); break; - case 65: + case 76: importTableSetAction(); break; - case 64: + case 75: importTableAction(); break; - case 63: + case 74: exportTableSetStructureAction(); break; - case 62: + case 73: exportTableSetAction(); break; - case 61: + case 72: exportTableAction(); break; - case 60: + case 71: setCheckpointAction(); break; - case 59: + case 70: setTSInitFileAction(); break; - case 58: + case 69: setLogMngAction(); break; - case 57: + case 68: recoverTableSetAction(); break; - case 56: + case 67: syncTableSetAction2(); break; - case 55: + case 66: syncTableSetAction1(); break; - case 54: + case 65: endBackupAction(); break; - case 53: + case 64: beginBackupAction(); break; - case 52: + case 63: removeArchLogAction(); break; - case 51: + case 62: addArchLogAction(); break; - case 50: + case 61: disableArchLogAction(); break; - case 49: + case 60: enableArchLogAction(); break; - case 48: + case 59: traceOffAction(); break; - case 47: + case 58: traceOnAction(); break; + case 57: + removePermAction(); + break; + case 56: + setRightPerm(); + break; + case 55: + setFilterPerm(); + break; + case 54: + setTableSetPerm(); + break; + case 51: + addPermAction(); + break; + case 50: + dropRoleAction(); + break; + case 49: + createRoleAction(); + break; + case 48: + showRoleAction(); + break; + case 47: + listRoleAction(); + break; case 46: removeRoleAction(); break; case 45: - addRoleAction(); + assignRoleAction(); break; case 44: changePwdAction();
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoAdm.def ^
@@ -35,6 +35,7 @@ add : ADD adm : ADM archlog : ARCHLOG +assign : ASSIGN backup : BACKUP begin : BEGIN_TOKEN binary : BINARY @@ -59,6 +60,7 @@ end : END_TOKEN export : EXPORT file : FILE +filter : FILTER for : FOR forceload : FORCELOAD from : FROM @@ -89,6 +91,7 @@ on : ON path : PATH passwd : PASSWD +permission : PERMISSION plain : PLAIN pool : POOL primary : PRIMARY @@ -98,6 +101,7 @@ remove : REMOVE recover : RECOVER retrieve : RETRIEVE +right : RIGHT role : ROLE secondary : SECONDARY session : SESSION @@ -179,12 +183,24 @@ Statement : VERIFY TABLESET IDENTIFIER ; verifyTableSetAction Statement : CORRECT TABLESET IDENTIFIER ; correctTableSetAction # -Statement : ADD USER IDENTIFIER IDENTIFIED BY STRINGVAL TO IDENTIFIER ; addUserAction -Statement : LIST USER FOR IDENTIFIER ; listUserAction -Statement : REMOVE USER IDENTIFIER FROM IDENTIFIER ; removeUserAction -Statement : PASSWD USER IDENTIFIER IDENTIFIED BY STRINGVAL TO IDENTIFIER ; changePwdAction -Statement : ADD ROLE IDENTIFIER TO USER IDENTIFIER FOR IDENTIFIER ; addRoleAction -Statement : REMOVE ROLE IDENTIFIER FROM USER IDENTIFIER FOR IDENTIFIER ; removeRoleAction +Statement : ADD USER IDENTIFIER IDENTIFIED BY STRINGVAL ; addUserAction +Statement : LIST USER ; listUserAction +Statement : REMOVE USER IDENTIFIER ; removeUserAction +Statement : PASSWD USER IDENTIFIER IDENTIFIED BY STRINGVAL ; changePwdAction +Statement : ASSIGN ROLE IDENTIFIER TO IDENTIFIER ; assignRoleAction +Statement : REMOVE ROLE IDENTIFIER FROM IDENTIFIER ; removeRoleAction +Statement : LIST ROLE ; listRoleAction +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 +PermList : PermList KSEP PermEntry +PermList : PermEntry +PermEntry : TABLESET EQU IDENTIFIER ; setTableSetPerm +PermEntry : FILTER EQU STRINGVAL ; setFilterPerm +PermEntry : RIGHT EQU IDENTIFIER ; setRightPerm +Statement : REMOVE PERMISSION IDENTIFIER FROM ROLE IDENTIFIER ; removePermAction + Statement : TRACE ON USER IDENTIFIER FOR IDENTIFIER ; traceOnAction Statement : TRACE OFF USER IDENTIFIER FOR IDENTIFIER ; traceOffAction #
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoAdm.h ^
@@ -67,8 +67,17 @@ virtual void listUserAction() = 0; virtual void removeUserAction() = 0; virtual void changePwdAction() = 0; - virtual void addRoleAction() = 0; + virtual void assignRoleAction() = 0; virtual void removeRoleAction() = 0; + virtual void listRoleAction() = 0; + virtual void showRoleAction() = 0; + virtual void createRoleAction() = 0; + virtual void dropRoleAction() = 0; + virtual void addPermAction() = 0; + virtual void setTableSetPerm() = 0; + virtual void setFilterPerm() = 0; + virtual void setRightPerm() = 0; + virtual void removePermAction() = 0; virtual void traceOnAction() = 0; virtual void traceOffAction() = 0; virtual void enableArchLogAction() = 0; @@ -149,6 +158,7 @@ SESSION, SECONDARY, ROLE, + RIGHT, RETRIEVE, RECOVER, REMOVE, @@ -158,6 +168,7 @@ PRIMARY, POOL, PLAIN, + PERMISSION, PASSWD, PATH, ON, @@ -188,6 +199,7 @@ FROM, FORCELOAD, FOR, + FILTER, FILE, EXPORT, END_TOKEN, @@ -212,6 +224,7 @@ BINARY, BEGIN_TOKEN, BACKUP, + ASSIGN, ARCHLOG, ADM, ADD, @@ -228,6 +241,8 @@ enum Action { SHIFT, REDUCE, ACCEPT, NULLACTION }; enum Production { Start, + PermList, + PermEntry, KeepTicketOpt, TimeoutOpt, LogOpt, @@ -252,6 +267,7 @@ void loadParser9(); void loadParser10(); void loadParser11(); + void loadParser12(); class ScannerStateEntry { @@ -348,8 +364,8 @@ int _num; }; - ActionEntry _actionMap[300][103]; - int _jumpMap[300][12]; + ActionEntry _actionMap[318][107]; + int _jumpMap[318][14]; class ProdEntry {
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoAdmAction.cc ^
@@ -1693,19 +1693,10 @@ void CegoAdmAction::listUserAction() { - - Chain tableSet; - - - Chain* pS = getTokenList().First(); - if ( pS ) - { - tableSet = pS; - } CegoAdminHandler::ResultType res; - res = _pAH->reqShowUser(tableSet); + res = _pAH->reqShowUser(); handleMedResult(res, true); CegoTableObject oe; @@ -1728,17 +1719,10 @@ void CegoAdmAction::addUserAction() { - Chain tableSet; Chain user; Chain password(_stringBuf); Chain pS = getTokenList().First(); - if ( pS ) - { - tableSet = pS; - } - pS = getTokenList().Next(); - pS = getTokenList().Next(); pS = getTokenList().Next(); pS = getTokenList().Next(); pS = getTokenList().Next(); @@ -1749,7 +1733,7 @@ CegoAdminHandler::ResultType res; - res = _pAH->medAddUser(tableSet, user, password); + res = _pAH->medAddUser(user, password); handleMedResult(res); @@ -1764,18 +1748,12 @@ Chain pS = getTokenList().First(); if ( pS ) { - tableSet = pS; - } - pS = getTokenList().Next(); - pS = getTokenList().Next(); - if ( pS ) - { user = pS; } CegoAdminHandler::ResultType res; - res = _pAH->medRemoveUser(tableSet, user); + res = _pAH->medRemoveUser(user); handleMedResult(res); } @@ -1783,17 +1761,10 @@ void CegoAdmAction::changePwdAction() { - Chain tableSet; Chain user; Chain password(_stringBuf); Chain* pS = getTokenList().First(); - if ( pS ) - { - tableSet = pS; - } - pS = getTokenList().Next(); - pS = getTokenList().Next(); pS = getTokenList().Next(); pS = getTokenList().Next(); pS = getTokenList().Next(); @@ -1804,32 +1775,50 @@ CegoAdminHandler::ResultType res; - res = _pAH->medChangePasswd(tableSet, user, password); + res = _pAH->medChangePasswd(user, password); handleMedResult(res); } -void CegoAdmAction::addRoleAction() +void CegoAdmAction::assignRoleAction() { - Chain tableSet; Chain user; Chain role; Chain pS = getTokenList().First(); if ( pS ) { - tableSet = pS; + user = pS; } pS = getTokenList().Next(); pS = getTokenList().Next(); if ( pS ) { + role = pS; + } + + CegoAdminHandler::ResultType res; + + res = _pAH->medAssignRole(user, role); + handleMedResult(res); + + +} + +void CegoAdmAction::removeRoleAction() +{ + + Chain user; + Chain role; + + Chain pS = getTokenList().First(); + if ( pS ) + { user = pS; } pS = getTokenList().Next(); pS = getTokenList().Next(); - pS = getTokenList().Next(); if ( pS ) { role = pS; @@ -1837,45 +1826,184 @@ CegoAdminHandler::ResultType res; - res = _pAH->medAddRole(tableSet, user, role); + res = _pAH->medRemoveRole(user, role); handleMedResult(res); +} + +void CegoAdmAction::listRoleAction() +{ + + CegoAdminHandler::ResultType res; + + res = _pAH->reqListRole(); + handleMedResult(res, true); + + CegoTableObject oe; + ListT<ListT<CegoFieldValue> > info; + + _pAH->getRoleList(oe, info); + + CegoOutput output(oe.getSchema()); + output.setRawMode(_rawMode); + output.tabOut(info); + + if ( _rawMode == false ) + { + Chain msg; + _pAH->getMsg(msg); + cout << msg << endl; + } } -void CegoAdmAction::removeRoleAction() +void CegoAdmAction::showRoleAction() { - Chain tableSet; - Chain user; Chain role; Chain* pS = getTokenList().First(); if ( pS ) { - tableSet = pS; + role = pS; } + + CegoAdminHandler::ResultType res; + + res = _pAH->reqShowRole(role); + handleMedResult(res, true); + + CegoTableObject oe; + ListT<ListT<CegoFieldValue> > info; + + _pAH->getRoleInfo(oe, info); + + CegoOutput output(oe.getSchema()); + output.setRawMode(_rawMode); + output.tabOut(info); + + if ( _rawMode == false ) + { + Chain msg; + _pAH->getMsg(msg); + cout << msg << endl; + } +} + + +void CegoAdmAction::createRoleAction() +{ + + Chain role; + + Chain* pS = getTokenList().First(); + if ( pS ) + { + role = pS; + } + + CegoAdminHandler::ResultType res; + + res = _pAH->medCreateRole(role); + handleMedResult(res); + +} + +void CegoAdmAction::dropRoleAction() +{ + + Chain role; + + Chain pS = getTokenList().First(); + if ( pS ) + { + role = pS; + } + + CegoAdminHandler::ResultType res; + + res = _pAH->medDropRole(role); + handleMedResult(res); + +} + +void CegoAdmAction::addPermAction() +{ + Chain role; + Chain permid; + + Chain pS = getTokenList().First(); + if ( pS ) + { + role = pS; + } + + pS = getTokenList().Next(); + pS = getTokenList().Next(); pS = getTokenList().Next(); pS = getTokenList().Next(); if ( pS ) { - user = pS; + permid = pS; + } + + CegoAdminHandler::ResultType res; + + res = _pAH->medAddPermission(role, permid, _tsPerm, _filterPerm, _rightPerm); + handleMedResult(res); + +} + +void CegoAdmAction::setTableSetPerm() +{ + Chain pS = getTokenList().First(); + if ( pS ) + { + _tsPerm = pS; + } +} + +void CegoAdmAction::setFilterPerm() +{ + _filterPerm = Chain(_stringBuf); +} + +void CegoAdmAction::setRightPerm() +{ + Chain pS = getTokenList().First(); + if ( pS ) + { + _rightPerm = pS; + } +} + +void CegoAdmAction::removePermAction() +{ + + Chain role; + Chain permid; + + Chain pS = getTokenList().First(); + if ( pS ) + { + role = pS; } pS = getTokenList().Next(); pS = getTokenList().Next(); pS = getTokenList().Next(); if ( pS ) { - role = pS; + permid = *pS; } - + CegoAdminHandler::ResultType res; - res = _pAH->medRemoveRole(tableSet, user, role); + res = _pAH->medRemovePermission(role, permid); handleMedResult(res); } + void CegoAdmAction::traceOnAction() {
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoAdmAction.h ^
@@ -146,9 +146,21 @@ void addUserAction(); void removeUserAction(); void changePwdAction(); - void addRoleAction(); + void assignRoleAction(); void removeRoleAction(); + void listRoleAction(); + void showRoleAction(); + void createRoleAction(); + void dropRoleAction(); + void addPermAction(); + + void setTableSetPerm(); + void setFilterPerm(); + void setRightPerm(); + + void removePermAction(); + void traceOnAction(); void traceOffAction(); @@ -211,6 +223,10 @@ bool _doForceload; Chain _xportMode; + Chain _tsPerm; + Chain _filterPerm; + Chain _rightPerm; + unsigned long _modId; ListT<CegoField> _admSchema;
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoAdminHandler.cc ^
@@ -444,14 +444,31 @@ { return CegoAdminHandler::CHANGE_PWD; } - else if ( docType == Chain(XML_ADD_ROLE_REQUEST) ) + else if ( docType == Chain(XML_ASSIGN_ROLE_REQUEST) ) { - return CegoAdminHandler::ADD_ROLE; + return CegoAdminHandler::ASSIGN_ROLE; } else if ( docType == Chain(XML_REMOVE_ROLE_REQUEST) ) { return CegoAdminHandler::REMOVE_ROLE; } + else if ( docType == Chain(XML_LIST_ROLE_REQUEST) ) + { + return CegoAdminHandler::LIST_ROLE; + } + else if ( docType == Chain(XML_SHOW_ROLE_REQUEST) ) + { + return CegoAdminHandler::SHOW_ROLE; + } + else if ( docType == Chain(XML_CREATE_ROLE_REQUEST) ) + { + return CegoAdminHandler::CREATE_ROLE; + } + else if ( docType == Chain(XML_DROP_ROLE_REQUEST) ) + { + return CegoAdminHandler::DROP_ROLE; + } + else if ( docType == Chain(XML_USER_TRACE_REQUEST) ) { return CegoAdminHandler::USER_TRACE; @@ -583,14 +600,30 @@ { return CegoAdminHandler::MED_CHANGE_PASSWD; } - else if ( docType == Chain(XML_MED_ADD_ROLE_REQUEST) ) + else if ( docType == Chain(XML_MED_CREATE_ROLE_REQUEST) ) + { + return CegoAdminHandler::MED_CREATE_ROLE; + } + else if ( docType == Chain(XML_MED_DROP_ROLE_REQUEST) ) + { + return CegoAdminHandler::MED_DROP_ROLE; + } + else if ( docType == Chain(XML_MED_ASSIGN_ROLE_REQUEST) ) { - return CegoAdminHandler::MED_ADD_ROLE; + return CegoAdminHandler::MED_ASSIGN_ROLE; } else if ( docType == Chain(XML_MED_REMOVE_ROLE_REQUEST) ) { return CegoAdminHandler::MED_REMOVE_ROLE; } + else if ( docType == Chain(XML_MED_ADD_PERM_REQUEST) ) + { + return CegoAdminHandler::MED_ADD_PERM; + } + else if ( docType == Chain(XML_MED_REMOVE_PERM_REQUEST) ) + { + return CegoAdminHandler::MED_REMOVE_PERM; + } else if ( docType == Chain(XML_MED_USER_TRACE_REQUEST) ) { return CegoAdminHandler::MED_USER_TRACE; @@ -1115,71 +1148,71 @@ return sendReq(XML_ADD_DATAFILE_REQUEST, pRoot); } -CegoAdminHandler::ResultType CegoAdminHandler::reqShowUser(const Chain& tableSet) +CegoAdminHandler::ResultType CegoAdminHandler::reqShowUser() { Element* pRoot = new Element(XML_FRAME_ELEMENT); - pRoot->setAttribute(XML_TABLESET_ATTR, tableSet); return sendReq(XML_SHOW_USER_REQUEST, pRoot); } -CegoAdminHandler::ResultType CegoAdminHandler::reqAddUser(const Chain& tableSet, const Chain& user, const Chain& password) +CegoAdminHandler::ResultType CegoAdminHandler::reqAddUser(const Chain& user, const Chain& password) { Element* pRoot = new Element(XML_FRAME_ELEMENT); - pRoot->setAttribute(XML_TABLESET_ATTR, tableSet); pRoot->setAttribute(XML_NAME_ATTR, user); - // Crypt crypt(password, CEGOSALT); - // pRoot->setAttribute(XML_PASSWD_ATTR, crypt.getEncryption()); - AESCrypt aescrypt(CEGOAESKEY, CEGOAESKEYLEN); pRoot->setAttribute(XML_PASSWD_ATTR, aescrypt.encrypt(password)); return sendReq(XML_ADD_USER_REQUEST, pRoot); } -CegoAdminHandler::ResultType CegoAdminHandler::reqRemoveUser(const Chain& tableSet, const Chain& user) +CegoAdminHandler::ResultType CegoAdminHandler::reqRemoveUser(const Chain& user) { Element* pRoot = new Element(XML_FRAME_ELEMENT); - pRoot->setAttribute(XML_TABLESET_ATTR, tableSet); pRoot->setAttribute(XML_NAME_ATTR, user); return sendReq(XML_REMOVE_USER_REQUEST, pRoot); } -CegoAdminHandler::ResultType CegoAdminHandler::reqChangePwd(const Chain& tableSet, const Chain& user, const Chain& password) +CegoAdminHandler::ResultType CegoAdminHandler::reqChangePwd(const Chain& user, const Chain& password) { Element* pRoot = new Element(XML_FRAME_ELEMENT); - pRoot->setAttribute(XML_TABLESET_ATTR, tableSet); pRoot->setAttribute(XML_NAME_ATTR, user); - // Crypt crypt(password, CEGOSALT); - // pRoot->setAttribute(XML_PASSWD_ATTR, crypt.getEncryption()); - AESCrypt aescrypt(CEGOAESKEY, CEGOAESKEYLEN); pRoot->setAttribute(XML_PASSWD_ATTR, aescrypt.encrypt(password)); return sendReq(XML_CHANGE_PWD_REQUEST, pRoot); } -CegoAdminHandler::ResultType CegoAdminHandler::reqAddRole(const Chain& tableSet, const Chain& user, const Chain& role) +CegoAdminHandler::ResultType CegoAdminHandler::reqListRole() +{ + Element* pRoot = new Element(XML_FRAME_ELEMENT); + return sendReq(XML_LIST_ROLE_REQUEST, pRoot); +} + +CegoAdminHandler::ResultType CegoAdminHandler::reqShowRole(const Chain& role) +{ + Element* pRoot = new Element(XML_FRAME_ELEMENT); + pRoot->setAttribute(XML_ROLE_ATTR, role); + return sendReq(XML_SHOW_ROLE_REQUEST, pRoot); +} + +CegoAdminHandler::ResultType CegoAdminHandler::reqAssignRole(const Chain& user, const Chain& role) { Element* pRoot = new Element(XML_FRAME_ELEMENT); - pRoot->setAttribute(XML_TABLESET_ATTR, tableSet); pRoot->setAttribute(XML_NAME_ATTR, user); pRoot->setAttribute(XML_ROLE_ATTR, role); - return sendReq(XML_ADD_ROLE_REQUEST, pRoot); + return sendReq(XML_ASSIGN_ROLE_REQUEST, pRoot); } -CegoAdminHandler::ResultType CegoAdminHandler::reqRemoveRole(const Chain& tableSet, const Chain& user, const Chain& role) +CegoAdminHandler::ResultType CegoAdminHandler::reqRemoveRole(const Chain& user, const Chain& role) { Element* pRoot = new Element(XML_FRAME_ELEMENT); - pRoot->setAttribute(XML_TABLESET_ATTR, tableSet); pRoot->setAttribute(XML_NAME_ATTR, user); pRoot->setAttribute(XML_ROLE_ATTR, role); return sendReq(XML_REMOVE_ROLE_REQUEST, pRoot); } -CegoAdminHandler::ResultType CegoAdminHandler::reqUserTrace(const Chain& tableSet, const Chain& user, bool isOn) +CegoAdminHandler::ResultType CegoAdminHandler::reqUserTrace( const Chain& user, bool isOn) { Element* pRoot = new Element(XML_FRAME_ELEMENT); - pRoot->setAttribute(XML_TABLESET_ATTR, tableSet); pRoot->setAttribute(XML_NAME_ATTR, user); if ( isOn ) pRoot->setAttribute(XML_TRACE_ATTR, XML_ON_VALUE); @@ -1470,50 +1503,83 @@ return sendReq(XML_MED_GET_TRANSACTIONINFO_REQUEST, pRoot); } -CegoAdminHandler::ResultType CegoAdminHandler::medAddUser(const Chain& tableSet, const Chain& user, const Chain& password) +CegoAdminHandler::ResultType CegoAdminHandler::medAddUser(const Chain& user, const Chain& password) { Element* pRoot = new Element(XML_FRAME_ELEMENT); - pRoot->setAttribute(XML_TABLESET_ATTR, tableSet); pRoot->setAttribute(XML_NAME_ATTR, user); pRoot->setAttribute(XML_PASSWD_ATTR, password); return sendReq(XML_MED_ADD_USER_REQUEST, pRoot); } -CegoAdminHandler::ResultType CegoAdminHandler::medRemoveUser(const Chain& tableSet, const Chain& user) +CegoAdminHandler::ResultType CegoAdminHandler::medRemoveUser(const Chain& user) { Element* pRoot = new Element(XML_FRAME_ELEMENT); - pRoot->setAttribute(XML_TABLESET_ATTR, tableSet); pRoot->setAttribute(XML_NAME_ATTR, user); return sendReq(XML_MED_REMOVE_USER_REQUEST, pRoot); } -CegoAdminHandler::ResultType CegoAdminHandler::medChangePasswd(const Chain& tableSet, const Chain& user, const Chain& password) +CegoAdminHandler::ResultType CegoAdminHandler::medChangePasswd(const Chain& user, const Chain& password) { Element* pRoot = new Element(XML_FRAME_ELEMENT); - pRoot->setAttribute(XML_TABLESET_ATTR, tableSet); pRoot->setAttribute(XML_NAME_ATTR, user); pRoot->setAttribute(XML_PASSWD_ATTR, password); return sendReq(XML_MED_CHANGE_PASSWD_REQUEST, pRoot); } -CegoAdminHandler::ResultType CegoAdminHandler::medAddRole(const Chain& tableSet, const Chain& user, const Chain& role) +CegoAdminHandler::ResultType CegoAdminHandler::medCreateRole(const Chain& role) +{ + Element* pRoot = new Element(XML_FRAME_ELEMENT); + pRoot->setAttribute(XML_ROLE_ATTR, role); + return sendReq(XML_MED_CREATE_ROLE_REQUEST, pRoot); +} + +CegoAdminHandler::ResultType CegoAdminHandler::medDropRole(const Chain& role) +{ + Element* pRoot = new Element(XML_FRAME_ELEMENT); + pRoot->setAttribute(XML_ROLE_ATTR, role); + return sendReq(XML_MED_DROP_ROLE_REQUEST, pRoot); +} + +CegoAdminHandler::ResultType CegoAdminHandler::medAssignRole(const Chain& user, const Chain& role) { Element* pRoot = new Element(XML_FRAME_ELEMENT); - pRoot->setAttribute(XML_TABLESET_ATTR, tableSet); pRoot->setAttribute(XML_NAME_ATTR, user); pRoot->setAttribute(XML_ROLE_ATTR, role); - return sendReq(XML_MED_ADD_ROLE_REQUEST, pRoot); + return sendReq(XML_MED_ASSIGN_ROLE_REQUEST, pRoot); } -CegoAdminHandler::ResultType CegoAdminHandler::medRemoveRole(const Chain& tableSet, const Chain& user, const Chain& role) +CegoAdminHandler::ResultType CegoAdminHandler::medRemoveRole(const Chain& user, const Chain& role) { Element* pRoot = new Element(XML_FRAME_ELEMENT); - pRoot->setAttribute(XML_TABLESET_ATTR, tableSet); pRoot->setAttribute(XML_NAME_ATTR, user); pRoot->setAttribute(XML_ROLE_ATTR, role); 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) +{ + Element* pRoot = new Element(XML_FRAME_ELEMENT); + pRoot->setAttribute(XML_ROLE_ATTR, role); + pRoot->setAttribute(XML_PERMID_ATTR, permid); + pRoot->setAttribute(XML_TABLESET_ATTR, tableSet); + pRoot->setAttribute(XML_FILTER_ATTR, filter); + pRoot->setAttribute(XML_PERM_ATTR, perm); + + return sendReq(XML_MED_ADD_PERM_REQUEST, pRoot); + +} + +CegoAdminHandler::ResultType CegoAdminHandler::medRemovePermission(const Chain& role, const Chain& permid) +{ + Element* pRoot = new Element(XML_FRAME_ELEMENT); + pRoot->setAttribute(XML_ROLE_ATTR, role); + pRoot->setAttribute(XML_PERMID_ATTR, permid); + + return sendReq(XML_MED_REMOVE_PERM_REQUEST, pRoot); + +} + + CegoAdminHandler::ResultType CegoAdminHandler::medUserTrace(const Chain& tableSet, const Chain& user, bool isOn) { Element* pRoot = new Element(XML_FRAME_ELEMENT); @@ -1804,6 +1870,16 @@ } } +void CegoAdminHandler::getFilter(Chain& filter) +{ + Element pRoot = _xml.getDocument()->getRootElement(); + + if ( pRoot ) + { + filter = pRoot->getAttributeValue(XML_FILTER_ATTR); + } +} + void CegoAdminHandler::getSysFileId(int& sysFid) { Element pRoot = _xml.getDocument()->getRootElement(); @@ -1904,7 +1980,27 @@ } } -void CegoAdminHandler::getUserRole(Chain& role) +void CegoAdminHandler::getPerm(Chain& perm) +{ + Element pRoot = _xml.getDocument()->getRootElement(); + + if ( pRoot ) + { + perm = pRoot->getAttributeValue(XML_PERM_ATTR); + } +} + +void CegoAdminHandler::getPermId(Chain& permid) +{ + Element pRoot = _xml.getDocument()->getRootElement(); + + if ( pRoot ) + { + permid = pRoot->getAttributeValue(XML_PERMID_ATTR); + } +} + +void CegoAdminHandler::getRole(Chain& role) { Element pRoot = _xml.getDocument()->getRootElement(); @@ -3927,15 +4023,8 @@ void CegoAdminHandler::getUserInfo(CegoTableObject& oe, ListT<ListT< CegoFieldValue > > & info) { - - ListT<CegoField> schema; - schema.Insert(CegoField(Chain("USERINFO"), Chain("USERINFO"), Chain("NAME"), VARCHAR_TYPE, 20)); - schema.Insert(CegoField(Chain("USERINFO"), Chain("USERINFO"), Chain("ROLE"), VARCHAR_TYPE, 10)); - schema.Insert(CegoField(Chain("USERINFO"), Chain("USERINFO"), Chain("TRACE"), VARCHAR_TYPE, 10)); - schema.Insert(CegoField(Chain("USERINFO"), Chain("USERINFO"), Chain("NUMREQ"), VARCHAR_TYPE, 10)); - schema.Insert(CegoField(Chain("USERINFO"), Chain("USERINFO"), Chain("NUMQUERY"), VARCHAR_TYPE, 10)); - - oe = CegoTableObject( 0, CegoObject::SYSTEM, Chain("USERINFO"), schema, Chain("USERINFO")); + int userLen=10; + int roleLen=10; Element pRoot = _xml.getDocument()->getRootElement(); @@ -3952,7 +4041,13 @@ { Chain userName = (pUserElement)->getAttributeValue(XML_NAME_ATTR); + if ( userName.length() > userLen ) + userLen=userName.length(); + Chain role = (pUserElement)->getAttributeValue(XML_ROLE_ATTR); + if ( role.length() > roleLen ) + roleLen=role.length(); + Chain trace = (pUserElement)->getAttributeValue(XML_TRACE_ATTR); Chain numReq = (pUserElement)->getAttributeValue(XML_NUMREQUEST_ATTR); @@ -3978,6 +4073,16 @@ } } } + + ListT<CegoField> schema; + schema.Insert(CegoField(Chain("USERINFO"), Chain("USERINFO"), Chain("NAME"), VARCHAR_TYPE, userLen)); + schema.Insert(CegoField(Chain("USERINFO"), Chain("USERINFO"), Chain("ROLE"), VARCHAR_TYPE, roleLen)); + schema.Insert(CegoField(Chain("USERINFO"), Chain("USERINFO"), Chain("TRACE"), VARCHAR_TYPE, 10)); + schema.Insert(CegoField(Chain("USERINFO"), Chain("USERINFO"), Chain("NUMREQ"), VARCHAR_TYPE, 10)); + schema.Insert(CegoField(Chain("USERINFO"), Chain("USERINFO"), Chain("NUMQUERY"), VARCHAR_TYPE, 10)); + + oe = CegoTableObject( 0, CegoObject::SYSTEM, Chain("USERINFO"), schema, Chain("USERINFO")); + } void CegoAdminHandler::getTableSetVerificationInfo(CegoTableObject& oe, ListT<ListT< CegoFieldValue > > & info) @@ -4073,6 +4178,92 @@ } +void CegoAdminHandler::getRoleList(CegoTableObject& oe, ListT<ListT< CegoFieldValue > > & info) +{ + + ListT<CegoField> schema; + schema.Insert(CegoField(Chain("ROLELIST"), Chain("ROLELIST"), Chain("ROLE"), VARCHAR_TYPE, 15)); + oe = CegoTableObject( 0, CegoObject::SYSTEM, Chain("ROLELIST"), schema, Chain("ROLELIST")); + + Element pRoot = _xml.getDocument()->getRootElement(); + + if ( pRoot ) + { + + ListT<Element> roleListElementList = pRoot->getChildren(XML_ROLELIST_ELEMENT); + Element *pRoleListElement = roleListElementList.First(); + if ( pRoleListElement ) + { + + ListT<Element> roleList = (pRoleListElement)->getChildren(XML_ROLE_ELEMENT); + Element pRoleElement = roleList.First(); + while ( pRoleElement ) + { + Chain role = (pRoleElement)->getAttributeValue(XML_NAME_ATTR); + + CegoFieldValue f1(VARCHAR_TYPE, role); + + ListT<CegoFieldValue> fl; + + fl.Insert(f1); + + info.Insert(fl); + + pRoleElement = roleList.Next(); + } + } + } +} + +void CegoAdminHandler::getRoleInfo(CegoTableObject& oe, ListT<ListT< CegoFieldValue > > & info) +{ + + ListT<CegoField> schema; + schema.Insert(CegoField(Chain("ROLEINFO"), Chain("ROLEINFO"), Chain("PERMID"), VARCHAR_TYPE, 15)); + schema.Insert(CegoField(Chain("ROLEINFO"), Chain("ROLEINFO"), Chain("TABLESET"), VARCHAR_TYPE, 15)); + schema.Insert(CegoField(Chain("ROLEINFO"), Chain("ROLEINFO"), Chain("FILTER"), VARCHAR_TYPE, 15)); + schema.Insert(CegoField(Chain("ROLEINFO"), Chain("ROLEINFO"), Chain("PERM"), VARCHAR_TYPE, 15)); + oe = CegoTableObject( 0, CegoObject::SYSTEM, Chain("ROLEINFO"), schema, Chain("ROLEINFO")); + + Element pRoot = _xml.getDocument()->getRootElement(); + + if ( pRoot ) + { + ListT<Element> permInfoList = pRoot->getChildren(XML_PERMINFO_ELEMENT); + + Element** pPermInfo = permInfoList.First(); + + if ( pPermInfo ) + { + ListT<Element> permList = (pPermInfo)->getChildren(XML_PERM_ELEMENT); + Element *pPermElement = permList.First(); + while ( pPermElement ) + { + Chain permid = (pPermElement)->getAttributeValue(XML_PERMID_ATTR); + Chain tableSet = (pPermElement)->getAttributeValue(XML_TABLESET_ATTR); + Chain filter = (pPermElement)->getAttributeValue(XML_FILTER_ATTR); + Chain perm = (*pPermElement)->getAttributeValue(XML_PERM_ATTR); + + CegoFieldValue f1(VARCHAR_TYPE, permid); + CegoFieldValue f2(VARCHAR_TYPE, tableSet); + CegoFieldValue f3(VARCHAR_TYPE, filter); + CegoFieldValue f4(VARCHAR_TYPE, perm); + + ListT<CegoFieldValue> fl; + + fl.Insert(f1); + fl.Insert(f2); + fl.Insert(f3); + fl.Insert(f4); + + info.Insert(fl); + + pPermElement = permList.Next(); + } + } + } +} + void CegoAdminHandler::getLogInfo(CegoTableObject& oe, ListT<ListT< CegoFieldValue > > & info) {
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoAdminHandler.h ^
@@ -97,8 +97,12 @@ ADD_USER, REMOVE_USER, CHANGE_PWD, - ADD_ROLE, + ASSIGN_ROLE, REMOVE_ROLE, + LIST_ROLE, + SHOW_ROLE, + CREATE_ROLE, + DROP_ROLE, USER_TRACE, REGISTER_HOST, ADD_ARCHLOG, @@ -130,8 +134,12 @@ MED_ADD_USER, MED_REMOVE_USER, MED_CHANGE_PASSWD, - MED_ADD_ROLE, + MED_ASSIGN_ROLE, MED_REMOVE_ROLE, + MED_ADD_PERM, + MED_REMOVE_PERM, + MED_CREATE_ROLE, + MED_DROP_ROLE, MED_USER_TRACE, MED_BEGIN_BACKUP, MED_END_BACKUP, @@ -236,14 +244,16 @@ ResultType reqAddDataFile(const Chain& tableSet, const Chain& fileType, int fileId, const Chain& dataFile, int fileSize); - ResultType reqShowUser(const Chain& tableSet); - ResultType reqAddUser(const Chain& tableSet, const Chain& user, const Chain& password); - ResultType reqRemoveUser(const Chain& tableSet, const Chain& user); - ResultType reqChangePwd(const Chain& tableSet, const Chain& user, const Chain& password); - ResultType reqAddRole(const Chain& tableSet, const Chain& user, const Chain& role); - ResultType reqRemoveRole(const Chain& tableSet, const Chain& user, const Chain& role); - ResultType reqUserTrace(const Chain& tableSet, const Chain& user, bool isOn); + ResultType reqShowUser(); + ResultType reqAddUser(const Chain& user, const Chain& password); + ResultType reqRemoveUser(const Chain& user); + ResultType reqChangePwd(const Chain& user, const Chain& password); + ResultType reqAddRole(const Chain& user, const Chain& role); + ResultType reqRemoveRole(const Chain& user, const Chain& role); + ResultType reqUserTrace(const Chain& user, bool isOn); + ResultType reqListRole(); + ResultType reqShowRole(const Chain& role); ResultType reqAddArchLog(const Chain& tableSet, const Chain& archId, const Chain& archPath); ResultType reqRemoveArchLog(const Chain& tableSet, const Chain& archId); @@ -290,11 +300,19 @@ ResultType medGetDetailedTableSetInfo(const Chain& tableSet); ResultType medGetObjectInfo(const Chain& tableSet); ResultType medGetTransactionInfo(const Chain& tableSet); - ResultType medAddUser(const Chain& tableSet, const Chain& user, const Chain& password); - ResultType medRemoveUser(const Chain& tableSet, const Chain& user); - ResultType medChangePasswd(const Chain& tableSet, const Chain& user, const Chain& password); - ResultType medAddRole(const Chain& tableSet, const Chain& user, const Chain& role); - ResultType medRemoveRole(const Chain& tableSet, const Chain& user, const Chain& role); + ResultType medAddUser(const Chain& user, const Chain& password); + ResultType medRemoveUser(const Chain& user); + ResultType medChangePasswd(const Chain& user, const Chain& password); + ResultType medAssignRole(const Chain& user, const Chain& role); + ResultType medRemoveRole(const Chain& user, const Chain& role); + + 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 medRemovePermission(const Chain& role, const Chain& permid); + + ResultType medUserTrace(const Chain& tableSet, const Chain& user, bool isOn); ResultType medBeginBackup(const Chain& tableSet); @@ -369,6 +387,9 @@ void getTableSetCorrectionInfo(CegoTableObject& oe, ListT<ListT< CegoFieldValue > > & info); + void getRoleList( CegoTableObject& oe, ListT<ListT< CegoFieldValue > > & info); + void getRoleInfo( CegoTableObject& oe, ListT<ListT< CegoFieldValue > > & info); + void getTableSet(Chain& tableSet); void getTableSetRoot(Chain& tsRoot); void getTableSetTSTicket(Chain& tsTicket); @@ -378,13 +399,16 @@ void getFileName(Chain& fileName); void getFileType(Chain& fileType); void getFileSize(int& fileSize); + void getFilter(Chain& filter); void getTargetHost(Chain& targetHost); void getEscapeCmd(Chain& escCmd); void getTSInitFile(Chain& initFile); void getTimeoutValue(int& timeout); void getUser(Chain& user); void getPassword(Chain& passwd); - void getUserRole(Chain& role); + void getPerm(Chain& perm); + void getPermId(Chain& permid); + void getRole(Chain& role); void getTrace(bool& isOn); void getUsage(bool& getUsage);
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoAdminThread.cc ^
@@ -494,9 +494,19 @@ srvChangePwd(pAH); break; } - case CegoAdminHandler::ADD_ROLE: + case CegoAdminHandler::LIST_ROLE: { - srvAddRole(pAH); + srvListRole(pAH); + break; + } + case CegoAdminHandler::SHOW_ROLE: + { + srvShowRole(pAH); + break; + } + case CegoAdminHandler::ASSIGN_ROLE: + { + srvAssignRole(pAH); break; } case CegoAdminHandler::REMOVE_ROLE: @@ -663,12 +673,12 @@ } case CegoAdminHandler::MED_ADD_USER: { - medAddUser(pAH); + medCreateUser(pAH); break; } case CegoAdminHandler::MED_REMOVE_USER: { - medRemoveUser(pAH); + medDropUser(pAH); break; } case CegoAdminHandler::MED_CHANGE_PASSWD: @@ -676,9 +686,19 @@ medChangePasswd(pAH); break; } - case CegoAdminHandler::MED_ADD_ROLE: + case CegoAdminHandler::MED_CREATE_ROLE: + { + medCreateRole(pAH); + break; + } + case CegoAdminHandler::MED_DROP_ROLE: { - medAddRole(pAH); + medDropRole(pAH); + break; + } + case CegoAdminHandler::MED_ASSIGN_ROLE: + { + medAssignRole(pAH); break; } case CegoAdminHandler::MED_REMOVE_ROLE: @@ -686,6 +706,16 @@ medRemoveRole(pAH); break; } + case CegoAdminHandler::MED_ADD_PERM: + { + medAddPerm(pAH); + break; + } + case CegoAdminHandler::MED_REMOVE_PERM: + { + medRemovePerm(pAH); + break; + } case CegoAdminHandler::MED_USER_TRACE: { medUserTrace(pAH); @@ -2430,11 +2460,7 @@ void CegoAdminThread::srvUserInfo(CegoAdminHandler pAH) { - Chain tableSet; - - pAH->getTableSet(tableSet); - - Element pUserInfo = _pDBMng->getUserList(tableSet); + Element* pUserInfo = _pDBMng->getUserList(); _lastAction = Chain("showUser"); pAH->sendResponse(Chain("User Info"), pUserInfo); @@ -2443,67 +2469,87 @@ void CegoAdminThread::srvAddUser(CegoAdminHandler pAH) { - - Chain tableSet; Chain user; Chain password; - pAH->getTableSet(tableSet); pAH->getUser(user); pAH->getPassword(password); - _pDBMng->addUser(tableSet, user, password); + _pDBMng->addUser(user, password); pAH->sendResponse(Chain("User " + user + " added")); } void CegoAdminThread::srvRemoveUser(CegoAdminHandler pAH) { - Chain tableSet; Chain user; - pAH->getTableSet(tableSet); pAH->getUser(user); - _pDBMng->removeUser(tableSet, user); + _pDBMng->removeUser(user); pAH->sendResponse(Chain("User " + user + " removed")); } void CegoAdminThread::srvChangePwd(CegoAdminHandler pAH) { - Chain tableSet; + Chain user; Chain password; - pAH->getTableSet(tableSet); + pAH->getUser(user); pAH->getPassword(password); - _pDBMng->changePassword(tableSet, user, password); + _pDBMng->changePassword(user, password); pAH->sendResponse(Chain("Password changed for user " + user)); } -void CegoAdminThread::srvAddRole(CegoAdminHandler pAH) +void CegoAdminThread::srvListRole(CegoAdminHandler pAH) +{ + + Element pRoleList = _pDBMng->getRoleList(); + + _lastAction = Chain("listRole"); + pAH->sendResponse(Chain("Role List"), pRoleList); + +} + +void CegoAdminThread::srvShowRole(CegoAdminHandler pAH) +{ + + Chain role; + pAH->getRole(role); + + Element pPermInfo = _pDBMng->getPermInfo(role); + + Host h; + Chain mediator = h.getName(); + + if ( pAH->syncWithInfo(Chain("mediator"), mediator, Chain("Role showed")) == false ) + return; + + pAH->sendResponse(Chain("Admin action finished"), pPermInfo); + +} + +void CegoAdminThread::srvAssignRole(CegoAdminHandler pAH) { - Chain tableSet; Chain user; Chain role; - pAH->getTableSet(tableSet); pAH->getUser(user); - pAH->getUserRole(role); + pAH->getRole(role); - _pDBMng->addUserRole(tableSet, user, role); + _pDBMng->assignUserRole(user, role); pAH->sendResponse(Chain("Role set for user " + user)); } void CegoAdminThread::srvRemoveRole(CegoAdminHandler pAH) { - Chain tableSet; Chain user; Chain role; - pAH->getTableSet(tableSet); + pAH->getUser(user); - pAH->getUserRole(role); + pAH->getRole(role); - _pDBMng->removeUserRole(tableSet, user, role); + _pDBMng->removeUserRole(user, role); pAH->sendResponse(Chain("Role set for user " + user)); } @@ -2511,14 +2557,12 @@ void CegoAdminThread::srvUserTrace(CegoAdminHandler pAH) { - Chain tableSet; Chain user; bool isOn; - pAH->getTableSet(tableSet); pAH->getUser(user); pAH->getTrace(isOn); - _pDBMng->setUserTrace(tableSet, user, isOn); + _pDBMng->setUserTrace(user, isOn); pAH->sendResponse(Chain("User trace set for " + user)); } @@ -4617,18 +4661,19 @@ } -void CegoAdminThread::medAddUser(CegoAdminHandler pAH) +void CegoAdminThread::medCreateUser(CegoAdminHandler pAH) { - Chain tableSet; - pAH->getTableSet(tableSet); - Chain user; pAH->getUser(user); Chain passwd; pAH->getPassword(passwd); + / + TODO : distributed user add logic must be redesigned + ---------------------------------------------------- + Chain primary; Chain secondary; Chain mediator; @@ -4681,7 +4726,7 @@ pPrimaryAH = getSession(Chain("primary"), primary, pAH->getUser(), pAH->getPassword()); - CegoAdminHandler::ResultType res = pPrimaryAH->reqAddUser(tableSet, user, passwd); + CegoAdminHandler::ResultType res = pPrimaryAH->reqAddUser(user, passwd); Chain msg; pPrimaryAH->getMsg(msg); @@ -4701,7 +4746,7 @@ pSecondaryAH = getSession(Chain("secondary"), secondary, pAH->getUser(), pAH->getPassword()); - CegoAdminHandler::ResultType res = pSecondaryAH->reqAddUser(tableSet, user, passwd); + CegoAdminHandler::ResultType res = pSecondaryAH->reqAddUser(user, passwd); Chain msg; pSecondaryAH->getMsg(msg); closeSession(pSecondaryAH); @@ -4715,31 +4760,33 @@ } } } - - // Crypt crypt(passwd, CEGOSALT); - // _pDBMng->addUser(tableSet, user, crypt.getEncryption()); + / AESCrypt aescrypt(CEGOAESKEY, CEGOAESKEYLEN); - _pDBMng->addUser(tableSet, user, aescrypt.encrypt(passwd)); + _pDBMng->addUser(user, aescrypt.encrypt(passwd)); + + Host h; + Chain mediator = h.getName(); if ( pAH->syncWithInfo(Chain("mediator"), mediator, Chain("Added user locally")) == false ) return; pAH->sendResponse(Chain("Admin action finished")); - } -void CegoAdminThread::medRemoveUser(CegoAdminHandler pAH) +void CegoAdminThread::medDropUser(CegoAdminHandler pAH) { - Chain tableSet; - pAH->getTableSet(tableSet); - Chain user; pAH->getUser(user); + / + TODO : distributed user remove logic must be redesigned + ---------------------------------------------------- + + Chain primary; Chain secondary; Chain mediator; @@ -4836,9 +4883,13 @@ } } - _pDBMng->removeUser(tableSet, user); - + / + + _pDBMng->removeUser(user); + Host h; + Chain mediator = h.getName(); + if ( pAH->syncWithInfo(Chain("mediator"), mediator, Chain("User removed")) == false ) return; @@ -4850,15 +4901,13 @@ void CegoAdminThread::medChangePasswd(CegoAdminHandler pAH) { - Chain tableSet; - pAH->getTableSet(tableSet); - Chain user; pAH->getUser(user); Chain passwd; pAH->getPassword(passwd); + /* Chain primary; Chain secondary; @@ -4951,12 +5000,13 @@ } } + / - // Crypt crypt(passwd, CEGOSALT); - // _pDBMng->changePassword(tableSet, user, crypt.getEncryption()); - AESCrypt aescrypt(CEGOAESKEY, CEGOAESKEYLEN); - _pDBMng->changePassword(tableSet, user, aescrypt.encrypt(passwd)); + _pDBMng->changePassword(user, aescrypt.encrypt(passwd)); + + Host h; + Chain mediator = h.getName(); if ( pAH->syncWithInfo(Chain("mediator"), mediator, Chain("Passwd changed")) == false ) return; @@ -4965,17 +5015,55 @@ } -void CegoAdminThread::medAddRole(CegoAdminHandler pAH) +void CegoAdminThread::medCreateRole(CegoAdminHandler pAH) { + + Chain role; + pAH->getRole(role); - Chain tableSet; - pAH->getTableSet(tableSet); + _pDBMng->createRole(role); + + Host h; + Chain mediator = h.getName(); + + if ( pAH->syncWithInfo(Chain("mediator"), mediator, Chain("Role created")) == false ) + return; + + pAH->sendResponse(Chain("Admin action finished")); + +} + + +void CegoAdminThread::medDropRole(CegoAdminHandler pAH) +{ + + Chain role; + pAH->getRole(role); + + _pDBMng->dropRole(role); + + Host h; + Chain mediator = h.getName(); + + if ( pAH->syncWithInfo(Chain("mediator"), mediator, Chain("Role dropped")) == false ) + return; + + pAH->sendResponse(Chain("Admin action finished")); + +} + + +void CegoAdminThread::medAssignRole(CegoAdminHandler pAH) +{ Chain user; pAH->getUser(user); Chain role; - pAH->getUserRole(role); + pAH->getRole(role); + + + / Chain primary; Chain secondary; @@ -5007,7 +5095,6 @@ Chain primaryStatus; Chain secondaryStatus; - _pDBMng->getStatusByHost(primary, primaryStatus); _pDBMng->getStatusByHost(secondary, secondaryStatus); @@ -5071,7 +5158,12 @@ } } - _pDBMng->addUserRole(tableSet, user, role); + / + + _pDBMng->assignUserRole(user, role); + + Host h; + Chain mediator = h.getName(); if ( pAH->syncWithInfo(Chain("mediator"), mediator, Chain("Role added")) == false ) return; @@ -5083,14 +5175,14 @@ void CegoAdminThread::medRemoveRole(CegoAdminHandler pAH) { - Chain tableSet; - pAH->getTableSet(tableSet); Chain user; pAH->getUser(user); Chain role; - pAH->getUserRole(role); + pAH->getRole(role); + + /* Chain primary; Chain secondary; @@ -5186,8 +5278,12 @@ } } } + / + + _pDBMng->removeUserRole(user, role); - _pDBMng->removeUserRole(tableSet, user, role); + Host h; + Chain mediator = h.getName(); if ( pAH->syncWithInfo(Chain("mediator"), mediator, Chain("Role removed")) == false ) return; @@ -5196,18 +5292,70 @@ } -void CegoAdminThread::medUserTrace(CegoAdminHandler pAH) + +void CegoAdminThread::medAddPerm(CegoAdminHandler pAH) { + + Chain role; + pAH->getRole(role); Chain tableSet; pAH->getTableSet(tableSet); + Chain filter; + pAH->getFilter(filter); + + Chain perm; + pAH->getPerm(perm); + + Chain permid; + pAH->getPermId(permid); + + + _pDBMng->addPerm(role, permid, tableSet, filter, perm); + + Host h; + Chain mediator = h.getName(); + + if ( pAH->syncWithInfo(Chain("mediator"), mediator, Chain("Permission added")) == false ) + return; + + pAH->sendResponse(Chain("Admin action finished")); + +} + +void CegoAdminThread::medRemovePerm(CegoAdminHandler pAH) +{ + + Chain role; + pAH->getRole(role); + + Chain permid; + pAH->getPermId(permid); + + _pDBMng->removePerm(role, permid); + + Host h; + Chain mediator = h.getName(); + + if ( pAH->syncWithInfo(Chain("mediator"), mediator, Chain("Permission removed")) == false ) + return; + + pAH->sendResponse(Chain("Admin action finished")); + +} + +void CegoAdminThread::medUserTrace(CegoAdminHandler pAH) +{ + Chain user; pAH->getUser(user); bool isOn; pAH->getTrace(isOn); + / + Chain primary = _pDBMng->getPrimary(tableSet); Chain secondary = _pDBMng->getSecondary(tableSet); Chain mediator = _pDBMng->getMediator(tableSet); @@ -5289,8 +5437,12 @@ } } } + */ + + _pDBMng->setUserTrace(user, isOn); - _pDBMng->setUserTrace(tableSet, user, isOn); + Host h; + Chain mediator = h.getName(); if ( pAH->syncWithInfo(Chain("mediator"), mediator, Chain("User trace set")) == false )
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoAdminThread.h ^
@@ -119,7 +119,10 @@ void srvAddUser(CegoAdminHandler pAH); void srvRemoveUser(CegoAdminHandler pAH); void srvChangePwd(CegoAdminHandler pAH); - void srvAddRole(CegoAdminHandler pAH); + + void srvListRole(CegoAdminHandler pAH); + void srvShowRole(CegoAdminHandler pAH); + void srvAssignRole(CegoAdminHandler pAH); void srvRemoveRole(CegoAdminHandler pAH); void srvUserTrace(CegoAdminHandler pAH); void srvSyncTableSet(CegoAdminHandler pAH); @@ -159,12 +162,18 @@ void medGetObjectInfo(CegoAdminHandler pAH); void medGetTransactionInfo(CegoAdminHandler pAH); - void medAddUser(CegoAdminHandler pAH); - void medRemoveUser(CegoAdminHandler pAH); + void medCreateUser(CegoAdminHandler pAH); + void medDropUser(CegoAdminHandler pAH); void medChangePasswd(CegoAdminHandler pAH); - void medAddRole(CegoAdminHandler pAH); + void medAssignRole(CegoAdminHandler pAH); void medRemoveRole(CegoAdminHandler pAH); + void medAddPerm(CegoAdminHandler pAH); + void medRemovePerm(CegoAdminHandler pAH); + + void medCreateRole(CegoAdminHandler pAH); + void medDropRole(CegoAdminHandler pAH); + void medUserTrace(CegoAdminHandler pAH); void medBeginBackup(CegoAdminHandler pAH);
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoDatabaseManager.cc ^
@@ -511,8 +511,10 @@ return pCopyInfo; } + void CegoDatabaseManager::useObject(int tabSetId, const Chain& objName, CegoObject::ObjectType type, ObjectUseMode mode, long tid) { + if ( mode == SHARED ) { // cout << "Using object " << objName << " " << type << " shared" << endl; @@ -1000,3 +1002,27 @@ } _logConfigured=true; } + +bool CegoDatabaseManager::verifyAccess(const int tabSetId, const Chain& objName, CegoObject::ObjectType type, CegoXMLSpace::AccessMode mode, const Chain& user) +{ + SetT<Chain> roleSet; + + getRoleSet(user, roleSet); + Chain tableSet = getTabSetName(tabSetId); + + Chain pRole = roleSet.First(); + while ( pRole ) + { + + Chain objPattern = objName; + + if ( matchRole( pRole, tableSet, objPattern, mode ) ) + return true; + pRole = roleSet.Next(); + } + return false; +} + + + +
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoDatabaseManager.h ^
@@ -110,6 +110,7 @@ void configureLogger(Logger::LogLevel level); bool isLoggerConfigured(); + bool verifyAccess(const int tabSetId, const Chain& objName, CegoObject::ObjectType type, CegoXMLSpace::AccessMode mode, const Chain& user); private: @@ -121,7 +122,7 @@ void PR(); void PW(); void V(); - + class ObjectRecord { public:
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoDbThread.cc ^
@@ -312,81 +312,6 @@ } } -/* -void CegoDbThread::loadObject(int tabSetId, const Chain& objName, CegoObject::ObjectType type) -{ - - try - { - if ( type == CegoObject::PROCEDURE ) - { - CegoProcObject po; - _pTabMng->getObject(tabSetId, objName, CegoObject::PROCEDURE, po); - - Chain loadString = Chain("load ") + po.getProcText(); - - _pDBMng->log(_modId, Logger::DEBUG, Chain("Thread ") + Chain(_idx) + Chain(" : Loading <<< ") + loadString + Chain(">>>")); - - CegoAction* pPA = new CegoAction(_pTabMng); - - try - { - pPA->setTableSet(_pDBMng->getTabSetName(tabSetId)); - pPA->setCommandChain(loadString); - pPA->parse(); - - CegoProcedure* pProc = pPA->getProcedure(); - _pTabMng->addCompProcedure(tabSetId, pProc); - delete pPA; - } - catch ( Exception e ) - { - delete pPA; - Chain msg = Chain("Cannot load procedure ") + objName; - throw Exception(EXLOC, msg, e); - } - } - else if ( type == CegoObject::VIEW ) - { - - CegoViewObject vo; - _pTabMng->getObject(tabSetId, objName, CegoObject::VIEW, vo); - - Chain loadString = Chain("load ") + vo.getViewStmt(); - - _pDBMng->log(_modId, Logger::DEBUG, Chain("Thread ") + Chain(_idx) + Chain(" : Loading <<< ") + loadString + Chain(">>>")); - - CegoAction* pPA = new CegoAction(_pTabMng); - - try - { - - pPA->setTableSet(_pDBMng->getTabSetName(tabSetId)); - pPA->setCommandChain(loadString); - pPA->parse(); - - CegoSelect* pSelect = pPA->getSelect(); - CegoView pView = new CegoView(objName, pSelect); - - _pTabMng->addCompView(tabSetId, pView); - - delete pPA; - } - catch ( Exception e ) - { - delete pPA; - Chain msg = Chain("Cannot load view ") + objName; - throw Exception(EXLOC, msg, e); - } - } - } - catch ( Exception e ) - { - throw e; - } -} -/ - void CegoDbThread::serveSession(CegoDistDbHandler pSH) { @@ -395,9 +320,8 @@ if ( pSH->acceptSession() ) { bool isTraceOn; - SetT<Chain> roleSet; Chain msg; - if ( _pDBMng->checkUser(pSH->getTableSet(), pSH->getUser(), pSH->getPassword(), msg, isTraceOn, roleSet) == false ) + if ( _pDBMng->checkUser(pSH->getUser(), pSH->getPassword(), msg, isTraceOn) == false ) { pSH->sendError(msg); return; @@ -413,26 +337,7 @@ _pDBMng->log(_modId, Logger::DEBUG, Chain("Thread ") + Chain(_idx) + Chain(" : Accepted session for tableset ") + pSH->getTableSet()); } - - Chain pRole = roleSet.First(); - while ( pRole ) - { - if ( pRole == Chain(XML_ROLE_ALL_VALUE) ) - _pPA->addRole(CegoAction::ALL); - else if ( pRole == Chain(XML_ROLE_READOBJ_VALUE) ) - _pPA->addRole(CegoAction::READOBJ); - else if ( pRole == Chain(XML_ROLE_WRITEOBJ_VALUE) ) - _pPA->addRole(CegoAction::WRITEOBJ); - else if ( pRole == Chain(XML_ROLE_CREATEOBJ_VALUE) ) - _pPA->addRole(CegoAction::CREATEOBJ); - else if ( pRole == Chain(XML_ROLE_DROPOBJ_VALUE) ) - _pPA->addRole(CegoAction::DROPOBJ); - else if ( pRole == Chain(XML_ROLE_EXECPROC_VALUE) ) - _pPA->addRole(CegoAction::EXECPROC); - - pRole = roleSet.Next(); - } - + _pPA->setTableSet(pSH->getTableSet()); bool isTerminated = false; @@ -456,7 +361,7 @@ if ( isTraceOn ) { - _pDBMng->incUserQuery(pSH->getTableSet(), pSH->getUser()); + _pDBMng->incUserQuery(pSH->getUser()); } _pPool->incNumQueryRequest(_idx);
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoDefs.h ^
@@ -40,7 +40,7 @@ #endif #define CEGO_PRODUCT "Cego" -#define CEGO_VERSION "2.10.13" +#define CEGO_VERSION "2.11.0" #define CEGO_COPYRIGHT "Copyright (C) 2000-2011 by Bjoern Lemke. All rights reserved" /*******************************/
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoDistManager.cc ^
@@ -326,6 +326,13 @@ int tabSetId = _pDBMng->getTabSetId(tableSet); + if ( _pDBMng->verifyAccess(tabSetId, objName, type, CegoXMLSpace::READ, _authUser) == false ) + { + Chain msg = Chain("Access not allowed for object ") + objName; + throw Exception(EXLOC, msg); + } + + _pDBMng->log(_modId, Logger::DEBUG, Chain("Getting object ") + objName); Chain hostName = _pDBMng->getPrimary(tabSetId); @@ -380,6 +387,13 @@ _pDBMng->log(_modId, Logger::DEBUG, Chain("Dropping object ") + objName); int tabSetId = _pDBMng->getTabSetId(tableSet); + + if ( _pDBMng->verifyAccess(tabSetId, objName, type, CegoXMLSpace::MODIFY, _authUser) == false ) + { + Chain msg = Chain("Access not allowed for object ") + objName; + throw Exception(EXLOC, msg); + } + Chain hostName = _pDBMng->getPrimary(tabSetId); Host h; @@ -525,6 +539,12 @@ Chain hostName = _pDBMng->getPrimary(tableSet); int tabSetId = _pDBMng->getTabSetId(tableSet); + if ( _pDBMng->verifyAccess(tabSetId, tableName, type, CegoXMLSpace::MODIFY, _authUser) == false ) + { + Chain msg = Chain("Access not allowed for object ") + tableName; + throw Exception(EXLOC, msg); + } + Host h; if ( hostName.toUpper() == h.getName().toUpper() ) @@ -591,7 +611,16 @@ _pDBMng->log(_modId, Logger::DEBUG, Chain("Creating global index ") + indexName + Chain(" in tableset ") + tableSet); + int tabSetId = _pDBMng->getTabSetId(tableSet); + + if ( _pDBMng->verifyAccess(tabSetId, indexName, CegoObject::INDEX, CegoXMLSpace::MODIFY, _authUser) == false ) + { + Chain msg = Chain("Access not allowed for index ") + indexName; + throw Exception(EXLOC, msg); + } + + Chain hostName =_pDBMng->getPrimary(tableSet); Host h; @@ -640,6 +669,12 @@ Chain hostName = _pDBMng->getPrimary(tableSet); int tabSetId = _pDBMng->getTabSetId(tableSet); + if ( _pDBMng->verifyAccess(tabSetId, tableName, CegoObject::TABLE, CegoXMLSpace::MODIFY, _authUser) == false ) + { + Chain msg = Chain("Access not allowed for object ") + tableName; + throw Exception(EXLOC, msg); + } + Host h; if ( hostName.toUpper() == h.getName().toUpper() ) { @@ -673,6 +708,12 @@ Chain hostName = _pDBMng->getPrimary(tableSet); int tabSetId = _pDBMng->getTabSetId(tableSet); + if ( _pDBMng->verifyAccess(tabSetId, tableName, CegoObject::TABLE, CegoXMLSpace::MODIFY, _authUser) == false ) + { + Chain msg = Chain("Access not allowed for object ") + tableName; + throw Exception(EXLOC, msg); + } + Host h; if ( hostName.toUpper() == h.getName().toUpper() ) { @@ -708,6 +749,12 @@ Chain hostName = _pDBMng->getPrimary(tableSet); int tabSetId = _pDBMng->getTabSetId(tableSet); + if ( _pDBMng->verifyAccess(tabSetId, objName, type, CegoXMLSpace::MODIFY, _authUser) == false ) + { + Chain msg = Chain("Access not allowed for object ") + objName; + throw Exception(EXLOC, msg); + } + Host h; if ( hostName.toUpper() == h.getName().toUpper() ) @@ -1032,6 +1079,13 @@ _pDBMng->log(_modId, Logger::DEBUG, Chain("Inserting into global table ") + oe.getName()); + if ( _pDBMng->verifyAccess(oe.getTabSetId(), oe.getName(), oe.getType(), CegoXMLSpace::WRITE, _authUser) == false ) + { + Chain msg = Chain("Access not allowed for object ") + oe.getName(); + throw Exception(EXLOC, msg); + } + + Chain hostName = _pDBMng->getPrimary(oe.getTabSetId()); Host h; @@ -1072,7 +1126,7 @@ void CegoDistManager::insertLocalDataTable(CegoTableObject& oe, ListT<CegoField>& fvl) { - _pDBMng->useObject(oe.getTabSetId(), oe.getName(), oe.getType(), CegoDatabaseManager::EXCLUSIVE_WRITE, _threadId); + _pDBMng->useObject(oe.getTabSetId(), oe.getName(), oe.getType(), CegoDatabaseManager::EXCLUSIVE_WRITE, _threadId); try { @@ -1090,6 +1144,13 @@ long CegoDistManager::deleteDistDataTable(CegoTableObject& oe, CegoPredDesc* pPred, CegoProcBlock* pBlock) { _pDBMng->log(_modId, Logger::DEBUG, Chain("Deleting from global table ") + oe.getName()); + + if ( _pDBMng->verifyAccess(oe.getTabSetId(), oe.getName(), oe.getType(), CegoXMLSpace::WRITE, _authUser) == false ) + { + Chain msg = Chain("Access not allowed for object ") + oe.getName(); + throw Exception(EXLOC, msg); + } + Chain hostName = _pDBMng->getPrimary(oe.getTabSetId()); @@ -1147,6 +1208,12 @@ { _pDBMng->log(_modId, Logger::DEBUG, Chain("Updating global table ") + oe.getName()); + + if ( _pDBMng->verifyAccess(oe.getTabSetId(), oe.getName(), oe.getType(), CegoXMLSpace::WRITE, _authUser) == false ) + { + Chain msg = Chain("Access not allowed for object ") + oe.getName(); + throw Exception(EXLOC, msg); + } Chain hostName = _pDBMng->getPrimary(oe.getTabSetId()); @@ -1259,6 +1326,13 @@ _pDBMng->log(_modId, Logger::DEBUG, Chain("Altering global table ") + oe.getName()); + if ( _pDBMng->verifyAccess(oe.getTabSetId(), oe.getName(), oe.getType(), CegoXMLSpace::MODIFY, _authUser) == false ) + { + Chain msg = Chain("Access not allowed for object ") + oe.getName(); + throw Exception(EXLOC, msg); + } + + Chain hostName = _pDBMng->getPrimary(oe.getTabSetId()); Host h; @@ -1290,6 +1364,13 @@ _pDBMng->log(_modId, Logger::DEBUG, Chain("Renaming global table ") + objName); int tabSetId = _pDBMng->getTabSetId(tableSet); + + if ( _pDBMng->verifyAccess(tabSetId, objName, type, CegoXMLSpace::MODIFY, _authUser) == false ) + { + Chain msg = Chain("Access not allowed for object ") + objName; + throw Exception(EXLOC, msg); + } + Chain hostName = _pDBMng->getPrimary(tabSetId); Host h; @@ -1327,6 +1408,13 @@ _pDBMng->log(_modId, Logger::DEBUG, Chain("Creating global view ") + viewName + Chain(" in tableset ") + tableSet); int tabSetId = _pDBMng->getTabSetId(tableSet); + + if ( _pDBMng->verifyAccess(tabSetId, viewName, CegoObject::VIEW, CegoXMLSpace::MODIFY, _authUser) == false ) + { + Chain msg = Chain("Access not allowed for object ") + viewName; + throw Exception(EXLOC, msg); + } + Chain hostName =_pDBMng->getPrimary(tabSetId); Host h; @@ -1382,6 +1470,13 @@ _pDBMng->log(_modId, Logger::DEBUG, Chain("Creating global procedure ") + procName + Chain(" in tableset ") + tableSet); int tabSetId = _pDBMng->getTabSetId(tableSet); + + if ( _pDBMng->verifyAccess(tabSetId, procName, CegoObject::PROCEDURE, CegoXMLSpace::MODIFY, _authUser) == false ) + { + Chain msg = Chain("Access not allowed for object ") + procName; + throw Exception(EXLOC, msg); + } + Chain hostName = _pDBMng->getPrimary(tabSetId); Host h; @@ -1720,10 +1815,17 @@ void CegoDistManager::setActiveUser(const Chain& tableSet, const Chain& user, const Chain& passwd) { + _authUser = user; + if ( _userList.Find(ActiveTSUser(tableSet)) == 0 ) _userList.Insert( ActiveTSUser(tableSet, user, passwd)); } +const Chain& CegoDistManager::getUser() const +{ + return _authUser; +} + void CegoDistManager::getActiveUser(const Chain& tableSet, Chain& user, Chain& passwd) {
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoDistManager.h ^
@@ -129,6 +129,8 @@ void setActiveUser(const Chain& tableSet, const Chain& user, const Chain& passwd); CegoLockHandler* getLockHandle(); + + const Chain& getUser() const; void getActiveUser(const Chain& tableSet, Chain& user, Chain& password); @@ -177,6 +179,8 @@ ListT<ActiveTSUser> _userList; + Chain _authUser; + long _threadId; unsigned long _modId;
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoMain.cc ^
@@ -67,15 +67,16 @@ #define USAGE "Usage:\n\n\ Info: cego [ --version ] [ --help ]\n\ - Adm pwd setup: cego --mode=setadminuser --user=<user>/<password> --dbxml=<db xml>\n\ - Usr pwd setup: cego --mode=setdbuser --user=<user>/<password> --tableset=<tableset> --dbxml=<db xml> [ --role=<role> ]\n\ + User setup: cego --mode=adduser --user=<user>/<password> --role=<role> --dbxml=<db xml>\n\ + Role setup: cego --mode=addrole --role=<role> --dbxml=<db xml>\n\ + Permission setup: cego --mode=addperm --role=<role> --permid=<permid> --tableset=<tableset> --filter=<object filter> --perm=<permission> --dbxml=<db xml>\n\ Define Mode: cego --mode=define --tsdef=<db attr string> --tableset=<tableset> --dbxml=<db xml>\n\ Creation Mode: cego --mode=create --tableset=<tableset> --dbxml=<db xml>\n\ Export Mode: cego --mode=<xmlexport\|binexport\|plainexport> --expfile=<exportfile> --tableset=<tableset> --dbxml=<db xml>\n\ \n\ Import Mode: cego --mode=<xmlimport\|binimport\|plainimport> --impfile=<importfile> --tableset=<tableset> --dbxml=<db xml> [ --noLogging ]\n\ \n\ - Batch Mode: cego --mode=batch --batchfile=<batchfile> --tableset=<tableset> --dbxml=<db xml> [ --poolsize=<poolsize> ] [ --ignore ]\n\ + Batch Mode: cego --mode=batch --batchfile=<batchfile> --tableset=<tableset> --dbxml=<db xml> --user=<user/pwd> [ --poolsize=<poolsize> ] [ --ignore ]\n\ Daemon Mode: cego --mode=daemon --dbxml=<db xml> [--tableset=<tableset>,<tableset>,... ] [ --cleanup ] [ --forceload ] [ --nolockstat ] [ --numdbthread=<numdb> ] [ --numadminthread=<numadm> ] [ --numlogthread=<numlog> ] [ --poolsize=<poolsize> ] [ --pidfile=<pidfile> ] [ --mediator=<host:port:user:passwd,...> ]\n\ \n\ General Options : [ --logfile=<logfile> ] [ --lockfile=<lockfile> ]\n" @@ -117,8 +118,9 @@ enum XPortFormat { BINARY, XML, PLAIN }; -int setAdminUser(GetLongOpt& longOpt); -int setDbUser(GetLongOpt& longOpt); +int addUser(GetLongOpt& longOpt); +int addRole(GetLongOpt& longOpt); +int addPerm(GetLongOpt& longOpt); int defineTableSet(GetLongOpt& longOpt); int createTableSet(GetLongOpt& longOpt); int importTableSet(GetLongOpt& longOpt, XPortFormat format); @@ -142,6 +144,9 @@ longOpt.addOpt("forceload"); longOpt.addOpt("nolockstat"); longOpt.addOpt("role", DEFAULTROLE); + longOpt.addOpt("filter"); + longOpt.addOpt("perm"); + longOpt.addOpt("permid"); longOpt.addOpt("tsdef"); longOpt.addOpt("nologging"); longOpt.addOpt("expfile"); @@ -208,13 +213,17 @@ int exitCode = 0; - if ( mode == Chain("setadminuser") ) + if ( mode == Chain("adduser") ) { - exitCode = setAdminUser(longOpt); + exitCode = addUser(longOpt); } - else if ( mode == Chain("setdbuser") ) + else if ( mode == Chain("addrole") ) { - exitCode = setDbUser(longOpt); + exitCode = addRole(longOpt); + } + else if ( mode == Chain("addperm") ) + { + exitCode = addPerm(longOpt); } else if ( mode == Chain("define") ) { @@ -265,7 +274,7 @@ exit(exitCode); } -int setAdminUser(GetLongOpt& longOpt) +int addUser(GetLongOpt& longOpt) { int exitCode = 0; @@ -277,15 +286,16 @@ Chain logFile = longOpt.getOptValue("logfile"); Chain lockFile = longOpt.getOptValue("lockfile"); Chain dbXML = longOpt.getOptValue("dbxml"); - Chain admString = longOpt.getOptValue("user"); - - Tokenizer admTok(admString, Chain("/")); + Chain userName = longOpt.getOptValue("user"); + Chain userRole = longOpt.getOptValue("role"); + + Tokenizer userTok(userName, Chain("/")); Chain user; Chain password; - admTok.nextToken(user); - admTok.nextToken(password); + userTok.nextToken(user); + userTok.nextToken(password); if ( dbXML.length() == 0 \|\| dbXML == Chain("") ) { @@ -305,12 +315,10 @@ pDBMng->xml2Doc(); pDBMng->configureLogger(); - // Crypt c(password, CEGOSALT); - // pDBMng->setAdminUser(user, c.getEncryption()); - AESCrypt aescrypt(CEGOAESKEY, CEGOAESKEYLEN); - pDBMng->setAdminUser(user, aescrypt.encrypt(password)); - + pDBMng->addUser(user, aescrypt.encrypt(password)); + pDBMng->assignUserRole(user, userRole); + pDBMng->doc2Xml(); delete pDBMng; @@ -329,7 +337,7 @@ return exitCode; } -int setDbUser(GetLongOpt& longOpt) +int addRole(GetLongOpt& longOpt) { int exitCode = 0; @@ -340,49 +348,73 @@ Chain logFile = longOpt.getOptValue("logfile"); Chain lockFile = longOpt.getOptValue("lockfile"); Chain dbXML = longOpt.getOptValue("dbxml"); - Chain userRole = longOpt.getOptValue("role"); - Chain tableSet = longOpt.getOptValue("tableset"); - - Chain userString = longOpt.getOptValue("user"); - - Tokenizer userTok(userString, Chain("/")); - - Chain user; - Chain password; + + Chain role = longOpt.getOptValue("role"); + Chain filter = longOpt.getOptValue("filter"); + Chain tableset = longOpt.getOptValue("tableset"); - userTok.nextToken(user); - userTok.nextToken(password); if ( dbXML.length() == 0 \|\| dbXML == Chain("") ) { throw Exception(EXLOC, "No dbxml set"); } - if ( user.length() == 0 \|\| user == Chain("") ) - { - throw Exception(EXLOC, "No user set"); - } - if ( password.length() == 0 \|\| password == Chain("") ) - { - throw Exception(EXLOC, "No password set"); - } - if ( tableSet.length() == 1 \|\| tableSet == Chain("") ) - { - throw Exception(EXLOC, "No tableset set"); - } pDBMng = new CegoDatabaseManager(dbXML, lockFile, logFile); pDBMng->xml2Doc(); pDBMng->configureLogger(); - // Crypt c(password, CEGOSALT); - // pDBMng->setDbUser(tableSet, user, c.getEncryption()); + pDBMng->createRole(role); + + pDBMng->doc2Xml(); + + delete pDBMng; + + } + catch ( Exception e) + { + if ( pDBMng ) + delete pDBMng; - AESCrypt aescrypt(CEGOAESKEY, CEGOAESKEYLEN); - pDBMng->setDbUser(tableSet, user, aescrypt.encrypt(password)); + Chain msg; + e.pop(msg); + cerr << msg << endl; + exitCode = 1; + } + return exitCode; +} - pDBMng->addUserRole(tableSet, user, userRole); +int addPerm(GetLongOpt& longOpt) +{ + int exitCode = 0; + + CegoDatabaseManager* pDBMng = 0; + + try { + + Chain logFile = longOpt.getOptValue("logfile"); + Chain lockFile = longOpt.getOptValue("lockfile"); + Chain dbXML = longOpt.getOptValue("dbxml"); + + Chain role = longOpt.getOptValue("role"); + Chain filter = longOpt.getOptValue("filter"); + Chain tableset = longOpt.getOptValue("tableset"); + Chain perm = longOpt.getOptValue("perm"); + Chain permid = longOpt.getOptValue("permid"); + + + if ( dbXML.length() == 0 \|\| dbXML == Chain("") ) + { + throw Exception(EXLOC, "No dbxml set"); + } + + pDBMng = new CegoDatabaseManager(dbXML, lockFile, logFile); + + pDBMng->xml2Doc(); + pDBMng->configureLogger(); + + pDBMng->addPerm(role, permid, tableset, filter, perm); pDBMng->doc2Xml(); @@ -403,6 +435,7 @@ return exitCode; } + int defineTableSet(GetLongOpt& longOpt) { @@ -538,7 +571,7 @@ if ( dbXML.length() == 0 \|\| dbXML == Chain("") ) { - throw Exception(EXLOC, "No dbxml set"); + throw Exception(EXLOC, "No dbxml set"); } if ( tableSet.length() == 0 \|\| tableSet == Chain("") ) { @@ -912,7 +945,18 @@ Chain poolSize = longOpt.getOptValue("poolsize"); Chain batchFileName = longOpt.getOptValue("batchfile"); bool ignoreError = longOpt.isSet("ignore"); + Chain userName = longOpt.getOptValue("user"); + + + Tokenizer userTok(userName, Chain("/")); + Chain user; + Chain password; + + userTok.nextToken(user); + userTok.nextToken(password); + + if ( dbXML.length() == 0 \|\| dbXML == Chain("") ) { throw Exception(EXLOC, "No dbxml set"); @@ -964,20 +1008,19 @@ pTabMng = new CegoDistManager(pDBMng); + pTabMng->setActiveUser(tableSet, user, password); pTabMng->setThreadId(1); pDBMng->log(modId, Logger::DEBUG, Chain("Starting tableset ") + tableSet + Chain(" ...")); Host h; pTabMng->startDistTableSet(tableSet, h.getName(), false); - - + pDBMng->log(modId, Logger::DEBUG, Chain("Tableset ") + tableSet + Chain(" completed")); pAction = new CegoAction( pTabMng); pAction->setTableSet(tableSet); - pAction->addRole(CegoAction::ALL); int tabSetId = pDBMng->getTabSetId(tableSet); @@ -1248,7 +1291,6 @@ try { pAction->setTableSet(tableSet); - pAction->addRole(CegoAction::ALL); Chain errorMsg; if ( processBatchFile(pDBMng, pAction, batchFileName, false, false, errorMsg) == false )
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoXMLSpace.cc ^
@@ -43,12 +43,14 @@ #include <lfc/Datetime.h> #include <lfc/ThreadLock.h> #include <lfc/Tokenizer.h> +#include <lfc/Matcher.h> // xml includes #include <lfc/XMLSuite.h> #include <lfc/Element.h> #include <lfc/Document.h> + // cego includes #include "CegoXMLdef.h" #include "CegoXMLSpace.h" @@ -1197,7 +1199,7 @@ throw Exception(EXLOC, "Root element not found"); } -void CegoXMLSpace::setAdminUser(const Chain& user, const Chain& password) +void CegoXMLSpace::setUserPwd(const Chain& user, const Chain& password) { P(); Element pRoot = _pDoc->getRootElement(); @@ -1216,268 +1218,412 @@ pUE = userList.Next(); } + V(); + Chain msg = Chain("Unknown user ") + user; + throw Exception(EXLOC, msg); + } + V(); +} + +void CegoXMLSpace::addUser(const Chain& user, const Chain& password) +{ + P(); + + Element pRoot = _pDoc->getRootElement(); + if ( pRoot ) + { + ListT<Element> userList = pRoot->getChildren(XML_USER_ELEMENT); + Element pUE = userList.First(); + while ( pUE ) + { + if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) + { + Chain msg = Chain("User ") + user + Chain(" already defined "); + throw Exception(EXLOC, msg); + V(); + } + pUE = userList.Next(); + } + Element pNUE = new Element(XML_USER_ELEMENT); pNUE->setAttribute(XML_NAME_ATTR, user); pNUE->setAttribute(XML_PASSWD_ATTR, password); pRoot->addContent(pNUE); - + V(); + return; } V(); + } -void CegoXMLSpace::setDbUser(const Chain& tableSet, const Chain& user, const Chain& password) +void CegoXMLSpace::assignUserRole(const Chain& user, const Chain& role) { - P(); Element pRoot = _pDoc->getRootElement(); - if ( pRoot ) + + ListT<Element> userList = pRoot->getChildren(XML_USER_ELEMENT); + Element pUE = userList.First(); + while ( pUE ) { - ListT<Element> tabSetList = pRoot->getChildren(XML_TABLESET_ELEMENT); - Element *pTSE = tabSetList.First(); - while ( pTSE ) + if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) { - if ( (pTSE)->getAttributeValue(XML_NAME_ATTR) == tableSet ) + + Chain roleString = (pUE)->getAttributeValue(XML_ROLE_ATTR); + Tokenizer t(roleString, ","); + + Chain assignedRole; + SetT<Chain> roleSet; + while ( t.nextToken(assignedRole) ) { - ListT<Element> userList = (pTSE)->getChildren(XML_USER_ELEMENT); - Element *pUE = userList.First(); - while ( pUE ) - { - if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) - { - (pUE)->setAttribute(XML_PASSWD_ATTR, password); - V(); - return; - } - pUE = userList.Next(); - } - - Element pNUE = new Element(XML_USER_ELEMENT); - pNUE->setAttribute(XML_NAME_ATTR, user); - pNUE->setAttribute(XML_PASSWD_ATTR, password); + roleSet.Insert(assignedRole); + } + roleSet.Insert(role); - (pTSE)->addContent(pNUE); - V(); - return; + Chain newRoleString; + Chain pRole = roleSet.First(); + while ( pRole ) + { + newRoleString += pRole; + pRole = roleSet.Next(); + if ( pRole ) + newRoleString += ","; } - pTSE = tabSetList.Next(); - } - } + + (pUE)->setAttribute(XML_ROLE_ATTR, newRoleString); + + V(); + return; + } + pUE = userList.Next(); + } + V(); - Chain msg = Chain("Unknown tableset ") + Chain(tableSet); + Chain msg = Chain("Unknown user ") + user; throw Exception(EXLOC, msg); - } -void CegoXMLSpace::addUser(const Chain& tableSet, const Chain& user, const Chain& password) + +void CegoXMLSpace::removeUserRole(const Chain& user, const Chain& role) { P(); - + Element pRoot = _pDoc->getRootElement(); - if ( pRoot ) + + ListT<Element> userList = pRoot->getChildren(XML_USER_ELEMENT); + Element *pUE = userList.First(); + while ( pUE ) { - ListT<Element> tabSetList = pRoot->getChildren(XML_TABLESET_ELEMENT); - Element *pTSE = tabSetList.First(); - while ( pTSE ) + if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) { - if ( (pTSE)->getAttributeValue(XML_NAME_ATTR) == tableSet ) + + Chain roleString = (pUE)->getAttributeValue(XML_ROLE_ATTR); + Tokenizer t(roleString, ","); + + Chain assignedRole; + SetT<Chain> roleSet; + while ( t.nextToken(assignedRole) ) { - ListT<Element> userList = (pTSE)->getChildren(XML_USER_ELEMENT); - Element *pUE = userList.First(); - while ( pUE ) - { - if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) - { - Chain msg = Chain("User ") + user + Chain(" already defined "); - throw Exception(EXLOC, msg); - V(); - } - pUE = userList.Next(); - } - - Element pNUE = new Element(XML_USER_ELEMENT); - pNUE->setAttribute(XML_NAME_ATTR, user); - pNUE->setAttribute(XML_PASSWD_ATTR, password); + roleSet.Insert(assignedRole); + } - (pTSE)->addContent(pNUE); - V(); - return; + roleSet.Remove(role); + + Chain newRoleString; + Chain pRole = roleSet.First(); + while ( pRole ) + { + newRoleString += pRole; + pRole = roleSet.Next(); + if ( pRole ) + newRoleString += ","; } - pTSE = tabSetList.Next(); - } - } + + (pUE)->setAttribute(XML_ROLE_ATTR, newRoleString); + + V(); + return; + } + pUE = userList.Next(); + } + V(); - Chain msg = Chain("Unknown tableset ") + tableSet; + Chain msg = Chain("Unknown user ") + user; throw Exception(EXLOC, msg); } -void CegoXMLSpace::addUserRole(const Chain& tableSet, const Chain& user, const Chain& role) +Chain CegoXMLSpace::getUserRole(const Chain& user) { P(); - Element pTSE = getTableSetElement(tableSet); - if ( pTSE ) + Element pRoot = _pDoc->getRootElement(); + ListT<Element> userList = pRoot->getChildren(XML_USER_ELEMENT); + Element *pUE = userList.First(); + while ( pUE ) { - ListT<Element> userList = pTSE->getChildren(XML_USER_ELEMENT); - Element *pUE = userList.First(); - while ( pUE ) + if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) { - if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) - { - - SetT<Chain> roleSet; - - getRoleSet( (pUE)->getAttributeValue(XML_ROLE_ATTR), roleSet ); - roleSet.Insert(role); - - (pUE)->setAttribute(XML_ROLE_ATTR, putRoleSet(roleSet)); + Chain role = (pUE)->getAttributeValue(XML_ROLE_ATTR); + V(); + return role; + } + pUE = userList.Next(); + } + + V(); + Chain msg = Chain("Unknown user ") + user; + throw Exception(EXLOC, msg); +} - +void CegoXMLSpace::createRole(const Chain& role) +{ + P(); + + Element pRoot = _pDoc->getRootElement(); + if ( pRoot ) + { + ListT<Element> roleList = pRoot->getChildren(XML_ROLE_ELEMENT); + Element *pRE = roleList.First(); + while ( pRE ) + { + if ( (pRE)->getAttributeValue(XML_NAME_ATTR) == role ) + { + Chain msg = Chain("Role ") + role + Chain(" already defined "); + throw Exception(EXLOC, msg); V(); - return; } - pUE = userList.Next(); + pRE = roleList.Next(); } - + + Element pNRE = new Element(XML_ROLE_ELEMENT); + pNRE->setAttribute(XML_NAME_ATTR, role); + pRoot->addContent(pNRE); V(); - Chain msg = Chain("Unknown user ") + user; - throw Exception(EXLOC, msg); + return; } - V(); - Chain msg = Chain("Unknown tableset ") + tableSet; - throw Exception(EXLOC, msg); + V(); } -void CegoXMLSpace::removeUserRole(const Chain& tableSet, const Chain& user, const Chain& role) +void CegoXMLSpace::dropRole(const Chain& role) { P(); - Element pTSE = getTableSetElement(tableSet); - if ( pTSE ) + Element pRoot = _pDoc->getRootElement(); + if ( pRoot ) { - ListT<Element> userList = pTSE->getChildren(XML_USER_ELEMENT); - Element *pUE = userList.First(); - while ( pUE ) + ListT<Element> roleList = pRoot->getChildren(XML_ROLE_ELEMENT); + Element *pRE = roleList.First(); + while ( pRE ) { - if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) + if ( (pRE)->getAttributeValue(XML_NAME_ATTR) == role ) { - - SetT<Chain> roleSet; - getRoleSet( (pUE)->getAttributeValue(XML_ROLE_ATTR), roleSet); - - roleSet.Remove(role); - - (pUE)->setAttribute(XML_ROLE_ATTR, putRoleSet(roleSet)); - + pRoot->removeChild(pRE); V(); return; + } - pUE = userList.Next(); - } - + pRE = roleList.Next(); + } V(); - Chain msg = Chain("Unknown user ") + user; + Chain msg = Chain("Unknown role ") + role; throw Exception(EXLOC, msg); } - V(); - Chain msg = Chain("Unknown tableset ") + tableSet; - throw Exception(EXLOC, msg); + V(); } - -Chain CegoXMLSpace::getUserRole(const Chain& tableSet, const Chain& user) +Element* CegoXMLSpace::getPermInfo(const Chain& role) { P(); - Element pTSE = getTableSetElement(tableSet); - if ( pTSE ) + Element pRoot = _pDoc->getRootElement(); + if ( pRoot ) { - ListT<Element> userList = pTSE->getChildren(XML_USER_ELEMENT); - Element pUE = userList.First(); - while ( pUE ) + ListT<Element> roleList = pRoot->getChildren(XML_ROLE_ELEMENT); + Element *pRE = roleList.First(); + while ( pRE ) { - if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) + if ( (pRE)->getAttributeValue(XML_NAME_ATTR) == role ) { - Chain role = (pUE)->getAttributeValue(XML_ROLE_ATTR); + + Element* pPermInfo = new Element(XML_PERMINFO_ELEMENT); + + ListT<Element> permList = (pRE)->getChildren(XML_PERM_ELEMENT); + Element *pPE = permList.First(); + while ( pPE ) + { + + pPermInfo->addContent((pPE)->createClone() ); + pPE = permList.Next(); + } V(); - return role; + + return pPermInfo; } - pUE = userList.Next(); - } - + pRE = roleList.Next(); + } V(); - Chain msg = Chain("Unknown user ") + user; + Chain msg = Chain("Unknown role ") + role; throw Exception(EXLOC, msg); } - V(); - Chain msg = Chain("Unknown tableset ") + tableSet; + V(); + Chain msg = Chain("Cannot get role info ") + role; throw Exception(EXLOC, msg); + } -void CegoXMLSpace::setUserTrace(const Chain& tableSet, const Chain& user, bool isOn) +void CegoXMLSpace::addPerm(const Chain& role, const Chain& permid, const Chain& tableset, const Chain& filter, const Chain& perm) { + + Chain uperm = perm.toUpper(); + + if ( uperm != Chain("READ") + && uperm != Chain("WRITE") + && uperm != Chain("MODIFY") + && uperm != Chain("EXEC") + && uperm != Chain("ALL") ) + { + Chain msg = Chain("Invalid permission ") + perm; + throw Exception(EXLOC, msg); + } + P(); - Element pTSE = getTableSetElement(tableSet); - if ( pTSE ) + Element pRoot = _pDoc->getRootElement(); + if ( pRoot ) { - ListT<Element> userList = pTSE->getChildren(XML_USER_ELEMENT); - Element pUE = userList.First(); - while ( pUE ) + ListT<Element> roleList = pRoot->getChildren(XML_ROLE_ELEMENT); + Element *pRE = roleList.First(); + while ( pRE ) { - if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) + if ( (pRE)->getAttributeValue(XML_NAME_ATTR) == role ) { - if ( isOn ) - (pUE)->setAttribute(XML_TRACE_ATTR, XML_ON_VALUE); - else - (pUE)->setAttribute(XML_TRACE_ATTR, XML_OFF_VALUE); + + 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; + V(); + throw Exception(EXLOC, msg); + + } + pPE = permList.Next(); + } + + Element pNPE = new Element(XML_PERM_ELEMENT); + pNPE->setAttribute(XML_TABLESET_ATTR, tableset); + pNPE->setAttribute(XML_FILTER_ATTR, filter); + pNPE->setAttribute(XML_PERM_ATTR, uperm); + pNPE->setAttribute(XML_PERMID_ATTR, permid); + + (pRE)->addContent(pNPE); V(); + return; + } - pUE = userList.Next(); - } - + pRE = roleList.Next(); + } V(); - Chain msg = Chain("Unknown user ") + user; + Chain msg = Chain("Unknown role ") + role; throw Exception(EXLOC, msg); } - V(); - Chain msg = Chain("Unknown tableset ") + tableSet; - throw Exception(EXLOC, msg); + V(); } -void CegoXMLSpace::removeUser(const Chain& tableSet, const Chain& user) +void CegoXMLSpace::removePerm(const Chain& role, const Chain& permid) { + P(); Element pRoot = _pDoc->getRootElement(); if ( pRoot ) { - ListT<Element> tabSetList = pRoot->getChildren(XML_TABLESET_ELEMENT); - Element *pTSE = tabSetList.First(); - while ( pTSE ) + ListT<Element> roleList = pRoot->getChildren(XML_ROLE_ELEMENT); + Element *pRE = roleList.First(); + while ( pRE ) { - if ( (pTSE)->getAttributeValue(XML_NAME_ATTR) == tableSet ) + if ( (pRE)->getAttributeValue(XML_NAME_ATTR) == role ) { - ListT<Element> userList = (pTSE)->getChildren(XML_USER_ELEMENT); - Element pUE = userList.First(); - while ( pUE ) + + ListT<Element> permList = (pRE)->getChildren(XML_PERM_ELEMENT); + Element pPE = permList.First(); + while ( pPE ) { - if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) + if ( (pPE)->getAttributeValue(XML_PERMID_ATTR) == permid ) { - (pTSE)->removeChild(pUE); + + (pRE)->removeChild(pPE); V(); return; - + } - pUE = userList.Next(); + pPE = permList.Next(); + } + V(); - Chain msg = Chain("Unknown user ") + user; + Chain msg = Chain("Unknown permission for role ") + role; throw Exception(EXLOC, msg); + } - pTSE = tabSetList.Next(); - } + pRE = roleList.Next(); + + } + V(); + Chain msg = Chain("Unknown role ") + role; + throw Exception(EXLOC, msg); + } + V(); +} + +void CegoXMLSpace::setUserTrace(const Chain& user, bool isOn) +{ + P(); + Element pRoot = _pDoc->getRootElement(); + ListT<Element> userList = pRoot->getChildren(XML_USER_ELEMENT); + Element pUE = userList.First(); + while ( pUE ) + { + if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) + { + if ( isOn ) + (pUE)->setAttribute(XML_TRACE_ATTR, XML_ON_VALUE); + else + (pUE)->setAttribute(XML_TRACE_ATTR, XML_OFF_VALUE); + V(); + return; + } + pUE = userList.Next(); + } + + V(); + Chain msg = Chain("Unknown user ") + user; + throw Exception(EXLOC, msg); +} + +void CegoXMLSpace::removeUser(const Chain& user) +{ + P(); + Element pRoot = _pDoc->getRootElement(); + if ( pRoot ) + { + ListT<Element> userList = pRoot->getChildren(XML_USER_ELEMENT); + Element *pUE = userList.First(); + while ( pUE ) + { + if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) + { + pRoot->removeChild(pUE); + V(); + return; + + } + pUE = userList.Next(); + } + V(); + Chain msg = Chain("Unknown user ") + user; + throw Exception(EXLOC, msg); } V(); - Chain msg = Chain("Unknown tableset ") + tableSet; - throw Exception(EXLOC, msg); } bool CegoXMLSpace::checkAdminUser(const Chain& user, const Chain& password) @@ -1492,16 +1638,26 @@ { if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) { - bool ret; + + Chain roleString = (pUE)->getAttributeValue(XML_ROLE_ATTR); - if ( (pUE)->getAttributeValue(XML_PASSWD_ATTR) == password ) + Tokenizer t(roleString, ","); + Chain role; + bool adminFound=false; + + while ( t.nextToken(role) && adminFound == false ) { - ret = true; + if ( role == Chain("admin") ) + adminFound = true; } - else + + bool ret = false; + + if ( adminFound && (pUE)->getAttributeValue(XML_PASSWD_ATTR) == password ) { - ret = false; + ret = true; } + V(); return ret; } @@ -1530,109 +1686,87 @@ return; } -bool CegoXMLSpace::checkUser(const Chain& tableSet, const Chain& user, const Chain& password, Chain& msg, bool& isTrace, SetT<Chain>& roleSet) +bool CegoXMLSpace::checkUser(const Chain& user, const Chain& password, Chain& msg, bool& isTrace) { P(); Element pRoot = _pDoc->getRootElement(); if ( pRoot ) { - ListT<Element> tabSetList = pRoot->getChildren(XML_TABLESET_ELEMENT); - Element pTSE = tabSetList.First(); - while ( pTSE ) + + ListT<Element> userList = pRoot->getChildren(XML_USER_ELEMENT); + Element *pUE = userList.First(); + while ( pUE ) { - if ( (Chain)(pTSE)->getAttributeValue(XML_NAME_ATTR) == (Chain)tableSet ) + if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) { - ListT<Element> userList = (pTSE)->getChildren(XML_USER_ELEMENT); - Element pUE = userList.First(); - while ( pUE ) + bool ret; + + if ( (pUE)->getAttributeValue(XML_PASSWD_ATTR) == password ) { - if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) - { - bool ret; - - if ( (pUE)->getAttributeValue(XML_PASSWD_ATTR) == password ) - { - ret = true; - } - else - { - msg = Chain("Invalid password for user ") + user; - ret = false; - } - - if ( (pUE)->getAttributeValue(XML_TRACE_ATTR) == Chain(XML_ON_VALUE) ) - { - int numReq = (pUE)->getAttributeValue(XML_NUMREQUEST_ATTR).asInteger(); - numReq++; - (pUE)->setAttribute(XML_NUMREQUEST_ATTR, Chain(numReq)); - isTrace=true; - } - else - isTrace=false; - - getRoleSet ( (pUE)->getAttributeValue(XML_ROLE_ATTR), roleSet ); - - V(); - return ret; - } - pUE = userList.Next(); - } - msg = Chain("Unknown user ") + user; + ret = true; + } + else + { + msg = Chain("Invalid password for user ") + user; + ret = false; + } + + if ( (pUE)->getAttributeValue(XML_TRACE_ATTR) == Chain(XML_ON_VALUE) ) + { + int numReq = (pUE)->getAttributeValue(XML_NUMREQUEST_ATTR).asInteger(); + numReq++; + (pUE)->setAttribute(XML_NUMREQUEST_ATTR, Chain(numReq)); + isTrace=true; + } + else + isTrace=false; + V(); - return false; + return ret; } - pTSE = tabSetList.Next(); - } - msg = Chain("Unknown tableset ") + tableSet; + pUE = userList.Next(); + } + msg = Chain("Unknown user ") + user; + V(); + return false; } V(); return false; } -void CegoXMLSpace::changePassword(const Chain& tableSet, const Chain& user, const Chain& password) +void CegoXMLSpace::changePassword(const Chain& user, const Chain& password) { P(); Element pRoot = _pDoc->getRootElement(); if ( pRoot ) { - ListT<Element> tabSetList = pRoot->getChildren(XML_TABLESET_ELEMENT); - Element pTSE = tabSetList.First(); - while ( pTSE ) + ListT<Element> userList = pRoot->getChildren(XML_USER_ELEMENT); + Element *pUE = userList.First(); + while ( pUE ) { - if ( (pTSE)->getAttributeValue(XML_NAME_ATTR) == tableSet ) - { - ListT<Element> userList = (pTSE)->getChildren(XML_USER_ELEMENT); - Element *pUE = userList.First(); - while ( pUE ) - { - if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) - { - (pUE)->setAttribute(XML_PASSWD_ATTR, password); - V(); - return; - } - pUE = userList.Next(); - } + if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) + { + (pUE)->setAttribute(XML_PASSWD_ATTR, password); V(); - Chain msg = Chain("Unknown user \"") + user + Chain("\""); - throw Exception(EXLOC, msg); + return; } - pTSE = tabSetList.Next(); - } + pUE = userList.Next(); + } + V(); + Chain msg = Chain("Unknown user \"") + user + Chain("\""); + throw Exception(EXLOC, msg); } V(); - Chain msg = Chain("Unknown tableset ") + tableSet; - throw Exception(EXLOC, msg); } -void CegoXMLSpace::incUserQuery(const Chain& tableSet, const Chain& user) +void CegoXMLSpace::incUserQuery(const Chain& user) { P(); - Element pTSE = getTableSetElement(tableSet); - if ( pTSE ) + Element pRoot = _pDoc->getRootElement(); + if ( pRoot ) { - ListT<Element> userList = pTSE->getChildren(XML_USER_ELEMENT); + ListT<Element> userList = pRoot->getChildren(XML_USER_ELEMENT); Element pUE = userList.First(); while ( pUE ) { @@ -1651,19 +1785,18 @@ Chain msg = Chain("Unknown user ") + user; throw Exception(EXLOC, msg); } - V(); - Chain msg = Chain("Unknown tableset ") + tableSet; - throw Exception(EXLOC, msg); + V(); } -Element CegoXMLSpace::getUserList(const Chain& tableSet) +Element* CegoXMLSpace::getUserList() { P(); - Element pTSE = getTableSetElement(tableSet); - if ( pTSE ) + + Element pRoot = _pDoc->getRootElement(); + if ( pRoot ) { - ListT<Element> userList = pTSE->getChildren(XML_USER_ELEMENT); + ListT<Element> userList = pRoot->getChildren(XML_USER_ELEMENT); Element pUserInfo = new Element(XML_USERINFO_ELEMENT); Element pUser = userList.First(); @@ -1674,7 +1807,7 @@ pN->setAttribute(XML_TRACE_ATTR, (pUser)->getAttributeValue(XML_TRACE_ATTR)); pN->setAttribute(XML_NUMREQUEST_ATTR, (pUser)->getAttributeValue(XML_NUMREQUEST_ATTR)); pN->setAttribute(XML_NUMQUERY_ATTR, (pUser)->getAttributeValue(XML_NUMQUERY_ATTR)); - pN->setAttribute(XML_ROLE_ATTR, getRoleAbbrev((pUser)->getAttributeValue(XML_ROLE_ATTR))); + pN->setAttribute(XML_ROLE_ATTR, (pUser)->getAttributeValue(XML_ROLE_ATTR)); pUserInfo->addContent(pN); pUser = userList.Next(); } @@ -1683,10 +1816,38 @@ return pUserInfo; } V(); - Chain msg = Chain("Unknown tableset ") + tableSet; - throw Exception(EXLOC, msg); + } + +Element* CegoXMLSpace::getRoleList() +{ + P(); + + Element pRoot = _pDoc->getRootElement(); + if ( pRoot ) + { + + ListT<Element> roleList = pRoot->getChildren(XML_ROLE_ELEMENT); + Element pRoleList = new Element(XML_ROLELIST_ELEMENT); + + Element pRE = roleList.First(); + while ( pRE ) + { + Element pN = new Element(XML_ROLE_ELEMENT); + pN->setAttribute(XML_NAME_ATTR, (pRE)->getAttributeValue(XML_NAME_ATTR)); + pRoleList->addContent(pN); + pRE = roleList.Next(); + } + V(); + + return pRoleList; + } + V(); + +} + + void CegoXMLSpace::getDataPort(int& dataPort) { P(); @@ -2453,19 +2614,35 @@ xmlLock.unlock(); } -void CegoXMLSpace::getRoleSet(const Chain& roleString, SetT<Chain>& roleSet) +void CegoXMLSpace::getRoleSet(const Chain& user, SetT<Chain>& roleSet) { - if ( roleString == Chain() ) - return; - Tokenizer t(roleString, ","); - Chain assignedRole; - while ( t.nextToken(assignedRole) ) - { - roleSet.Insert(assignedRole); + P(); + Element pRoot = _pDoc->getRootElement(); + if ( pRoot ) + { + ListT<Element> userList = pRoot->getChildren(XML_USER_ELEMENT); + Element pUE = userList.First(); + while ( pUE ) + { + if ( (pUE)->getAttributeValue(XML_NAME_ATTR) == user ) + { + Chain roleString = (pUE)->getAttributeValue(XML_ROLE_ATTR); + + Tokenizer t(roleString, ","); + Chain role; + while ( t.nextToken(role) ) + { + roleSet.Insert(role); + } + } + pUE = userList.Next(); + } } + V(); } +/ Chain CegoXMLSpace::getRoleAbbrev(const Chain& roleString) { Chain abbrev; @@ -2490,20 +2667,95 @@ return abbrev; } +/ -Chain CegoXMLSpace::putRoleSet(const SetT<Chain>& roleSet) -{ - Chain roleString; - Chain pRole = roleSet.First(); - while ( pRole ) +bool CegoXMLSpace::matchRole(const Chain& role, const Chain tableSet, const Chain& objPattern, AccessMode perm) +{ + + P(); + Element pRoot = _pDoc->getRootElement(); + if ( pRoot ) { - roleString += pRole; - pRole = roleSet.Next(); - if ( pRole ) - roleString += ","; + ListT<Element> roleElementList = pRoot->getChildren(XML_ROLE_ELEMENT); + Element pRE = roleElementList.First(); + while ( pRE ) + { + if ( (pRE)->getAttributeValue(XML_NAME_ATTR) == role ) + { + + ListT<Element> permElementList = (pRE)->getChildren(XML_PERM_ELEMENT); + + Element *pPE = permElementList.First(); + while ( pPE ) + { + Chain actTableSet = (pPE)->getAttributeValue(XML_TABLESET_ATTR); + Chain filter = (pPE)->getAttributeValue(XML_FILTER_ATTR); + Chain actPerm = (pPE)->getAttributeValue(XML_PERM_ATTR); + + if ( actTableSet == tableSet && fitsPerm(actPerm, perm) ) + { + if ( filter == Chain("ALL") ) + { + V(); + return true; + } + else + { + Matcher m(filter); + m.prepare(); + + if ( m.match(objPattern) ) + { + V(); + return true; + } + } + } + pPE = permElementList.Next(); + } + } + pRE = roleElementList.Next(); + } } + V(); + return false; +} + +bool CegoXMLSpace::fitsPerm(const Chain& perm, AccessMode req) +{ + + Chain uperm = perm.toUpper(); - return roleString; + if ( uperm == Chain("ALL") ) + return true; + else if ( req == READ ) + { + if ( uperm == Chain("READ") \|\| uperm == Chain("WRITE") \|\| uperm == Chain("MODIFY") ) + return true; + else + return false; + } + else if ( req == WRITE ) + { + if ( uperm == Chain("WRITE") \|\| uperm == Chain("MODIFY") ) + return true; + else + return false; + } + else if ( req == MODIFY ) + { + if ( uperm == Chain("MODIFY") ) + return true; + else + return false; + } + else if ( req == EXEC ) + { + if ( uperm == Chain("EXEC") ) + return true; + else + return false; + } } Element* CegoXMLSpace::getTableSetElement(const Chain& tableSet)
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoXMLSpace.h ^
@@ -51,6 +51,8 @@ public: + enum AccessMode { READ, WRITE, MODIFY, EXEC, ALL }; + CegoXMLSpace(const Chain& xmlDef); ~CegoXMLSpace(); @@ -93,8 +95,7 @@ void setArchRestoreProg(const Chain& progname); Chain getArchRestoreProg(); - void setAdminUser(const Chain& user, const Chain& password); - void setDbUser(const Chain& tableSet, const Chain& user, const Chain& password); + void setUserPwd(const Chain& user, const Chain& password); bool isArchiveMode(int tabSetId); bool isArchiveMode(const Chain& tableSet); @@ -104,21 +105,30 @@ bool fileRecoveryRequired(const Chain& tableSet); - void addUser(const Chain& tableSet, const Chain& user, const Chain& password); - void removeUser(const Chain& tableSet, const Chain& user); - void changePassword(const Chain& tableSet, const Chain& user, const Chain& password); - void addUserRole(const Chain& tableSet, const Chain& user, const Chain& role); - void removeUserRole(const Chain& tableSet, const Chain& user, const Chain& role); - Chain getUserRole(const Chain& tableSet, const Chain& user); - void setUserTrace(const Chain& tableSet, const Chain& user, bool isOn); + void addUser(const Chain& user, const Chain& password); + void removeUser(const Chain& user); + void changePassword(const Chain& user, const Chain& password); + void assignUserRole(const Chain& user, const Chain& role); + void removeUserRole(const Chain& user, const Chain& role); + + void createRole(const Chain& role); + 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 removePerm(const Chain& role, const Chain& permid); + + Chain getUserRole(const Chain& user); + void setUserTrace(const Chain& user, bool isOn); bool checkAdminUser(const Chain& user, const Chain& password); void getAdminUser(Chain& user, Chain& password); - bool checkUser(const Chain& tableSet, const Chain& user, const Chain& password, Chain& msg, bool& isTrace, SetT<Chain>& roleSet); - void incUserQuery(const Chain& tableSet, const Chain& user); - Element* getUserList(const Chain& tableSet); - + bool checkUser(const Chain& user, const Chain& password, Chain& msg, bool& isTrace); + void incUserQuery(const Chain& user); + Element* getUserList(); + Element* getRoleList(); + Chain getPrimary(const int tabSetId); Chain getPrimary(const Chain& tabSetName); Chain getSecondary(const int tabSetId); @@ -219,6 +229,9 @@ Chain getTSInitFile(const Chain& tableSet); + void getRoleSet(const Chain& user, SetT<Chain>& roleSet); + + bool matchRole(const Chain& role, const Chain tableSet, const Chain& objPattern, AccessMode perm); void getModuleList(ListT<Chain> &modList); Logger::LogLevel getLogLevel(const Chain& module); @@ -228,12 +241,12 @@ void P(); void V(); - void getRoleSet(const Chain& roleString, SetT<Chain>& roleSet); - Chain getRoleAbbrev(const Chain& roleString); - Chain putRoleSet(const SetT<Chain>& roleSet); + // Chain getRoleAbbrev(const Chain& roleString); Element* getTableSetElement(const Chain& tableSet); Element* getCachedTableSetElement(int tabSetId); + bool fitsPerm(const Chain& perm, AccessMode req); + Document *_pDoc; Chain _xmlDef; @@ -242,6 +255,3 @@ #endif - - -
[-] [+]	Changed	cego-2.11.0.tar.bz2/src/CegoXMLdef.h ^
@@ -97,8 +97,13 @@ #define XML_ADD_USER_REQUEST "ADD_USER" #define XML_REMOVE_USER_REQUEST "REMOVE_USER" #define XML_CHANGE_PWD_REQUEST "CHANGE_PWD" -#define XML_ADD_ROLE_REQUEST "ADD_ROLE" +#define XML_ASSIGN_ROLE_REQUEST "ASSIGN_ROLE" #define XML_REMOVE_ROLE_REQUEST "REMOVE_ROLE" +#define XML_LIST_ROLE_REQUEST "LIST_ROLE" +#define XML_SHOW_ROLE_REQUEST "SHOW_ROLE" +#define XML_CREATE_ROLE_REQUEST "CREATE_ROLE" +#define XML_DROP_ROLE_REQUEST "DROP_ROLE" + #define XML_USER_TRACE_REQUEST "USER_TRACE" #define XML_ADD_ARCHLOG_REQUEST "ADD_ARCHLOG" #define XML_REMOVE_ARCHLOG_REQUEST "REMOVE_ARCHLOG" @@ -132,8 +137,12 @@ #define XML_MED_ADD_USER_REQUEST "MED_ADD_USER" #define XML_MED_REMOVE_USER_REQUEST "MED_REMOVE_USER" #define XML_MED_CHANGE_PASSWD_REQUEST "MED_CHANGE_PASSWD" -#define XML_MED_ADD_ROLE_REQUEST "MED_ADD_ROLE" +#define XML_MED_ASSIGN_ROLE_REQUEST "MED_ASSIGN_ROLE" #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_REMOVE_PERM_REQUEST "MED_REMOVE_PERM" #define XML_MED_USER_TRACE_REQUEST "MED_USER_TRACE" #define XML_MED_BEGIN_BACKUP_REQUEST "MED_BEGIN_BACKUP" #define XML_MED_END_BACKUP_REQUEST "MED_END_BACKUP" @@ -239,6 +248,8 @@ #define XML_OBJLIST_ELEMENT "OBJLIST" #define XML_OUTPARAM_ELEMENT "OUTPARAM" #define XML_ORDERING_ELEMENT "ORDERING" +#define XML_PERM_ELEMENT "PERM" +#define XML_PERMINFO_ELEMENT "PERMINFO" #define XML_PLAN_ELEMENT "PLAN" #define XML_POOLINFO_ELEMENT "POOLINFO" #define XML_POOLENTRYLIST_ELEMENT "POOLENTRYLIST" @@ -247,6 +258,8 @@ #define XML_PROCEDURE_ELEMENT "PROCEDURE" #define XML_REFSCHEMA_ELEMENT "REFSCHEMA" #define XML_REF_ELEMENT "REF" +#define XML_ROLE_ELEMENT "ROLE" +#define XML_ROLELIST_ELEMENT "ROLELIST" #define XML_ROW_ELEMENT "ROW" #define XML_SCHEMA_ELEMENT "SCHEMA" #define XML_SELECT_ELEMENT "SELECT" @@ -308,6 +321,7 @@ #define XML_FILESIZE_ATTR "FILESIZE" #define XML_FILENAME_ATTR "FILENAME" #define XML_FILELOCKTIMEOUT_ATTR "FILELOCKTIMEOUT" +#define XML_FILTER_ATTR "FILTER" #define XML_FIXSTAT_ATTR "FIXSTAT" #define XML_FORCELOAD_ATTR "FORCELOAD" #define XML_FORMAT_ATTR "FORMAT" @@ -371,6 +385,8 @@ #define XML_OPENUNDO_ATTR "OPENUNDO" #define XML_OPENUPD_ATTR "OPENUPD" #define XML_PAGELOCKTIMEOUT_ATTR "PAGELOCKTIMEOUT" +#define XML_PERM_ATTR "PERM" +#define XML_PERMID_ATTR "PERMID" #define XML_POOLLOCKTIMEOUT_ATTR "POOLLOCKTIMEOUT" #define XML_READDELAY_ATTR "READDELAY" #define XML_ROLE_ATTR "ROLE" @@ -640,4 +656,12 @@ #define XML_DEBUG_VALUE "DEBUG" #define XML_NONE_VALUE "NONE" +#define XML_ADMIN_ROLE "admin" +#define XML_CREATE_ROLE "create" +#define XML_MODIFY_ROLE "modify" +#define XML_READ_ROLE "read" +#define XML_DROP_ROLE "drop" + + + #endif
[-] [+]	Changed	cego-2.11.0.tar.bz2/tools/cgmkdb ^
@@ -1,110 +1,108 @@ #!/bin/bash # -# mkcgdb +# cgmkdb # ------ -# Utility script to build up a cego database with one tableset +# Utility script to generate an empty cego database with one tableset. # # (C)opyright 2010 by Bjoern Lemke # # The database and tableset parameters defined below -# should be edited and customized to appropriate values +# should be edited and customized to appropriate values. # +# Thanks to Keve Nagy, this script has been improved and stabilized # +## Variable definitions: +cgmkdbVersion="2.1"; ## Helps to identify and keep track of different editions. DEFCEGOROOT=/usr/local/cego -printUsage() -{ - echo "Usage : $0 [ -r <root path>] [ -t <tableset> ] <dbname>" +## Function definitions: +printVersion() { + echo "cgmkdb v${cgmkdbVersion} - The cego empty database generator utility." } -args=`getopt r:t: $` +printUsage() { + echo "Usage : $0 [-r <root_path>] [-t <tableset_name>] [-u <ts_username>] <db_name>" + echo "" +} -if [ $? != 0 ] +## Parameter handling: +if [ $# -eq 1 ] then - printUsage - exit 1 + case "$1" in + -h\|-\?\|-help\|--help) printVersion; printUsage; exit 0;; + -v\|-V\|--version) printVersion; echo ""; exit 0;; + ) printVersion; echo "Incorrect use of parameter: $1."; printUsage; exit 0;; + esac fi +args=`getopt r:R:t:T:u:U: $` +test $? != 0 && { printUsage; exit 1; } + set -- $args for i do - case "$i" - in - -r) - CEGOROOT=$2; shift; - shift;; - -t) - CEGOTABLESET=$2;shift; - shift;; - -h) - printUsage - exit 0;; - --) - DBNAME=$2 - shift; break;; - esac + case "$i" in + -r\|-R) CEGOROOT=$2; shift; shift;; + -t\|-T) CEGOTABLESET=$2; shift; shift;; + -u\|-U) CEGOTSUSER=$2; shift; shift;; + --) DBNAME=$2; shift; break;; + esac done -if [ -z "$DBNAME" ] -then - echo "No dbname specified" - printUsage - exit 1 -fi - - -# path to the database root path, where the database should be created - -if [ -z "$CEGOROOT" ] -then - CEGOROOT=$DEFCEGOROOT -fi +test -z "$DBNAME" && { echo "No dbname specified."; printUsage; exit 1; } -if [ ! -d $CEGOROOT ] +## Remove tailing "/" chars from $CEGOROOT +if [ "${CEGOROOT}x" != "x" ] then - echo "Root directory $CEGOROOT must exist" - exit 1 -fi - -DBROOT=$CEGOROOT/$DBNAME + varLen=${#CEGOROOT} + pos=`expr ${varLen} - 1` + tailChar=`echo ${CEGOROOT}\|cut -c ${varLen}-${varLen}` + while test "${tailChar}x" = "/x" + do + CEGOROOT=`echo ${CEGOROOT}\|cut -c 1-${pos}` + varLen=${#CEGOROOT} + pos=`expr ${varLen} - 1` + tailChar=`echo ${CEGOROOT}\|cut -c ${varLen}-${varLen}` + done +fi + +## path to database root, where the database should be created. +test -z "$CEGOROOT" && CEGOROOT=$DEFCEGOROOT +test ! -d $CEGOROOT && { echo "Database root directory $CEGOROOT must exist."; exit 1; } +DBROOT=${CEGOROOT}/${DBNAME} if [ -d $DBROOT ] then - echo "Root directory $DBROOT/$DBNAME already exists" - echo "Must be removed manually to create database" + echo "Database root directory $DBROOT/$DBNAME already exists." + echo "You need to remove it manually before creating this database." exit 1 fi -if [ -z "$CEGOTABLESET" ] -then - TS=${DBNAME} -else - TS=${CEGOTABLESET} -fi - +printVersion +echo "" echo "Creating database in directory $DBROOT ..." - -# path to the cego executable -CEGO=cego -# name of the database xml file -DBXML=${DBROOT}/${DBNAME}.xml -# several database parameters +echo "Database name: $DBNAME" +CEGO=cego; ## path to the cego executable +DBXML=${DBROOT}/${DBNAME}.xml; ## name of the database xml file +## +## Database parameters: PAGESIZE=16384 ADMPORT=2000 DBPORT=2200 LOGPORT=3000 -PIDFILE=${DBROOT}/pid +PIDFILE=${DBROOT}/${DBNAME}.pid ADMINUSER=cgadm ADMINPWD=cgadm -LOGFILE=${DBROOT}/cego.log - +LOGFILE=${DBROOT}/${DBNAME}.log +LOCKFILE=${DBROOT}/${DBNAME}.lock # DEBUGLEVEL=DEBUG DEBUGLEVEL=NOTICE - -# tableset defs +## +## Tableset defs: +TS=${CEGOTABLESET:-$DBNAME} TSROOT=${DBROOT}/data TSTICKET=${TSROOT}/tsticket.xml SYSSIZE=100 @@ -112,11 +110,10 @@ LOGFILESIZE=1000000 LOGFILENUM=3 SORTAREASIZE=10000000 -APPFILE=${TSROOT}/${TS}data01.dbf +APPFILE=${TSROOT}/${TS}_data01.dbf APPSIZE=3000 -DBUSER=${DBNAME} -DBPWD=${DBNAME} - +DBUSER=${CEGOTSUSER:-$DBNAME} +DBPWD=${DBUSER} ########################## ### end of customizing ### ########################## @@ -124,88 +121,66 @@ # rm -rf ${TSROOT} mkdir ${DBROOT} -if [ $? != 0 ] -then - echo "Cannot create database root directory" - exit 1 -fi +test $? != 0 && { echo "Cannot create database root directory."; exit 1; } mkdir ${TSROOT} -if [ $? != 0 ] -then - echo "Cannot create tableset root directory" - exit 1 -fi +test $? != 0 && { echo "Cannot create tableset root directory."; exit 1; } -echo "Creating xml ..." -cat > $DBXML <<EOF +/bin/echo -n " Generating database configuration xml ... " +cat << _EOF_ > $DBXML <?xml version="1.0" ?> <!DOCTYPE CEGO_DB_SPEC> -<DATABASE NAME="$DBNAME" PAGESIZE="$PAGESIZE" -ADMINPORT="$ADMPORT" LOGPORT="$LOGPORT" DATAPORT="$DBPORT" -PIDFILE="$PIDFILE" MAXFID="1" MAXTSID="1" -NUMRECSEMA="1000" NUMSYSPAGESEMA="43" NUMDATAPAGESEMA="43" -NUMIDXPAGESEMA="43" NUMRBPAGESEMA="43" NUMDATAFILESEMA="11" -NUMBUFFERPOOLSEMA="11" MAXFIXTRIES="30" -CSMODE="ON" QESCMODE="ON" LOGMNGPROG="./cglogmng"> -<MODULE NAME="ALL" LEVEL="$DEBUGLEVEL"></MODULE> +<DATABASE NAME="$DBNAME" PAGESIZE="$PAGESIZE" ADMINPORT="$ADMPORT" LOGPORT="$LOGPORT" DATAPORT="$DBPORT" PIDFILE="$PIDFILE" MAXFID="1" MAXTSID="1" NUMRECSEMA="1000" NUMSYSPAGESEMA="43" NUMDATAPAGESEMA="43" NUMIDXPAGESEMA="43" NUMRBPAGESEMA="43" NUMDATAFILESEMA="11" NUMBUFFERPOOLSEMA="11" MAXFIXTRIES="30" CSMODE="ON" QESCMODE="ON" LOGMNGPROG="./cglogmng"> + <MODULE NAME="ALL" LEVEL="$DEBUGLEVEL"></MODULE> </DATABASE> -EOF - -if [ $? != 0 ] -then - echo "Cannot create database xml file" - exit 1 -fi - - -# <MODULE NAME="CegoTableManager" LEVEL="NOTICE"></MODULE> -# <MODULE NAME="CegoAdminThreadPool" LEVEL="NOTICE"></MODULE> -# <MODULE NAME="CegoSelect" LEVEL="NOTICE"></MODULE> - -/bin/echo -n "Creating admin user ..." -${CEGO} --mode=setadminuser --dbxml=${DBXML} --user=${ADMINUSER}/${ADMINPWD} --logfile=${LOGFILE} -if [ $? -eq 0 ] -then - echo "... operation ok" -else - echo "... operation failed" - exit 1 -fi +_EOF_ +test $? -eq 0 && echo OK \|\| { echo FAILED; exit 1; } -/bin/echo -n "Defining tableset $TS1..." -${CEGO} --mode=define --tableset=${TS} -dbxml=${DBXML} --tsdef=tsroot:${TSROOT},tsticket:${TSTICKET},syssize:${SYSSIZE},tmpsize:${TMPSIZE},logfilesize:${LOGFILESIZE},logfilenum:${LOGFILENUM},appfile:${APPFILE},appsize:${APPSIZE},sortareasize=${SORTAREASIZE} --logfile=${LOGFILE} -if [ $? -eq 0 ] -then - echo "... operation ok" -else - echo "... operation failed" - exit 1 -fi - -/bin/echo -n "Creating database user for $TS1 ..." -${CEGO} --mode=setdbuser --tableset=${TS} --dbxml=${DBXML} --user=${DBUSER}/${DBPWD} --role=ALL --logfile=${LOGFILE} -if [ $? -eq 0 ] -then - echo "... operation ok" -else - echo "... operation failed" - exit 1 -fi +## <MODULE NAME="CegoTableManager" LEVEL="NOTICE"></MODULE> +## <MODULE NAME="CegoAdminThreadPool" LEVEL="NOTICE"></MODULE> +## <MODULE NAME="CegoSelect" LEVEL="NOTICE"></MODULE> + +/bin/echo -n " * Creating admin user for the database ... " +MAINARGS="--dbxml=${DBXML} --logfile=${LOGFILE} --lockfile=${LOCKFILE}" +${CEGO} --mode=adduser --user=${ADMINUSER}/${ADMINPWD} --role=admin ${MAINARGS} +test $? -eq 0 && echo OK \|\| { echo FAILED; exit 1; } + +/bin/echo -n " * Creating role ALL ... " +${CEGO} --mode=addrole --role=ALL ${MAINARGS} +test $? -eq 0 && echo OK \|\| { echo FAILED; exit 1; } + +/bin/echo -n " + Creating role permission ... " +${CEGO} --mode=addperm --permid=${TS}_P --role=ALL --tableset=${TS} --filter="ALL" --perm="ALL" ${MAINARGS} +test $? -eq 0 && echo OK \|\| { echo FAILED; exit 1; } + + +/bin/echo " * Creating a tableset ... " +/bin/echo -n " + Defining tableset $TS ... " +MAINARGS="${MAINARGS} --tableset=${TS}" +${CEGO} --mode=define ${MAINARGS} --tsdef=tsroot:${TSROOT},tsticket:${TSTICKET},syssize:${SYSSIZE},tmpsize:${TMPSIZE},logfilesize:${LOGFILESIZE},logfilenum:${LOGFILENUM},appfile:${APPFILE},appsize:${APPSIZE},sortareasize=${SORTAREASIZE} +test $? -eq 0 && echo OK \|\| { echo FAILED; exit 1; } + +/bin/echo -n " + Creating tableset $TS ... " +${CEGO} --mode=create ${MAINARGS} +test $? -eq 0 && echo OK \|\| { echo FAILED; exit 1; } + +/bin/echo -n " * Creating database start script ... " +cat << _EOF_ > ${DBROOT}/startdb +echo "Starting cego database-instance ${DBNAME} with tableset ${TS} ..." +nohup cego --mode=daemon ${MAINARGS} & +echo "" +_EOF_ +test $? -eq 0 && echo OK \|\| { echo FAILED; exit 1; } +chmod 755 ${DBROOT}/startdb -/bin/echo -n "Creating tableset $TS1..." -${CEGO} --mode=create --dbxml=${DBXML} --tableset=${TS} --logfile=${LOGFILE} -if [ $? -eq 0 ] -then - echo "... operation ok" -else - echo "... operation failed" - exit 1 -fi +/bin/echo -n " * Creating database stop script ... " +cat << _EOF_ > ${DBROOT}/stopdb +echo "Stopping cego database-instance ${DBNAME} with tableset ${TS} ..." +kill -INT \`cat ${PIDFILE}\` +echo "" +_EOF_ +test $? -eq 0 && echo OK \|\| { echo FAILED; exit 1; } +chmod 755 ${DBROOT}/stopdb -/bin/echo "Creating database start script ..." -/bin/echo "nohup cego --mode=daemon --dbxml=${DBXML} --tableset=${TS} &" > ${DBROOT}/startdb -chmod 755 ${DBROOT}/startdb -/bin/echo "Creating database stop script ..." -/bin/echo "kill -INT \`cat ${DBROOT}/pid\`" > ${DBROOT}/stopdb -chmod 755 ${DBROOT}/stopdb \ No newline at end of file +echo "Done." +echo ""