forked from Mirrors/privacore-open-source-search-engine
Removed code in XmlDoc::getLinkInfo2() after unconditional early return
This commit is contained in:
88
XmlDoc.cpp
88
XmlDoc.cpp
@ -11890,94 +11890,6 @@ LinkInfo **XmlDoc::getLinkInfo2 ( ) {
|
||||
// any more.
|
||||
m_linkInfo2Valid = true;
|
||||
return (LinkInfo **)&s_null;
|
||||
|
||||
// return if we got it
|
||||
if ( m_linkInfo2Valid ) return &ptr_linkInfo2;
|
||||
|
||||
m_linkInfo2Valid = true;
|
||||
ptr_linkInfo2 = NULL;
|
||||
return &ptr_linkInfo2;
|
||||
|
||||
/*
|
||||
if ( ! cr->m_importFromHosts2Conf ) {
|
||||
m_linkInfo2Valid = true;
|
||||
ptr_linkInfo2 = NULL;
|
||||
return &ptr_linkInfo2;
|
||||
}
|
||||
|
||||
// change status
|
||||
setStatus ( "getting remote hosts2.conf inlinkers" );
|
||||
|
||||
XmlDoc **od = getOldXmlDoc ( );
|
||||
if ( ! od || od == (XmlDoc **)-1 ) return (LinkInfo **)od;
|
||||
int32_t *sni = getSiteNumInlinks();
|
||||
if ( ! sni || sni == (int32_t *)-1 ) return (LinkInfo **)sni;
|
||||
int32_t *ip = getIp();
|
||||
if ( ! ip || ip == (int32_t *)-1 ) return (LinkInfo **)ip;
|
||||
int64_t *d = getDocId();
|
||||
if ( ! d || d == (int64_t *)-1 ) return (LinkInfo **)d;
|
||||
// grab a ptr to the LinkInfo contained in our Doc class
|
||||
LinkInfo *oldLinkInfo2 = NULL;
|
||||
if ( *od ) oldLinkInfo2 = *(*od)->getLinkInfo2();
|
||||
|
||||
// . now search for some link info for this url/doc
|
||||
// . this queries the search engine to get linking docIds along
|
||||
// with their termIds/scores from anchor text and then compiles
|
||||
// it all into one IndexList
|
||||
// . if we have no linkers to this url then we set siteHash, etc.
|
||||
// for this linkInfo class
|
||||
// . this is my google algorithm
|
||||
// . let's use the first url (before redirects) for this
|
||||
// . m_newDocId is used for classifying doc under predefined news topic
|
||||
// . catSiteRec is used for classifying pages under a predefined
|
||||
// newstopic. this is currently for news search only.
|
||||
// . use the rootTitleRecPtr if there and we are doing our link info
|
||||
// stuff in this collection, but if doing it in another collection
|
||||
// the msg25 will look up the root in that collection...
|
||||
if ( ! m_calledMsg25b ) {
|
||||
// do not redo it
|
||||
m_calledMsg25b = true;
|
||||
// shortcut
|
||||
Msg25 *m = &m_msg25;
|
||||
// can we be cancelled?
|
||||
bool canBeCancelled = true;
|
||||
// not if pageparser though
|
||||
if ( m_pbuf ) canBeCancelled = false;
|
||||
// not if injecting
|
||||
if ( ! m_sreqValid ) canBeCancelled = false;
|
||||
// use this buffer so XmlDoc::print() can display wherever
|
||||
//SafeBuf *sb = NULL;
|
||||
//if ( m_pbuf ) sb = &m_pageLinkBuf2;
|
||||
// call it
|
||||
if ( ! m->getPageLinkInfo2 ( getFirstUrl() ,
|
||||
m_coll ,
|
||||
cr->m_externalColl ,
|
||||
m_masterState ,
|
||||
m_masterLoop ,
|
||||
cr->m_doLinkSpamCheck ,
|
||||
cr->m_oneVotePerIpDom ,
|
||||
canBeCancelled ) )
|
||||
// blocked
|
||||
return (LinkInfo **)-1;
|
||||
// error?
|
||||
if ( g_errno ) return NULL;
|
||||
}
|
||||
|
||||
// at this point assume its valid
|
||||
m_linkInfo2Valid = true;
|
||||
// get the link info we got set
|
||||
ptr_linkInfo2 = m_msg25.m_linkInfo;
|
||||
// we should free it
|
||||
m_freeLinkInfo2 = true;
|
||||
// take it from msg25 permanently
|
||||
m_msg25.m_linkInfo = NULL;
|
||||
// set flag
|
||||
m_linkInfo2Valid = true;
|
||||
// validate the hop count thing too
|
||||
//m_minInlinkerHopCount = m_msg25.getMinInlinkerHopCount();
|
||||
// return it
|
||||
return &ptr_linkInfo2;
|
||||
*/
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user