User: rt Date: 2008-01-30 08:29:54+0000 Modified: dba/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
Log: INTEGRATION: CWS dba24d (1.24.26); FILE MERGED 2007/12/01 13:39:42 fs 1.24.26.4: RESYNC: (1.24-1.25); FILE MERGED 2007/11/26 07:30:10 oj 1.24.26.3: #i83810# assertion changed 2007/11/21 21:08:16 fs 1.24.26.2: #i82233# some debugging code 2007/11/08 14:10:56 fs 1.24.26.1: during #i81658#: string cleanup File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: SingleSelectQueryComposer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/SingleSelectQueryComposer.cxx?r1=1.25&r2=1.26 Delta lines: +20 -1 -------------------- --- SingleSelectQueryComposer.cxx 2007-11-21 15:33:37+0000 1.25 +++ SingleSelectQueryComposer.cxx 2008-01-30 08:29:51+0000 1.26 @@ -901,7 +901,7 @@ if (SQL_ISRULE(pCondition,boolean_primary)) { // this should not occur - DBG_ERROR("Primary condition in And-Criteria"); + DBG_ERROR("boolean_primary in And-Criteria"); return sal_False; } // Das erste Element ist (wieder) eine AND-Verknuepfung @@ -955,12 +955,15 @@ } else if (SQL_ISRULE(pCondition,in_predicate)) { + OSL_ENSURE( false, "OSingleSelectQueryComposer::setANDCriteria: in_predicate not implemented!" ); } else if (SQL_ISRULE(pCondition,all_or_any_predicate)) { + OSL_ENSURE( false, "OSingleSelectQueryComposer::setANDCriteria: all_or_any_predicate not implemented!" ); } else if (SQL_ISRULE(pCondition,between_predicate)) { + OSL_ENSURE( false, "OSingleSelectQueryComposer::setANDCriteria: between_predicate not implemented!" ); } rFilter.push_back(aItem); @@ -1603,15 +1606,31 @@ OSQLParseNode* pWhereNode = const_cast<OSQLParseNode*>(m_aAdditiveIterator.getWhereTree()); OSQLParseNode* pCondition = pWhereNode->getChild(1); + #if OSL_DEBUG_LEVEL > 0 + ::rtl::OUString sCondition; + pCondition->parseNodeToStr( sCondition, m_xConnection ); + #endif OSQLParseNode::negateSearchCondition(pCondition); pCondition = pWhereNode->getChild(1); + #if OSL_DEBUG_LEVEL > 0 + sCondition = ::rtl::OUString(); + pCondition->parseNodeToStr( sCondition, m_xConnection ); + #endif OSQLParseNode::disjunctiveNormalForm(pCondition); pCondition = pWhereNode->getChild(1); + #if OSL_DEBUG_LEVEL > 0 + sCondition = ::rtl::OUString(); + pCondition->parseNodeToStr( sCondition, m_xConnection ); + #endif OSQLParseNode::absorptions(pCondition); pCondition = pWhereNode->getChild(1); + #if OSL_DEBUG_LEVEL > 0 + sCondition = ::rtl::OUString(); + pCondition->parseNodeToStr( sCondition, m_xConnection ); + #endif if ( pCondition ) { ::std::vector< ::std::vector < PropertyValue > > aFilters; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
