Changeset 12389

Timestamp:

2006-08-03T10:59:45+12:00 (18 years ago)

Author:

mdewsnip

Message:

The "the following words were too common and were ignored" message (for Lucene stopwords) was being displayed always, rather than just when it was appropriate.

Location:

trunk/gsdl

Files:

• macros/query.dm (modified) (1 diff)
• src/recpt/queryaction.cpp (modified) (1 diff)

trunk/gsdl/macros/query.dm

@@ -543 +543 @@
 _freqmsg_
 _textpostprocess_
-(_stopwordsmsg_)</small><br />
+_If_(_stopwordsmsg_,(_stopwordsmsg_))</small><br />
 _resultline_
 ,<div class="divbar">&nbsp;</div>)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -1606 +1606 @@
   disp.setmacro ("freqmsg", "query", freqmsg);
 
-  text_t stopwordsmsg = "_textstopwordsmsg_ ";
-  text_tset::const_iterator stopwords_iterator = response.stopwords.begin();
-  while (stopwords_iterator != response.stopwords.end()) {
-    if (stopwordsmsg != "_textstopwordsmsg_ ") {
-      stopwordsmsg += ", ";
-    }
-    stopwordsmsg += (*stopwords_iterator);
-    ++stopwords_iterator;
-  }
-  disp.setmacro("stopwordsmsg", "query", stopwordsmsg);
+  text_tset::const_iterator this_stopword = response.stopwords.begin();
+  text_tset::const_iterator end_stopword = response.stopwords.end();
+  if (this_stopword != end_stopword) {
+    text_t stopwordsmsg = "_textstopwordsmsg_ ";
+    while (this_stopword != end_stopword) {
+      if (stopwordsmsg != "_textstopwordsmsg_ ") {
+    stopwordsmsg += ", ";
+      }
+      stopwordsmsg += (*this_stopword);
+      ++this_stopword;
+    }
+    disp.setmacro("stopwordsmsg", "query", stopwordsmsg);
+  }
 }