Changeset 584


Ignore:
Timestamp:
07/19/14 01:47:39 (5 years ago)
Author:
jls17
Message:
  • if you used $SCHEMA$ as form name in sample data push-fields, the current schema is use to resolve references instead of the specified sample schema (#134)
Location:
branches/work_311/doc
Files:
2 edited

Legend:

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

    r558 r584  
    527527                        CRefItem refItem(*this->obj, ifElse, nAction, REFM_PUSHFIELD_FORM); 
    528528                        arIn->AddFieldReference(schemaInsideId, fieldId, refItem); 
     529 
     530                        if (fieldId == - AR_KEYWORD_SCHEMA)     pushSchema = schemaName; 
    529531                } 
    530532                else 
  • branches/work_311/doc/DocFilterActionStruct.cpp

    r558 r584  
    401401                        int fieldId = atoi(&action.pushFieldsList.pushFieldsList[0].field.schema[1]); 
    402402 
    403                         pushSchema = action.sampleSchema; 
     403                        pushSchema = (fieldId == (-AR_KEYWORD_SCHEMA) ? schemaName : action.sampleSchema); 
    404404                        strm << "$" << (fieldId < 0 ? CAREnum::Keyword(abs(fieldId)) : arIn->LinkToField(schemaInsideId, fieldId, rootLevel)) << "$ (Sample Schema: " << arIn->LinkToSchema(action.sampleSchema, rootLevel) << ")"; 
    405405 
Note: See TracChangeset for help on using the changeset viewer.