|
*** class.tx_indexedsearch.php.org Mon Mar 20 20:10:09 2006
|
|
--- class.tx_indexedsearch.php Mon Mar 20 20:09:09 2006
|
|
***************
|
|
*** 842,853 ****
|
|
function execPHashListQuery($wordSel,$plusQ='') {
|
|
return $GLOBALS['TYPO3_DB']->exec_SELECTquery(
|
|
'IR.phash',
|
|
! 'index_words IW,
|
|
! index_rel IR,
|
|
! index_section ISEC',
|
|
$wordSel.'
|
|
- AND IW.wid=IR.wid
|
|
- AND ISEC.phash = IR.phash
|
|
'.$this->sectionTableWhere().'
|
|
'.$plusQ,
|
|
'IR.phash'
|
|
--- 842,851 ----
|
|
function execPHashListQuery($wordSel,$plusQ='') {
|
|
return $GLOBALS['TYPO3_DB']->exec_SELECTquery(
|
|
'IR.phash',
|
|
! 'index_words IW
|
|
! JOIN index_rel IR ON IW.wid = IR.wid
|
|
! JOIN index_section ISEC ON IR.phash = ISEC.phash',
|
|
$wordSel.'
|
|
'.$this->sectionTableWhere().'
|
|
'.$plusQ,
|
|
'IR.phash'
|
|
***************
|
|
*** 1029,1046 ****
|
|
return $GLOBALS['TYPO3_DB']->exec_SELECTquery(
|
|
'ISEC.*, IP.*, '
|
|
.$grsel,
|
|
! 'index_words IW,
|
|
! index_rel IR,
|
|
! index_section ISEC,
|
|
! index_phash IP'.
|
|
$page_join,
|
|
$wordSel.'
|
|
IP.phash IN ('.$list.') '.
|
|
$this->mediaTypeWhere().' '.
|
|
$this->languageWhere().'
|
|
- AND IW.wid=IR.wid
|
|
- AND ISEC.phash = IR.phash
|
|
- AND IP.phash = IR.phash
|
|
AND '.$page_where,
|
|
'IP.phash,ISEC.phash,ISEC.phash_t3,ISEC.rl0,ISEC.rl1,ISEC.rl2 ,ISEC.page_id,ISEC.uniqid,IP.phash_grouping,IP.data_filename ,IP.data_page_id ,IP.data_page_reg1,IP.data_page_type,IP.data_page_mp,IP.gr_list,IP.item_type,IP.item_title,IP.item_description,IP.item_mtime,IP.tstamp,IP.item_size,IP.contentHash,IP.crdate,IP.parsetime,IP.sys_language_uid,IP.item_crdate,IP.cHashParams,IP.externalUrl,IP.recordUid,IP.freeIndexUid',
|
|
$orderBy
|
|
--- 1027,1041 ----
|
|
return $GLOBALS['TYPO3_DB']->exec_SELECTquery(
|
|
'ISEC.*, IP.*, '
|
|
.$grsel,
|
|
! 'index_words IW
|
|
! JOIN index_rel IR ON IW.wid = IR.wid
|
|
! JOIN index_section ISEC ON IR.phash = ISEC.phash
|
|
! JOIN index_phash IP ON IR.phash = IP.phash'.
|
|
$page_join,
|
|
$wordSel.'
|
|
IP.phash IN ('.$list.') '.
|
|
$this->mediaTypeWhere().' '.
|
|
$this->languageWhere().'
|
|
AND '.$page_where,
|
|
'IP.phash,ISEC.phash,ISEC.phash_t3,ISEC.rl0,ISEC.rl1,ISEC.rl2 ,ISEC.page_id,ISEC.uniqid,IP.phash_grouping,IP.data_filename ,IP.data_page_id ,IP.data_page_reg1,IP.data_page_type,IP.data_page_mp,IP.gr_list,IP.item_type,IP.item_title,IP.item_description,IP.item_mtime,IP.tstamp,IP.item_size,IP.contentHash,IP.crdate,IP.parsetime,IP.sys_language_uid,IP.item_crdate,IP.cHashParams,IP.externalUrl,IP.recordUid,IP.freeIndexUid',
|
|
$orderBy
|
|
***************
|
|
*** 1062,1072 ****
|
|
|
|
return $GLOBALS['TYPO3_DB']->exec_SELECTquery(
|
|
'ISEC.*, IP.*',
|
|
! 'index_phash IP,index_section ISEC'.$page_join,
|
|
'IP.phash IN ('.$list.') '.
|
|
$this->mediaTypeWhere().' '.
|
|
$this->languageWhere().'
|
|
- AND IP.phash = ISEC.phash
|
|
AND '.$page_where,
|
|
'IP.phash,ISEC.phash,ISEC.phash_t3,ISEC.rl0,ISEC.rl1,ISEC.rl2 ,ISEC.page_id,ISEC.uniqid,IP.phash_grouping,IP.data_filename ,IP.data_page_id ,IP.data_page_reg1,IP.data_page_type,IP.data_page_mp,IP.gr_list,IP.item_type,IP.item_title,IP.item_description,IP.item_mtime,IP.tstamp,IP.item_size,IP.contentHash,IP.crdate,IP.parsetime,IP.sys_language_uid,IP.item_crdate,IP.cHashParams,IP.externalUrl,IP.recordUid,IP.freeIndexUid',
|
|
$orderBy
|
|
--- 1057,1066 ----
|
|
|
|
return $GLOBALS['TYPO3_DB']->exec_SELECTquery(
|
|
'ISEC.*, IP.*',
|
|
! 'index_phash IP JOIN index_section ISEC ON IP.phash = ISEC.phash'.$page_join,
|
|
'IP.phash IN ('.$list.') '.
|
|
$this->mediaTypeWhere().' '.
|
|
$this->languageWhere().'
|
|
AND '.$page_where,
|
|
'IP.phash,ISEC.phash,ISEC.phash_t3,ISEC.rl0,ISEC.rl1,ISEC.rl2 ,ISEC.page_id,ISEC.uniqid,IP.phash_grouping,IP.data_filename ,IP.data_page_id ,IP.data_page_reg1,IP.data_page_type,IP.data_page_mp,IP.gr_list,IP.item_type,IP.item_title,IP.item_description,IP.item_mtime,IP.tstamp,IP.item_size,IP.contentHash,IP.crdate,IP.parsetime,IP.sys_language_uid,IP.item_crdate,IP.cHashParams,IP.externalUrl,IP.recordUid,IP.freeIndexUid',
|
|
$orderBy
|