gigablast/open-source-search-engine
1
0
Fork 0
mirror of https://github.com/gigablast/open-source-search-engine.git synced 2024-10-04 20:27:43 +03:00
Code Issues Projects Releases Wiki Activity

bulk api nominal updates

Browse Source
This commit is contained in:
Matt Wells 2013-11-13 14:30:51 -08:00
parent 9e77f1b2f6
commit 7020f66daa
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HttpServer.cpp
View File

@ -921,7 +921,8 @@ bool HttpServer::sendReply ( TcpSocket *s , HttpRequest *r , bool isAdmin) {
// "GET /crawlbot/downloadobjects"
// "GET /crawlbot/downloadpages"
if ( strncmp ( path , "/crawlbot/download/" ,19 ) == 0 ||
strncmp ( path , "/v2/crawl/download/" ,19 ) == 0 )
strncmp ( path , "/v2/crawl/download/" ,19 ) == 0 ||
strncmp ( path , "/v2/bulk/download/" ,18 ) == 0 )
return sendBackDump ( s , r );
// . is it a diffbot api request, like "GET /api/*"

15
PageCrawlBot.cpp
View File

@ -2306,7 +2306,7 @@ bool sendPageCrawlbot ( TcpSocket *socket , HttpRequest *hr ) {
// no longer a delete function, we need to set "name" below
delColl = false;//NULL;
// john wants just a brief success reply
char *reply = "{\"reply\":\"Successfully deleted crawl.\"}";
char *reply = "{\"response\":\"Successfully deleted job.\"}";
return g_httpServer.sendDynamicPage( socket,
reply,
gbstrlen(reply),
@ -2814,16 +2814,21 @@ bool printCrawlDetailsInJson ( SafeBuf &sb , CollectionRec *cx ) {
char *token = cx->m_diffbotToken.getBufStart();
char *name = cx->m_diffbotCrawlName.getBufStart();
char *mt = "crawl";
if ( cx->m_isCustomCrawl == 2 ) mt = "bulk";
sb.safePrintf("\"downloadJson\":"
"\"http://api.diffbot.com/v2/crawl/download/"
"\"http://api.diffbot.com/v2/%s/download/"
"%s-%s_data.json\",\n"
, mt
, token
, name
);
sb.safePrintf("\"downloadUrls\":"
"\"http://api.diffbot.com/v2/crawl/download/"
"\"http://api.diffbot.com/v2/%s/download/"
"%s-%s_urls.csv\",\n"
, mt
, token
, name
);
@ -3012,11 +3017,11 @@ bool printCrawlBotPage2 ( TcpSocket *socket ,
// injection is currently not in use, so this is an artifact:
if ( fmt == FMT_JSON && injectionResponse )
sb.safePrintf("\"seedsResponse\":\"%s\",\n\n"
sb.safePrintf("\"response\":\"%s\",\n\n"
, injectionResponse->getBufStart() );
if ( fmt == FMT_JSON && urlUploadResponse )
sb.safePrintf("\"crawlResponse\":\"%s\",\n\n"
sb.safePrintf("\"response\":\"%s\",\n\n"
, urlUploadResponse->getBufStart() );