diff options
37 files changed, 429 insertions, 6268 deletions
diff --git a/xmlhelp/prj/build.lst b/xmlhelp/prj/build.lst index c8f5eb1602..b360e5f763 100644 --- a/xmlhelp/prj/build.lst +++ b/xmlhelp/prj/build.lst @@ -5,6 +5,5 @@ xh xmlhelp\source\treeview nmake - all xh_treeview xh_inc NULL xh xmlhelp\source\com\sun\star\help nmake - all xh_help xh_inc NULL xh xmlhelp\source\cxxhelp\util nmake - all xh_cutil xh_inc NULL xh xmlhelp\source\cxxhelp\qe nmake - all xh_qe xh_inc NULL -xh xmlhelp\source\cxxhelp\db nmake - all xh_db xh_inc NULL xh xmlhelp\source\cxxhelp\provider nmake - all xh_provider xh_inc NULL -xh xmlhelp\util nmake - all xh_util xh_cutil xh_qe xh_db xh_provider NULL +xh xmlhelp\util nmake - all xh_util xh_cutil xh_qe xh_provider NULL diff --git a/xmlhelp/source/cxxhelp/db/Block.cxx b/xmlhelp/source/cxxhelp/db/Block.cxx deleted file mode 100644 index d263851b0c..0000000000 --- a/xmlhelp/source/cxxhelp/db/Block.cxx +++ /dev/null @@ -1,98 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: Block.cxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_xmlhelp.hxx" -#include <rtl/memory.h> -#include <db/Block.hxx> -#ifndef _XMLSEARCH_UTIL_RANDOMACCESSSTREAM_HXX_ -#include <util/RandomAccessStream.hxx> -#endif -#include <db/DBEnv.hxx> - - -using namespace xmlsearch; -using namespace xmlsearch::db; - - -/******************************************************************************/ -/* */ -/* Block */ -/* */ -/******************************************************************************/ - - -Block::Block( const DBEnv* dbenv ) - : dbenv_( dbenv ), - isLeaf_( true ), - free_( 0 ), - num_( 0 ), - dataL_( dbenv->getDataLen() ), - data_( new sal_Int8[ dbenv->getDataLen() ] ) -{ - rtl_zeroMemory( data_,dataL_ ); -} - - -Block::~Block() -{ - delete[] data_; -} - - - -void Block::read( util::RandomAccessStream* in ) -{ - sal_Int8 buffer[4]; - in->readBytes( buffer,4 ); - num_ = getInteger_( buffer ); - - in->readBytes( buffer,4 ); - sal_Int32 twoFields = getInteger_( buffer ); - - isLeaf_ = ( twoFields & 0x80000000 ) != 0; - free_ = twoFields & 0x7FFFFFFF; - - in->readBytes( data_,dbenv_->getDataLen() ); -} - - -sal_Int32 Block::getInteger( sal_Int32 i ) const throw( excep::IllegalIndexException ) -{ - if( i < 0 || dbenv_->getDataLen() <= i ) - throw excep::IllegalIndexException( - rtl::OUString::createFromAscii( "Block::getInteger -> index out of range" ) ); - - sal_Int32 ret = ::getInteger_( &data_[i] ); - return ret; -} - - - diff --git a/xmlhelp/source/cxxhelp/db/BlockManager.cxx b/xmlhelp/source/cxxhelp/db/BlockManager.cxx deleted file mode 100644 index 5368917680..0000000000 --- a/xmlhelp/source/cxxhelp/db/BlockManager.cxx +++ /dev/null @@ -1,218 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: BlockManager.cxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_xmlhelp.hxx" -#include <db/BlockManager.hxx> -#include <util/RandomAccessStream.hxx> - - - -using namespace ::xmlsearch; -using namespace ::xmlsearch::excep; -using namespace ::xmlsearch::db; - - - -BlockManager::BlockManager( DBEnv* dbenv ) throw( IOException ) - : dbenv_( dbenv ), - oldest_( 0 ), - newest_( 0 ), - blockused_( 0 ), - blockTable_( dbenv_ ? dbenv_->getBlockCount() : 0 ) // Hardcoded headerlen? -{ - if( blockTable_.size() ) - mapStorage2Memory( 0 ); - else - { - delete dbenv_; - throw IOException( rtl::OUString::createFromAscii( "BlockManager::BlockManager -> no blockcount" ) ); - } -} - - - -BlockManager::~BlockManager() -{ - delete dbenv_; -} - - - -void BlockManager::lock( sal_Int32 blNum ) throw( excep::IllegalIndexException ) -{ - if( blNum < 0 || blockTable_.size() <= sal_uInt32( blNum ) ) - throw excep::IllegalIndexException( rtl::OUString::createFromAscii( "BlockManager::lock ->" ) ); - - blockTable_[ blNum ].lock(); -} - - - -void BlockManager::unlock( sal_Int32 blNum ) throw( excep::IllegalIndexException ) -{ - if( blNum < 0 || blockTable_.size() <= sal_uInt32( blNum ) ) - throw excep::IllegalIndexException( rtl::OUString::createFromAscii( "BlockManager::unlock ->" ) ); - - blockTable_[ blNum ].unlock(); -} - - -bool BlockManager::isLocked( sal_Int32 blNum ) throw( excep::IllegalIndexException ) -{ - if( blNum < 0 || blockTable_.size() <= sal_uInt32( blNum ) ) - throw excep::IllegalIndexException( rtl::OUString::createFromAscii( "BlockManager::isLocked ->" ) ); - - return blockTable_[ blNum ].isLocked(); -} - - -void BlockManager::modf( sal_Int32 blNum ) throw( excep::IllegalIndexException ) -{ - if( blNum < 0 || blockTable_.size() <= sal_uInt32( blNum ) ) - throw excep::IllegalIndexException( rtl::OUString::createFromAscii( "BlockManager::modf ->" ) ); - - blockTable_[ blNum ].modf(); -} - - -void BlockManager::close() throw( excep::IOException ) -{ - if( ! dbenv_ ) - throw excep::IOException( rtl::OUString::createFromAscii( "BlockManager::save -> no environment" ) ); - - for( sal_uInt32 i = 0; i < blockTable_.size(); ++i ) - if( blockTable_[i].isModf() ) - blockTable_[i].write( dbenv_,i ); -} - - - -const Block* BlockManager::accessBlock( sal_Int32 blNum ) throw( excep::NoSuchBlock ) -{ - if( blNum < 0 || blockTable_.size() <= sal_uInt32( blNum ) ) - throw excep::IllegalIndexException( - rtl::OUString::createFromAscii( - "BlockManager:accessBlock -> index out of range" ) ); - - if( blockTable_[ blNum ].is() ) - moveToFront( blNum ); - else if( blockused_ < dbenv_->getMaximumBlockCount() ) - mapStorage2Memory( blNum ); - else - remap( blNum ); - - return blockTable_[ blNum ].getBlock( ); -} - - - -void BlockManager::moveToFront( sal_Int32 blNum ) -{ - if( blNum == oldest_ ) - { - oldest_ = blockTable_[blNum].next(); - blockTable_[blNum].prev( newest_ ); - blockTable_[newest_].next( blNum ); - newest_ = blNum; - } - else if( blNum != newest_ ) - { - blockTable_[blockTable_[blNum].next()].prev( blockTable_[blNum].prev() ); - blockTable_[blockTable_[blNum].prev()].next( blockTable_[blNum].next() ); - blockTable_[blNum].prev( newest_ ); - blockTable_[newest_].next( blNum ); - newest_ = blNum; - } -} - - -// maps file into buffer - -void BlockManager::mapStorage2Memory( sal_Int32 blNum ) throw( excep::IOException ) -{ - add( blNum ); - blockTable_[blNum].read( dbenv_,blNum ); -} - - - -void BlockManager::remap( sal_Int32 blNum ) throw( excep::XmlSearchException ) -{ - sal_Int32 idx = oldest_; - - while( blockTable_[ idx ].isLocked() && idx != newest_ ) - idx = blockTable_[ idx ].next(); - - if( blockTable_[ idx ].isLocked() ) - throw excep::XmlSearchException( - rtl::OUString::createFromAscii( "everything locked" ) ); - - if( blockTable_[ idx].isModf() ) - blockTable_[ idx ].write( dbenv_,idx ); - - // delete from double-linked list - if( idx == oldest_ ) - oldest_ = blockTable_[ idx ].next(); - else if( idx == newest_ ) - newest_ = blockTable_[ idx ].prev(); - else - { - blockTable_[ blockTable_[ idx ].next() ].prev( blockTable_[ idx ].prev() ); - blockTable_[ blockTable_[ idx ].prev() ].next( blockTable_[ idx ].next() ); - } - - add( blNum ); - blockTable_[blNum].add( blockTable_[ idx ].reset() ); -} - - - -void BlockManager::add( sal_Int32 blNum ) -{ - blockTable_[ blNum ].prev( newest_ ); - blockTable_[ newest_ ].next( blNum ); - newest_ = blNum; -} - - -void BlockManager::mapBlocks( const BlockProcessor& blProc ) -{ - sal_Int32 nBlocks = dbenv_->getBlockCount(); - Block* block = 0; - for (int i = 0; i < nBlocks; i++) - { - dbenv_->read( i,block ); - blProc.process( block ); - } -} - - - diff --git a/xmlhelp/source/cxxhelp/db/BtreeDict.cxx b/xmlhelp/source/cxxhelp/db/BtreeDict.cxx deleted file mode 100644 index 8dd402e53b..0000000000 --- a/xmlhelp/source/cxxhelp/db/BtreeDict.cxx +++ /dev/null @@ -1,623 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: BtreeDict.cxx,v $ - * $Revision: 1.16 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_xmlhelp.hxx" -#include <stdlib.h> -#ifndef INCLUDED_STL_VECTOR -#include <vector> -#define INCLUDED_STL_VECTOR -#endif -#include <db/BtreeDict.hxx> -#include <db/Block.hxx> -#include <db/BlockFactory.hxx> -#include <db/BlockManager.hxx> -#include <db/DBEnv.hxx> -#include <util/RandomAccessStream.hxx> -#include <util/DBEnvImpl.hxx> -#ifndef _XMLSEARCH_UTIL_RANDOMACCESSSTREAM_HXX_ -#include <util/RandomAccessStream.hxx> -#endif - - - -const sal_Int32 xmlsearch::db::BtreeDict::ENTHEADERLEN = 6; -const sal_Int32 xmlsearch::db::BtreeDict::BLOCKSIZE = 2048; -const sal_Int32 xmlsearch::db::BtreeDict::HEADERLEN = 8; -const sal_Int32 xmlsearch::db::BtreeDict::DATALEN = -xmlsearch::db::BtreeDict::BLOCKSIZE - xmlsearch::db::BtreeDict::HEADERLEN; - -const sal_Int32 xmlsearch::db::BtreeDict::nBlocksLimit = 64; -const sal_Int32 xmlsearch::db::BtreeDict::MaxKeyLength = 255; -const sal_Int32 xmlsearch::db::BtreeDict::lastPtrIndex = 508; //!!! Careful with that number, Eugene - - -namespace xmlsearch { - - namespace db { - - class DictBlock - : public Block - { - friend class BtreeDict; - - - public: - - DictBlock( const DBEnv* dbenv ) - : Block( dbenv ) - { - } - - sal_Int32 free() const - { - return getFree() + firstEntry(); - } - - sal_Int32 numberOfEntries() const - { - return getInteger( 0 ); - } - - sal_Int32 nthPointer( sal_Int32 n ) const - { - return getInteger( 4*(n+1) ); - } - - sal_Int32 getChildIdx( sal_Int32 index ) const - { - return nthPointer( BtreeDict::lastPtrIndex - index ); - } - - sal_Int32 entryKeyLength( sal_Int32 i ) const - { - - return getData()[i] & 0xFF; - } - - sal_Int32 entryID( sal_Int32 i ) const - { - return getInteger(i + 2); - } - - sal_Int32 entryCompression( sal_Int32 i ) const - { - return getData()[i+1] & 0xFF; - } - - sal_Int32 entryLength( sal_Int32 entry ) const - { - return BtreeDict::ENTHEADERLEN + entryKeyLength( entry ); - } - - sal_Int32 entryKey( sal_Int32 entry ) const - { - return entry + BtreeDict::ENTHEADERLEN; - } - - sal_Int32 firstEntry() const - { - return 4; - } - - sal_Int32 nextEntry( sal_Int32 entry ) const - { - return entry + entryLength( entry ); - } - - void restoreKeyInBuffer( sal_Int32 entry, sal_Int8* buffer ) const - { - sal_Int32 howMany = entryKeyLength( entry ); - sal_Int32 where = entryCompression( entry ); - sal_Int32 from = entryKey( entry ); - while( howMany-- > 0 ) - buffer[ where++ ] = getData()[ from++ ]; - } - - rtl::OUString restoreKey( sal_Int32 entry, sal_Int8* buffer ) const - { - sal_Int32 howMany = entryKeyLength( entry ); - sal_Int32 where = entryCompression( entry ); - sal_Int32 from = entryKey( entry ); - while( howMany-- > 0 ) - buffer[ where++ ] = getData()[ from++ ]; - - return rtl::OUString( (sal_Char*)(buffer),where,RTL_TEXTENCODING_UTF8 ); - } - - rtl::OUString findID( sal_Int32 id ) const throw( xmlsearch::excep::XmlSearchException ) - { - sal_Int8 buffer[ BtreeDict::MaxKeyLength ]; - sal_Int32 freeSpace = free(); - for( sal_Int32 ent = firstEntry(); ent < freeSpace; ent = nextEntry( ent ) ) - if( entryID( ent ) == id ) // found - return restoreKey( ent,buffer ); - else - restoreKeyInBuffer( ent,buffer ); - - throw xmlsearch::excep::XmlSearchException( - rtl::OUString::createFromAscii( "DictBlock::findID -> ID not found in block" ) ); - } - - - void withPrefix( const BtreeDict* owner, - const rtl::OUString& prefix, - sal_Int32 prefLen, - std::vector<sal_Int32>& result) const - throw( xmlsearch::excep::XmlSearchException ); - - -// void withPrefix( const BtreeDict* owner, -// const rtl::OUString& prefix, -// sal_Int32 prefLen, -// std::vector<sal_Int32>& result) const -// throw( xmlsearch::excep::XmlSearchException ) -// { -// sal_Int8 buffer[ BtreeDict::MaxKeyLength ]; -// const int freeSpace = free(); -// int entryPtr = firstEntry(); -// if( isLeaf() ) -// while (entryPtr < freeSpace) -// { -// if( restoreKey( entryPtr,buffer).compareTo( prefix,prefix.getLength() ) == 0 ) -// result.push_back( entryID( entryPtr ) ); -// entryPtr = nextEntry(entryPtr); -// } -// else -// { -// owner->lock( getNum() ); -// sal_Int32 entryIndex = 0; -// while( entryPtr < freeSpace ) -// { -// rtl::OUString key = restoreKey( entryPtr,buffer ); - -// if( key.getLength() > prefLen ) -// key = key.copy( 0,prefLen ); -// sal_Int32 cmp = key.compareTo(prefix); - -// if( cmp < 0 ) -// { -// entryPtr = nextEntry( entryPtr ); -// ++entryIndex; -// } -// else if( cmp == 0 ) -// { -// result.push_back( entryID( entryPtr ) ); -// owner->accessBlock( getChildIdx( entryIndex ) )->withPrefix( owner,prefix,prefLen,result ); -// entryPtr = nextEntry( entryPtr ); -// ++entryIndex; -// } -// else -// { -// owner->unlock( getNum() ); -// owner->accessBlock( getChildIdx( entryIndex ) )->withPrefix( owner,prefix,prefLen,result ); -// return; -// } -// } - -// owner->unlock( getNum() ); -// owner->accessBlock( getChildIdx( numberOfEntries() ) )->withPrefix( owner,prefix,prefLen,result ); -// } -// } - - - void setBlockNumbers( sal_Int32* blocks ) - { - for( sal_Int32 e = firstEntry(); e < getFree() ; e = nextEntry(e) ) - blocks[ entryID(e) ] = getNum(); - } - - - protected: - - void doMap( BtreeDict* owner,EntryProcessor* processor ) const - throw( xmlsearch::excep::XmlSearchException ) - { - sal_Int8 buffer[ BtreeDict::MaxKeyLength ]; - sal_Int32 freeSpace = free(); - sal_Int32 entryPtr = firstEntry(); - - if( isLeaf() ) - while( entryPtr < freeSpace ) - { - processor->processEntry( restoreKey( entryPtr,buffer ), - entryID( entryPtr ) ); - entryPtr = nextEntry( entryPtr ); - } - else - { - owner->lock( getNum() ); - sal_Int8 entryIdx = 0; - while( entryPtr < freeSpace ) - { - owner->accessBlock( getChildIdx( entryIdx ) )->doMap( owner,processor ); - processor->processEntry( restoreKey( entryPtr,buffer ), - entryID( entryPtr ) ); - entryPtr = nextEntry( entryPtr ); - ++entryIdx; - } - owner->accessBlock( getChildIdx( entryIdx ) )->doMap( owner,processor ); - owner->unlock( getNum() ); - } - } - - - }; // end class DictBlock - - - } // end namespace db - -} // end namespace xmlsearch - - - - -using namespace xmlsearch; -using namespace xmlsearch::excep; -using namespace xmlsearch::db; -using namespace xmlsearch::util; - - - - -void DictBlock::withPrefix( const BtreeDict* owner, - const rtl::OUString& prefix, - sal_Int32 prefLen, - std::vector<sal_Int32>& result) const - throw( xmlsearch::excep::XmlSearchException ) -{ - sal_Int8 buffer[ BtreeDict::MaxKeyLength ]; - const int freeSpace = free(); - int entryPtr = firstEntry(); - if( isLeaf() ) - while( entryPtr < freeSpace ) - { - rtl::OUString key = restoreKey( entryPtr,buffer); - if( key.indexOf( prefix ) != -1 ) - result.push_back( entryID( entryPtr ) ); - entryPtr = nextEntry(entryPtr); - } - else - { - owner->lock( getNum() ); - sal_Int32 entryIndex = 0; - while( entryPtr < freeSpace ) - { - rtl::OUString key = restoreKey( entryPtr,buffer ); - - if( key.getLength() > prefLen ) - key = key.copy( 0,prefLen ); - - sal_Int32 cmp = key.indexOf(prefix); - - if( cmp != -1 ) - result.push_back( entryID( entryPtr ) ); - owner->accessBlock( getChildIdx( entryIndex ) )->withPrefix( owner,prefix,prefLen,result ); - entryPtr = nextEntry( entryPtr ); - ++entryIndex; - } - - owner->unlock( getNum() ); - owner->accessBlock( getChildIdx( numberOfEntries() ) )->withPrefix( owner,prefix,prefLen,result ); - } -} - - - - -class BlockProcessorImpl - : public BlockProcessor -{ -public: - - BlockProcessorImpl( BtreeDict* bla ) - : bla_( bla ) - { - } - - - ~BlockProcessorImpl() - { - } - - - void process( Block* block ) const; - -private: - - BtreeDict* bla_; -}; - - - -void BlockProcessorImpl::process( Block* block ) const -{ - DictBlock* bla = dynamic_cast<DictBlock*>( block ); - bla->setBlockNumbers( bla_->get_blocks() ); -} - - - - - -BtreeDict::BtreeDict( const util::IndexAccessor& indexAccessor ) throw( IOException ) - : blockManager_( new DBEnvImpl( indexAccessor ) ), // may throw IOExcption - blocksL_( 0 ), - blocks_( 0 ) -{ - - RandomAccessStream* SCHEMA = indexAccessor.getStream( rtl::OUString::createFromAscii( "SCHEMA" ), - rtl::OUString::createFromAscii( "r" ) ); - - if( SCHEMA ) - { - sal_Int32 len = SCHEMA->length(); - char* bff = new char[ 1 + len ]; - bff[ len ] = 0; - SCHEMA->readBytes( reinterpret_cast<sal_Int8*>( bff ),len ); - delete SCHEMA; - - rtl::OString aStr( bff ); - - sal_Int32 idx = 3 + aStr.lastIndexOf( "rt=" ); - root_ = atoi( bff + idx ); - - idx = 4 + aStr.lastIndexOf( "id1=" ); - sal_Int32 count = atoi( bff + idx ); - blocks_ = new sal_Int32[ blocksL_ = count ]; - - delete[] bff; - BlockProcessorImpl blProc( this ); - blockManager_.mapBlocks( blProc ); - } - else - throw IOException( rtl::OUString::createFromAscii( "BtreeDict::BtreeDict -> no SCHEMA/schema" ) ); -} - - -BtreeDict::~BtreeDict() -{ - delete[] blocks_; -} - - -const DictBlock* BtreeDict::accessBlock( sal_Int32 id ) const -{ - const Block* bl = blockManager_.accessBlock( id ); - return dynamic_cast< const DictBlock* >( bl ); -} - - -void BtreeDict::lock( sal_Int32 blNum ) const throw( excep::IllegalIndexException ) -{ - blockManager_.lock( blNum ); -} - - -void BtreeDict::unlock( sal_Int32 blNum ) const throw( excep::IllegalIndexException ) -{ - blockManager_.unlock( blNum ); -} - -sal_Int32 BtreeDict::fetch( const rtl::OUString& key ) const throw( excep::XmlSearchException ) -{ - /** - * Here is the correct code. To function it requires a bug fix in the old Javacode of - * Jaczeks index engine. - */ - - rtl::OString searchString( key.getStr(),key.getLength(),RTL_TEXTENCODING_UTF8 ); - - return find( accessBlock( root_ ), - reinterpret_cast< const sal_Int8* >( searchString.getStr() ), - searchString.getLength() ); - - - /** - * The key has to be replaced by UTF8-encoded byterepresentations of unicode string, - * as a workaround to Jazceks bug. - */ - -// rtl::OString Key( key.getStr(),key.getLength(),RTL_TEXTENCODING_ISO_8859_1 ); - -// sal_Int32 len = key.getLength(); -// sal_Int8 *searchStr = new sal_Int8[ 1+len ]; -// searchStr[len] = 0; - -// rtl_copyMemory( searchStr,(const sal_Int8*)(Key.getStr()),len ); -// sal_Int32 ret = find( accessBlock( root_ ), -// searchStr, -// len ); -// delete[] searchStr; -// return ret; -} - - -rtl::OUString BtreeDict::fetch( sal_Int32 conceptID ) const throw( excep::XmlSearchException ) -{ - if( blocksL_ <= conceptID ) - throw excep::XmlSearchException( rtl::OUString() ); - - return findID( blocks_[conceptID], conceptID ); -} - - -std::vector< sal_Int32 > BtreeDict::withPrefix( const rtl::OUString& prefix ) const - throw( excep::XmlSearchException ) -{ - std::vector< sal_Int32 > result; - const DictBlock *bl = accessBlock( root_ ); - bl->withPrefix( this,prefix,prefix.getLength(),result ); - return result; -} - - - -sal_Int32 BtreeDict::find( const DictBlock* bl, - const sal_Int8* key, - sal_Int32 inputKeyLen ) const throw( excep::XmlSearchException ) -{ - sal_Int32 entryPtr = bl->firstEntry(); - sal_Int32 freeSpace = bl->free(); - sal_Int32 nCharsEqual = 0; - sal_Int32 compression = 0; - - for( sal_Int32 entryIdx = 0; ; ) - { - if( entryPtr == freeSpace ) - return find( bl, - key, - inputKeyLen, - bl->numberOfEntries() ); - - else if( compression == nCharsEqual ) - { - sal_Int32 keyLen = bl->entryKeyLength( entryPtr ); - sal_Int32 keyPtr = bl->entryKey( entryPtr ), i; - for( i = 0; i < keyLen && key[ nCharsEqual ] == bl->getData()[keyPtr + i]; i++ ) - ++nCharsEqual; - if( i == keyLen ) - { - if( nCharsEqual == inputKeyLen ) - return bl->entryID( entryPtr ); - } - else if( ( key[ nCharsEqual ] & 0xFF ) < ( bl->getData()[ keyPtr + i ] & 0xFF) ) - return find( bl,key,inputKeyLen,entryIdx ); - } - - else if( compression < nCharsEqual ) // compression dropped - return find( bl,key,inputKeyLen,entryPtr == freeSpace ? bl->numberOfEntries() : entryIdx ); - - - do - { - entryPtr = bl->nextEntry( entryPtr ); - ++entryIdx; - } while( bl->entryCompression( entryPtr ) > nCharsEqual ); - - compression = bl->entryCompression( entryPtr ); - } -} - - - - -sal_Int32 BtreeDict::find( const DictBlock* bl, - const sal_Int8* key, - sal_Int32 inputKeyLen, - sal_Int32 index ) const throw( xmlsearch::excep::XmlSearchException ) -{ - return bl->isLeaf() ? 0 : find( child( bl,index ),key,inputKeyLen ); -} - - - -const DictBlock* BtreeDict::child( const DictBlock* bl,sal_Int32 index) const throw( excep::XmlSearchException ) -{ - return accessBlock( bl->getChildIdx(index) ); -} - - -rtl::OUString BtreeDict::findID( sal_Int32 blNum,sal_Int32 id ) const throw( xmlsearch::excep::XmlSearchException ) -{ - return accessBlock( blNum )->findID( id ); -} - - - - -// Definitions for DBEnvImpl - - - -DBEnvImpl::DBEnvImpl( const util::IndexAccessor& indexAccessor ) -{ - file_ = indexAccessor.getStream( rtl::OUString::createFromAscii( "DICTIONARY" ), - rtl::OUString::createFromAscii( "r" ) ); -} - - -DBEnvImpl::~DBEnvImpl() -{ - delete file_; -} - - -sal_Int32 DBEnvImpl::getEntryHeaderLen() const -{ - return BtreeDict::ENTHEADERLEN; -} - - -sal_Int32 DBEnvImpl::getBlockCount() const -{ - if( file_ ) - return file_->length() / BtreeDict::BLOCKSIZE; - else - return 0; -} - -sal_Int32 DBEnvImpl::getMaximumBlockCount() const -{ - return BtreeDict::nBlocksLimit; -} - - -sal_Int32 util::DBEnvImpl::getDataLen() const -{ - return BtreeDict::DATALEN; -} - - -sal_Int32 DBEnvImpl::getBlockLen() const -{ - return BtreeDict::BLOCKSIZE; -} - - -void DBEnvImpl::read( sal_Int32 blNum,xmlsearch::db::Block*& block ) const -{ - if( ! block ) - block = new xmlsearch::db::DictBlock( this ); - - if( file_ ) - { - file_->seek( blNum * getBlockLen() ); - block->read( file_ ); - } -} - - -void DBEnvImpl::write( sal_Int32 blNum,xmlsearch::db::Block* block ) -{ - (void)blNum; - if( ! block ) - return; -} diff --git a/xmlhelp/source/cxxhelp/db/makefile.mk b/xmlhelp/source/cxxhelp/db/makefile.mk deleted file mode 100644 index bc5bd5aaef..0000000000 --- a/xmlhelp/source/cxxhelp/db/makefile.mk +++ /dev/null @@ -1,61 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.9 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME= xmlhelp -TARGET= jadb -AUTOSEG= TRUE - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(GUI)"=="WNT" -CFLAGS+=-GR -.ENDIF -.IF "$(COM)"=="GCC" -CFLAGSCXX+=-frtti -.ENDIF - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/Block.obj \ - $(SLO)$/BlockManager.obj \ - $(SLO)$/BtreeDict.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/xmlhelp/source/cxxhelp/inc/db/Block.hxx b/xmlhelp/source/cxxhelp/inc/db/Block.hxx deleted file mode 100644 index d12cfe9f05..0000000000 --- a/xmlhelp/source/cxxhelp/inc/db/Block.hxx +++ /dev/null @@ -1,119 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: Block.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _XMLSEARCH_DB_BLOCK_HXX_ -#define _XMLSEARCH_DB_BLOCK_HXX_ - -#include <rtl/ustring.hxx> -#include <excep/XmlSearchExceptions.hxx> - - -namespace xmlsearch { - - namespace util { - - class RandomAccessStream; - - } - - namespace db { - - - class DBEnv; - - - class Block // refcounted class - { - public: - - Block( const DBEnv* ); - virtual ~Block(); - - sal_Int32 getInteger( sal_Int32 i ) const throw( xmlsearch::excep::IllegalIndexException ); - - void trueLeaf() { isLeaf_ = true; } - void falseLeaf() { isLeaf_ = false; } - bool isLeaf() const { return isLeaf_; } - - void setFree( sal_Int32 free ) { free_ = free; } - sal_Int32 getFree() const { return free_; } - - void setNum( sal_Int32 num ) { num_ = num; } - sal_Int32 getNum() const { return num_; } - - void read( util::RandomAccessStream* in ); - - const sal_Int8* getData() const { return data_; } - - - protected: - - const DBEnv* dbenv_; // not owner - - - private: - - bool isLeaf_; - sal_Int32 free_; - sal_Int32 num_; - sal_Int32 dataL_; - sal_Int8* data_; - - // methods - - Block( const Block& ); - Block& operator=( const Block& ); - - }; // end class Block - - - } -} - - -inline sal_Int32 getInteger_( const sal_Int8* v ) -{ - return (((((( v[0]&0xFF ) << 8 ) - | v[1]&0xFF ) << 8 ) - | v[2]&0xFF ) << 8 ) - | v[3]&0xFF; -} - - - -inline void setInteger_( sal_Int8* v,sal_Int32 value ) -{ - v[0] = sal_Int8((value >> 24) & 0xFF); - v[1] = sal_Int8((value >> 16) & 0xFF); - v[2] = sal_Int8((value >> 8) & 0xFF); - v[3] = sal_Int8( value & 0xFF ); -} - - -#endif diff --git a/xmlhelp/source/cxxhelp/inc/db/BlockFactory.hxx b/xmlhelp/source/cxxhelp/inc/db/BlockFactory.hxx deleted file mode 100644 index e4381c1ec0..0000000000 --- a/xmlhelp/source/cxxhelp/inc/db/BlockFactory.hxx +++ /dev/null @@ -1,54 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: BlockFactory.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _XMLSEARCH_DB_BLOCKFACTORY_HXX_ -#define _XMLSEARCH_DB_BLOCKFACTORY_HXX_ - -namespace xmlsearch { - - namespace db { - - - class Block; - - - class BlockFactory - { - public: - - virtual ~BlockFactory() { } - virtual Block* makeBlock() const = 0; - }; - - - } -} - - -#endif diff --git a/xmlhelp/source/cxxhelp/inc/db/BlockManager.hxx b/xmlhelp/source/cxxhelp/inc/db/BlockManager.hxx deleted file mode 100644 index e5728b58d4..0000000000 --- a/xmlhelp/source/cxxhelp/inc/db/BlockManager.hxx +++ /dev/null @@ -1,159 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: BlockManager.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _XMLSEARCH_DB_BLOCKMANAGER_HXX_ -#define _XMLSEARCH_DB_BLOCKMANAGER_HXX_ - -#include <rtl/ustring.hxx> -#ifndef INCLUDED_STL_VECTOR -#include <vector> -#define INCLUDED_STL_VECTOR -#endif -#include <db/Block.hxx> -#include <db/BlockFactory.hxx> -#include <db/DBEnv.hxx> -#include <excep/XmlSearchExceptions.hxx> - -namespace xmlsearch { - - namespace util { - - class RandomAccessStream; - - } - - namespace db { - - - class BlockDecoratour // internal class for BlockManager - { - public: - - BlockDecoratour() - : lock_( false ), - modf_( false ), - prev_( 0 ), - next_( 0 ), - block_( 0 ) - { - } - - ~BlockDecoratour() { delete block_; } - - void lock() { lock_ = true; } - void unlock() { lock_ = false; } - bool isLocked() const { return lock_; } - - bool isModf() const { return modf_; } - void modf() { modf_ = true; } - - void next( sal_Int32 parnext ) { next_ = parnext; } - sal_Int32 next() const { return next_; } - void prev( sal_Int32 parprev ) { prev_ = parprev; } - sal_Int32 prev() const { return prev_; } - - void read( DBEnv* dbenv,sal_Int32 blNum ) { dbenv->read( blNum,block_ ); } - void write(DBEnv* dbenv,sal_Int32 blNum ) { dbenv->write( blNum,block_ ); } - - Block* reset() { lock_ = modf_ = false; prev_ = next_ = 0; Block* tmp = block_; block_ = 0; return tmp; } - void add( Block* block ) { delete block_; block_ = block; } - bool is() const { return block_ != 0; } - - const Block* getBlock() const { return block_; } - - private: - - bool lock_; - bool modf_; - sal_Int32 prev_; - sal_Int32 next_; - Block* block_; - - }; - - - - class BlockProcessor - { - public: - - virtual void process( Block* block ) const = 0; - virtual ~BlockProcessor() {} - }; - - - class BlockManager - { - public: - - // Buffered mapping of stream into memory - - BlockManager( DBEnv* ) throw( xmlsearch::excep::IOException ); - virtual ~BlockManager(); - - // From BlockManagerBase - virtual void lock( sal_Int32 blNum ) throw( xmlsearch::excep::IllegalIndexException ); - virtual void unlock( sal_Int32 blNum ) throw( xmlsearch::excep::IllegalIndexException ); - virtual bool isLocked( sal_Int32 blNum ) throw( xmlsearch::excep::IllegalIndexException ); - - virtual void modf( sal_Int32 blNum ) throw( xmlsearch::excep::IllegalIndexException ); - virtual void close() throw( xmlsearch::excep::IOException ); - - virtual const Block* accessBlock( sal_Int32 blNum ) throw( xmlsearch::excep::NoSuchBlock ); - virtual void mapBlocks( const BlockProcessor& blProc ); - - - private: - - // types - - xmlsearch::db::DBEnv* dbenv_; - - sal_Int32 oldest_; - sal_Int32 newest_; - BlockDecoratour dummy_; - sal_Int32 blockused_; - std::vector< BlockDecoratour > blockTable_; - - - // private methods - - void moveToFront( sal_Int32 index ); - void mapStorage2Memory( sal_Int32 blNum ) throw( xmlsearch::excep::IOException ); - void remap( sal_Int32 blNum ) throw( xmlsearch::excep::XmlSearchException ); - void add( sal_Int32 blNum ); - }; - - - } -} - - - -#endif diff --git a/xmlhelp/source/cxxhelp/inc/db/BtreeDict.hxx b/xmlhelp/source/cxxhelp/inc/db/BtreeDict.hxx deleted file mode 100644 index e0ecea5624..0000000000 --- a/xmlhelp/source/cxxhelp/inc/db/BtreeDict.hxx +++ /dev/null @@ -1,110 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: BtreeDict.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _XMLSEARCH_DB_BTREEDICT_HXX_ -#define _XMLSEARCH_DB_BTREEDICT_HXX_ - -#ifndef INCLUDED_STL_VECTOR -#include <vector> -#define INCLUDED_STL_VECTOR -#endif -#include <rtl/ustring.hxx> -#include <excep/XmlSearchExceptions.hxx> -#include <db/BlockManager.hxx> -#include <db/EntryProcessor.hxx> -#include <util/IndexAccessor.hxx> - -namespace xmlsearch { - - namespace db { - - - class DictBlock; - class DBEnv; - - - class BtreeDict - { - public: - - static const sal_Int32 ENTHEADERLEN; - static const sal_Int32 BLOCKSIZE; - static const sal_Int32 HEADERLEN; - static const sal_Int32 DATALEN; - - static const sal_Int32 nBlocksLimit; - static const sal_Int32 MaxKeyLength; - static const sal_Int32 lastPtrIndex; //!!! Careful with that number, Eugene - - BtreeDict( const xmlsearch::util::IndexAccessor& indexAccessor ) - throw( xmlsearch::excep::IOException ); - ~BtreeDict(); - - void lock( sal_Int32 blNum ) const throw( xmlsearch::excep::IllegalIndexException ); - void unlock( sal_Int32 blNum ) const throw( xmlsearch::excep::IllegalIndexException ); - - const DictBlock* accessBlock( sal_Int32 id ) const; - - sal_Int32 fetch( const rtl::OUString& key ) const throw( xmlsearch::excep::XmlSearchException ); - rtl::OUString fetch( sal_Int32 conceptID ) const throw( xmlsearch::excep::XmlSearchException ); - - std::vector< sal_Int32 > withPrefix( const rtl::OUString& prefix ) const throw( xmlsearch::excep::XmlSearchException ); - sal_Int32* get_blocks() const { return blocks_; } - - void test(); - - private: - - mutable BlockManager blockManager_; - sal_Int32 root_; - sal_Int32 blocksL_; - sal_Int32* blocks_; - - sal_Int32 find( const DictBlock* bl, - const sal_Int8* key, - sal_Int32 inputKeyLen ) const throw( xmlsearch::excep::XmlSearchException ); - - sal_Int32 find( const DictBlock* bl, - const sal_Int8* key, - sal_Int32 inputKeyLen, - sal_Int32 index ) const throw( xmlsearch::excep::XmlSearchException ); - - const DictBlock* child( const DictBlock* bl, - sal_Int32 index) const throw( xmlsearch::excep::XmlSearchException ); - - rtl::OUString findID( sal_Int32 blNum,sal_Int32 id ) const throw( xmlsearch::excep::XmlSearchException ); - - }; - - - } -} - - -#endif diff --git a/xmlhelp/source/cxxhelp/inc/db/DBEnv.hxx b/xmlhelp/source/cxxhelp/inc/db/DBEnv.hxx deleted file mode 100644 index 1659eb0d82..0000000000 --- a/xmlhelp/source/cxxhelp/inc/db/DBEnv.hxx +++ /dev/null @@ -1,68 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: DBEnv.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _XMLSEARCH_DB_DBENV_HXX_ -#define _XMLSEARCH_DB_DBENV_HXX_ - -namespace xmlsearch { - - namespace db { - - - class Block; - - - // environment class for a DBEnv - - class DBEnv - { - public: - - virtual sal_Int32 getEntryHeaderLen() const = 0; - - virtual sal_Int32 getBlockCount() const = 0; - - virtual sal_Int32 getMaximumBlockCount() const = 0; - - virtual sal_Int32 getDataLen() const = 0; - - virtual sal_Int32 getBlockLen() const = 0; - - virtual void read( sal_Int32 block,Block*& ) const = 0; - - virtual void write( sal_Int32,Block* ) = 0; - }; - - - } - -} - - -#endif diff --git a/xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx b/xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx deleted file mode 100644 index 775c68b765..0000000000 --- a/xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx +++ /dev/null @@ -1,122 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: ConceptData.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _XMLSEARCH_QE_CONCEPTDATA_HXX_ -#define _XMLSEARCH_QE_CONCEPTDATA_HXX_ - -#include <rtl/ref.hxx> -#include <sal/types.h> -#ifndef INCLUDED_STL_VECTOR -#include <vector> -#define INCLUDED_STL_VECTOR -#endif - - -namespace xmlsearch { - - namespace qe { - - - class RoleFiller; - class Query; - class ContextTables; - - class ConceptData - { - public: - - ConceptData( sal_Int32 id = 0, - sal_Int32 role = 0, - double score = 0.0, - sal_Int32 queryNo = 0, - sal_Int32 nColumns = 0, - ContextTables* contextTables = 0 ); - - virtual ~ConceptData(); - - void acquire() { ++m_nRefcount; } - void release() { if( ! --m_nRefcount ) delete this; } - - bool cEquals( ConceptData* r ) { return concept_ == r->concept_; } - bool crEquals( ConceptData* r ) { return cEquals( r ) && role_ == r->role_; } - bool crqEquals( ConceptData* r ) { return crEquals( r ) && queryNo_ == r->queryNo_; } - bool compareWith( ConceptData* r ) { return - concept_ < r->concept_ || - cEquals( r ) && role_ < r->role_ || - crEquals( r ) && penalty_ < r->penalty_; } - - void addLast( ConceptData* r ); - - sal_Int32 getConcept() const { return concept_; } - - sal_Int32 getQueryMask() const - { - return ( next_.is() ? next_->getQueryMask() : 0 ) | ( 1 << queryNo_ ); - } - - void runBy( std::vector< Query* >& queries ); - - virtual void generateFillers( std::vector< RoleFiller* >& array, sal_Int32 last ); - - sal_Int32 getConcept() { return concept_; } - - sal_uInt8 getRole() { return role_; } - - sal_uInt8 getQuery() { return queryNo_; } - - double getScore() { return penalty_; } - - double getPenalty() { return penalty_; } - - - protected: - - static const sal_Int32 ProxPerTerm; - - sal_uInt8 queryNo_,nColumns_,role_; - - sal_Int32 concept_,proximity_; - - double penalty_; - - sal_uInt32 m_nRefcount; - - ContextTables* ctx_; - rtl::Reference< ConceptData > next_; - std::vector< rtl::Reference< RoleFiller > > roleFillers_; - }; - - - - } - -} - - -#endif diff --git a/xmlhelp/source/cxxhelp/inc/qe/ContextTables.hxx b/xmlhelp/source/cxxhelp/inc/qe/ContextTables.hxx deleted file mode 100644 index bd5f85dfed..0000000000 --- a/xmlhelp/source/cxxhelp/inc/qe/ContextTables.hxx +++ /dev/null @@ -1,132 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: ContextTables.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _XMLSEARCH_QE_CONTEXTTABLES_HXX_ -#define _XMLSEARCH_QE_CONTEXTTABLES_HXX_ - -#ifndef INCLUDED_STL_VECTOR -#include <vector> -#define INCLUDED_STL_VECTOR -#endif -#include <rtl/ustring.hxx> -#include <excep/XmlSearchExceptions.hxx> - - -namespace xmlsearch { - - namespace qe { - - /* forward declaration */ - - class ContextTables; - - - /******************************************************************************/ - - - class Tables - { - public: - - Tables( ContextTables* p ); - - ~Tables(); - - void setTables( ContextTables* p ); - - - private: - - sal_Int32 initialWordsCachedL_,destsCachedL_,linkTypesCachedL_,seqNumbersCachedL_; - sal_Int32 *initialWordsCached_,*destsCached_,*linkTypesCached_,*seqNumbersCached_; - - }; // end class Tables - - - /******************************************************************************/ - - - class ContextTables - { - friend class Tables; - - public: - - ContextTables( const std::vector< sal_Int32 >& offsets, - sal_Int32 contextDataL,sal_Int8 *contextData, - sal_Int32 linkNamesL,rtl::OUString *linkNames ); - - ~ContextTables(); - - void setMicroindex( sal_Int32 docNo ) throw( xmlsearch::excep::XmlSearchException ); - - sal_Int32 linkCode( const rtl::OUString& linkName_ ); - - bool* getIgnoredElementsSet( sal_Int32& len, /*out*/ - const sal_Int32 ignoredElementsL, - const rtl::OUString* ignoredElements ); - - bool notIgnored( sal_Int32 ctx, - sal_Int32 ignoredElementsL,bool* ignoredElements ); - - sal_Int32 firstParentWithCode( const sal_Int32 pos,const sal_Int32 linkCode_ ); - - void resetContextSearch(); - - sal_Int32 wordContextLin(sal_Int32 wordNumber); - - private: - - sal_Int32 nTextNodes_,initialWordsIndex_,lastDocNo_; - sal_Int32 initialWordsL_,destsL_,linkTypesL_,seqNumbersL_,markersL_; - sal_Int32 *initialWords_,*dests_,*linkTypes_,*seqNumbers_,*markers_; - - sal_Int32 contextDataL_; - sal_Int8 *contextData_; // no - - sal_Int32 linkNamesL_; - rtl::OUString *linkNames_; // no - - std::vector<Tables*> cache_; - std::vector< sal_Int32 > kTable_,auxArray_; - - const std::vector< sal_Int32 >& offsets_; - - }; // end class ContextTables - - - /******************************************************************************/ - - } // end namespace qe - -} // end namespace xmlsearch - - - -#endif diff --git a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx index d2d15ae283..66f7fc9271 100644 --- a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx +++ b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx @@ -1,286 +1,107 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: DocGenerator.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _XMLSEARCH_QE_DOCGENERATOR_HXX_ -#define _XMLSEARCH_QE_DOCGENERATOR_HXX_ - -#include <rtl/ref.hxx> -#ifndef _RTL_USTRING_HXX__ -#include <rtl/ustring.hxx> -#endif -#include <excep/XmlSearchExceptions.hxx> -#include <qe/XmlIndex.hxx> -#include <qe/ConceptData.hxx> -#include <util/CompressorIterator.hxx> -#include <util/Decompressor.hxx> - - -namespace xmlsearch { - - namespace qe { - - - class Query; - - - class NonnegativeIntegerGenerator - { - public: - - static const sal_Int32 END; - - virtual ~NonnegativeIntegerGenerator() { }; - virtual sal_Int32 first() throw( xmlsearch::excep::XmlSearchException ) = 0; - virtual sal_Int32 next() throw( xmlsearch::excep::XmlSearchException ) = 0; - }; - - - class NextDocGenerator - { - public: - - NextDocGenerator( ConceptData* cd,XmlIndex* env ); - - ~NextDocGenerator() { delete iterator_; } - - sal_Int32 first() throw( xmlsearch::excep::XmlSearchException ) - { - return ( document_ = ( iterator_ ? iterator_->first() : NonnegativeIntegerGenerator::END ) ); - } - - sal_Int32 next() throw( xmlsearch::excep::XmlSearchException ) - { - if( iterator_ ) - return document_ = iterator_->next(); - - throw xmlsearch::excep::XmlSearchException( rtl::OUString::createFromAscii( "NextDocGenerator::next ->" ) ); - } - - sal_Int32 getDocument() { return document_; } - - sal_Int32 getConcept() { return concept_; } - - sal_Int32 getQueryMask() { return queryMask_; } - - rtl::Reference< ConceptData > getTerms() { return terms_; } - - bool smallerThan( NextDocGenerator* other ) - { - return - document_ < other->document_ - || - document_ == other->document_ && concept_ < other->concept_; - } - - - private: - - sal_Int32 document_,concept_,queryMask_; - rtl::Reference< ConceptData > terms_; - NonnegativeIntegerGenerator* iterator_; - }; - - - class NextDocGeneratorHeap - { - public: - - NextDocGeneratorHeap() - : nonEmpty_( false ), - heapSize_( 0 ), - free_( 0 ) - - { - } - - ~NextDocGeneratorHeap() - { - reset(); - } - - void reset(); - - void addGenerator( NextDocGenerator* gen ); - - void start(); - - bool isNonEmpty() const { return nonEmpty_; } - - void step() throw( xmlsearch::excep::XmlSearchException ); - - sal_Int32 getDocument() { return heap_[0]->getDocument(); } - - sal_Int32 getConcept() { return heap_[0]->getConcept(); } - - sal_Int32 getQueryMask() { return heap_[0]->getQueryMask(); } - - rtl::Reference< ConceptData > getTerms() { return heap_[0]->getTerms(); } - - bool atDocument( sal_Int32 document ); - - - private: - - bool nonEmpty_; - - sal_Int32 heapSize_,free_; - - std::vector< NextDocGenerator* > heap_; - - void heapify( sal_Int32 i ); - }; - - - - class RoleFiller - { - public: - - static RoleFiller* STOP() { return &roleFiller_; } - - RoleFiller(); - - RoleFiller( sal_Int32 nColumns, - ConceptData* first, - sal_Int32 role, - sal_Int32 pos, - sal_Int32 parentContext, - sal_Int32 limit ); - - ~RoleFiller(); - - void acquire() { ++m_nRefcount; } - void release() { if( ! --m_nRefcount ) delete this; } - - void scoreList( Query* ,sal_Int32 ); - - sal_Int32 getConcept(); - - void use( std::vector< RoleFiller*>& place,sal_Int32 query ); - - private: - - static RoleFiller roleFiller_; - - sal_uInt32 m_nRefcount; - sal_uInt8 fixedRole_; - sal_Int16 filled_; - sal_Int32 begin_,end_,parentContext_,limit_; - - RoleFiller* next_; - std::vector< RoleFiller* > fillers_; - - ConceptData* conceptData_; - - double penalty( Query* query,sal_Int32 nColumns ); - - void makeQueryHit( Query* query,sal_Int32 doc,double penalty_ ); - - void considerReplacementWith( RoleFiller* replacement ); - - double getScore() { return conceptData_->getScore(); } - }; - - - - class ConceptGroupGenerator - : public xmlsearch::util::CompressorIterator - { - public: - - static const sal_Int32 NConceptsInGroup; - - ConceptGroupGenerator(); - - ConceptGroupGenerator( sal_Int32 dataL,sal_Int8* data,sal_Int32 index,sal_Int32 k ); - - virtual ~ConceptGroupGenerator(); - - void init( sal_Int32 bytesL,sal_Int8* bytes,sal_Int32 index,sal_Int32 k ); - - bool next() throw( xmlsearch::excep::XmlSearchException ); - - void generateFillers( std::vector< RoleFiller* >& array ); - - sal_Int32 position() { return last_; } - - void value( sal_Int32 value_ ) { last_ += value_; } - - sal_Int32 decodeConcepts( sal_Int32 k, sal_Int32 shift, sal_Int32 *concepts ) throw( xmlsearch::excep::XmlSearchException ); - - void addTerms( sal_Int32 index, ConceptData* terms ); - - private: - - static const sal_Int32 BitsInLabel; - - sal_Int32 last_,k1_,k2_; - std::vector< rtl::Reference< ConceptData > > table_; - xmlsearch::util::Decompressor* bits_; - rtl::Reference< ConceptData> cData_; - }; - - - class GeneratorHeap - { - public: - - GeneratorHeap() - : heapSize_( 0 ), - free_( 0 ) - { } - - ~GeneratorHeap() { reset(); } - - bool start( std::vector< RoleFiller* >& start ) throw( xmlsearch::excep::XmlSearchException ); - - bool next( std::vector< RoleFiller* >& start ) throw( xmlsearch::excep::XmlSearchException ); - - void reset(); - - void addGenerator( ConceptGroupGenerator* cd ); - - private: - - sal_Int32 heapSize_,free_; - - std::vector< ConceptGroupGenerator* > heap_; - - void buildHeap(); - - void heapify( sal_Int32 root ); - - }; - - - - } -} - -#endif +/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: DocGenerator.hxx,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _XMLSEARCH_QE_DOCGENERATOR_HXX_
+#define _XMLSEARCH_QE_DOCGENERATOR_HXX_
+
+#include <rtl/ref.hxx>
+#ifndef _RTL_USTRING_HXX__
+#include <rtl/ustring.hxx>
+#endif
+#include <excep/XmlSearchExceptions.hxx>
+#include <util/CompressorIterator.hxx>
+#include <util/Decompressor.hxx>
+
+
+namespace xmlsearch {
+
+ namespace qe {
+
+
+ class Query;
+
+
+ class NonnegativeIntegerGenerator
+ {
+ public:
+
+ static const sal_Int32 END;
+
+ virtual ~NonnegativeIntegerGenerator() { };
+ virtual sal_Int32 first() throw( xmlsearch::excep::XmlSearchException ) = 0;
+ virtual sal_Int32 next() throw( xmlsearch::excep::XmlSearchException ) = 0;
+ };
+
+
+ class RoleFiller
+ {
+ public:
+
+ static RoleFiller* STOP() { return &roleFiller_; }
+
+ RoleFiller();
+
+ ~RoleFiller();
+
+ void acquire() { ++m_nRefcount; }
+ void release() { if( ! --m_nRefcount ) delete this; }
+
+ private:
+
+ static RoleFiller roleFiller_;
+
+ sal_uInt32 m_nRefcount;
+ sal_uInt8 fixedRole_;
+ sal_Int16 filled_;
+ sal_Int32 begin_,end_,parentContext_,limit_;
+
+ RoleFiller* next_;
+ std::vector< RoleFiller* > fillers_;
+ };
+
+
+ class GeneratorHeap
+ {
+ public:
+
+ GeneratorHeap()
+ : heapSize_( 0 ),
+ free_( 0 )
+ { }
+ private:
+
+ sal_Int32 heapSize_,free_;
+ };
+
+
+
+ }
+}
+
+#endif
diff --git a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx index 583b0e9e65..336bc96282 100644 --- a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx +++ b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx @@ -1,330 +1,178 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: Query.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _XMLSEARCH_QE_QUERY_HXX_ -#define _XMLSEARCH_QE_QUERY_HXX_ - -#include <sal/types.h> -#include <rtl/memory.h> -#include <rtl/ustring.hxx> -#include <qe/XmlIndex.hxx> - - -namespace xmlsearch { - - namespace qe { - - class QueryResults; - class Search; - class ConceptData; - class RoleFiller; - class ContextTables; - - - class QueryHit - { - public: - - QueryHit( sal_Int32 nColumns,double penalty,sal_Int32 doc,sal_Int32 begin,sal_Int32 end ) - : doc_( doc ), - begin_( begin ), - end_( end ), - matchesL_( 2*nColumns ), - matches_( new sal_Int32[ 2*nColumns ] ), - penalty_( penalty ) - { - rtl_zeroMemory( matches_,sizeof( sal_Int32 ) * matchesL_ ); - } - - ~QueryHit() { delete[] matches_; } - - sal_Int32 getDocument() const { return doc_; } - - sal_Int32* getMatches( sal_Int32& matchesL ); - - sal_Int32 countOfMatches() const { return matchesL_; } - - sal_Int32 getBegin() const { return begin_; } - - sal_Int32 getEnd() const { return end_; } - - double getPenalty() const { return penalty_; } - - bool betterThan( const QueryHit* o ) - { - if( penalty_ != o->penalty_ ) - return penalty_ < o->penalty_; - else if( begin_ != o->begin_ ) - return begin_ < o->begin_; - else if( end_ != o->end_ ) - return end_ < o->end_; - else - return false; - } - - bool worseThan( const QueryHit* o ) - { - if( penalty_ != o->penalty_ ) - return penalty_ > o->penalty_; - else if( begin_ != o->begin_ ) - return begin_ > o->begin_; - else if( end_ != o->end_ ) - return end_ > o->end_; - else - return false; - } - - bool worseThan( double penalty,sal_Int32 begin,sal_Int32 end ) - { - if( penalty_ != penalty ) - return penalty_ > penalty; - else if( begin_ != begin ) - return begin_ > begin; - else if( end_ != end ) - return end_ > end; - else - return false; - } - - bool compareTo( const QueryHit* o ) const - { - if( penalty_ != o->penalty_ ) - return penalty_ < o->penalty_; - else if( begin_ != o->begin_ ) - return begin_ < o->begin_; - else if( end_ != o->end_ ) - return end_ < o->end_; - else - return false; - } - - - private: - - sal_Int32 doc_,begin_,end_; - - sal_Int32 matchesL_; - sal_Int32 *matches_; // ...concept, word number, ... - - double penalty_; - - }; // end class QueryHit - - - - class QueryHitData - { - public: - - QueryHitData( double penalty,const rtl::OUString& document,sal_Int32 termsL, rtl::OUString* terms ) - : penalty_( penalty ), - document_( document ), - termsL_( termsL ), - terms_( terms ) { } - - ~QueryHitData() { delete[] terms_; } - - rtl::OUString getDocument() const { return document_; } - - double getPenalty() const { return penalty_; } - - - private: - - double penalty_; - - const rtl::OUString document_; - - sal_Int32 termsL_; - rtl::OUString* terms_; - - }; // end class QueryHitData - - - - class HitStore - { - public: - - HitStore( double, sal_Int32,sal_Int32 ); - - ~HitStore(); - - QueryHit* firstBestQueryHit(); - - QueryHit* nextBestQueryHit(); - - bool goodEnough( double penalty,sal_Int32 begin,sal_Int32 end ); - - QueryHit* createQueryHit( double penalty,sal_Int32 doc,sal_Int32 begin,sal_Int32 end ); - - double getCurrentStandard() { return standard_; } - - - private: - - const sal_Int32 limit_,nColumns_; - - sal_Int32 index_,free_; - - double standard_; - - std::vector< QueryHit* > heap_; - - void heapify( sal_Int32 ); - - void quicksort( sal_Int32 p,sal_Int32 r ); - - sal_Int32 partition( sal_Int32 p,sal_Int32 r ); - }; - - - - class Query - { - public: - - Query( XmlIndex* env, - sal_Int32 nColumns, - sal_Int32 nHits, - sal_Int32 missingPenaltiesL, - double* missingPenalties ); - - virtual ~Query(); - - void missingTerms( sal_Int32 nMissingTerms ); - - virtual void addControlConceptData( Search*,sal_Int32 ) { } - - virtual bool zoned() const { return false; } - - virtual ConceptData* makeConceptData( sal_Int32 col,sal_Int32 concept,double penalty,sal_Int32 queryNo ); - - void getHits( std::vector< QueryHitData* >& data,sal_Int32 nHits ); - - double lookupPenalty( sal_Int32 pattern ) { return penalties_[ pattern ]; } - - RoleFiller* getRoleFillers() { return roleFillerList_; } - - void resetForNextDocument(); - - void saveRoleFillers( RoleFiller* roleFillerList ) { roleFillerList_ = roleFillerList; } - - bool vote(); - - sal_Int32 getNColumns() { return nColumns_; } - - QueryHit* maybeCreateQueryHit( double penalty, - sal_Int32 doc, sal_Int32 begin, sal_Int32 end, sal_Int32 parentContext); - - void setIgnoredElements( const sal_Int32 ignoredElementsL,const rtl::OUString* ignoredElements ); - - double getOutOufOrderPenalty() { return 0.25; } - - double getGapPenalty() { return 0.005; } - - void updateEstimate( sal_Int32 role,double penalty ); - - - protected: - - XmlIndex* env_; - ContextTables* ctx_; - HitStore store_; - - sal_Int32 nHitsRequested_,nColumns_; - double currentStandard_; - - sal_Int32 missingPenaltyL_,upperboundTemplateL_,penaltiesL_; - double *missingPenalty_,*upperboundTemplate_,*penalties_; - - sal_Int32 ignoredElementsL_; - bool *ignoredElements_; - - - private: - - bool vote_; - double missingTermsPenalty_; - - // for use with Start/Stop - - RoleFiller *roleFillerList_; - - void makePenaltiesTable(); - - double computePenalty( sal_Int32 ); - - }; - - - - class PrefixTranslator - { - public: - - static PrefixTranslator* makePrefixTranslator( const rtl::OUString*,sal_Int32 ) - { - return 0; - } - }; - - - - - class QueryResults; - - - - class QueryHitIterator - { - public: - - QueryHitIterator( const QueryResults* result ); - - ~QueryHitIterator(); - - bool next(); - - QueryHitData* getHit( const PrefixTranslator* ) const; - - private: - - bool accessible_; - sal_Int32 index_; - const QueryResults* result_; - }; - - - } - -} - - -#endif +/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: Query.hxx,v $
+ * $Revision: 1.4 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _XMLSEARCH_QE_QUERY_HXX_
+#define _XMLSEARCH_QE_QUERY_HXX_
+
+#include <sal/types.h>
+#include <rtl/memory.h>
+#include <rtl/ustring.hxx>
+#include <vector>
+
+
+namespace xmlsearch {
+
+ namespace qe {
+
+ class Search;
+ class RoleFiller;
+
+ class QueryHit
+ {
+ public:
+
+ QueryHit( sal_Int32 nColumns,double penalty,sal_Int32 doc,sal_Int32 begin,sal_Int32 end )
+ : doc_( doc ),
+ begin_( begin ),
+ end_( end ),
+ matchesL_( 2*nColumns ),
+ matches_( new sal_Int32[ 2*nColumns ] ),
+ penalty_( penalty )
+ {
+ rtl_zeroMemory( matches_,sizeof( sal_Int32 ) * matchesL_ );
+ }
+
+ ~QueryHit() { delete[] matches_; }
+
+ sal_Int32 getDocument() const { return doc_; }
+
+ sal_Int32 countOfMatches() const { return matchesL_; }
+
+ sal_Int32 getBegin() const { return begin_; }
+
+ sal_Int32 getEnd() const { return end_; }
+
+ double getPenalty() const { return penalty_; }
+
+ bool betterThan( const QueryHit* o )
+ {
+ if( penalty_ != o->penalty_ )
+ return penalty_ < o->penalty_;
+ else if( begin_ != o->begin_ )
+ return begin_ < o->begin_;
+ else if( end_ != o->end_ )
+ return end_ < o->end_;
+ else
+ return false;
+ }
+
+ bool worseThan( const QueryHit* o )
+ {
+ if( penalty_ != o->penalty_ )
+ return penalty_ > o->penalty_;
+ else if( begin_ != o->begin_ )
+ return begin_ > o->begin_;
+ else if( end_ != o->end_ )
+ return end_ > o->end_;
+ else
+ return false;
+ }
+
+ bool worseThan( double penalty,sal_Int32 begin,sal_Int32 end )
+ {
+ if( penalty_ != penalty )
+ return penalty_ > penalty;
+ else if( begin_ != begin )
+ return begin_ > begin;
+ else if( end_ != end )
+ return end_ > end;
+ else
+ return false;
+ }
+
+ bool compareTo( const QueryHit* o ) const
+ {
+ if( penalty_ != o->penalty_ )
+ return penalty_ < o->penalty_;
+ else if( begin_ != o->begin_ )
+ return begin_ < o->begin_;
+ else if( end_ != o->end_ )
+ return end_ < o->end_;
+ else
+ return false;
+ }
+
+
+ private:
+
+ sal_Int32 doc_,begin_,end_;
+
+ sal_Int32 matchesL_;
+ sal_Int32 *matches_; // ...concept, word number, ...
+
+ double penalty_;
+
+ }; // end class QueryHit
+
+
+
+ class QueryHitData
+ {
+ public:
+
+ QueryHitData( double penalty,const rtl::OUString& document,sal_Int32 termsL, rtl::OUString* terms )
+ : penalty_( penalty ),
+ document_( document ),
+ termsL_( termsL ),
+ terms_( terms ) { }
+
+ ~QueryHitData() { delete[] terms_; }
+
+ rtl::OUString getDocument() const { return document_; }
+
+ double getPenalty() const { return penalty_; }
+
+
+ private:
+
+ double penalty_;
+
+ const rtl::OUString document_;
+
+ sal_Int32 termsL_;
+ rtl::OUString* terms_;
+
+ }; // end class QueryHitData
+
+
+ class PrefixTranslator
+ {
+ public:
+
+ static PrefixTranslator* makePrefixTranslator( const rtl::OUString*,sal_Int32 )
+ {
+ return 0;
+ }
+ };
+ }
+
+}
+
+
+#endif
diff --git a/xmlhelp/source/cxxhelp/inc/qe/QueryProcessor.hxx b/xmlhelp/source/cxxhelp/inc/qe/QueryProcessor.hxx deleted file mode 100644 index 8e2ef044f7..0000000000 --- a/xmlhelp/source/cxxhelp/inc/qe/QueryProcessor.hxx +++ /dev/null @@ -1,133 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: QueryProcessor.hxx,v $ - * $Revision: 1.3.26.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _XMLSEARCH_QE_QUERYPROCESSOR_HXX_ -#define _XMLSEARCH_QE_QUERYPROCESSOR_HXX_ - -#ifndef INCLUDED_STL_VECTOR -#include <vector> -#define INCLUDED_STL_VECTOR -#endif -#include <rtl/ustring.hxx> -#include <excep/XmlSearchExceptions.hxx> -#include <qe/Query.hxx> -#include <qe/Search.hxx> - - -namespace xmlsearch { - - namespace qe { - - - class QueryStatement - { - public: - - QueryStatement( sal_Int32 nHits, - const std::vector< rtl::OUString >& terms, - const rtl::OUString& scope ) - : nHits_( nHits ), - terms_( terms ), - scope_( scope ) - { - } - - ~QueryStatement() - { - } - - - sal_Int32 getHitCount() const { return nHits_; } - - const std::vector< rtl::OUString >& getTerms() const { return terms_; } - - const rtl::OUString getScope() const { return scope_; } - - - private: - - sal_Int32 nHits_; - std::vector< rtl::OUString > terms_; - rtl::OUString scope_; - - }; - - - - class QueryResults - { - friend class QueryHitIterator; - - public: - - QueryResults( Query*, sal_Int32 ); - - ~QueryResults(); - - QueryHitIterator* makeQueryHitIterator() const - { - return new QueryHitIterator( this ); - } - - - private: - - std::vector< QueryHitData* > queryHits_; - }; - - - - class QueryProcessor - { - public: - - QueryProcessor( const rtl::OUString& installDir ) - throw( xmlsearch::excep::IOException ); - - ~QueryProcessor(); - - QueryResults* processQuery( const QueryStatement& ment ); - - private: - - static const double INFLpenalty; - - Query* processQuery( Search&,const QueryStatement& ); - - QueryResults* makeQueryResults( Query*,sal_Int32 nHits ); - - XmlIndex env_; - }; - - } - -} - - -#endif diff --git a/xmlhelp/source/cxxhelp/inc/qe/Search.hxx b/xmlhelp/source/cxxhelp/inc/qe/Search.hxx deleted file mode 100644 index f569645e0c..0000000000 --- a/xmlhelp/source/cxxhelp/inc/qe/Search.hxx +++ /dev/null @@ -1,116 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: Search.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _XMLSEARCH_QE_SEARCH_HXX_ -#define _XMLSEARCH_QE_SEARCH_HXX_ - - -#ifndef INCLUDED_STL_VECTOR -#include <vector> -#define INCLUDED_STL_VECTOR -#endif -#include <rtl/ref.hxx> -#include <rtl/ustring.hxx> -#include <qe/Query.hxx> -#include <qe/XmlIndex.hxx> -#ifndef _XMLSEARCH_DB_CONTEXTTABLES_HXX_ -#include <qe/ContextTables.hxx> -#endif -#include <qe/ConceptData.hxx> -#include <qe/DocGenerator.hxx> - - -class QueryFactoryImpl; - - -namespace xmlsearch { - - namespace qe { - - - class RoleFiller; - - - class Search - { - public: - - Search( XmlIndex* env ); - ~Search(); - - Query* addQuery( const rtl::OUString& context, - sal_Int32 nValidTerms,sal_Int32 nMissingTerms,sal_Int32 nHits, - double variantPenalty, - const std::vector< sal_Int32 >& primary, - const std::vector< std::vector< sal_Int32 > >& columns ); - - void startSearch(); - - - private: - - XmlIndex* env_; - QueryFactoryImpl* queryFactory_; - NextDocGeneratorHeap nextDocGenHeap_; - GeneratorHeap genHeap_; - ConceptGroupGenerator firstGenerator_; - std::vector< Query* > queries_; - ConceptData** conceptVisitor_; - std::vector< rtl::Reference< ConceptData > > conceptData_; - sal_Int32 free2_,limit_,document_,max_,base_,startingIndex_,nConcepts_; - sal_Int32 *concepts_; - std::vector<sal_Int32> docConcepts_,queryMasks_,maxConcepts_,kTable_,offsets_; - - sal_Int32 dataL_; - sal_Int8 *data_; - - void addTerm( sal_Int32 col,sal_Int32 concept,double score ); - - sal_Int32 partition( sal_Int32 p,sal_Int32 r ); - - void quicksort( sal_Int32 p,sal_Int32 r ); - - void searchDocument(); - - sal_Int32 nextDocument( std::vector< RoleFiller* >& start ) throw( xmlsearch::excep::XmlSearchException ); - - bool openDocumentIndex( sal_Int32 docNo ) throw( xmlsearch::excep::XmlSearchException ); - - ConceptGroupGenerator* makeGenerator( sal_Int32 group ) throw( xmlsearch::excep::XmlSearchException ); //t - - sal_Int32 indexOf( sal_Int32 concept ) throw( xmlsearch::excep::XmlSearchException ); - }; - - - } - -} - - -#endif diff --git a/xmlhelp/source/cxxhelp/inc/qe/XmlIndex.hxx b/xmlhelp/source/cxxhelp/inc/qe/XmlIndex.hxx deleted file mode 100644 index 6626bbabe8..0000000000 --- a/xmlhelp/source/cxxhelp/inc/qe/XmlIndex.hxx +++ /dev/null @@ -1,134 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: XmlIndex.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _XMLSEARCH_QE_XMLINDEX_HXX_ -#define _XMLSEARCH_QE_XMLINDEX_HXX_ - -#ifndef INCLUDED_STL_VECTOR -#include <vector> -#define INCLUDED_STL_VECTOR -#endif -#include <rtl/ustring.hxx> -#include <excep/XmlSearchExceptions.hxx> -#include <qe/ContextTables.hxx> -#include <db/BtreeDict.hxx> -#include <util/IndexAccessor.hxx> - - -namespace xmlsearch { - - namespace qe { - - - class QueryHit; - class QueryHitData; - class NonnegativeIntegerGenerator; - - - class XmlIndex - { - public: - - XmlIndex( const rtl::OUString& indexDir ) - throw( xmlsearch::excep::IOException ); - - ~XmlIndex(); - - ContextTables* getContextInfo() { return contextTables_; } - - - sal_Int32 fetch( const rtl::OUString& key ) const throw( xmlsearch::excep::XmlSearchException ) - { - return dict_.fetch( key ); - } - - rtl::OUString fetch( sal_Int32 key ) const throw( xmlsearch::excep::XmlSearchException ) - { - return dict_.fetch( key ); - } - - std::vector< sal_Int32 > withPrefix( const rtl::OUString& prefix ) const throw( xmlsearch::excep::XmlSearchException ) - { - return dict_.withPrefix( prefix ); - } - - bool occursInText( sal_Int32 concept ); - - void reset(); - - void resetContextSearch() { contextTables_->resetContextSearch(); } - - NonnegativeIntegerGenerator* getDocumentIterator( sal_Int32 concept ); - - rtl::OUString documentName( sal_Int32 docNumber ) throw( xmlsearch::excep::XmlSearchException ); - - QueryHitData* hitToData( QueryHit* ); - - sal_Int8* getPositions( sal_Int32&,sal_Int32 docNo ) throw( xmlsearch::excep::XmlSearchException ); - - sal_Int32 getDocumentIndex( sal_Int32 docNo ) { return microIndexOffsets_[ docNo ] - currentBatchOffset_; } - - - private: - - sal_Int32 currentBatchOffset_,maxDocNumberInCache_; - - xmlsearch::util::IndexAccessor indexAccessor_; - xmlsearch::util::RandomAccessStream* positionsFile_; - xmlsearch::db::BtreeDict dict_; - - ContextTables* contextTables_; - - sal_Int32 allListsL_; - sal_Int8* allLists_; - - bool allInCache_; - sal_Int32 positionsL_; - sal_Int8 *positions_; - - sal_Int32 contextsDataL_; - sal_Int8 *contextsData_; - - sal_Int32 linkNamesL_; - rtl::OUString* linkNames_; - - std::vector< sal_Int32 > concepts_,offsets_,documents_,microIndexOffsets_,titles_,contextsOffsets_; - - void readMicroindexes( sal_Int32 docNo ) throw( xmlsearch::excep::IOException ); - }; - - - } - -} - - - -#endif - diff --git a/xmlhelp/source/cxxhelp/inc/util/ConceptList.hxx b/xmlhelp/source/cxxhelp/inc/util/ConceptList.hxx index 810e5085f2..bbb2997e30 100644 --- a/xmlhelp/source/cxxhelp/inc/util/ConceptList.hxx +++ b/xmlhelp/source/cxxhelp/inc/util/ConceptList.hxx @@ -58,18 +58,6 @@ namespace xmlsearch { void value( sal_Int32 val ) { value_ += val; } - sal_Int32 first() throw( xmlsearch::excep::XmlSearchException ) - { - value_ = 0; - sal_Int32 ret = list_.readNext( k_,this ) ? value_ : END; - return ret; - } - - sal_Int32 next() throw( xmlsearch::excep::XmlSearchException ) - { - return list_.readNext( k_,this) ? value_ : END; - } - private: sal_Int32 k_,value_; diff --git a/xmlhelp/source/cxxhelp/inc/util/DBEnvImpl.hxx b/xmlhelp/source/cxxhelp/inc/util/DBEnvImpl.hxx deleted file mode 100644 index 2f1d644365..0000000000 --- a/xmlhelp/source/cxxhelp/inc/util/DBEnvImpl.hxx +++ /dev/null @@ -1,71 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: DBEnvImpl.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _XMLSEARCH_DB_DBENVIMPL_HXX_ -#define _XMLSEARCH_DB_DBENVIMPL_HXX_ -#endif - - -#include <rtl/ustring.hxx> -#include <db/DBEnv.hxx> -#include <util/RandomAccessStream.hxx> -#include <db/Block.hxx> -#include <util/IndexAccessor.hxx> - -namespace xmlsearch { - - namespace util { - - - class DBEnvImpl - : public xmlsearch::db::DBEnv - { - public: - - DBEnvImpl( const IndexAccessor& indexDir ); - virtual ~DBEnvImpl(); - - virtual sal_Int32 getEntryHeaderLen() const; - virtual sal_Int32 getBlockCount() const; - virtual sal_Int32 getMaximumBlockCount() const; - virtual sal_Int32 getDataLen() const; - virtual sal_Int32 getBlockLen() const; - virtual void read( sal_Int32 blNum,xmlsearch::db::Block*& block ) const; - virtual void write( sal_Int32 blNum,xmlsearch::db::Block* block ); - - - private: - - xmlsearch::util::RandomAccessStream* file_; - }; - - - } - -} diff --git a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx index 3b8a3c1168..19ec1e726f 100644 --- a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx +++ b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx @@ -60,35 +60,17 @@ namespace xmlsearch { virtual sal_Int32 getNextByte() = 0; - sal_Int32 read( sal_Int32 kBits ) throw( xmlsearch::excep::XmlSearchException ); - - sal_Int32 ascendingDecode( sal_Int32 k,sal_Int32 start,sal_Int32 *concepts ) - throw( xmlsearch::excep::XmlSearchException ); - - void ascDecode( sal_Int32 k,std::vector< sal_Int32 >& array) throw( xmlsearch::excep::XmlSearchException ); - - void decode(sal_Int32 k, sal_Int32* array ) throw( xmlsearch::excep::XmlSearchException ); - - void decode( sal_Int32 k,std::vector< sal_Int32 >& array) throw( xmlsearch::excep::XmlSearchException ); - virtual void initReading() { toRead_ = 0; } - bool readNext( sal_Int32 k,CompressorIterator* it) throw( xmlsearch::excep::XmlSearchException ); - private: static const sal_Int32 BitsInByte; static const sal_Int32 NBits; sal_Int32 readByte_, toRead_, path_; - - sal_Int32 read() throw( xmlsearch::excep::XmlSearchException ); - - sal_Int32 countZeroes() throw( xmlsearch::excep::XmlSearchException ); - }; diff --git a/xmlhelp/source/cxxhelp/inc/util/IndexAccessor.hxx b/xmlhelp/source/cxxhelp/inc/util/IndexAccessor.hxx deleted file mode 100644 index 55ca0534ab..0000000000 --- a/xmlhelp/source/cxxhelp/inc/util/IndexAccessor.hxx +++ /dev/null @@ -1,90 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: IndexAccessor.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _XMLSEARCH_UTIL_INDEXACCESSOR_HXX_ -#define _XMLSEARCH_UTIL_INDEXACCESSOR_HXX_ - - -#include <rtl/ustring.hxx> -#include <excep/XmlSearchExceptions.hxx> - -namespace xmlsearch { - - namespace util { - - class RandomAccessStream; - - class IndexAccessor - { - public: - - enum ACCESSKIND { READ, - WRITE, - READWRITE }; - - - IndexAccessor( const rtl::OUString& dirName ) - { - if( dirName.getLength() ) - if( dirName.getStr()[dirName.getLength()-1] != sal_Unicode( '/' ) ) - dirName_ = ( dirName + rtl::OUString::createFromAscii( "/" ) ) ; - else - dirName_ = dirName; - } - - - ~IndexAccessor() - { - } - - - IndexAccessor( const IndexAccessor& accessor ) - { - dirName_ = accessor.dirName_; - } - - - RandomAccessStream* getStream( const rtl::OUString& fileName, - const rtl::OUString& how ) const; - - - sal_Int32 readByteArray( sal_Int8*& data, const rtl::OUString& fileName ) - throw( xmlsearch::excep::IOException ); - - private: - - rtl::OUString dirName_; - - }; - - } -} - - -#endif diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 7ec8db82c3..386329a9a8 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -1062,7 +1062,8 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja } Reference< XHierarchicalNameAccess > Databases::findJarFileForPath - ( const rtl::OUString& jar, const rtl::OUString& Language, const rtl::OUString& path ) + ( const rtl::OUString& jar, const rtl::OUString& Language, + const rtl::OUString& path, rtl::OUString* o_pExtensionPath ) { Reference< XHierarchicalNameAccess > xNA; if( ! jar.getLength() || @@ -1074,7 +1075,7 @@ Reference< XHierarchicalNameAccess > Databases::findJarFileForPath JarFileIterator aJarFileIt( m_xContext, *this, jar, Language ); Reference< XHierarchicalNameAccess > xTestNA; Reference< deployment::XPackage > xParentPackageBundle; - while( (xTestNA = aJarFileIt.nextJarFile( xParentPackageBundle )).is() ) + while( (xTestNA = aJarFileIt.nextJarFile( xParentPackageBundle, o_pExtensionPath )).is() ) { if( xTestNA.is() && xTestNA->hasByHierarchicalName( path ) ) { @@ -1663,7 +1664,7 @@ rtl::OUString KeyDataBaseFileIterator::implGetDbFileFromPackage // class JarFileIterator Reference< XHierarchicalNameAccess > JarFileIterator::nextJarFile - ( Reference< deployment::XPackage >& o_xParentPackageBundle ) + ( Reference< deployment::XPackage >& o_xParentPackageBundle, rtl::OUString* o_pExtensionPath ) { Reference< XHierarchicalNameAccess > xNA; @@ -1687,6 +1688,8 @@ Reference< XHierarchicalNameAccess > JarFileIterator::nextJarFile break; xNA = implGetJarFromPackage( xHelpPackage ); + if( xNA.is() && o_pExtensionPath != NULL ) + *o_pExtensionPath = xHelpPackage->getURL(); break; } @@ -1697,6 +1700,8 @@ Reference< XHierarchicalNameAccess > JarFileIterator::nextJarFile break; xNA = implGetJarFromPackage( xHelpPackage ); + if( xNA.is() && o_pExtensionPath != NULL ) + *o_pExtensionPath = xHelpPackage->getURL(); break; } case END_REACHED: diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index f2ac185bc4..9abbadf30c 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -271,8 +271,8 @@ namespace chelp { const rtl::OUString& Language ); com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > - findJarFileForPath( const rtl::OUString& jar, - const rtl::OUString& Language, const rtl::OUString& path ); + findJarFileForPath( const rtl::OUString& jar, const rtl::OUString& Language, + const rtl::OUString& path, rtl::OUString* o_pExtensionPath = NULL ); /** * Maps a given language-locale combination to language. @@ -533,7 +533,8 @@ namespace chelp { {} com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > - nextJarFile( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); + nextJarFile( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle, + rtl::OUString* o_pExtensionPath = NULL ); private: com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx index b6b9ab505b..0035c4fdf9 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx @@ -37,7 +37,6 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/script/XInvocation.hpp> -#include <qe/QueryProcessor.hxx> #ifndef INCLUDED_STL_ALGORITHM #include <algorithm> #define INCLUDED_STL_ALGORITHM @@ -47,6 +46,8 @@ #define INCLUDED_STL_SET #endif +#include <qe/Query.hxx>
+#include <qe/DocGenerator.hxx>
#include "resultsetforquery.hxx" #include "databases.hxx" diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index cb77a97e7e..4fac24adfd 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -992,55 +992,65 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, RTL_TEXTENCODING_UTF8 ) + rtl::OString('\''); } - rtl::OString aPureExtensionId; - rtl::OString aExpandedExtensionPath; - if( !aPureProgramm.getLength() ) + // Do we need to add extension path? + ::rtl::OUString aExtensionPath; + rtl::OUString aJar = urlParam->get_jar(); + + bool bAddExtensionPath = false;
+ sal_Int32 nQuestionMark1 = aJar.indexOf( sal_Unicode('?') ); + sal_Int32 nQuestionMark2 = aJar.lastIndexOf( sal_Unicode('?') ); + if( nQuestionMark1 != -1 && nQuestionMark2 != -1 && nQuestionMark1 != nQuestionMark2 ) { - // Extension jar file? Search for ? - rtl::OUString aJar = urlParam->get_jar(); - sal_Int32 nQuestionMark1 = aJar.indexOf( sal_Unicode('?') ); - sal_Int32 nQuestionMark2 = aJar.lastIndexOf( sal_Unicode('?') ); - if( nQuestionMark1 != -1 && nQuestionMark2 != -1 && nQuestionMark1 != nQuestionMark2 ) - { - // ExtensionPath - ::rtl::OUString aExtensionPath = aJar.copy( nQuestionMark1 + 1, nQuestionMark2 - nQuestionMark1 - 1 ); - - Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); - Reference< XPropertySet > xProps( xFactory, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - Reference< XComponentContext > xContext; - if (xProps.is()) - { - xProps->getPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xContext; - } - if( !xContext.is() ) - { - throw RuntimeException( - ::rtl::OUString::createFromAscii( "InputStreamTransformer::InputStreamTransformer(), no XComponentContext" ), - Reference< XInterface >() ); - } + aExtensionPath = aJar.copy( nQuestionMark1 + 1, nQuestionMark2 - nQuestionMark1 - 1 ); + bAddExtensionPath = true; + } + else + { + // Path not yet specified, search directly + Reference< XHierarchicalNameAccess > xNA = pDatabases->findJarFileForPath + ( aJar, urlParam->get_language(), urlParam->get_path(), &aExtensionPath ); + if( xNA.is() && aExtensionPath.getLength() ) + bAddExtensionPath = true; + } - rtl::OUString aOUExpandedExtensionPath = Databases::expandURL( aExtensionPath, xContext ); - aExpandedExtensionPath = rtl::OUStringToOString( aOUExpandedExtensionPath, osl_getThreadTextEncoding() ); - - // Add extension language part - rtl::OString aExtensionLanguage = aPureLanguage; - if( aExtensionLanguage.getLength() > 2 ) - aExtensionLanguage = aExtensionLanguage.copy( 0, 2 ); - aExpandedExtensionPath += rtl::OString('/'); - aExpandedExtensionPath += aExtensionLanguage; - parString[last++] = "ExtensionPath"; - parString[last++] = rtl::OString('\'') + aExpandedExtensionPath + rtl::OString('\''); - - // ExtensionId - sal_Int32 iSlash = aPath.indexOf( '/' ); - if( iSlash != -1 ) - aPureExtensionId = aPath.copy( 0, iSlash ); - - parString[last++] = "ExtensionId"; - parString[last++] = rtl::OString('\'') + aPureExtensionId + rtl::OString('\''); + if( bAddExtensionPath ) + { + Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); + Reference< XPropertySet > xProps( xFactory, UNO_QUERY ); + OSL_ASSERT( xProps.is() ); + Reference< XComponentContext > xContext; + if (xProps.is()) + { + xProps->getPropertyValue( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xContext; } + if( !xContext.is() ) + { + throw RuntimeException( + ::rtl::OUString::createFromAscii( "InputStreamTransformer::InputStreamTransformer(), no XComponentContext" ), + Reference< XInterface >() ); + } + + rtl::OUString aOUExpandedExtensionPath = Databases::expandURL( aExtensionPath, xContext ); + rtl::OString aExpandedExtensionPath = rtl::OUStringToOString( aOUExpandedExtensionPath, osl_getThreadTextEncoding() ); + + // Add extension language part + rtl::OString aExtensionLanguage = aPureLanguage; + if( aExtensionLanguage.getLength() > 2 ) + aExtensionLanguage = aExtensionLanguage.copy( 0, 2 ); + aExpandedExtensionPath += rtl::OString('/'); + aExpandedExtensionPath += aExtensionLanguage; + parString[last++] = "ExtensionPath"; + parString[last++] = rtl::OString('\'') + aExpandedExtensionPath + rtl::OString('\''); + + // ExtensionId + rtl::OString aPureExtensionId; + sal_Int32 iSlash = aPath.indexOf( '/' ); + if( iSlash != -1 ) + aPureExtensionId = aPath.copy( 0, iSlash ); + + parString[last++] = "ExtensionId"; + parString[last++] = rtl::OString('\'') + aPureExtensionId + rtl::OString('\''); } for( int i = 0; i < last; ++i ) diff --git a/xmlhelp/source/cxxhelp/qe/ConceptData.cxx b/xmlhelp/source/cxxhelp/qe/ConceptData.cxx deleted file mode 100644 index 779a6e5f5b..0000000000 --- a/xmlhelp/source/cxxhelp/qe/ConceptData.cxx +++ /dev/null @@ -1,105 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: ConceptData.cxx,v $ - * $Revision: 1.8 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_xmlhelp.hxx" -#include <qe/ConceptData.hxx> -#include <qe/Query.hxx> -#include <qe/DocGenerator.hxx> - - -using namespace xmlsearch::qe; - - -const sal_Int32 ConceptData::ProxPerTerm = 10; - - -ConceptData::ConceptData( sal_Int32 id, - sal_Int32 role, - double score, - sal_Int32 queryNo, - sal_Int32 nColumns, - ContextTables* contextTables ) - : queryNo_( sal_uInt8( queryNo & 0xF ) ), - nColumns_( sal_uInt8( nColumns & 0xF ) ), - role_( sal_uInt8( role & 0xF ) ), - concept_( id ), - proximity_( nColumns * ProxPerTerm ), - penalty_( score ), - m_nRefcount( 0 ), - ctx_( contextTables ), - next_( 0 ) -{ -} - - -ConceptData::~ConceptData() -{ -} - - -void ConceptData::runBy( std::vector< Query* >& queries ) -{ - rtl::Reference< ConceptData > cd( this ); - do - { - Query* query = queries[ cd->queryNo_ ]; - query->updateEstimate( cd->role_,cd->penalty_ ); - } - while( (cd = cd->next_).is() ); -} - - -void ConceptData::addLast( ConceptData* r ) -{ - if( next_.is() ) - next_->addLast( r ); - else - next_ = r; -} - - -void ConceptData::generateFillers( std::vector< RoleFiller* >& array, sal_Int32 pos ) -{ - if( array[ queryNo_ ] != RoleFiller::STOP() ) // not 'prohibited' - { - sal_Int32 wcl = ctx_->wordContextLin( pos ); - roleFillers_.push_back( new RoleFiller( nColumns_, - this, - role_, - pos, - wcl, - pos + proximity_ ) ); - roleFillers_.back()->use( array, queryNo_ ); - } - // !!! maybe eliminate tail recursion - if( next_.is() ) - next_->generateFillers( array,pos ); -} diff --git a/xmlhelp/source/cxxhelp/qe/ContextTables.cxx b/xmlhelp/source/cxxhelp/qe/ContextTables.cxx deleted file mode 100644 index b52e6dfaea..0000000000 --- a/xmlhelp/source/cxxhelp/qe/ContextTables.cxx +++ /dev/null @@ -1,572 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: ContextTables.cxx,v $ - * $Revision: 1.10 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_xmlhelp.hxx" - -#ifndef _rtl_MEMORY_H_ -#include <rtl/memory.h> -#endif -#include <qe/ContextTables.hxx> -#ifndef _XMLSEARCH_UTIL_BYTEARRAYDECOMPRESSOR_HXX_ -#include <util/Decompressor.hxx> -#endif - -using namespace xmlsearch; -using namespace xmlsearch::qe; - - - -Tables::Tables( ContextTables* p ) - : initialWordsCached_( new sal_Int32[ initialWordsCachedL_ = p->initialWordsL_ ] ), - destsCached_( new sal_Int32[ destsCachedL_ = p->destsL_ ] ), - linkTypesCached_( new sal_Int32[ linkTypesCachedL_ = p->linkTypesL_ ] ), - seqNumbersCached_( new sal_Int32[ seqNumbersCachedL_ = p->seqNumbersL_ ] ) -{ - rtl_copyMemory( (void*)initialWordsCached_, - (void*)p->initialWords_, - sizeof(sal_Int32) * p->initialWordsL_ ); - - rtl_copyMemory( (void*)destsCached_, - (void*)p->dests_, - sizeof(sal_Int32) * p->destsL_ ); - - rtl_copyMemory( (void*)linkTypesCached_, - (void*)p->linkTypes_, - sizeof(sal_Int32) * p->linkTypesL_ ); - - rtl_copyMemory( (void*)seqNumbersCached_, - (void*)p->seqNumbers_, - sizeof(sal_Int32) * p->seqNumbersL_ ); -} - - - -Tables::~Tables() -{ - delete[] seqNumbersCached_; - delete[] linkTypesCached_; - delete[] destsCached_; - delete[] initialWordsCached_; -} - - - -void Tables::setTables( ContextTables* p ) -{ - delete[] p->initialWords_; - p->initialWordsL_ = initialWordsCachedL_; - p->initialWords_ = initialWordsCached_; - initialWordsCached_ = 0; - - delete[] p->dests_; - p->destsL_ = destsCachedL_; - p->dests_ = destsCached_; - destsCached_ = 0; - - delete[] p->linkTypes_; - p->linkTypesL_ = linkTypesCachedL_; - p->linkTypes_ = linkTypesCached_; - linkTypesCached_ = 0; - - delete[] p->seqNumbers_; - p->seqNumbersL_ = seqNumbersCachedL_; - p->seqNumbers_ = seqNumbersCached_; - seqNumbersCached_ = 0; - - p->nTextNodes_ = initialWordsCachedL_; -} - - - - -ContextTables::ContextTables( const std::vector< sal_Int32 >& offsets, - sal_Int32 contextDataL,sal_Int8 *contextData, - sal_Int32 linkNamesL,rtl::OUString *linkNames ) - : lastDocNo_( -1 ), - initialWordsL_( 0 ), - destsL_( 0 ), - linkTypesL_( 0 ), - seqNumbersL_( 0 ), - markersL_( 0 ), - initialWords_( 0 ), - dests_( 0 ), - linkTypes_( 0 ), - seqNumbers_( 0 ), - markers_( 0 ), - contextDataL_( contextDataL ), - contextData_( contextData ), - linkNamesL_( linkNamesL ), - linkNames_( linkNames ), - cache_( offsets.size() ), - kTable_( 5 ), - auxArray_( 4096 ), - offsets_( offsets ) -{ - for( sal_uInt32 i = 0; i < offsets_.size(); ++i ) - cache_[i] = 0; -} - - - -ContextTables::~ContextTables() -{ - delete[] markers_; - delete[] seqNumbers_; - delete[] linkTypes_; - delete[] dests_; - delete[] initialWords_; - - for( sal_uInt32 i = 0; i < cache_.size(); ++i ) - delete cache_[i]; -} - - - -void ContextTables::setMicroindex( sal_Int32 docNo ) throw( excep::XmlSearchException ) -{ - if( docNo != lastDocNo_ ) - { // check if we need to do anything - if( cache_[ docNo ] ) - cache_[ docNo ]->setTables( this ); - else - { - sal_Int32 offset = offsets_[ docNo ]; - sal_Int32 k0 = contextData_[ offset ] & 0xFF; - util::ByteArrayDecompressor compr( contextDataL_,contextData_,offset + 1 ); - kTable_.clear(); - compr.decode( k0,kTable_ ); - // decompress initialWords into auxiliary array - auxArray_.clear(); - compr.ascDecode( kTable_[0],auxArray_ ); // _initialWords - - delete[] initialWords_; - initialWords_ = new sal_Int32[ initialWordsL_ = auxArray_.size() ]; - sal_Int32 k; - for( k = 0; k < initialWordsL_; ++k ) //?opt - initialWords_[k] = auxArray_[k]; - - nTextNodes_ = initialWordsL_; - // decompress destinations into auxiliary array - auxArray_.clear(); - compr.decode( kTable_[1],auxArray_ ); // _dests - auxArray_.push_back( -1 ); // sentinel, root - - delete[] dests_; - dests_ = new sal_Int32[ destsL_ = auxArray_.size() ]; - for( k = 0; k < destsL_; ++k ) //?opt - dests_[k] = auxArray_[k]; - - delete[] linkTypes_; - linkTypes_ = new sal_Int32[ linkTypesL_ = destsL_ - nTextNodes_ - 1 ]; - compr.decode( kTable_[2],linkTypes_ ); - - delete[] seqNumbers_; - seqNumbers_ = new sal_Int32[ seqNumbersL_ = destsL_ - 1 ]; - compr.decode( kTable_[ 3 ],seqNumbers_ ); - - cache_[docNo] = new Tables( this ); - } - - lastDocNo_ = docNo; - delete[] markers_; - markers_ = new sal_Int32[ markersL_ = destsL_ ]; - } - initialWordsIndex_ = 0; -} - - - -sal_Int32 ContextTables::linkCode( const rtl::OUString& linkName_ ) -{ - for( sal_Int32 i = 0; i < linkNamesL_; ++i ) - if( linkName_ == linkNames_[i] ) - return i; - return -1; // when not found -} - - -bool* ContextTables::getIgnoredElementsSet( sal_Int32& len, - const sal_Int32 ignoredElementsL, - const rtl::OUString* ignoredElements ) -{ - bool *result = 0; - if( ignoredElements && ignoredElementsL > 0 ) - { - for( sal_Int32 i = 0; i < ignoredElementsL; ++i ) - { - sal_Int32 code = linkCode( ignoredElements[i] ); - if( code > -1 ) - { - if( ! result ) - result = new bool[ len = linkNamesL_ ]; - - result[ code ] = true; - } - } - } - return result; -} - - - -bool ContextTables::notIgnored( sal_Int32 ctx, - sal_Int32 ignoredElementsL,bool* ignoredElements ) -{ - (void)ignoredElementsL; - - do - { - if( ignoredElements[ linkTypes_[ ctx ] ] ) - return false; - } - while( ( ctx = dests_[ ctx ] ) > -1 ); // parentContext 'hand inlined' - return true; -} - - -/* - * starting with ctx and going up the ancestry tree look for the first - * context with the given linkCode - */ - -sal_Int32 ContextTables::firstParentWithCode( const sal_Int32 pos,const sal_Int32 linkCode_ ) -{ - sal_Int32 ctx = dests_[ wordContextLin(pos) ]; // first parent of text node - const sal_Int32 shift = nTextNodes_; - const sal_Int32 limit = destsL_ - 1; - while( linkTypes_[ ctx - shift ] != linkCode_ ) - if( ( ctx = dests_[ ctx ] ) == limit ) - return -1; - return ctx; -} - - -void ContextTables::resetContextSearch() -{ - initialWordsIndex_ = 0; -} - - -sal_Int32 ContextTables::wordContextLin(sal_Int32 wordNumber) -{ - for (sal_Int32 i = initialWordsIndex_; i < nTextNodes_; ++i ) - if (initialWords_[i] > wordNumber) - { // first such i - // - 1 if wordNumbers can be the same - initialWordsIndex_ = i; // cached to speed up next search - return i - 1; - } - return nTextNodes_ - 1; -} - - -// void ContextTables::appendSegment( sal_Int32 context,rtl::OUStringBuffer& result ) -// { -// result.append( context < nTextNodes_ ? -// rtl::OUString::createFromAscii( "text()" ) : -// linkNames_[ linkTypes_[ context - nTextNodes_ ] ] ); -// result.append(sal_Unicode( '[' ) ); -// result.append( seqNumbers_[ context ] ); -// result.append(sal_Unicode( "]/" ) ); -// } - - -// /* -// * XPath (forking) location of the hit -// */ - -// void ContextTables::hitLocation( sal_Int32 termsL,rtl::OUString* terms, -// sal_Int32 matchesL,sal_Int32* matches, -// StringBuffer& result ) -// { -// const sal_Int32 N = termsL; -// std::vector< sal_Int32 > stacks( N ); -// sal_Int32* wordNumbers = new sal_Int32[N]; -// std::vector< sal_Int32 > stack; -// sal_Int32 lastInitialWordIndex = -1; -// sal_Int32 pattern = 0,context = 0,nPopped = 0,pathStart = 0,pathEnd = 0; -// for( sal_Int32 i = 0,marker = 1; i < N; i++,marker <<= 1 ) -// if ( terms[i] ) -// { -// const sal_Int32 wordNumber = matches[i*2 + 1]; -// const sal_Int32 initialWordIndex = findIndexBin(wordNumber); -// wordNumbers[i] = wordNumber - initialWords_[initialWordIndex] + 1; -// if( initialWordIndex == lastInitialWordIndex ) // save work -// ; // do nothing, path will be reused -// else -// { -// pattern |= marker; -// stack = stacks[i] = new IntegerArray(); - -// context = initialWordIndex; -// do -// { -// const sal_Int32 parent = dests_[context]; -// if( parent != -1 ) -// { -// stack.add( context ); -// markers_[context] |= marker; -// context = parent; -// } -// else -// break; -// } -// while( true ); -// lastInitialWordIndex = initialWordIndex; -// } -// } - -// // find and output common path -// // process first non-missing match - -// sal_Int32 i = 0, marker = 1, nMissing = 0; - -// // find first non-missing matching term -// // there has to be at least one if the hit was built -// // count potential leading missing terms to output appropriate elements -// // before outputting elements for matches - -// for ( ; i < N; i++,marker <<= 1 ) -// if (terms[i] != null) -// { -// result.append( rtl::OUString::createFromAscii( "<Matches path=\"" ) ); -// stack = stacks[i]; -// while (stack.size() > 0) -// { -// context = stack.popLast(); -// if ( markers_[context] == pattern ) -// { -// markers_[context] = 0; -// appendSegment( context,result ); // belongs to common -// context = -1; // used -// ++nPopped; -// } -// else -// break; -// } -// // end of 'matches' && common path -// result.append("\">"); -// // output elements for any leading missingTerms -// while (--nMissing >= 0) -// result.append("<MissingTerm/>"); - -// result.append("<Match term=\""); -// result.append(terms[i]); -// result.append("\" path=\""); -// pathStart = result.getLength(); -// if (context != -1) -// { -// appendSegment(context, result); -// markers_[context] = 0; -// } -// while (stack.size() > 0 ) -// { -// context = stack.popLast(); -// appendSegment(context, result); -// markers_[context] = 0; -// } - -// pathEnd = result.length(); - -// result.append("\" tokenNumber=\""); -// result.append(wordNumbers[i]); -// result.append("]\"/>"); - -// break; // just the first non-zero -// } -// else -// ++nMissing; // only count leading missing terms - -// // process the remaining matches -// for (i++, marker <<= 1 ; i < N; i++, marker <<= 1) -// if (terms[i] != null) { -// result.append("<Match term=\""); -// result.append(terms[i]); -// result.append("\" path=\""); -// stack = stacks[i]; -// if (stack == null) // reuse previously generated path -// result.append(result.substring(pathStart, pathEnd)); -// else { -// stack.pop(nPopped); -// pathStart = result.length(); -// while (stack.cardinality() > 0) { -// context = stack.popLast(); -// appendSegment(context, result); -// _markers[context] = 0; -// } -// pathEnd = result.length(); -// } -// result.append("\" tokenNumber=\""); -// result.append(wordNumbers[i]); -// result.append("]\"/>"); -// } -// else -// result.append("<MissingTerm/>"); -// result.append("</Matches>"); -// } - - -// /* -// * QueryHitData is initialized in the caller -// * this function fills the commonPath for all matching terms -// * and relative paths for the individual terms -// */ - -// void ContextTables::hitLocation(String[] terms, sal_Int32[] matches, QueryHitData data) { -// StringBuffer buffer = new StringBuffer(512); -// const sal_Int32 N = terms.length; -// IntegerArray[] stacks = new IntegerArray[N]; -// sal_Int32[] wordNumbers = new sal_Int32[N]; -// IntegerArray stack; -// sal_Int32 lastInitialWordIndex = -1; -// sal_Int32 pattern = 0, nPopped = 0, pathStart = 0, pathEnd = 0; -// for (sal_Int32 i = 0, marker = 1; i < N; i++, marker <<= 1) -// if (terms[i] != null) { -// const sal_Int32 wordNumber = matches[i*2 + 1]; -// const sal_Int32 initialWordIndex = findIndexBin(wordNumber); -// wordNumbers[i] = wordNumber - _initialWords[initialWordIndex] + 1; -// if (initialWordIndex == lastInitialWordIndex) // save work -// ; // do nothing, path will be reused -// else { -// pattern |= marker; -// stack = stacks[i] = new IntegerArray(); -// for (sal_Int32 ctx = initialWordIndex;;) { -// const sal_Int32 parent = _dests[ctx]; -// if (parent != -1) { -// stack.add(ctx); -// _markers[ctx] |= marker; -// ctx = parent; -// } -// else -// break; -// } -// lastInitialWordIndex = initialWordIndex; -// } -// } -// // find and output common path -// // process first match -// StringBuffer path = new StringBuffer(256); -// String previousPath = null; // we may be copying subpaths from it -// sal_Int32 i = 0, marker = 1; -// for ( ; i < N; i++, marker <<= 1) -// if (terms[i] != null) { -// sal_Int32 context = 0; -// stack = stacks[i]; -// while (stack.cardinality() > 0) { -// context = stack.popLast(); -// if (_markers[context] == pattern) { -// _markers[context] = 0; -// appendSegment(context, path); // belongs to common -// context = -1; // used -// ++nPopped; -// } -// else -// break; -// } -// data.setCommonPath(path.toString()); -// // end of 'matches' && common path -// path.setLength(0); // will now be used for relative paths -// pathStart = 0; -// if (context != -1) { -// appendSegment(context, path); -// _markers[context] = 0; -// } -// while (stack.cardinality() > 0) { -// context = stack.popLast(); -// appendSegment(context, path); -// _markers[context] = 0; -// } -// pathEnd = path.length(); -// data.setMatchLocation(i, previousPath = path.toString(), wordNumbers[i]); -// break; // just the first non-zero -// } - -// // process the remaining matches -// for (i++, marker <<= 1 ; i < N; i++, marker <<= 1) -// if (terms[i] != null) { -// path.setLength(0); -// stack = stacks[i]; -// if (stack == null) // reuse previously generated path -// path.append(previousPath.substring(pathStart, pathEnd)); -// else { -// stack.pop(nPopped); -// pathStart = path.length(); -// while (stack.cardinality() > 0) { -// const sal_Int32 context = stack.popLast(); -// appendSegment(context, path); -// _markers[context] = 0; -// } -// pathEnd = path.length(); -// } -// data.setMatchLocation(i, previousPath = path.toString(), wordNumbers[i]); -// } -// } - -// private sal_Int32 ContextTables::findIndexBin(const sal_Int32 wordNumber) { -// sal_Int32 i = 0, j = _nTextNodes - 1; -// while (i <= j) { -// const sal_Int32 k = (i + j) >>> 1; -// if (_initialWords[k] < wordNumber) -// i = k + 1; -// else if (_initialWords[k] > wordNumber) -// j = k - 1; -// else -// return k; -// } -// return i - 1; -// } - - /* - public void addGoverningFiller(int query, RoleFiller rf, int parent) { - // !!! for now assume just one query - GoverningContext gc = null; - if (_governingContexts[parent] == null) { - // find parent governing context - for (int c = _dests[parent]; ; c = _dests[c]) - if (_governingContexts[c] != null || c == 0) { - // System.out.println("parent found at " + c); - gc = new GoverningContext(c, rf); - break; - } - } - else - gc = new GoverningContext(_governingContexts[parent], rf); - _governingContexts[parent] = gc; - } - */ - - - - - - - - diff --git a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx index 61fb87f950..0e8413ea2d 100644 --- a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx +++ b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx @@ -1,493 +1,64 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: DocGenerator.cxx,v $ - * $Revision: 1.10 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_xmlhelp.hxx" -#include <qe/DocGenerator.hxx> -#include <qe/Query.hxx> - - -using namespace xmlsearch; -using namespace xmlsearch::qe; - - -const sal_Int32 NonnegativeIntegerGenerator::END = -1; -const sal_Int32 ConceptGroupGenerator::NConceptsInGroup = 16; -const sal_Int32 ConceptGroupGenerator::BitsInLabel = 4; - - -RoleFiller RoleFiller::roleFiller_; - - -RoleFiller::RoleFiller() - : m_nRefcount( 0 ), - fixedRole_( 0 ), - filled_( 0 ), - begin_( 0 ), - end_( 0 ), - parentContext_( 0 ), - limit_( 0 ), - next_( 0 ), - fillers_( 0 ), - conceptData_( 0 ) -{ -} - - -RoleFiller::RoleFiller( sal_Int32 nColumns, - ConceptData* first, - sal_Int32 role, - sal_Int32 pos, - sal_Int32 parentContext, - sal_Int32 limit ) - : m_nRefcount( 0 ), - fixedRole_( sal_uInt8( role & 0xF ) ), // primary/constitutive concept/role - next_( 0 ), - fillers_( nColumns ), - conceptData_( first ) -{ - filled_ = sal_Int16( 1 << fixedRole_ ); - begin_ = pos; // offset in file - // _end = _begin + first.getConceptLength(); - end_ = begin_ + 1; - limit_ = limit; - parentContext_ = parentContext; - next_ = 0; - for( sal_uInt32 i = 0; i < fillers_.size(); ++i ) - fillers_[i] = 0; - fillers_[ role ] = this; -} - - -RoleFiller::~RoleFiller() -{ - -} - - -void RoleFiller::scoreList( Query* query,sal_Int32 document ) -{ - sal_Int32 nColumns = query->getNColumns(); - RoleFiller* candidateHit = this; // function called for the head of list - RoleFiller* next; // lookahead: if overlap, if so, is it better - - // 'candidateHit' always points at the current candidate to be converted to a QueryHit - // 'penalty' is its penalty - // 'next' is used to explore earlier overlapping fillers - // the decision to emit a QueryHit is made when either there's no next - // or next doesn't overlap the current candidate - // the loop's logic makes sure that at emit time there's no better/earlier filler - // to overlap with the candidate - - double penalty_ = candidateHit->penalty( query,nColumns ); - - for( next = candidateHit->next_; next; next = next->next_ ) - if( next->end_ < candidateHit->begin_ ) - { // no overlap - candidateHit->makeQueryHit( query,document,penalty_ ); - candidateHit = next; - penalty_ = candidateHit->penalty( query,nColumns ); - } - else - { // !!! can be computed in two steps - double penalty2 = next->penalty( query,nColumns ); - if( penalty2 <= penalty_ ) - { // prefer next, disregard candidateHit - penalty_ = penalty2; - candidateHit = next; - } - } - candidateHit->makeQueryHit(query,document,penalty_); -} - - - - -void RoleFiller::makeQueryHit( Query* query,sal_Int32 doc,double penalty_ ) -{ - QueryHit* hit = query->maybeCreateQueryHit( penalty_,doc, - begin_,end_,parentContext_ ); - if( hit ) - { - sal_Int32 N; - sal_Int32* matches = hit->getMatches( N ); - N /= 2; - - for( sal_Int32 i = 0,j = 0; i < N; ++i ) - if( filled_ & 1 << i ) - { - matches[ j++ ] = fillers_[ i ]->getConcept(); - matches[ j++ ] = fillers_[ i ]->begin_; - } - else - j += 2; - } -} - - - -sal_Int32 RoleFiller::getConcept() -{ - return conceptData_->getConcept(); -} - - - -void RoleFiller::use( std::vector< RoleFiller*>& place,sal_Int32 query ) -{ - RoleFiller* rf = place[ query ]; - if( rf ) - { - place[ query ] = this; // put at the head of list - next_ = rf; - while( rf->limit_ >= begin_ ) - { - // check if we can grow/improve a hit - // we don't ever replace filler's fixed role - if( fixedRole_ != rf->fixedRole_ && - // in same parent context eg. PARA - rf->parentContext_ == parentContext_ ) - { - if( ( rf->filled_ & ( 1 << fixedRole_ ) ) == 0 ) - { - // not filled yet - rf->filled_ |= 1 << fixedRole_; - rf->fillers_[ fixedRole_ ] = this; - rf->end_ = end_; - } - else - rf->considerReplacementWith( this ); - } - - if( rf->next_ ) - rf = rf->next_; - else - return; - } - } - else - place[query] = this; -} - - -void RoleFiller::considerReplacementWith( RoleFiller* replacement ) -{ - // !!! simplistic for now - // needs gap and out of order - sal_Int32 role = replacement->fixedRole_; - if( replacement->getScore() > fillers_[role]->getScore() ) - fillers_[ role ] = replacement; -} - - - -double RoleFiller::penalty( Query* query,sal_Int32 nColumns ) -{ - sal_Int32 length = end_ - begin_ + 1; - double penalty_ = query->lookupPenalty( filled_ ); - // !!! here is a chance to check against query - // if hit worth scoring further - // might not be if query already has lots of good hits - for( sal_Int32 i = 0; i < nColumns; ++i ) - if( filled_ & ( 1 << i ) ) - { - penalty_ += fillers_[i]->conceptData_->getPenalty(); - //length -= _fillers[i]._conceptData.getConceptLength() + 1; - length -= 2; // !!! ??? c.length is not used ? - if( filled_ >> (i + 1) ) - for( sal_Int32 j = i + 1; j < nColumns; ++j ) - if( ( filled_ & 1 << j ) && fillers_[j]->begin_ < begin_ ) - penalty_ += query->getOutOufOrderPenalty(); - } - double result = penalty_ + length * query->getGapPenalty(); - return result < 0.0 ? 0.0 : result; // !!! quick fix -} - - - -NextDocGenerator::NextDocGenerator( ConceptData* cd,XmlIndex* env ) - : document_( 0 ), - concept_( cd ? cd->getConcept() : -1 ), - queryMask_( cd ? cd->getQueryMask() : -1 ), - terms_( cd ), - iterator_( env->getDocumentIterator( concept_ ) ) -{ -} - - - -void NextDocGeneratorHeap::reset() -{ - for( sal_Int32 i = 0; i < heapSize_; ++i ) - { - delete heap_[i]; heap_[i] = 0; - } - free_ = 0; - nonEmpty_ = false; -} - - - -void NextDocGeneratorHeap::addGenerator( NextDocGenerator* gen ) -{ - if( sal_uInt32( free_ ) == heap_.size() ) - { - heap_.push_back( 0 ); - } - - heap_[free_++] = gen; -} - - - -void NextDocGeneratorHeap::start() -{ - if( ( heapSize_ = free_ ) > 0 ) - { - for( sal_Int32 i = heapSize_ / 2; i >= 0; --i ) - heapify(i); - nonEmpty_ = true; - } - else - nonEmpty_ = false; -} - - -void NextDocGeneratorHeap::step() throw( excep::XmlSearchException ) -{ - if( heap_[0]->next() != NonnegativeIntegerGenerator::END ) - heapify(0); - else if ( heapSize_ > 1 ) - { - delete heap_[0]; - heap_[0] = heap_[--heapSize_]; - heap_[ heapSize_ ] = 0; - heapify(0); - } - else - nonEmpty_ = false; -} - - -void NextDocGeneratorHeap::heapify( sal_Int32 i ) -{ - NextDocGenerator* temp; - for( sal_Int32 r,l,smallest; ; ) - { - r = ( i + 1 ) << 1; - l = r - 1; - smallest = ( l < heapSize_ && heap_[l]->smallerThan( heap_[i] ) ) ? l : i; - if( r < heapSize_ && heap_[r]->smallerThan( heap_[ smallest ] ) ) - smallest = r; - if( smallest != i ) - { - temp = heap_[ smallest ]; - heap_[ smallest ] = heap_[ i ]; - heap_[i] = temp; - i = smallest; - } - else - break; - } -} - - -bool NextDocGeneratorHeap::atDocument( sal_Int32 document ) -{ - return nonEmpty_ && heap_[0]->getDocument() == document; -} - - - - -ConceptGroupGenerator::ConceptGroupGenerator( sal_Int32 dataL,sal_Int8* data,sal_Int32 index,sal_Int32 k ) - : last_( 0 ), - k1_( k ), - k2_( BitsInLabel ), - table_( NConceptsInGroup ), - bits_( new util::ByteArrayDecompressor( dataL,data,index ) ) -{ -} - - - -ConceptGroupGenerator::ConceptGroupGenerator() - : last_( 0 ), - k1_( 0 ), - k2_( BitsInLabel ), - table_( NConceptsInGroup ), - bits_( 0 ) -{ -} - - -ConceptGroupGenerator::~ConceptGroupGenerator() -{ - delete bits_; -} - - -void ConceptGroupGenerator::generateFillers( std::vector< RoleFiller* >& array ) -{ - cData_->generateFillers( array,last_ ); -} - - -bool ConceptGroupGenerator::next() throw( excep::XmlSearchException ) -{ - while( bits_->readNext( k1_,this ) ) - { - sal_Int32 bla = bits_->read( k2_ ); - if( ( cData_ = table_[ bla ] ).is() ) - return true; - } - return false; -} - - -sal_Int32 ConceptGroupGenerator::decodeConcepts( sal_Int32 k, - sal_Int32 shift, - sal_Int32 *concepts ) - throw( excep::XmlSearchException ) -{ - return bits_->ascendingDecode( k,shift,concepts ); -} - - - -void ConceptGroupGenerator::init( sal_Int32 bytesL,sal_Int8* bytes,sal_Int32 index,sal_Int32 k ) -{ - k1_ = k; - delete bits_; - bits_ = new util::ByteArrayDecompressor( bytesL,bytes,index ); - last_ = 0; - for( sal_Int32 i = 0;i < NConceptsInGroup; i++ ) - table_[i] = 0; -} - - - -void ConceptGroupGenerator::addTerms( sal_Int32 index,ConceptData* terms ) -{ - table_[ index ] = terms; -} - - - -void GeneratorHeap::reset() -{ - for( sal_Int32 i = 0; i < heapSize_; ++i ) - { - delete heap_[i]; - heap_[i] = 0; - } - free_ = 0; -} - - -void GeneratorHeap::addGenerator( ConceptGroupGenerator* cd ) -{ - if( sal_uInt32( free_ ) == heap_.size() ) - { - heap_.push_back( 0 ); - } - - heap_[free_++] = cd; -} - - -void GeneratorHeap::buildHeap() -{ - for( sal_Int32 i = heapSize_/2; i >= 0; i-- ) - heapify(i); -} - - -void GeneratorHeap::heapify( sal_Int32 root ) -{ - for( sal_Int32 smallest = 0; ; ) - { - const sal_Int32 right = ( root + 1 ) << 1; - const sal_Int32 left = right - 1; - smallest = ( left < heapSize_ && heap_[left]->position() < heap_[ root ]->position() ) ? left : root; - if( right< heapSize_ && heap_[right]->position() < heap_[smallest]->position() ) - smallest = right; - if( smallest != root ) - { - ConceptGroupGenerator* temp = heap_[smallest]; - heap_[smallest] = heap_[root]; - heap_[root] = temp; - root = smallest; - } - else - break; - } -} - - -bool GeneratorHeap::start( std::vector< RoleFiller* >& array ) throw( xmlsearch::excep::XmlSearchException ) -{ - if( ( heapSize_ = free_ ) > 0 ) - { - for( sal_Int32 i = 0; i < free_; ++i ) - heap_[i]->next(); - - buildHeap(); - heap_[0]->generateFillers( array ); - return true; - } - else - return false; -} - - -bool GeneratorHeap::next( std::vector< RoleFiller* >& array ) throw( xmlsearch::excep::XmlSearchException ) -{ - if( heapSize_ > 0 ) - { - if( ! heap_[0]->next() ) // no more - if( heapSize_ > 1) - { - delete heap_[0]; - heap_[0] = heap_[--heapSize_]; - heap_[heapSize_] = 0; - } - else - { - heapSize_ = 0; - return false; - } - heapify(0); - heap_[0]->generateFillers( array ); - return true; - } - else - return false; -} +/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: DocGenerator.cxx,v $
+ * $Revision: 1.10 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_xmlhelp.hxx"
+#include <qe/DocGenerator.hxx>
+#include <qe/Query.hxx>
+
+
+using namespace xmlsearch;
+using namespace xmlsearch::qe;
+
+
+const sal_Int32 NonnegativeIntegerGenerator::END = -1;
+
+
+RoleFiller RoleFiller::roleFiller_;
+
+
+RoleFiller::RoleFiller()
+ : m_nRefcount( 0 ),
+ fixedRole_( 0 ),
+ filled_( 0 ),
+ begin_( 0 ),
+ end_( 0 ),
+ parentContext_( 0 ),
+ limit_( 0 ),
+ next_( 0 ),
+ fillers_( 0 )
+{
+}
+
+
+RoleFiller::~RoleFiller()
+{
+
+}
diff --git a/xmlhelp/source/cxxhelp/qe/Query.cxx b/xmlhelp/source/cxxhelp/qe/Query.cxx deleted file mode 100644 index 913ef6977f..0000000000 --- a/xmlhelp/source/cxxhelp/qe/Query.cxx +++ /dev/null @@ -1,393 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: Query.cxx,v $ - * $Revision: 1.13 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_xmlhelp.hxx" -#include <qe/Query.hxx> -#include <qe/XmlIndex.hxx> -#include <qe/ConceptData.hxx> -#include <qe/QueryProcessor.hxx> -#include <qe/ContextTables.hxx> - - -using namespace xmlsearch::qe; - - -sal_Int32* QueryHit::getMatches( sal_Int32& matchesL ) -{ - matchesL = matchesL_; - return matches_; -} - - -/******************************************************************************/ -/* */ -/* HitStore */ -/* */ -/******************************************************************************/ - - -HitStore::HitStore( double initialStandard,sal_Int32 limit,sal_Int32 nColumns ) - : limit_( limit ), - nColumns_( nColumns ), - index_( 0 ), - free_( 0 ), - standard_( initialStandard ), - heap_( limit ) -{ - for( sal_uInt32 i = 0; i < heap_.size(); ++i ) - heap_[i] = 0; -} - - - -HitStore::~HitStore() -{ - for( sal_uInt32 i = 0; i < heap_.size(); ++i ) - delete heap_[i]; -} - - - -bool HitStore::goodEnough( double penalty, sal_Int32 begin, sal_Int32 end ) -{ - return free_ == limit_ ? heap_[0]->worseThan( penalty,begin,end ) : true; -} - - -QueryHit* HitStore::createQueryHit( double penalty,sal_Int32 doc,sal_Int32 begin,sal_Int32 end ) -{ - QueryHit* hit = new QueryHit( nColumns_,penalty,doc,begin,end ); - if( free_ == limit_ ) - { // goodEnough'ness checked already - delete heap_[0]; - heap_[0] = hit; - heapify( 0 ); - standard_ = heap_[0]->getPenalty(); - } - else if( free_ < limit_ ) - { - heap_[ free_++ ] = hit; - if( free_ == limit_ ) - { // we have the needed number - for( sal_Int32 i = free_/2; i >= 0; --i ) // build heap - heapify( i ); - standard_ = heap_[0]->getPenalty(); - } - } - return hit; -} - - -struct CompareQueryHit -{ - bool operator()( const QueryHit* l,const QueryHit* r ) - { - return l->compareTo( r ); - } -}; - - -#include <algorithm> - - -QueryHit* HitStore::firstBestQueryHit() -{ - if( free_ > 0) - { - CompareQueryHit bla; - heap_.resize( free_ ); - std::stable_sort( heap_.begin(),heap_.end(),bla ); - index_ = 0; - return nextBestQueryHit(); - } - else - return 0; -} - - -QueryHit* HitStore::nextBestQueryHit() -{ - return index_ < free_ ? heap_[ index_++ ] : 0; -} - - -void HitStore::heapify( sal_Int32 i ) -{ - for( sal_Int32 r,l,worst; ; ) - { - r = (i + 1) << 1; l = r - 1; - worst = l < free_ && heap_[i]->betterThan( heap_[l] ) ? l : i; - if( r < free_ && heap_[ worst ]->betterThan( heap_[r] ) ) - worst = r; - if (worst != i) - { - QueryHit* temp = heap_[ worst ]; - heap_[ worst ] = heap_[ i ]; - heap_[i] = temp; - i = worst; // continue - } - else - break; - } -} - - -// sal_Int32 HitStore::partition( sal_Int32 p,sal_Int32 r ) -// { -// QueryHit* x = heap_[ ((p + r) >> 1) & 0x7FFFFFFF ]; -// sal_Int32 i = p - 1, j = r + 1; -// while( true ) -// { -// while( x->compareTo( heap_[--j] ) ) -// ; -// while( heap_[++i]->compareTo( x ) ) -// ; -// if( i < j ) -// { -// QueryHit* t = heap_[i]; -// heap_[i] = heap_[j]; -// heap_[j] = t; -// } -// else -// return j; -// } -// } - - -// void HitStore::quicksort( sal_Int32 p,sal_Int32 r ) -// { -// while( p < r ) -// { -// sal_Int32 q = partition( p,r ); -// quicksort(p, q); -// p = q + 1; -// } -// } - - - -/******************************************************************************/ -/* */ -/* Query */ -/* */ -/******************************************************************************/ - - -#define MissingTermPenalty 10.0 - - -Query::Query( XmlIndex* env, - sal_Int32 nColumns, - sal_Int32 nHits, - sal_Int32 missingPenaltiesL, - double* missingPenalties ) - : env_( env ), - ctx_( env ? env->getContextInfo() : 0 ), - store_( nColumns * MissingTermPenalty - 0.0001,nHits,nColumns ), - nHitsRequested_( nHits ), - nColumns_( nColumns ), - currentStandard_( nColumns * MissingTermPenalty - 0.0001 ), - missingPenaltyL_( nColumns ), - upperboundTemplateL_( nColumns ), - penaltiesL_( missingPenaltiesL ), - missingPenalty_( new double[ nColumns ] ), - upperboundTemplate_( new double[ nColumns ] ), - penalties_( missingPenalties ), - ignoredElementsL_( 0 ), - ignoredElements_( 0 ), - missingTermsPenalty_( 0.0 ) -{ - // for the EmptyQuery case (awaits arch improvement pass) - - if( missingPenalties ) - for( sal_Int32 i = 0;i < nColumns_; ++i ) - missingPenalty_[i] = missingPenalties[i]; - else - for( sal_Int32 i = 0;i < nColumns_; ++i ) - missingPenalty_[i] = MissingTermPenalty; - - makePenaltiesTable(); - // _roleFillerList = RoleFiller.STOP; -} - - -Query::~Query() -{ - delete[] missingPenalty_; - delete[] upperboundTemplate_; - delete[] penalties_; - delete[] ignoredElements_; -} - - -void Query::setIgnoredElements( const sal_Int32 ignoredElementsL,const rtl::OUString* ignoredElements ) -{ - if( ctx_ ) - ignoredElements_ = ctx_->getIgnoredElementsSet( ignoredElementsL_, - ignoredElementsL,ignoredElements ); - - if( ! ctx_ ) - { - ignoredElementsL_ = 0; - ignoredElements_ = 0; - } -} - - - -void Query::missingTerms( sal_Int32 nMissingTerms ) -{ - missingTermsPenalty_ = MissingTermPenalty * nMissingTerms; -} - - - -ConceptData* Query::makeConceptData( sal_Int32 col,sal_Int32 concept,double penalty,sal_Int32 queryNo ) -{ - return new ConceptData( concept,col,penalty,queryNo,nColumns_,env_->getContextInfo() );; -} - - -void Query::getHits( std::vector< QueryHitData* >& data,sal_Int32 n ) -{ - if( n <= 0 ) - return; - - QueryHit* qh = store_.firstBestQueryHit(); - - while( qh ) - { - data.push_back( env_->hitToData( qh ) ); - qh = data.size() < sal_uInt32( n ) ? store_.nextBestQueryHit() : 0; - } -} - - -QueryHit* Query::maybeCreateQueryHit( double penalty, - sal_Int32 doc, sal_Int32 begin, sal_Int32 end, sal_Int32 parentContext ) -{ - // hits are located using only terms actually present in text - // if B is not present, the query A B C reduces to A C and penalties - // are computed as if B did not occur in query - // to meaningfully merge results from different servers, some of which - // may have B, penalty has to be normalized to the common computing scheme - - QueryHit* res = - ( store_.goodEnough( penalty += missingTermsPenalty_,begin,end ) - && ( ! ignoredElements_ || ctx_->notIgnored( parentContext,ignoredElementsL_,ignoredElements_ ) ) ) - ? - store_.createQueryHit( penalty,doc,begin,end ) - : - 0; - return res; -} - - -void Query::makePenaltiesTable() -{ - sal_Int32 nPatterns = 1 << nColumns_; - delete[] penalties_; - penalties_ = new double[ penaltiesL_ = nPatterns ]; - for (sal_Int32 i = 0; i < nPatterns; ++i ) - penalties_[i] = computePenalty(i); -} - - -double Query::computePenalty( sal_Int32 n ) -{ - double penalty = 0.0; - for( sal_Int32 i = 0; i < nColumns_; ++i ) - if( ( n & 1 << i ) == 0 ) - penalty += missingPenalty_[i]; - return penalty; -} - - -void Query::resetForNextDocument() -{ - currentStandard_ = store_.getCurrentStandard(); - // "everything's missing" - for( sal_Int32 i = 0; i < nColumns_; i++ ) - upperboundTemplate_[i] = missingPenalty_[i]; - vote_ = false; -} - - -bool Query::vote() -{ - double sum = 0.0; - for( sal_Int32 i = 0; i < nColumns_; i++ ) - sum += upperboundTemplate_[i]; - return vote_ = (sum <= currentStandard_ ); -} - - -void Query::updateEstimate( sal_Int32 role,double penalty ) -{ - if( penalty < upperboundTemplate_[ role ] ) - upperboundTemplate_[ role ] = penalty; -} - - -/******************************************************************************/ -/* */ -/* QueryHitIterator */ -/* */ -/******************************************************************************/ - - - -QueryHitIterator::QueryHitIterator( const QueryResults* result ) - : index_( -1 ), - result_( result ) -{ -} - - -QueryHitIterator::~QueryHitIterator() -{ - delete result_; -} - - -bool QueryHitIterator::next() -{ - return accessible_ = ( ++index_ < sal_Int32( result_->queryHits_.size() ) ); -} - - -QueryHitData* QueryHitIterator::getHit( const PrefixTranslator* ) const -{ - if( accessible_ ) - return result_->queryHits_[index_]; - else - return 0; -} diff --git a/xmlhelp/source/cxxhelp/qe/QueryProcessor.cxx b/xmlhelp/source/cxxhelp/qe/QueryProcessor.cxx deleted file mode 100644 index 12310bac2f..0000000000 --- a/xmlhelp/source/cxxhelp/qe/QueryProcessor.cxx +++ /dev/null @@ -1,169 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: QueryProcessor.cxx,v $ - * $Revision: 1.10 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_xmlhelp.hxx" -#include <qe/QueryProcessor.hxx> -#include <db/DBEnv.hxx> - - - -using namespace std; -using namespace xmlsearch; -using namespace xmlsearch::excep; -using namespace xmlsearch::qe; - - -const double QueryProcessor::INFLpenalty = 0.0; - - -QueryProcessor::QueryProcessor( const rtl::OUString& installDir ) - throw( IOException ) - : env_( installDir ) -{ -} - - -QueryProcessor::~QueryProcessor() -{ - // delete env_; -} - - - -QueryResults* QueryProcessor::processQuery( const QueryStatement& ment ) -{ - Search search( &env_ ); - Query* query = processQuery( search,ment ); - query->setIgnoredElements( 0,0 ); - search.startSearch(); - return makeQueryResults( query,ment.getHitCount() ); -} - - -Query* QueryProcessor::processQuery( Search& search,const QueryStatement& ment ) -{ - sal_Int32 nValidTerms = 0, nMissingTerms = 0, nContentTerms = 0; - double variantPenalty = 0.0; - - const sal_Int32 nHits = ment.getHitCount(); - const rtl::OUString scope = ment.getScope(); - const vector< rtl::OUString >& terms = ment.getTerms(); - const sal_Int32 nTerms = terms.size(); - - vector< sal_Int32 > primary( nTerms ); - vector< sal_Int32 > missingTerms( nTerms ); - vector< vector< sal_Int32 > > columns( nTerms ); - - for( int i = 0; i < nTerms; ++i ) - { - const sal_Int32 lgt = terms[i].getLength(); - const sal_Unicode* str = terms[i].getStr(); - - if( str[0] == sal_Unicode('+') ) - { - // poor man's escape for query control - // not implemented yet - } - else - { - ++nContentTerms; - rtl::OUString term = terms[i].toAsciiLowerCase(); - sal_Int32 id = 0; - std::vector< sal_Int32 > ids; - if( str[0] == sal_Unicode('\"') ) - { - id = env_.fetch( term.copy( 1 ) ); // goes to BtreeDict::fetch - } - else if( str[lgt-1] == sal_Unicode( '*' ) ) - { - ids = env_.withPrefix( term.copy( 0,lgt - 1 ) ); // goes to BtreeDict::withPrefix - variantPenalty = 0.0; - } - else - { - sal_Int32 formID; - id = env_.fetch( term ); - - // std::vector< rtl::OUString > variants( morph_->getVariants( term ) ); - std::vector< rtl::OUString > variants; - - for( sal_uInt32 j = 0; j < variants.size(); ++j ) - { - formID = env_.fetch( variants[j] ); - if( formID > 0 && formID != id ) - ids.push_back( formID ); - } - variantPenalty = INFLpenalty; - } - - if( ids.size() > 0 || id > 0 ) - { - columns[ nValidTerms ] = ids; - primary[ nValidTerms++ ] = id; - } - else - { - ++nMissingTerms; - // !!! not used now (intended to fill out appropriate missing terms in QueryHits - missingTerms.push_back( nContentTerms - 1 ); - } - - } - } - - return search.addQuery( scope, - nValidTerms,nMissingTerms,nHits, - variantPenalty, - primary, - columns ); -} - - - -QueryResults::QueryResults( Query* query, sal_Int32 nHits ) -{ - if( query ) - query->getHits( queryHits_,nHits ); -} - - -QueryResults::~QueryResults() -{ - for( sal_uInt32 i = 0; i < queryHits_.size(); ++i ) - delete queryHits_[i]; -} - - -QueryResults* QueryProcessor::makeQueryResults( Query* query,sal_Int32 nHits ) -{ - return new QueryResults( query,nHits ); -} - diff --git a/xmlhelp/source/cxxhelp/qe/Search.cxx b/xmlhelp/source/cxxhelp/qe/Search.cxx deleted file mode 100644 index 4dd8e78176..0000000000 --- a/xmlhelp/source/cxxhelp/qe/Search.cxx +++ /dev/null @@ -1,718 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: Search.cxx,v $ - * $Revision: 1.11 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_xmlhelp.hxx" -#include <qe/Search.hxx> - - -using namespace std; -using namespace xmlsearch; -using namespace xmlsearch::qe; - - - - -/******************************************************************************/ -/* */ -/* Emtpy ConceptData/Query */ -/* */ -/******************************************************************************/ - - -class EmptyConceptData - : public ConceptData -{ -public: - - virtual void generateFillers( std::vector< RoleFiller* >& , sal_Int32 ) { } - -}; // end class EmptyQuery - - - -class EmptyQuery - : public Query -{ -public: - - EmptyQuery() - : Query( 0,0,0,0,0 ), - conceptDataInstance_( ) - { - } - - ConceptData* makeConceptData( sal_Int32 col, - sal_Int32 concept, - double penalty, - sal_Int32 queryNo ) - { - (void)col; - (void)concept; - (void)penalty; - (void)queryNo; - - return &conceptDataInstance_; - } - -private: - - EmptyConceptData conceptDataInstance_; - -}; // end class EmptyQuery - - - -/******************************************************************************/ -/* */ -/* ConceptData1/Query1 */ -/* */ -/******************************************************************************/ - - -class ConceptData1 - : public ConceptData -{ -public: - - ConceptData1( sal_Int32 id, - sal_Int32 role, - double score, - sal_Int32 queryNo, - sal_Int32 nColumns, - ContextTables* ctxInfo, - sal_Int32 code ) - : ConceptData( id,role,score,queryNo,nColumns,ctxInfo ), - fieldCode_( code ) - { - } - - virtual void generateFillers( std::vector< RoleFiller* >& array, sal_Int32 pos ); - - -private: - - sal_Int32 fieldCode_; - -}; // end class ConceptData1 - - -class Query1 - : public Query -{ -public: - - Query1( XmlIndex* env, - sal_Int32 nColumns, - sal_Int32 nHits, - sal_Int32 missingPenaltiesL, - double* missingPenalties, - sal_Int32 fieldCode ) - : Query( env,nColumns,nHits,missingPenaltiesL,missingPenalties ), - searchFieldCode_( fieldCode ) - { - } - - virtual ConceptData* makeConceptData( sal_Int32 col, - sal_Int32 concept, - double score, - sal_Int32 query ); - - -private: - - sal_Int32 searchFieldCode_; -}; - - - -/********************************************************************************/ -// Impl -/********************************************************************************/ - - -void ConceptData1::generateFillers( std::vector< RoleFiller* >& array, sal_Int32 pos ) -{ - if( array[ queryNo_ ] != RoleFiller::STOP() ) - { // not 'prohibited' - // !!! candidate for a single _ctx op - sal_Int32 ancestor = ctx_->firstParentWithCode(pos,fieldCode_); - if( ancestor != -1 ) - { - - - RoleFiller* p = new RoleFiller( nColumns_, - this, - role_, - pos, - ancestor, - pos + proximity_); - p->use( array,queryNo_ ); - } - } - - if( next_.is() ) - next_->generateFillers( array,pos ); -} - - - -ConceptData* Query1::makeConceptData( sal_Int32 col, - sal_Int32 concept, - double score, - sal_Int32 query ) -{ - return new ConceptData1( concept,col,score,query,nColumns_,ctx_,searchFieldCode_ ); -} - - - -/******************************************************************************/ -/* */ -/* QueryFactoryImpl */ -/* */ -/******************************************************************************/ - - -class QueryFactoryImpl -{ -public: - - Query* makeQuery( XmlIndex* env,const rtl::OUString& context,sal_Int32 nColumns,sal_Int32 nHits); - - Query* empty() { return &emptyQueryInstance_; } - -private: - - EmptyQuery emptyQueryInstance_; - -}; // end class QueryFactoryImpl - - - - -Query* QueryFactoryImpl::makeQuery( XmlIndex* env, - const rtl::OUString& context, - sal_Int32 nColumns, - sal_Int32 nHits ) -{ - if( ! context.getLength() ) - return new Query( env,nColumns,nHits,0,0 ); - else if( context.indexOf( sal_Unicode( '|' ) ) != -1 ) - { - return 0; //t - } - else if( context.indexOf( rtl::OUString::createFromAscii( "//" ) ) != -1 ) - { - return 0; //t - } - else if( context.indexOf( sal_Unicode( '/' ) ) != -1 ) - { - return 0; //t - } - else if( context.indexOf( sal_Unicode( '@' ) ) != -1 ) - { - return 0; //t - } - else if( context.indexOf( sal_Unicode( '[' ) ) != -1 ) - { - return 0; //t - } - else - { - sal_Int32 code = env->getContextInfo()->linkCode( context ); - if( code != -1 ) - return new Query1( env,nColumns,nHits,0,0,code); - else - return &emptyQueryInstance_; - } -} - - - -Search::Search( XmlIndex* env ) - : env_( env ), - queryFactory_( 0 ), - nextDocGenHeap_(), - firstGenerator_(), - free2_( 0 ), - limit_( 0 ), - base_( 0 ), - concepts_( new sal_Int32[ ConceptGroupGenerator::NConceptsInGroup ] ), - dataL_( 0 ), - data_( 0 ) -{ -} - - - -Search::~Search() -{ - sal_uInt32 i; - Query* stopq = queryFactory_ ? queryFactory_->empty() : 0; - ConceptData* stopc = stopq ? stopq->makeConceptData( 0,0,0.0,0 ) : 0; - (void)stopc; - - for( i = 0; i < queries_.size(); ++i ) - if( queries_[i] != stopq ) - delete queries_[i]; - - delete[] concepts_; - - delete queryFactory_; -} - - - - -Query* Search::addQuery( const rtl::OUString& context, - sal_Int32 nValidTerms,sal_Int32 nMissingTerms,sal_Int32 nHits, - double variantPenalty, - const std::vector< sal_Int32 >& primary, - const std::vector< std::vector< sal_Int32 > >& columns ) -{ - // by now, scope == context - if( ! queryFactory_ ) - queryFactory_ = new QueryFactoryImpl(); - - Query* query = queryFactory_->makeQuery( env_,context,nValidTerms,nHits ); - query->missingTerms( nMissingTerms ); - queries_.push_back( query ); - - for( sal_Int32 i = 0; i < nValidTerms; ++i ) - { - if( primary[i] > 0 ) - addTerm( i,primary[i],0.0 ); - - for( sal_uInt32 j = 0; j < columns[i].size(); ++j ) - addTerm( i,columns[i][j],variantPenalty ); - } - - // start stop - query->addControlConceptData( this,queries_.size()-1 ); - return query; -} - - - -void Search::startSearch() -{ - sal_Int32 i,j; - // set up ConceptData lists - // order search terms - quicksort( 0, free2_ - 1); - - // remove duplicates - for (i = 0; i < free2_ - 1; i = j) - { - for (j = i + 1; j < free2_; j++) - { - if( conceptData_[i]->crqEquals( conceptData_[j].get() ) ) - conceptData_[j] = 0; - else - i = j; - } - } - - // create lists - for( i = 0; i < free2_ - 1; i = j ) - { - for (j = i + 1; j < free2_; j++ ) - { - if( conceptData_[j].is() ) - if( conceptData_[i]->cEquals( conceptData_[j].get() ) ) - { - conceptData_[i]->addLast( conceptData_[j].get() ); - conceptData_[j] = 0; - } - else - i = j; - } - } - - // densify - for( i = 0; i < free2_ - 1; i++) - { - if( ! conceptData_[i].is() ) - { - for( j = i + 1; j < free2_; j++) - { - if (conceptData_[j].is() ) - { - conceptData_[i] = conceptData_[j]; - conceptData_[j] = 0; - break; - } - } - } - } - - // set up new document generators - nextDocGenHeap_.reset(); - for( i = 0; i < free2_ && conceptData_[i].is(); i++) - { - NextDocGenerator* gen = new NextDocGenerator( conceptData_[i].get(),env_ ); - try - { - sal_Int32 doc; - gen->first(); - if( ( doc = gen->getDocument() ) != NonnegativeIntegerGenerator::END ) - { - /* !!! ??? is concept length used any more in any way - conceptData_[i]. - setConceptLength(_env. - getConceptLength(conceptData_[i].getConcept())); - */ - nextDocGenHeap_.addGenerator( gen ); - } - } - catch( ... ) - { - } - } - - nextDocGenHeap_.start(); - env_->reset(); - env_->resetContextSearch(); - searchDocument(); -} - - - - -void Search::addTerm( sal_Int32 col,sal_Int32 concept,double score ) -{ - if( env_->occursInText( concept ) ) - { - ConceptData* cd = queries_[queries_.size()-1]->makeConceptData( col,concept,score,queries_.size()-1 ); - if( sal_uInt32( free2_ ) == conceptData_.size() ) - { - conceptData_.push_back( 0 ); -// conceptVisitor_ = &conceptData_[0]; - } - conceptData_[ free2_++ ] = cd; - } -} - - - - - -void Search::searchDocument() -{ - std::vector< RoleFiller* > start( queries_.size() ); - do - { - try - { - switch( nextDocument( start ) ) - { - case 0: // multi group - genHeap_.start( start ); - while( genHeap_.next( start ) ) - ; - break; - - case 1: // single group - while( firstGenerator_.next() ) - firstGenerator_.generateFillers( start ); - break; - - case 2: // reached the end - return; - } - } - catch( const excep::XmlSearchException& ) - { - continue; - } - - RoleFiller* next; - for( sal_uInt32 i = 0; i < queries_.size(); ++i ) - { - if( ( next = start[i] ) != 0 && next != RoleFiller::STOP() ) - next->scoreList( queries_[i],document_ ); - else if( queries_[i]->zoned() ) - { - RoleFiller* rfs = queries_[i]->getRoleFillers(); - if( rfs && rfs != RoleFiller::STOP() ) - rfs->scoreList( queries_[i],document_ ); - } - } - genHeap_.reset(); - } - while( nextDocGenHeap_.isNonEmpty() ); - - // #i80952 -#if 0 - for( sal_uInt32 i = 0; i < start.size(); ++i ) - if( start[i] != RoleFiller::STOP() ) - delete start[i]; -#endif -} - - - -sal_Int32 Search::nextDocument( std::vector< RoleFiller* >& start ) throw( xmlsearch::excep::XmlSearchException ) -{ - while( nextDocGenHeap_.isNonEmpty() ) - { // still something to do - sal_uInt32 i; - for( i = 0; i < queries_.size(); ++i ) - if( queries_[i] ) - queries_[i]->resetForNextDocument(); - - // gather all concepts this document has - // and store associated conceptData - sal_Int32 index = 0; - document_ = nextDocGenHeap_.getDocument(); - docConcepts_.clear(); - queryMasks_.clear(); - do - { - docConcepts_.push_back( nextDocGenHeap_.getConcept() ); - queryMasks_.push_back( nextDocGenHeap_.getQueryMask() ); - ConceptData *conceptData = ( conceptData_[ index++ ] = nextDocGenHeap_.getTerms() ).get(); - conceptData->runBy( queries_ ); - nextDocGenHeap_.step(); - } - while( nextDocGenHeap_.atDocument( document_) ); - - // if there is no saturation model, some query will always vote YES - // and so every document will be opened - // even if this case, however, savings can be achieved by not generating fillers - // for some queries (not scoring, etc) - // and, with more care, creation of some GroupGenerators can be avoided - // saturating queries with lots of good hits will lead to best results - - sal_Int32 voteMask = 0; - Query* query; - for( i = 0; i < queries_.size(); ++i ) - { - query = queries_[i]; - if( query ) - { - query->saveRoleFillers( 0 ); - if( query->vote() ) - { - // normal reset - start[i] = query->zoned() ? RoleFiller::STOP() : 0; - voteMask |= 1 << i; - } - else - start[i] = RoleFiller::STOP(); // prohibit setting - } - } - - // we may eliminate some ConceptGroupGenerators - // those which would be used only by Queries which voted NO - if( voteMask != 0 ) - { // need to open up document - ConceptGroupGenerator* gen; - // !!! don't gather Fillers for disinterested Queries - if( openDocumentIndex( document_ ) ) - { // multi group - // set up all needed generators - sal_Int32 j = 0; - while( ( queryMasks_[j] & voteMask ) == 0 ) - ++j; - // assert(j < index); - sal_Int32 c = docConcepts_[j]; - sal_Int32 group = 0; - // find first group - while( /*group < maxConcepts_.size() &&*/ - c > maxConcepts_[ group ] && ++group < limit_ ) - ; - gen = makeGenerator( group ); - gen->addTerms( indexOf(c),conceptData_[j].get() ); - - for( ++j; j < index; j++ ) - if( ( queryMasks_[j] & voteMask ) > 0 ) - { - c = docConcepts_[j]; - if( c > max_ ) - { // need to find another group - // assert(group < _limit); - while( /*group < maxConcepts_.size() &&*/ - c > maxConcepts_[ group ] && ++group < limit_ ) - ; - gen = makeGenerator( group ); - } - gen->addTerms( indexOf(c),conceptData_[j].get() ); - } - return 0; - } - else - { // single group - for( sal_Int32 j = 0; j < index; j++ ) - if( queryMasks_[j] & voteMask ) - firstGenerator_.addTerms( indexOf( docConcepts_[j] ),conceptData_[j].get() ); - return 1; - } - } - } - return 2; -} - - - - -bool Search::openDocumentIndex( sal_Int32 docNo ) throw( excep::XmlSearchException ) -{ - data_ = env_->getPositions( dataL_,docNo ); - base_ = env_->getDocumentIndex( docNo ); - - startingIndex_ = 0; - sal_Int32 kk = data_[ base_ ] & 0xFF, k2; - - switch( kk >> 6 ) - { // get type - case 0: // single group, no extents - k2 = data_[base_ + 1]; - firstGenerator_.init( dataL_,data_,base_ += 2,k2 ); - // decode concept table - nConcepts_ = firstGenerator_.decodeConcepts( kk & 0x3F,0,concepts_ ); - return false; - - case 2: // multi group, no extents - { - kTable_.clear(); - offsets_.clear(); - maxConcepts_.clear(); - util::ByteArrayDecompressor compr( dataL_,data_,base_ + 1 ); - compr.decode( kk & 0x3F,kTable_ ); - - sal_Int32 last = kTable_.back(); - kTable_.pop_back(); - compr.ascDecode( last,offsets_ ); - last = kTable_.back(); - kTable_.pop_back(); - compr.ascDecode( last,maxConcepts_ ); - - base_ += 1 + compr.bytesRead(); - limit_ = maxConcepts_.size(); - } - return true; - - case 1: // single group, extents - case 3: // multi group, extents - throw excep::XmlSearchException( rtl::OUString::createFromAscii( "extents not yet implemented\n" ) ); - } - return false; -} - - - - - -ConceptGroupGenerator* Search::makeGenerator( sal_Int32 group ) - throw( excep::XmlSearchException ) -{ - sal_Int32 shift,index; - if( group > 0 ) - { - index = base_ + offsets_[ group - 1 ]; - shift = maxConcepts_[ group - 1 ]; - } - else - { - index = base_; - shift = 0; - } - - // initialize generator - ConceptGroupGenerator* gen = - new ConceptGroupGenerator( dataL_,data_,index,kTable_[ 1 + 2*group ] ); - // decode concept table - nConcepts_ = gen->decodeConcepts( kTable_[2*group],shift,concepts_ ); - - if( group < limit_ ) - max_ = concepts_[ nConcepts_ ] = maxConcepts_[ group ]; - else - max_ = concepts_[ nConcepts_ - 1 ]; - - genHeap_.addGenerator( gen ); - startingIndex_ = 0; // in _concepts; lower search index - return gen; -} - - - -sal_Int32 Search::indexOf(sal_Int32 concept) throw( excep::XmlSearchException ) -{ - sal_Int32 i = startingIndex_,j = nConcepts_,k; - while( i <= j ) - if( concepts_[ k = (i + j)/2 ] < concept ) - i = k + 1; - else if( concept < concepts_[k] ) - j = k - 1; - else - { - startingIndex_ = k + 1; - return k; - } - throw excep::XmlSearchException( rtl::OUString::createFromAscii( "indexOf not found" ) ); -} - - - - -sal_Int32 Search::partition( sal_Int32 p,sal_Int32 r ) -{ - rtl::Reference< ConceptData > x = conceptData_[ ((p + r) >> 1) & 0x7FFFFFFF ]; - sal_Int32 i = p - 1, j = r + 1; - while( true ) - { - while( x->compareWith( conceptData_[--j].get() ) ) - ; - while( conceptData_[++i]->compareWith( x.get() ) ) - ; - if( i < j ) - { - rtl::Reference< ConceptData > t = conceptData_[i]; - conceptData_[i] = conceptData_[j]; - conceptData_[j] = t; - } - else - return j; - } -} - - - -void Search::quicksort( sal_Int32 p,sal_Int32 r ) -{ - while (p < r) - { - sal_Int32 q = partition( p,r ); - quicksort(p, q); - p = q + 1; - } -} diff --git a/xmlhelp/source/cxxhelp/qe/XmlIndex.cxx b/xmlhelp/source/cxxhelp/qe/XmlIndex.cxx deleted file mode 100644 index e4ba266bf7..0000000000 --- a/xmlhelp/source/cxxhelp/qe/XmlIndex.cxx +++ /dev/null @@ -1,457 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: XmlIndex.cxx,v $ - * $Revision: 1.19 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_xmlhelp.hxx" -#include <osl/diagnose.h> -#include <qe/XmlIndex.hxx> -#include <qe/DocGenerator.hxx> -#include <util/ConceptList.hxx> -#ifndef _XMLSEARCH_UTIL_RANDOMACCESSSTREAM_HXX_ -#include <util/RandomAccessStream.hxx> -#endif -#include <util/Decompressor.hxx> -#include <qe/Query.hxx> - -using namespace xmlsearch; -using namespace xmlsearch::excep; -using namespace xmlsearch::qe; - - -// extern sal_Int32 getInteger_( const sal_Int8* ); - - -XmlIndex::XmlIndex( const rtl::OUString& indexDir ) - throw( IOException ) - : currentBatchOffset_( 0 ), - maxDocNumberInCache_( -1 ), - indexAccessor_( indexDir ), - dict_( indexAccessor_ ), - contextTables_( 0 ), - allListsL_( 0 ), - allLists_( 0 ), - positionsL_( 0 ), - positions_( 0 ), - contextsDataL_( 0 ), - contextsData_( 0 ), - concepts_( 0 ), - documents_( 0 ) -{ - // reading DOCS - try - { - allListsL_ = indexAccessor_.readByteArray( allLists_, - rtl::OUString::createFromAscii("DOCS") ); // reading DOCS - } - catch( IOException ) - { - OSL_ENSURE( allLists_ != 0, "XmlIndex::XmlIndex -> cannot open DOCS/docs" ); - throw; - } - - // reading CONTEXTS - try - { - contextsDataL_ = indexAccessor_.readByteArray( contextsData_, - rtl::OUString::createFromAscii("CONTEXTS") ); // reading CONTEXTS - } - catch( IOException ) - { - OSL_ENSURE( allLists_ != 0, "XmlIndex::XmlIndex -> cannot open CONTEXTS/contexts" ); - delete[] allLists_; - throw; - } - - // reading POSITIONS - { - positionsFile_ = indexAccessor_.getStream( rtl::OUString::createFromAscii( "POSITIONS" ), - rtl::OUString::createFromAscii( "r" ) ); - - OSL_ENSURE( positionsFile_ != 0, "XmlIndex::XmlIndex -> cannot open POSITIONS/positions" ); - - if( positionsFile_ ) - { - //!!! temporary: better than fixed large value, worse than 'intelligent' size mgt - allInCache_ = true; - if( allInCache_ ) // yes, intended - { - reset(); - positions_ = new sal_Int8[ positionsL_ = positionsFile_->length() ]; - positionsFile_->readBytes( positions_,positionsL_ ); - } - } - else - { - delete[] allLists_; - delete[] contextsData_; - throw IOException( rtl::OUString::createFromAscii( "XmlIndex::XmlIndex -> no POSITIONS/positions") ); - } - } - - - // reading DOCS.TAB - { - util::RandomAccessStream* in = indexAccessor_.getStream( rtl::OUString::createFromAscii( "DOCS.TAB" ), - rtl::OUString::createFromAscii( "r" ) ); - - if( in ) - { - sal_Int8 a[4]; - a[0] = a[1] = a[2] = 0; - in->readBytes( &a[3],1 ); - sal_Int32 k1 = ::getInteger_( a ); - util::StreamDecompressor sddocs( in ); - sddocs.ascDecode( k1,concepts_ ); - in->readBytes( &a[3],1 ); - sal_Int32 k2 = ::getInteger_( a ); - offsets_.push_back( 0 ); - util::StreamDecompressor sdoffsets( in ); - sdoffsets.ascDecode( k2,offsets_ ); - delete in; - } - else - { - delete[] allLists_; - delete[] contextsData_; - delete[] positions_; - delete positionsFile_; - throw IOException( rtl::OUString::createFromAscii( "XmlIndex::XmlIndex -> no DOCS.TAB/docs.tab") ); - } - } - - // reading OFFSETS - { - util::RandomAccessStream* in = indexAccessor_.getStream( rtl::OUString::createFromAscii( "OFFSETS" ), - rtl::OUString::createFromAscii( "r" ) ); - if( in ) - { - sal_Int8 a[4]; - a[0] = a[1] = a[2] = 0; - in->readBytes( &a[3],1 ); - sal_Int32 k1 = ::getInteger_( a ); - util::StreamDecompressor sddocs( in ); - sddocs.decode( k1,documents_ ); - in->readBytes( &a[3],1 ); - sal_Int32 k2 = ::getInteger_( a ); - util::StreamDecompressor sdoffsets( in ); - sdoffsets.ascDecode( k2,microIndexOffsets_ ); - in->readBytes( &a[3],1 ); - sal_Int32 k3 = ::getInteger_( a ); - util::StreamDecompressor sdtitles( in ); - sdtitles.decode( k3,titles_ ); - - in->readBytes( &a[3],1 ); - sal_Int32 k4 = ::getInteger_( a ); - // contextsOffsets_ = new IntegerArray(_documents.cardinality() + 1); - util::StreamDecompressor co(in); - // _contextsOffsets.add(0); // first, trivial offset - co.ascDecode( k4,contextsOffsets_ ); - delete in; - } - else - { - delete[] allLists_; - delete[] contextsData_; - delete[] positions_; - delete positionsFile_; - throw IOException( rtl::OUString::createFromAscii( "XmlIndex::XmlIndex -> no OFFSETS/offsets") ); - } - } - - // reading linknames - { - util::RandomAccessStream* in = - indexAccessor_.getStream( rtl::OUString::createFromAscii( "LINKNAMES" ), - rtl::OUString::createFromAscii( "r" ) ); - if( ! in ) - { - delete[] allLists_; - delete[] contextsData_; - delete[] positions_; - delete positionsFile_; - throw IOException( - rtl::OUString::createFromAscii( "BtreeDict::BtreeDict -> no LINKNAMES/linknames" ) ); - } - - sal_Int32 len = in->length(); - char* bff = new char[ 1 + len ], *bff1 = new char[ 1 + len ]; - bff[ len ] = 0; - in->readBytes( reinterpret_cast<sal_Int8*>( bff ),len ); - delete in; - - // Now the buffer must be densified. - int i,len1 = 0; - for( i = 0; i < len; ++i ) - { - if( bff[i] ) - bff1[ len1++ ] = bff[i]; - } - bff1[len1] = 0; - delete[] bff; - rtl::OString aStr( bff1 ); // build a string from the densified buffer; - delete[] bff1; - -// // Now determine the order -// #define NAMECOUNT 16 -// #define UNREACHABLEPLACE 100000; -// /** -// * The available names cannot be determined from LINKNAMES at current, -// * because LINKNAMES is a serialized Java-object -// * Always update LINKNAMES if index.xsl or default.xsl are modified. -// */ -// rtl::OString LN[NAMECOUNT]; -// LN[0] = "text:span"; -// LN[1] = "help:help-text"; -// LN[2] = "help:to-be-embedded"; -// LN[3] = "headingheading"; -// LN[4] = "office:body"; -// LN[5] = "text:p"; -// LN[6] = "office:document"; -// LN[7] = "help:link"; -// LN[8] = "help:key-word"; -// LN[9] = "table:table"; -// LN[10] = "table:table-header-row"; -// LN[11] = "table:table-row"; -// LN[12] = "table:table-cell"; -// LN[13] = "text:unordered-list"; -// LN[14] = "text:ordered-list"; -// LN[15] = "text:list-item"; - // Now determine the order - -#define NAMECOUNT 16 -#define UNREACHABLEPLACE 100000; - /** - * The available names cannot be determined from LINKNAMES at current, - * because LINKNAMES is a serialized Java-object - * Always update LINKNAMES if index.xsl or default.xsl are modified. - */ - - rtl::OString LN[NAMECOUNT]; - LN[0] = "helpdocument"; - LN[1] = "body"; - LN[2] = "title"; - LN[3] = "table"; - LN[4] = "tablecell"; - LN[5] = "tablerow"; - LN[6] = "list"; - LN[7] = "listitem"; - LN[8] = "item"; - LN[9] = "emph"; - LN[10] = "paragraph"; - LN[11] = "section"; - LN[12] = "bookmark"; - LN[13] = "bookmark_value"; - LN[14] = "ahelp"; - LN[15] = "link"; - - // Determine index in file - int idx[NAMECOUNT]; - /*int*/ linkNamesL_ = NAMECOUNT; - for( i = 0; i < NAMECOUNT; ++i ) - if( ( idx[i] = aStr.indexOf( LN[i] ) ) == -1 ) { - idx[i] = UNREACHABLEPLACE; - --linkNamesL_; - } - - linkNames_ = new rtl::OUString[linkNamesL_]; - for( i = 0; i < linkNamesL_; ++i ) { - // TODO what happens to first if we never hit Place? - int first = 0; - int Place = UNREACHABLEPLACE; // This is the defintely last place - for( int j = 0; j < NAMECOUNT; ++j ) - { - if( idx[j] < Place ) - Place = idx[first = j]; - } - idx[first] = UNREACHABLEPLACE; - linkNames_[i] = rtl::OUString( LN[first].getStr(),LN[first].getLength(),RTL_TEXTENCODING_UTF8 ); - } - -#undef NAMECOUNT -#undef UNREACHABLEPLACE - } // end linknames - - - { - contextTables_ = new ContextTables(contextsOffsets_, - contextsDataL_,contextsData_, - linkNamesL_,linkNames_ ); - } -} - - -XmlIndex::~XmlIndex() -{ - delete[] allLists_; - delete[] contextsData_; - delete[] linkNames_; - delete[] positions_; - delete positionsFile_; - delete contextTables_; -} - - - -void XmlIndex::reset() -{ - maxDocNumberInCache_ = allInCache_ ? static_cast<sal_Int32>(microIndexOffsets_.size()) - 1 : -1; -} - - -sal_Int32 binarySearch( const std::vector<sal_Int32>& arr,sal_Int32 value ) -{ - sal_Int32 i = 0, j = arr.size(), k; - while (i <= j) - if (arr[k = (i + j)/2] < value) - i = k + 1; - else if (value < arr[k]) - j = k - 1; - else - return k; - return -1; -} - - -NonnegativeIntegerGenerator* XmlIndex::getDocumentIterator( sal_Int32 concept ) -{ - sal_Int32 index = binarySearch( concepts_,concept ); - - if( index >= 0 ) - return new util::ConceptList( allLists_,allListsL_,offsets_[index] ); - else - return 0; -} - - -bool XmlIndex::occursInText( sal_Int32 concept ) -{ - return binarySearch( concepts_,concept) >= 0; -} - - -sal_Int8* XmlIndex::getPositions( sal_Int32& len,sal_Int32 docNo ) throw( excep::XmlSearchException ) -{ - contextTables_->setMicroindex( docNo ); - if( docNo > maxDocNumberInCache_ ) - readMicroindexes( docNo ); - - len = positionsL_; - return positions_; -} - - -rtl::OUString XmlIndex::documentName( sal_Int32 docNumber ) throw( excep::XmlSearchException ) -{ - if( docNumber < 0 || documents_.size() <= sal_uInt32( docNumber ) ) - { - rtl::OUString message = rtl::OUString::createFromAscii( "XmlIndex::documentName -> " ); - throw excep::XmlSearchException( message ); - } - - return dict_.fetch( documents_[ docNumber ] ); -} - - - - -void XmlIndex::readMicroindexes( sal_Int32 docNo ) throw( xmlsearch::excep::IOException ) -{ - currentBatchOffset_ = microIndexOffsets_[docNo]; - sal_Int32 offsetLimit = currentBatchOffset_ + positionsL_; - sal_Int32 upTo = 0, nextDoc = docNo; - sal_Int32 lastOffset = 0; - - do - { - if( ++nextDoc == sal_Int32( microIndexOffsets_.size() ) ) - lastOffset = sal_Int32( positionsFile_->length() ); - else if( microIndexOffsets_[ nextDoc ] > offsetLimit ) - lastOffset = microIndexOffsets_[ nextDoc ]; - } - while( lastOffset == 0 ); - - if( lastOffset > offsetLimit ) - { - upTo = microIndexOffsets_[ nextDoc - 1 ]; - maxDocNumberInCache_ = nextDoc - 2; - } - else - { - upTo = lastOffset; - maxDocNumberInCache_ = nextDoc - 1; - } - - if( maxDocNumberInCache_ < docNo ) - { // cache too small - // for current microindex - // System.out.println("expanding cache to " + _positionsCacheSize); - delete[] positions_; - positions_ = new sal_Int8[ positionsL_ = lastOffset - currentBatchOffset_ ]; - readMicroindexes( docNo ); - return; - } - - positionsFile_->seek( currentBatchOffset_ ); - positionsFile_->readBytes( positions_,upTo - currentBatchOffset_ ); -} - - -QueryHitData* XmlIndex::hitToData( QueryHit* hit ) -{ - sal_Int32 termsL,matchesL; - sal_Int32 *matches = hit->getMatches( matchesL ); - rtl::OUString *terms = new rtl::OUString[ termsL = matchesL >>/*>*/ 1 ]; - for( sal_Int32 i = 0; i < termsL; ++i ) - { - sal_Int32 aInt = ( i << 1 ); - if( 0 <= aInt && aInt < matchesL ) - { - sal_Int32 match = matches[ aInt ]; - if( match > 0 ) - try - { - terms[i] = fetch( match ); - } - catch( const excep::XmlSearchException& ) - { - } - } - } - - sal_Int32 document = hit->getDocument(); - QueryHitData *res = new QueryHitData( hit->getPenalty(), - documentName( document ), - termsL,terms ); - contextTables_->setMicroindex( document ); - contextTables_->resetContextSearch(); - return res; -} - - diff --git a/xmlhelp/source/cxxhelp/qe/makefile.mk b/xmlhelp/source/cxxhelp/qe/makefile.mk index e86231898c..249950c4f0 100644 --- a/xmlhelp/source/cxxhelp/qe/makefile.mk +++ b/xmlhelp/source/cxxhelp/qe/makefile.mk @@ -45,14 +45,7 @@ ENABLE_EXCEPTIONS=TRUE CFLAGS+=-GR .ENDIF -SLOFILES=\ - $(SLO)$/ConceptData.obj \ - $(SLO)$/ContextTables.obj \ - $(SLO)$/DocGenerator.obj \ - $(SLO)$/Query.obj \ - $(SLO)$/QueryProcessor.obj \ - $(SLO)$/Search.obj \ - $(SLO)$/XmlIndex.obj +SLOFILES=$(SLO)$/DocGenerator.obj # --- Targets ------------------------------------------------------ diff --git a/xmlhelp/source/cxxhelp/util/Decompressor.cxx b/xmlhelp/source/cxxhelp/util/Decompressor.cxx index b745650dfc..972ebfe8c9 100644 --- a/xmlhelp/source/cxxhelp/util/Decompressor.cxx +++ b/xmlhelp/source/cxxhelp/util/Decompressor.cxx @@ -30,183 +30,29 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmlhelp.hxx" -#include <db/Block.hxx> #include <util/Decompressor.hxx> #include <util/CompressorIterator.hxx> - - using namespace xmlsearch; using namespace xmlsearch::util; - - const sal_Int32 Decompressor::BitsInByte = 8; const sal_Int32 Decompressor::NBits = 32; - -sal_Int32 Decompressor::read( sal_Int32 kBits ) throw( excep::XmlSearchException ) -{ - sal_Int32 shift = BitsInByte - toRead_; - if( kBits <= toRead_ ) - return ( ( readByte_ << shift ) & 0xFF) >>/*>*/ (shift + ( toRead_ -= kBits)); - else - { - sal_Int32 result = toRead_ > 0 ? ( ( readByte_ << shift ) & 0xFF ) >>/*>*/ shift : 0; - for( kBits -= toRead_; kBits >= BitsInByte; kBits -= BitsInByte ) - result = ( result << BitsInByte ) | getNextByte(); - if( kBits > 0 ) - return ( result << kBits ) | ( ( readByte_ = getNextByte() ) >>/*>*/ ( toRead_ = BitsInByte - kBits ) ); - else - { - toRead_ = 0; - return result; - } - } -} - - -sal_Int32 Decompressor::ascendingDecode( sal_Int32 k,sal_Int32 start,sal_Int32* array ) - throw( xmlsearch::excep::XmlSearchException ) -{ - sal_Int32 path = 0, index = 0; - LOOP: - while( true ) - if( read() ) - array[index++] = (start += path | read(k)); - else - for( sal_Int32 cnt = 0;; readByte_ = getNextByte(), toRead_ = BitsInByte ) - while( toRead_-- > 0 ) - if( readByte_ & ( 1 << toRead_ ) ) - { - ++cnt; - sal_Int32 Path = ( (path >>/*>*/ ( k + cnt ) << cnt ) | read( cnt ) ) << k; - if (Path != path) - { - array[index++] = ( start += ( path = Path ) | read( k ) ); - goto LOOP; - } - else - return index; - } - else - ++cnt; -} - - - -void Decompressor::ascDecode( sal_Int32 k,std::vector< sal_Int32 >& array) throw( excep::XmlSearchException ) -{ - for( sal_Int32 path = 0,start = 0; ; ) - if( read() != 0 ) - array.push_back( start += path | read( k ) ); - else - { - sal_Int32 count = countZeroes() + 1; - sal_Int32 saved = path; - path = ( ( path >>/*>*/ ( k + count ) << count) | read( count ) ) << k; - if( path != saved ) // convention for end - array.push_back( start += path | read( k ) ); - else - break; - } -} - - -void Decompressor::decode( sal_Int32 k,std::vector< sal_Int32 >& array) throw( excep::XmlSearchException ) -{ - for( sal_Int32 path = 0; ; ) - if( read() ) - array.push_back( path | read( k ) ); - else - { - sal_Int32 count = countZeroes() + 1; - sal_Int32 saved = path; - path = ( ( path >>/*>*/ ( k + count ) << count ) | read( count ) ) << k; - if( path != saved ) // convention for end - array.push_back( path | read( k ) ); - else - break; - } -} - - - -void Decompressor::decode(sal_Int32 k, sal_Int32* array ) throw( excep::XmlSearchException ) -{ - for( sal_Int32 path = 0,index = 0; ; ) - if( read() ) - array[ index++] = ( path | read( k ) ); - else - { - sal_Int32 count = countZeroes() + 1; - sal_Int32 saved = path; - path = ( ( path >>/*>*/ ( k + count ) << count ) | read( count ) ) << k; - if( path != saved ) // convention for end - array[ index++ ] = ( path | read( k ) ); - else - break; - } -} - - - -sal_Int32 Decompressor::read() throw( excep::XmlSearchException ) -{ - if( toRead_-- > 0 ) - return readByte_ & ( 1 << toRead_ ); - else - { // get next word - toRead_ = BitsInByte - 1; - return ( readByte_ = getNextByte() ) & 0x80; - } -} - - -sal_Int32 Decompressor::countZeroes() throw( excep::XmlSearchException ) -{ - for( sal_Int32 count = 0; ;readByte_ = getNextByte(),toRead_ = BitsInByte ) - while( toRead_-- > 0 ) - if( readByte_ & ( 1 << toRead_ ) ) - return count; - else - ++count; -} - - -bool Decompressor::readNext( sal_Int32 k,CompressorIterator* it) throw( excep::XmlSearchException ) +inline sal_Int32 getInteger_( const sal_Int8* v ) { - if( read() != 0 ) - { - it->value( path_ | read(k) ); - return true; - } - else - for( sal_Int32 count = 1; ; readByte_ = getNextByte(), toRead_ = BitsInByte ) - while( toRead_-- > 0 ) - if( readByte_ & ( 1 << toRead_ ) ) - { - sal_Int32 saved = path_; - path_ = ( (path_ >>/*>*/ ( k + count ) << count ) | read( count ) ) << k; - if( path_ != saved ) - { - it->value( path_ | read( k ) ); - return true; - } - else - return false; - } - else - ++count; + return (((((( v[0]&0xFF ) << 8 ) + | v[1]&0xFF ) << 8 ) + | v[2]&0xFF ) << 8 ) + | v[3]&0xFF; } - - +
sal_Int32 StreamDecompressor::getNextByte() { sal_Int8 a[4]; a[0] = a[1] = a[2] = 0; if( in_->readBytes( &a[3],1 ) != -1 ) - return ::getInteger_( a ); + return getInteger_( a ); else return -1; } diff --git a/xmlhelp/source/cxxhelp/util/IndexAccessor.cxx b/xmlhelp/source/cxxhelp/util/IndexAccessor.cxx deleted file mode 100644 index 2bc42a0f26..0000000000 --- a/xmlhelp/source/cxxhelp/util/IndexAccessor.cxx +++ /dev/null @@ -1,180 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: IndexAccessor.cxx,v $ - * $Revision: 1.10 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_xmlhelp.hxx" -#include <osl/diagnose.h> -#include <osl/file.hxx> -#include <util/IndexAccessor.hxx> -#include <util/RandomAccessStream.hxx> - - -using namespace xmlsearch::excep; -using namespace xmlsearch::util; - - -class RandomAccessStreamImpl - : public RandomAccessStream -{ -public: - - RandomAccessStreamImpl( const rtl::OUString& aPath,const rtl::OUString& how ); - - ~RandomAccessStreamImpl() - { - close(); - } - - virtual void seek( sal_Int32 pos ) - { - file_.setPos( Pos_Absolut,sal_uInt64( pos ) ); - } - - virtual sal_Int32 readBytes( sal_Int8* data,sal_Int32 num ) - { - sal_uInt64 nbytesread; - -#ifdef DBG_UTIL - osl::FileBase::RC err = - file_.read( (void*)(data), sal_uInt64(num),nbytesread ); - - OSL_ENSURE( err == osl::FileBase::E_None, "RandomAccessStreamImpl::readBytes: -> file not open" ); -#else - file_.read( (void*)(data), sal_uInt64(num),nbytesread ); -#endif - - return sal_Int32( nbytesread ); - } - - virtual void writeBytes( sal_Int8*, sal_Int32 ) - { - // Do nothing by now - } - - virtual sal_Int32 length() - { - osl::DirectoryItem aItem; - osl::FileStatus aStatus( FileStatusMask_FileSize ); - osl::DirectoryItem::get( path_,aItem ); - aItem.getFileStatus( aStatus ); - return sal_Int32( aStatus.getFileSize() ); - } - - virtual void close() - { - file_.close(); - } - - bool isOpen() - { - return isOpen_; - } - -private: - - rtl::OUString path_; - osl::File file_; - bool isOpen_; -}; - - -RandomAccessStreamImpl::RandomAccessStreamImpl( const rtl::OUString& aPath,const rtl::OUString& how ) - : path_( aPath ), - file_( aPath ) -{ - sal_uInt32 flags = 0; - const sal_Unicode* bla = how.getStr(); - - for( int i = 0; i < how.getLength(); ++i ) - { - if( bla[i] == sal_Unicode( 'r' ) ) - flags |= Read; - else if( bla[i] == sal_Unicode( 'w' ) ) - flags |= Write; - else if( bla[i] == sal_Unicode( 'c' ) ) - flags |= Create; - } - isOpen_ = ( file_.open( flags ) == osl::FileBase::E_None ); - if( !isOpen_ ) - { - file_.close(); - OSL_ENSURE( false,"RandomAccessStreamImpl::RandomAccessStreamImpl -> could not open file" ); - } -} - - - -RandomAccessStream* IndexAccessor::getStream( const rtl::OUString& fileName,const rtl::OUString& how ) const -{ - rtl::OUString qualifiedName; - int retry = 2; - RandomAccessStreamImpl *p = 0; - - while( retry-- && ! p ) - { - if( retry == 1 ) - qualifiedName = dirName_ + fileName; - else if( retry == 0 ) - qualifiedName = dirName_ + fileName.toAsciiLowerCase(); - - p = new RandomAccessStreamImpl( qualifiedName,how ); - if( ! p->isOpen() ) - { - delete p; p = 0; - } - } - - return p; -} - - -sal_Int32 IndexAccessor::readByteArray( sal_Int8*& out,const rtl::OUString& fileName ) - throw( IOException ) -{ - RandomAccessStream* in = getStream( fileName,rtl::OUString::createFromAscii("r") ); - if( ! in ) - throw IOException( - rtl::OUString::createFromAscii( "IndexAccessor::readByteArray -> cannot open file " ) + - fileName ); - - sal_Int32 n; - delete[] out; - out = new sal_Int8[ n = in->length() ]; - in->readBytes( out,n ); - delete in; - return n; -} - - - - - - - diff --git a/xmlhelp/source/cxxhelp/util/makefile.mk b/xmlhelp/source/cxxhelp/util/makefile.mk index e872498f71..8e25c8584c 100644 --- a/xmlhelp/source/cxxhelp/util/makefile.mk +++ b/xmlhelp/source/cxxhelp/util/makefile.mk @@ -46,8 +46,7 @@ CFLAGS+=-GR .ENDIF SLOFILES=\ - $(SLO)$/Decompressor.obj \ - $(SLO)$/IndexAccessor.obj + $(SLO)$/Decompressor.obj # --- Targets ------------------------------------------------------ diff --git a/xmlhelp/util/makefile.mk b/xmlhelp/util/makefile.mk index fb0a92d8e6..8b2a951713 100644 --- a/xmlhelp/util/makefile.mk +++ b/xmlhelp/util/makefile.mk @@ -72,7 +72,6 @@ SHL1STDLIBS= \ SHL1LIBS = \ $(SLB)$/jaqe.lib \ $(SLB)$/jautil.lib \ - $(SLB)$/jadb.lib \ $(SLB)$/chelp.lib # --- Def-File --------------------------------------------------------- |