From 90139509a6240f703712cdd57bbb508174d8946e Mon Sep 17 00:00:00 2001 From: mwells Date: Sun, 3 Aug 2014 19:38:50 -0700 Subject: [PATCH] gui updates --- PageResults.cpp | 250 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 226 insertions(+), 24 deletions(-) diff --git a/PageResults.cpp b/PageResults.cpp index 25707494..6dc8ffba 100644 --- a/PageResults.cpp +++ b/PageResults.cpp @@ -1546,6 +1546,8 @@ bool printLeftNavColumn ( SafeBuf &sb, State0 *st ) { SearchInput *si = &st->m_si; Msg40 *msg40 = &st->m_msg40; + char format = si->m_format; + // // BEGIN FACET PRINTING // @@ -1554,7 +1556,7 @@ bool printLeftNavColumn ( SafeBuf &sb, State0 *st ) { // . LATER: show the text string corresponding to the hash // by looking it up in the titleRec // - if ( si->m_format == FORMAT_HTML ) msg40->printFacetTables ( &sb ); + if ( format == FORMAT_HTML ) msg40->printFacetTables ( &sb ); // // END FACET PRINTING // @@ -1566,7 +1568,7 @@ bool printLeftNavColumn ( SafeBuf &sb, State0 *st ) { SafeBuf *gbuf = &msg40->m_gigabitBuf; long numGigabits = gbuf->length()/sizeof(Gigabit); - if ( si->m_format != FORMAT_HTML ) numGigabits = 0; + if ( format != FORMAT_HTML ) numGigabits = 0; // print gigabits @@ -1574,7 +1576,7 @@ bool printLeftNavColumn ( SafeBuf &sb, State0 *st ) { //long numCols = 5; //long perRow = numGigabits / numCols; - if ( numGigabits && si->m_format == FORMAT_HTML ) + if ( numGigabits && format == FORMAT_HTML ) // gigabit unhide function sb.safePrintf ( "\n" ); - if ( numGigabits && si->m_format == FORMAT_HTML ) + if ( numGigabits && format == FORMAT_HTML ) sb.safePrintf("
0 && si->m_format == FORMAT_HTML ) + //if ( i > 0 && format == FORMAT_HTML ) // sb.safePrintf("
"); //if ( perRow && (i % perRow == 0) ) // sb.safePrintf(""); // print all sentences containing this gigabit Gigabit *gi = &gigabits[i]; // after the first 3 hide them with a more link - if ( i == 3 && si->m_format == FORMAT_HTML ) + if ( i == 1 && format == FORMAT_HTML ) { + sb.safePrintf("" + "Show more"); sb.safePrintf(""); + "style=display:none;>" + "

"); + } //printGigabit ( st,sb , msg40 , gi , si ); //sb.safePrintf("
"); printGigabitContainingSentences(st,&sb,msg40,gi,si, &gigabitQuery); - sb.safePrintf("

"); + if ( format == FORMAT_HTML ) + sb.safePrintf("

"); } - if ( numGigabits >= 3 && si->m_format == FORMAT_HTML ) - sb.safePrintf("
" - "Show more"); + //if ( numGigabits >= 1 && format == FORMAT_HTML ) - if ( numGigabits && si->m_format == FORMAT_HTML ) + if ( numGigabits && format == FORMAT_HTML ) sb.safePrintf("

"); + // + // now print various knobs + // + + // + // print sort by date options + // + if ( format == FORMAT_HTML ) + sb.safePrintf( + "
" + "" + "SEARCH TOOLS    " + "" + "
" + + "
" + + /* + "
" + "" + "NEWSET FIRST    " + "" + "
" + + "
" + + "
" + "" + "OLDEST FIRST    " + "" + "
" + "
" + + */ + ); + + + // + // print date contraint functions now + // + if ( format == FORMAT_HTML && 1 == 2) + sb.safePrintf( + "
" + "" + "ANYTIME    " + "" + "
" + + "
" + + "
" + "" + "LAST 24 HOURS    " + "" + "
" + + "
" + + "
" + "" + "LAST 7 DAYS    " + "" + "
" + "
" + + "
" + "" + "LAST 30 DAYS    " + "" + "
" + "
" + + + ); + + + // // now the MAIN column // - sb.safePrintf("\n\n"); + if ( format == FORMAT_HTML ) + sb.safePrintf("\n" + "\n"); return true; }