Changeset 489 for branches


Ignore:
Timestamp:
03/27/14 15:57:42 (6 years ago)
Author:
jls17
Message:
  • fixed: in push-field actions with all-matching-id mapping, the source and target forms were switched
Location:
branches/work_304/doc
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/work_304/doc/DocAlActionStruct.cpp

    r468 r489  
    576576                { 
    577577                        strm << " All Matching Ids<br/>"; 
    578                         CDocAllMatchingIdsTable allMatchingFieldsTbl(schemaName, pushSchema, *obj, CDocAllMatchingIdsTable::AMM_PUSHFIELDS, nAction, ifElse, rootLevel); 
     578                        CDocAllMatchingIdsTable allMatchingFieldsTbl(pushSchema, schemaName, *obj, CDocAllMatchingIdsTable::AMM_PUSHFIELDS, nAction, ifElse, rootLevel); 
    579579                        allMatchingFieldsTbl.ToStream(strm); 
    580580                } 
  • branches/work_304/doc/DocAllMatchingIdsTable.cpp

    r372 r489  
    1919#include "../ARInside.h" 
    2020 
    21 CDocAllMatchingIdsTable::CDocAllMatchingIdsTable(const string& table1, const string& table2, CARServerObject& obj, AllMatchingMode mode, int nAction, IfElseState ifElse, int rootLevel) 
    22 : tableLeft(table1), tableRight(table2), obj(obj), matchMode(mode), nAction(nAction), ifElse(ifElse), rootLevel(rootLevel) 
     21CDocAllMatchingIdsTable::CDocAllMatchingIdsTable(const string& targetForm, const string& sourceForm, CARServerObject& obj, AllMatchingMode mode, int nAction, IfElseState ifElse, int rootLevel) 
     22: tableLeftTarget(targetForm), tableRightSource(sourceForm), obj(obj), matchMode(mode), nAction(nAction), ifElse(ifElse), rootLevel(rootLevel) 
    2323{ 
    2424} 
     
    2929        { 
    3030                CARInside& arIn = *CARInside::GetInstance(); 
    31                 CARSchema schema1(tableLeft); 
    32                 CARSchema schema2(tableRight); 
     31                CARSchema schema1(tableLeftTarget); 
     32                CARSchema schema2(tableRightSource); 
    3333 
    3434                CTable tblListField("tblListMatchingIds", "TblObjectList"); 
     
    9393        catch(exception& e) 
    9494        { 
    95                 cout << "EXCEPTION in AllMatchingIds of " << tableLeft << ", " << tableRight << ": " << e.what() << endl; 
     95                cout << "EXCEPTION in AllMatchingIds of " << tableLeftTarget << ", " << tableRightSource << ": " << e.what() << endl; 
    9696        } 
    9797 
  • branches/work_304/doc/DocAllMatchingIdsTable.h

    r372 r489  
    3333 
    3434public: 
    35         CDocAllMatchingIdsTable(const string& table1, const string& table2, CARServerObject& obj, AllMatchingMode mode, int nAction, IfElseState ifElse, int rootLevel); 
     35        CDocAllMatchingIdsTable(const string& targetForm, const string& sourceForm, CARServerObject& obj, AllMatchingMode mode, int nAction, IfElseState ifElse, int rootLevel); 
    3636        std::ostream& ToStream(std::ostream& strm); 
    3737 
    3838private: 
    39         std::string tableLeft; 
    40         std::string tableRight; 
     39        std::string tableLeftTarget; 
     40        std::string tableRightSource; 
    4141        CARServerObject &obj; 
    4242        AllMatchingMode matchMode; 
  • branches/work_304/doc/DocFilterActionStruct.cpp

    r377 r489  
    453453                { 
    454454                        strm << " All Matching Ids<br/>" << endl; 
    455                         CDocAllMatchingIdsTable allMatchingFieldsTbl(schemaName, pushSchema, *obj, CDocAllMatchingIdsTable::AMM_PUSHFIELDS, nAction, ifElse, rootLevel); 
     455                        CDocAllMatchingIdsTable allMatchingFieldsTbl(pushSchema, schemaName, *obj, CDocAllMatchingIdsTable::AMM_PUSHFIELDS, nAction, ifElse, rootLevel); 
    456456                        allMatchingFieldsTbl.ToStream(strm); 
    457457                } 
Note: See TracChangeset for help on using the changeset viewer.