Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java,v
diff -u -r1.1 -r1.2
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java	27 Oct 2008 03:31:23 -0000	1.1
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java	28 Oct 2008 05:35:23 -0000	1.2
@@ -125,7 +125,7 @@
     }
 
     public ToolOutput getToolOutput(String name, IChatService chatService, Long toolSessionId, Long learnerId) {
-	if (isTextSearchConditionName(ChatConstants.TEXT_SEARCH_DEFINITION_NAME)) {
+	if (isTextSearchConditionName(name)) {
 	    // entry is loaded from DB
 	    Chat chat = chatService.getSessionBySessionId(toolSessionId).getChat();
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java,v
diff -u -r1.4 -r1.5
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java	27 Oct 2008 00:53:02 -0000	1.4
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java	28 Oct 2008 05:35:24 -0000	1.5
@@ -149,7 +149,7 @@
 
     public ToolOutput getToolOutput(String name, IForumService forumService, Long toolSessionId, Long learnerId) {
 	ToolOutput toolOutput = null;
-	if (isTextSearchConditionName(ForumConstants.TEXT_SEARCH_DEFINITION_NAME)) {
+	if (isTextSearchConditionName(name)) {
 	    // a map of "topic creation date" -> "all learner's answers to that topic"
 	    Map<Date, Set<String>> answers = new HashMap<Date, Set<String>>();
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java,v
diff -u -r1.6 -r1.7
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java	27 Oct 2008 00:48:05 -0000	1.6
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java	28 Oct 2008 05:35:24 -0000	1.7
@@ -133,7 +133,7 @@
     }
 
     public ToolOutput getToolOutput(String name, IQaService qaService, Long toolSessionId, Long learnerId) {
-	if (isTextSearchConditionName(QaAppConstants.TEXT_SEARCH_DEFINITION_NAME)) {
+	if (isTextSearchConditionName(name)) {
 	    // user answers are loaded from the DB and array of strings is created
 
 	    QaSession session = qaService.retrieveQaSession(toolSessionId);
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java,v
diff -u -r1.2 -r1.3
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java	27 Oct 2008 00:49:15 -0000	1.2
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java	28 Oct 2008 05:35:24 -0000	1.3
@@ -133,7 +133,7 @@
     }
 
     public ToolOutput getToolOutput(String name, ISurveyService surveyService, Long toolSessionId, Long learnerId) {
-	if (isTextSearchConditionName(SurveyConstants.TEXT_SEARCH_DEFINITION_NAME)) {
+	if (isTextSearchConditionName(name)) {
 	    // user answers are loaded from the DB and array of strings is created
 
 	    Survey survey = surveyService.getSurveyBySessionId(toolSessionId);