Changeset 163

Show
Ignore:
Timestamp:
07/18/08 10:00:36 (6 months ago)
Author:
zork
Message:

reverted member index change

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/dba/dba/storeable.cpp

    r156 r163  
    4141//==================== MemberEntryBase ================== 
    4242 
    43 MemberEntryBase::MemberEntryBase(int pMemberTableIndex, const char* pMemberName, int pMemberOffset) 
     43MemberEntryBase::MemberEntryBase(const char* pMemberName, int pMemberOffset) 
    4444  : mMemberName(pMemberName), 
    45     mMemberOffset(pMemberOffset), 
    46     mMemberTableIndex(pMemberTableIndex) 
     45    mMemberOffset(pMemberOffset) 
    4746{}; 
    4847 
    …… 
    5150  mMemberOffset = pNewOffset; 
    5251}; 
    53  
    54 void  
    55 MemberEntryBase::setMemberTableIndex(int pIndex) { 
    56   mMemberTableIndex = pIndex; 
    57 }; 
    58  
    5952 
    6053int  
    …… 
    6861}; 
    6962//==================== StoreTableMember ================== 
    70 StoreTableMember::StoreTableMember(int pIndex, StoreTable* pOwner, const char* pMemberName, int pMemberOffset, StoreableFilterBase* pFilter, int pDatabaseType)  
    71   : MemberEntryBase(pIndex, pMemberName, pMemberOffset), 
     63StoreTableMember::StoreTableMember(StoreTable* pOwner, const char* pMemberName, int pMemberOffset, StoreableFilterBase* pFilter, int pDatabaseType)  
     64  : MemberEntryBase(pMemberName,pMemberOffset), 
    7265    mFilter(pFilter), 
    7366    mFilterOwner(true), 
    …… 
    112105//==================== ColMemberEntry ================== 
    113106 
    114 ColMemberEntry::ColMemberEntry(int pIndex, ColTable* pOwner, const char* pMemberName, int pMemberOffset, CollectionFilterBase* pFilter, const char* pFKeyName) 
    115   : MemberEntryBase(pIndex, pMemberName, pMemberOffset), 
     107ColMemberEntry::ColMemberEntry(ColTable* pOwner, const char* pMemberName, int pMemberOffset, CollectionFilterBase* pFilter, const char* pFKeyName) 
     108  : MemberEntryBase(pMemberName, pMemberOffset), 
    116109    mTableName(NULL), 
    117110    mFKeyName(pFKeyName), 
    …… 
    123116}; 
    124117 
    125 ColMemberEntry::ColMemberEntry(int pIndex, ColTable* pOwner, const char* pMemberName, int pMemberOffset, CollectionFilterBase* pFilter, const char* pFKeyName, const char* pTableName, id pRelationId) 
    126   : MemberEntryBase(pIndex, pMemberName, pMemberOffset), 
     118ColMemberEntry::ColMemberEntry(ColTable* pOwner, const char* pMemberName, int pMemberOffset, CollectionFilterBase* pFilter, const char* pFKeyName, const char* pTableName, id pRelationId) 
     119  : MemberEntryBase(pMemberName, pMemberOffset), 
    127120    mTableName(pTableName), 
    128121    mFKeyName(pFKeyName), 

  • trunk/dba/dba/storeable.h

    r156 r163  
    3030      @param pMemberOffset number of bytes from 'this' to first byte of member field in class 
    3131    */ 
    32     MemberEntryBase(int pMemberTableIndex, const char* pMemberName, int pMemberOffset); 
     32    MemberEntryBase(const char* pMemberName, int pMemberOffset); 
    3333    /**@internal 
    3434      Get number of bytes from this to first byte of member field 
    …… 
    3636    int getMemberOffset() const; 
    3737    /** 
    38       Get index of member in store table 
    39     */ 
    40     int getMemberTableIndex() const; 
    41     /** 
    4238      Get name of relation where class member is stored 
    4339    */ 
    …… 
    4743    */ 
    4844    void setMemberOffset(int pNewOffset); 
    49     /**@internal 
    50       set in BIND_* macros - for internal use only 
    51     */ 
    52     void setMemberTableIndex(int pIndex); 
    5345  private:   
    5446    const char* mMemberName; 
    5547    int mMemberOffset; 
    56     int mMemberTableIndex; 
    5748}; 
    5849 
    …… 
    9283      @param pDatabaseType type of archive data (Database::StoreType enum value) 
    9384    */ 
    94     StoreTableMember(int pIndex, StoreTable* pOwner, const char* pMemberName, int pMemberOffset, StoreableFilterBase* pFilter, int pDatabaseType); 
     85    StoreTableMember(StoreTable* pOwner, const char* pMemberName, int pMemberOffset, StoreableFilterBase* pFilter, int pDatabaseType); 
    9586    /**@internal 
    9687      used by BIND_* macros - for internal use only 
    …… 
    152143class dbaDLLEXPORT ColMemberEntry : public MemberEntryBase { 
    153144  public: 
    154     ColMemberEntry(int pIndex, ColTable* pOwner, const char* pMemberName, int pMemberOffset, CollectionFilterBase* pFilter, const char* pFKeyName); 
    155     ColMemberEntry(int pIndex, ColTable* pOwner, const char* pMemberName, int pMemberOffset, CollectionFilterBase* pFilter, const char* pFKeyName, const char* pTableName, id pRelationName); 
     145    ColMemberEntry(ColTable* pOwner, const char* pMemberName, int pMemberOffset, CollectionFilterBase* pFilter, const char* pFKeyName); 
     146    ColMemberEntry(ColTable* pOwner, const char* pMemberName, int pMemberOffset, CollectionFilterBase* pFilter, const char* pFKeyName, const char* pTableName, id pRelationName); 
    156147    const char* getTableName() const; 
    157148    const char* getFKeyName() const; 
    …… 
    230221void \ 
    231222Class::st_createTables() {                            \ 
    232   int index = 0;                                   \ 
    233223  st_table = new dba::StoreTable(table);                         \ 
    234224  st_table->setClassOffset( (char*)(Class*)dba::Storeable::dba_pointer_place - (char*)dba_pointer_place ); \ 
    …… 
    238228  st_ColTable->setClassOffset( (char*)(Class*)dba::Storeable::dba_pointer_place - (char*)dba_pointer_place ); \ 
    239229  st_ColTable->setNextTable(parent::st_getColTable()); \ 
    240   sStoreTableList.mColTables.insert(st_ColTable); 
     230  sStoreTableList.mColTables.insert(st_ColTable);             
    241231 
    242232/** 
    …… 
    248238*/ 
    249239#define BIND_STR(member,filter_class,field) \ 
    250   new dba::StoreTableMember(index++,st_table,field,(char*)&(member) - (char*)this,new filter_class(member),dba::Database::STRING); 
     240  new dba::StoreTableMember(st_table,field,(char*)&(member) - (char*)this,new filter_class(member),dba::Database::STRING); 
    251241 
    252242/** 
    …… 
    258248*/ 
    259249#define BIND_INT(member,filter_class,field) \ 
    260   new dba::StoreTableMember(index++,st_table,field,(char*)&(member) - (char*)this,new filter_class(member),dba::Database::INTEGER); 
     250  new dba::StoreTableMember(st_table,field,(char*)&(member) - (char*)this,new filter_class(member),dba::Database::INTEGER); 
    261251 
    262252/** 
    …… 
    268258*/ 
    269259#define BIND_FLT(member,filter_class,field) \ 
    270   new dba::StoreTableMember(index++,st_table,field,(char*)&(member) - (char*)this,new filter_class(member),dba::Database::FLOAT); 
     260  new dba::StoreTableMember(st_table,field,(char*)&(member) - (char*)this,new filter_class(member),dba::Database::FLOAT); 
    271261 
    272262/** 
    …… 
    278268*/ 
    279269#define BIND_DAT(member,filter_class,field) \ 
    280   new dba::StoreTableMember(index++,st_table,field,(char*)&(member) - (char*)this,new filter_class(member),dba::Database::DATE); 
     270  new dba::StoreTableMember(st_table,field,(char*)&(member) - (char*)this,new filter_class(member),dba::Database::DATE); 
    281271 
    282272/** 
    …… 
    289279*/ 
    290280#define BIND_COL(member,filter_class,fkname) \ 
    291   new dba::ColMemberEntry(index++,st_ColTable,NULL,(char*)&(member) - (char*)this,new filter_class(member),fkname); 
     281  new dba::ColMemberEntry(st_ColTable,NULL,(char*)&(member) - (char*)this,new filter_class(member),fkname); 
    292282 
    293283/** 
    …… 
    304294*/ 
    305295#define BIND_CLA(member,filter_class,fkname,coll_id,table_name) \ 
    306   new dba::ColMemberEntry(index++,st_ColTable,NULL,(char*)&(member) - (char*)this,new filter_class(member),fkname,table_name,coll_id); 
     296  new dba::ColMemberEntry(st_ColTable,NULL,(char*)&(member) - (char*)this,new filter_class(member),fkname,table_name,coll_id); 
    307297 
    308298/** 
    …… 
    320310        tmp->setFilterOwner(false); \ 
    321311        tmp->setMemberOffset(tmp->getMemberOffset() + ((char*)&(member) - (char*)this)); \ 
    322         tmp->setMemberTableIndex(index++); \ 
    323312        st_table->addMember(tmp); \ 
    324313        entry = entry->getNextMember();           \