changeset 129:42193ad7b28c

cleanup.
author casties
date Wed, 01 Feb 2017 19:55:06 +0100
parents aef031e76278
children 0078abf001fc
files src/main/java/de/mpiwg/itgroup/ismi/search/beans/SimpleSearchBean.java
diffstat 1 files changed, 8 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/ismi/search/beans/SimpleSearchBean.java	Wed Feb 01 18:20:04 2017 +0100
+++ b/src/main/java/de/mpiwg/itgroup/ismi/search/beans/SimpleSearchBean.java	Wed Feb 01 19:55:06 2017 +0100
@@ -133,15 +133,13 @@
         	
         	Map<Entity, Attribute> map = new HashMap<Entity, Attribute>();
         	if(includeAuthors && includeTitles){
-        		map = getWrapper().searchEntityByAttributeFilter0(term, filters, -1);
+        		map = getWrapper().searchEntityByAttributeFilter(term, filters, -1);
         	}else if(includeAuthors){
-        		map = getWrapper().searchEntityByAttributeFilter0(term, authorsFilters, -1);
+        		map = getWrapper().searchEntityByAttributeFilter(term, authorsFilters, -1);
         	}else if(includeTitles){
-        		map = getWrapper().searchEntityByAttributeFilter0(term, titlesFilters, -1);
+        		map = getWrapper().searchEntityByAttributeFilter(term, titlesFilters, -1);
         	}
-        	//System.out.println("getWrapper().searchEntityByAttributeFilter0= " + (System.currentTimeMillis() - start));
-        	sb.append("\n\n***********************\n");
-        	sb.append("getWrapper().searchEntityByAttributeFilter0= " + (System.currentTimeMillis() - start) + "\n");
+        	sb.append("searchEntityByAttributeFilter0 took " + (System.currentTimeMillis() - start) + "ms. ");
         	
         	for(Entity ent : map.keySet()){
         		if(counter == 1000 || (System.currentTimeMillis() - start) > SEC_20){
@@ -180,12 +178,10 @@
         	
         	
         	long end = System.currentTimeMillis();
-        	sb.append("Word: " + term + "\n");
-        	sb.append("includeTitles: " + includeTitles + "\n");
-        	sb.append("includeAuthors: " + includeAuthors + "\n");
-        	sb.append("Simple search time execution= " + (end - start) + "\n");
-        	sb.append("***********************\n");
-        	sb.append("\n");
+        	sb.append("Word=" + term + " ");
+        	sb.append("includeTitles=" + includeTitles + " ");
+        	sb.append("includeAuthors=" + includeAuthors + " ");
+        	sb.append("Simple search took " + (end - start) + "ms");
         	logger.info(sb.toString());
         	
         }