+ imp. of the search results display

src/common/kiwix/cluceneIndexer.cpp

@@ -37,7 +37,10 @@ namespace kiwix {
 					const string &title,
 					const string &unaccentedTitle,
 					const string &keywords,
-					const string &content) {
+					const string &content,
+					const string &snippet,
+					const string &size,
+					const string &wordCount) {
     
     Document doc;
     

src/common/kiwix/cluceneIndexer.h

@@ -47,7 +47,10 @@ namespace kiwix {
 			  const string &title, 
 			  const string &unaccentedTitle,
 			  const string &keywords, 
-			  const string &content);
+			  const string &content,
+			  const string &snippet,
+			  const string &size,
+			  const string &wordCount);
     void indexNextPercentPost();
     void stopIndexing();
 

src/common/kiwix/indexer.cpp

@@ -126,11 +126,28 @@ namespace kiwix {
 	    accentedTitle = currentArticle.getTitle();
 	  }
 
+	  /* count words */
+	  stringstream st;
+	  st << countWords(this->htmlParser.dump);
+	  const std::string wordCountString = st.str();
+
+	  /* snippet */
+	  const std::string snippet = std::string(this->htmlParser.dump, 0, 300);
+
+	  /* size */
+	  st << content.size();
+	  const std::string size = st.str();
+
 	  this->indexNextArticle(url, 
 				 accentedTitle,
 				 removeAccents(this->htmlParser.title), 
 				 removeAccents(this->htmlParser.keywords),
-				 removeAccents(this->htmlParser.dump));
+				 removeAccents(this->htmlParser.dump),
+				 snippet,
+				 size,
+				 wordCountString
+				 );
+
 	}
       }
     }

src/common/kiwix/indexer.h

@@ -24,6 +24,7 @@
 #include <vector>
 #include <fstream>
 #include <iostream>
+#include <sstream>
 
 #include <xapian.h>
 #include <unaccent.h>
@@ -48,7 +49,10 @@ namespace kiwix {
 				  const string &title, 
 				  const string &unaccentedTitle,
 				  const string &keywords, 
-				  const string &content) = 0;
+				  const string &content,
+				  const string &snippet,
+				  const string &size,
+				  const string &wordCount) = 0;
     virtual void indexNextPercentPost() = 0;
     virtual void stopIndexing() = 0;
 

src/common/kiwix/searcher.cpp

@@ -135,6 +135,9 @@ namespace kiwix {
       CDT result;
       result["title"] = this->resultOffset->title;
       result["url"] = this->resultOffset->url;
+      result["snippet"] = this->resultOffset->snippet;
+      result["size"] = this->resultOffset->size;
+      result["wordCount"] = this->resultOffset->wordCount;
       resultsCDT.PushBack(result);
       this->resultOffset++;
     }

src/common/kiwix/searcher.h

@@ -50,6 +50,9 @@ struct Result
   string url;
   string title;
   int score;
+  string snippet;
+  int wordCount;
+  int size;
 }; 
 
 namespace kiwix {

src/common/kiwix/xapianIndexer.cpp

@@ -54,12 +54,18 @@ namespace kiwix {
 				       const string &title, 
 				       const string &unaccentedTitle,
 				       const string &keywords, 
-				       const string &content) {
+				       const string &content,
+				       const string &snippet,
+				       const string &size,
+				       const string &wordCount) {
 
     /* Put the data in the document */
     Xapian::Document currentDocument; 
     currentDocument.clear_values();
     currentDocument.add_value(0, title);
+    currentDocument.add_value(1, snippet);
+    currentDocument.add_value(2, size);
+    currentDocument.add_value(3, wordCount);
     currentDocument.set_data(url);
     indexer.set_document(currentDocument);
 

src/common/kiwix/xapianIndexer.h

@@ -38,7 +38,10 @@ namespace kiwix {
 			  const string &title, 
 			  const string &unaccentedTitle,
 			  const string &keywords, 
-			  const string &content);
+			  const string &content,
+			  const string &snippet,
+			  const string &size,
+			  const string &wordCount);
     void indexNextPercentPost();
     void stopIndexing();
     

src/common/kiwix/xapianSearcher.cpp

@@ -58,6 +58,9 @@ namespace kiwix {
       Result result;
       result.url = doc.get_data();
       result.title = doc.get_value(0);
+      result.snippet = doc.get_value(1);
+      result.size = atoi(doc.get_value(2).c_str());
+      result.wordCount = atoi(doc.get_value(3).c_str());
       result.score = i.get_percent();
       
       this->results.push_back(result);

static/results.tmpl

@@ -104,7 +104,7 @@
     <TMPL_loop results>
 	  <li>
 	    <a href="<TMPL_var url>"><TMPL_var title></a>
-	    <cite><TMPL_var snippet></cite>
+	    <cite><TMPL_if snippet><TMPL_var snippet>...</TMPL_if></cite>
 	    <TMPL_if size><TMPL_if wordCount><div class="informations"><TMPL_var size> KB (<TMPL_var wordCount> words)</div></TMPL_if></TMPL_if>
 	  </li>
     </TMPL_loop>