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

print comma before json item so we do not end in trailing comma ever

Browse Source
This commit is contained in:
Matt Wells 2014-02-19 10:04:49 -08:00
parent dda7648333
commit b37b19ea4a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PageResults.cpp
View File

@ -1572,10 +1572,10 @@ bool printSearchResultsTail ( State0 *st ) {
// if ended in ",\n" cuz it was json, remove that // if ended in ",\n" cuz it was json, remove that
if ( si->m_format == FORMAT_JSON && sb->length() >= 4 ) { //if ( si->m_format == FORMAT_JSON && sb->length() >= 4 ) {
char *p = sb->getBuf() - 2; // char *p = sb->getBuf() - 2;
if ( p[0] ==',' && p[1] == '\n' ) sb->incrementLength(-2); // if ( p[0] ==',' && p[1] == '\n' ) sb->incrementLength(-2);
} //}
if ( si->m_format == FORMAT_JSON ) { if ( si->m_format == FORMAT_JSON ) {
// print ending ] for json // print ending ] for json
@ -2091,6 +2091,11 @@ bool printResult ( State0 *st, long ix ) {
// just print cached web page? // just print cached web page?
if ( mr->ptr_content ) { if ( mr->ptr_content ) {
// for json items separate with \n,\n
if ( si->m_format != FORMAT_HTML && ix>0 )
sb->safePrintf(",\n");
sb->safeStrcpy ( mr->ptr_content ); sb->safeStrcpy ( mr->ptr_content );
// . let's hack the spidertime onto the end // . let's hack the spidertime onto the end
// . so when we sort by that using gbsortby:spiderdate // . so when we sort by that using gbsortby:spiderdate
@ -2105,16 +2110,13 @@ bool printResult ( State0 *st, long ix ) {
// so fix that shit here... // so fix that shit here...
//float f = mr->m_lastSpidered; //float f = mr->m_lastSpidered;
//sb->safePrintf(",\"lastCrawlTimeUTC\":%.0f}",f); //sb->safePrintf(",\"lastCrawlTimeUTC\":%.0f}",f);
sb->safePrintf(",\"lastCrawlTimeUTC\":%li}", sb->safePrintf(",\"lastCrawlTimeUTC\":%li}\n",
mr->m_lastSpidered); mr->m_lastSpidered);
} }
//mr->size_content ); //mr->size_content );
if ( si->m_format == FORMAT_HTML ) if ( si->m_format == FORMAT_HTML )
sb->safePrintf("\n\n<br><br>\n\n"); sb->safePrintf("\n\n<br><br>\n\n");
// for json items separate with \n
if ( si->m_format != FORMAT_HTML )
sb->safePrintf("\n,\n");
// just in case // just in case
sb->nullTerm(); sb->nullTerm();
return true; return true;