more complicated topic searches now possible...

[mir.git] / source / mircoders / servlet / ServletModuleOpenIndy.java

diff --git a/source/mircoders/servlet/ServletModuleOpenIndy.java b/source/mircoders/servlet/ServletModuleOpenIndy.java
index eef87c9..b3de697 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleOpenIndy.java
+++ b/source/mircoders/servlet/ServletModuleOpenIndy.java
@@ -102,6 +102,7 @@ import mircoders.search.ImagesSearchTerm;
 import mircoders.search.KeywordSearchTerm;
 import mircoders.search.TextSearchTerm;
 import mircoders.search.TopicSearchTerm;
+import mircoders.search.TopicMatrixSearchTerm;
 import mircoders.search.UnIndexedSearchTerm;
 import mircoders.search.VideoSearchTerm;
 import mircoders.storage.DatabaseComment;
@@ -119,7 +120,7 @@ import mircoders.storage.DatabaseTopics;
  *    open-postings to the newswire
  *
  * @author mir-coders group
- * @version $Id: ServletModuleOpenIndy.java,v 1.89 2003/05/08 02:43:42 zapata Exp $
+ * @version $Id: ServletModuleOpenIndy.java,v 1.89.2.2 2003/06/03 20:58:30 john Exp $
  *
  */
 
@@ -583,6 +584,7 @@ public class ServletModuleOpenIndy extends ServletModule
     String to = req.getParameter("mail_to");
     String from = req.getParameter("mail_from");
     String from_name = req.getParameter("mail_from_name");
+    String from_ip = req.getRemoteAddr();
     String comment = req.getParameter("mail_comment");
     String mail_language = req.getParameter("mail_language");
 
@@ -641,7 +643,7 @@ public class ServletModuleOpenIndy extends ServletModule
 
 
       // add some headers
-      content = "To: " + to + "\nReply-To: "+ from + "\n" + content;
+      content = "To: " + to + "\nReply-To: "+ from + "\nX-Originating-IP: "+ from_ip + "\n" + content;
       // put in the comment where it should go
       if (comment != null) {
         String commentTextToInsert = "\n\nAttached comment from " + from_name + ":\n" + comment;
@@ -727,6 +729,7 @@ public class ServletModuleOpenIndy extends ServletModule
       TextSearchTerm descriptionTerm = new TextSearchTerm("description", "search_content", "description", "description", "description");
       ContentSearchTerm contentTerm = new ContentSearchTerm("content_data", "search_content", "content", "", "");
       TopicSearchTerm topicTerm = new TopicSearchTerm();
+      TopicMatrixSearchTerm topicMatrixTerm = new TopicMatrixSearchTerm();
       ImagesSearchTerm imagesTerm = new ImagesSearchTerm();
       AudioSearchTerm audioTerm = new AudioSearchTerm();
       VideoSearchTerm videoTerm = new VideoSearchTerm();
@@ -791,6 +794,11 @@ public class ServletModuleOpenIndy extends ServletModule
             queryString = queryString + " +" + topicFragment;
           }
 
+          String topicMatrixFragment = topicMatrixTerm.makeTerm(req);
+          if (topicMatrixFragment != null) {
+            queryString = queryString + " +" + topicMatrixFragment;
+          }
+
           String imagesFragment = imagesTerm.makeTerm(req);
           if (imagesFragment != null) {
             queryString = queryString + " +" + imagesFragment;