merged 1.1 branch into head

[mir.git] / source / mircoders / search / TopicMatrixSearchTerm.java

diff --git a/source/mircoders/search/TopicMatrixSearchTerm.java b/source/mircoders/search/TopicMatrixSearchTerm.java
index e6be2a1..065b476 100755 (executable)
--- a/source/mircoders/search/TopicMatrixSearchTerm.java
+++ b/source/mircoders/search/TopicMatrixSearchTerm.java
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import mir.entity.Entity;
 import mir.entity.EntityList;
-import mir.storage.StorageObjectFailure;
+import mir.storage.DatabaseFailure;
 import mircoders.entity.EntityContent;
 import mircoders.storage.DatabaseContentToTopics;
 
@@ -48,7 +48,7 @@ public class TopicMatrixSearchTerm extends SearchTerm{
     super(null, "search_topicmatrix", "topic", null, null);
   }
 
-  public void index(Document doc, Entity entity) throws StorageObjectFailure{
+  public void index(Document doc, Entity entity) throws DatabaseFailure{
     EntityList topics = DatabaseContentToTopics.getInstance().getTopics((EntityContent) entity);
     if (topics != null && topics.size()>0){
       for(int k=0;k<topics.size();k++){
@@ -74,9 +74,7 @@ public class TopicMatrixSearchTerm extends SearchTerm{
     if (queryTerm.equals("")){
       return null;
     }
-    else {
-      return "( "+queryTerm+ " )";
-    }
+               return "( "+queryTerm+ " )";
 
   }