Forks/open-source-search-engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'diffbot' into testing

Browse Source
This commit is contained in:
Matt Wells 2014-03-09 20:44:09 -07:00
commit 9debee20dc
1 changed files with 9 additions and 1 deletions

10
XmlDoc.cpp
View File

@ -13513,7 +13513,11 @@ long *XmlDoc::getDiffbotTitleHashes ( long *numHashes ) {
if ( ! ptr_linkInfo2 ) *numHashes = 0;
// hack: use linkdbdata2 field
if ( m_diffbotTitleHashBufValid ) return (long *)ptr_linkInfo2;
if ( m_diffbotTitleHashBufValid ) {
// do not return NULL without g_errno set
if ( ptr_linkInfo2 == NULL ) return (long *)0x01;
return (long *)ptr_linkInfo2;
}
SafeBuf *tdbr = getTokenizedDiffbotReply();
if ( ! tdbr || tdbr == (void *)-1 ) return (long *)tdbr;
@ -13560,6 +13564,9 @@ long *XmlDoc::getDiffbotTitleHashes ( long *numHashes ) {
*numHashes = size_linkInfo2 / 4;
m_diffbotTitleHashBufValid = true;
// if no hashes return 0x01 because NULL means g_errno
if ( ptr_linkInfo2 == NULL ) return (long *)0x01;
return (long *)ptr_linkInfo2;
}
@ -20293,6 +20300,7 @@ char *XmlDoc::getMetaList ( bool forDelete ) {
// diffbot reply if not already there.
long numHashes;
long *th = getDiffbotTitleHashes(&numHashes);
if ( ! th && ! g_errno ) { char *xx=NULL;*xx=0; }
if ( ! th || th == (void *)-1 ) return (char *)th;
// this returns false if it blocks
long *status = od->nukeJSONObjects( th , numHashes );