From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Mon, 19 Mar 2018 15:59:32 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=4b6bc41331390252829f2529ecc342c190ff660d;p=mediacube.git

git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30979
---

diff --git a/server/-configuration/scheduledjobs.json b/server/-configuration/scheduledjobs.json
index c29446f8..b2fc4826 100644
--- a/server/-configuration/scheduledjobs.json
+++ b/server/-configuration/scheduledjobs.json
@@ -31,7 +31,7 @@
       "template": "import-statistics.xml",
       "cronexpression": "0 0 0/1 1/1 * ? *",
       "parameters": [ 
-      	{"name": "daysBeforeNow", "value": 6, "type": "java.lang.Integer"}
+      	{"name": "daysBeforeNow", "value": 1, "type": "java.lang.Integer"}
       ]
 	},
 	{
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportStatisticsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportStatisticsStep.java
index e5e88c40..4856bf15 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportStatisticsStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportStatisticsStep.java
@@ -63,6 +63,21 @@ public class ImportStatisticsStep extends JobStep {
 		return result;
 	}
 
+	private BasicDBObject createStory(BasicDBObject story, String label, String objId, long duration, long rdCount, long sfCount, long parentStoryId,
+			String reporters) {
+		BasicDBObject raw = new BasicDBObject();
+		raw.put(IOctopusAPI.ID, NoSQLUtils.asLong(story, IOctopusAPI.ID));
+		raw.put(IOctopusAPI.NAME, NoSQLUtils.asString(story, IOctopusAPI.NAME));
+		raw.put(IOctopusAPI.PARENT_STORY_ID, parentStoryId);
+		raw.put(IOctopusAPI.REPORTERS, reporters);
+		raw.put(IOctopusAPI.OBJ_ID, objId);
+		raw.put(IOctopusAPI.LABEL, label);
+		raw.put("duration", duration);
+		raw.put(IOctopusAPI.REF_RUNDOWN, rdCount);
+		raw.put(IOctopusAPI.REF_STORYFOLDER, sfCount);
+		return raw;
+	}
+
 	@StepEntry
 	public Object[] execute(int daysBeforeNow, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {
 		marker = jobRuntime.getMarker();
@@ -92,93 +107,7 @@ public class ImportStatisticsStep extends JobStep {
 		stories.putAll(folderStories);
 		logger.info(jobRuntime.getMarker(), "Gyűjtőkben megtalálható anyagok száma {}", stories.size());
 
-		BasicDBObject planStat = new BasicDBObject();
-
-		BasicDBObject typeStat = new BasicDBObject();
-		BasicDBObject typeStatRawData = new BasicDBObject();
-		typeStat.put("rawData", typeStatRawData);
-		long sumDuration = 0;
-		long sumIngestDuration = 0;
-		long sumIngestCount = 0;
-		long sumArchiveDuration = 0;
-		long sumArchiveCount = 0;
-
-		List<BasicDBObject> rawData = new ArrayList<>();
-		for (BasicDBObject story : stories.values()) {
-			List<BasicDBObject> mosObjects = NoSQLUtils.asList(story, IOctopusAPI.MOS_OBJECTS);
-			for (BasicDBObject mos : mosObjects) {
-				String label = NoSQLUtils.asString(mos, IOctopusAPI.LABEL);
-				long duration = NoSQLUtils.asLong(mos, "duration");
-				long rdCount = NoSQLUtils.asLong(story, IOctopusAPI.REF_RUNDOWN);
-				long sfCount = NoSQLUtils.asLong(story, IOctopusAPI.REF_STORYFOLDER);
-				long parentStoryId = NoSQLUtils.asLong(story, IOctopusAPI.PARENT_STORY_ID);
-
-				BasicDBObject raw = new BasicDBObject();
-				raw.put(IOctopusAPI.ID, NoSQLUtils.asLong(story, IOctopusAPI.ID));
-				raw.put(IOctopusAPI.NAME, NoSQLUtils.asString(story, IOctopusAPI.NAME));
-				raw.put(IOctopusAPI.PARENT_STORY_ID, parentStoryId);
-				raw.put(IOctopusAPI.REPORTERS, NoSQLUtils.asString(story, IOctopusAPI.REPORTERS));
-				raw.put(IOctopusAPI.OBJ_ID, NoSQLUtils.asString(mos, IOctopusAPI.OBJ_ID));
-				raw.put(IOctopusAPI.LABEL, label);
-				raw.put("duration", duration);
-				raw.put(IOctopusAPI.REF_RUNDOWN, rdCount);
-				raw.put(IOctopusAPI.REF_STORYFOLDER, sfCount);
-
-				long ingestCount = 0;
-				long ingestDuration = 0;
-				BasicDBObject ingestInfo = manager.getIngestInfo(scheduledDate, String.valueOf(parentStoryId));
-				if (ingestInfo != null) {
-					ingestCount = ingestInfo.getLong("count");
-					ingestDuration = ingestInfo.getLong("duration");
-					raw.put("ingest_count", ingestCount);
-					raw.put("ingest_duration", ingestDuration);
-					sumIngestCount += ingestCount;
-					sumIngestDuration += ingestDuration;
-				}
-
-				long archiveCount = 0;
-				long archiveDuration = 0;
-				BasicDBObject archiveInfo = manager.getArchiveInfo(scheduledDate, String.valueOf(parentStoryId));
-				if (archiveInfo != null) {
-					archiveCount = archiveInfo.getLong("count");
-					archiveDuration = archiveInfo.getLong("duration");
-					raw.put("archive_count", archiveCount);
-					raw.put("archive_duration", archiveDuration);
-					sumArchiveCount += archiveCount;
-					sumArchiveDuration += archiveDuration;
-				}
-
-				rawData.add(raw);
-
-				//planStat
-				if (sfCount > 0 && rdCount == 0) {
-					NoSQLUtils.addLong(planStat, "skip_count", 1);
-					NoSQLUtils.addLong(planStat, "skip_duration", duration);
-				}
-				if (rdCount > 0) {
-					NoSQLUtils.addLong(planStat, "onair_count", 1);
-					NoSQLUtils.addLong(planStat, "onair_duration", duration);
-
-					//typeStat
-					sumDuration += duration;
-					if (typeStatRawData.containsKey(label)) {
-						BasicDBObject dbo = NoSQLUtils.asDBObject(typeStatRawData, label);
-						dbo.put("count", dbo.getInt("count") + 1);
-						dbo.put("duration", dbo.getInt("duration") + duration);
-					} else
-						typeStatRawData.put(label, new BasicDBObject("count", 1).append("duration", duration));
-				}
-			}
-		}
-
-		planStat.put("all_count", rawData.size());
-		planStat.put("all_duration", sumDuration);
-		planStat.put("archive_count", sumArchiveCount);
-		planStat.put("archive_duration", sumArchiveDuration);
-		planStat.put("ingest_count", sumIngestCount);
-		planStat.put("ingest_duration", sumIngestDuration);
-
-		store(scheduledDate, rawData, typeStat, planStat);
+		storeStories(scheduledDate, stories);
 		return null;
 	}
 
@@ -281,7 +210,7 @@ public class ImportStatisticsStep extends JobStep {
 			String reporterNames = "";
 			if (reporters != null && reporters.size() > 0) {
 				for (BasicDBObject reporter : reporters) {
-					String userName = NoSQLUtils.asString(reporter, "userName");
+					String userName = NoSQLUtils.asString(reporter, "longName");
 					if (userName != null) {
 						if (reporterNames.length() > 0)
 							reporterNames += ", ";
@@ -296,7 +225,7 @@ public class ImportStatisticsStep extends JobStep {
 		return result;
 	}
 
-	private void store(Calendar scheduledDate, List<BasicDBObject> stories, BasicDBObject typeStat, BasicDBObject planStat) {
+	private void store(Calendar scheduledDate, List<BasicDBObject> stories, BasicDBObject typeStat, BasicDBObject planStat, BasicDBObject reporterStat) {
 		BasicDBObject dailyHistory = new BasicDBObject();
 		dailyHistory.put("dateTime", scheduledDate.getTime());
 		BasicDBList list = new BasicDBList();
@@ -306,10 +235,103 @@ public class ImportStatisticsStep extends JobStep {
 		}
 		dailyHistory.put("typeStat", typeStat);
 		dailyHistory.put("planStat", planStat);
+		dailyHistory.put("reporterStat", reporterStat);
 
 		DBCollection collection = db.getCollection("daily_news_history");
 		collection.remove(new BasicDBObject("dateTime", scheduledDate.getTime()));
 		collection.save(dailyHistory);
 	}
 
+	private void storeStories(Calendar scheduledDate, Map<Long, BasicDBObject> stories) {
+		BasicDBObject planStat = new BasicDBObject();
+		BasicDBObject typeStat = new BasicDBObject();
+		BasicDBObject reporterStat = new BasicDBObject();
+
+		List<BasicDBObject> rawData = new ArrayList<>();
+		List<String> processed = new ArrayList<>();
+
+		for (BasicDBObject story : stories.values()) {
+			List<BasicDBObject> mosObjects = NoSQLUtils.asList(story, IOctopusAPI.MOS_OBJECTS);
+			for (BasicDBObject mos : mosObjects) {
+				String objId = NoSQLUtils.asString(mos, IOctopusAPI.OBJ_ID);
+				long parentStoryId = NoSQLUtils.asLong(story, IOctopusAPI.PARENT_STORY_ID);
+				String key = String.format("%d-%s", parentStoryId, objId);
+				if (processed.contains(key))
+					continue;
+				processed.add(key);
+
+				String label = NoSQLUtils.asString(mos, IOctopusAPI.LABEL);
+				long duration = NoSQLUtils.asLong(mos, "duration");
+				long rdCount = NoSQLUtils.asLong(story, IOctopusAPI.REF_RUNDOWN);
+				long sfCount = NoSQLUtils.asLong(story, IOctopusAPI.REF_STORYFOLDER);
+				String reporters = NoSQLUtils.asString(story, IOctopusAPI.REPORTERS);
+
+				BasicDBObject raw = createStory(story, label, objId, duration, rdCount, sfCount, parentStoryId, reporters);
+				rawData.add(raw);
+
+				NoSQLUtils.addLong(planStat, "all_count", 1);
+				NoSQLUtils.addLong(planStat, "all_duration", duration);
+
+				BasicDBObject perTypeStat = NoSQLUtils.asDBObjectOrCreate(typeStat, label);
+				NoSQLUtils.addLong(perTypeStat, "all_count", 1);
+				NoSQLUtils.addLong(perTypeStat, "all_duration", duration);
+
+				BasicDBObject perReporterStat = NoSQLUtils.asDBObjectOrCreate(reporterStat, reporters);
+				NoSQLUtils.addLong(perReporterStat, "all_count", 1);
+				NoSQLUtils.addLong(perReporterStat, "all_duration", duration);
+
+				BasicDBObject ingestInfo = manager.getIngestInfo(scheduledDate, String.valueOf(parentStoryId));
+				if (ingestInfo != null) {
+					long ingestCount = ingestInfo.getLong("count");
+					long ingestDuration = ingestInfo.getLong("duration");
+					raw.put("ingest_count", ingestCount);
+					raw.put("ingest_duration", ingestDuration);
+					NoSQLUtils.addLong(planStat, "ingest_count", ingestCount);
+					NoSQLUtils.addLong(planStat, "ingest_duration", ingestDuration);
+					NoSQLUtils.addLong(perTypeStat, "ingest_count", ingestCount);
+					NoSQLUtils.addLong(perTypeStat, "ingest_duration", ingestDuration);
+					NoSQLUtils.addLong(perReporterStat, "ingest_count", ingestCount);
+					NoSQLUtils.addLong(perReporterStat, "ingest_duration", ingestDuration);
+				}
+
+				BasicDBObject archiveInfo = manager.getArchiveInfo(scheduledDate, String.valueOf(parentStoryId));
+				if (archiveInfo != null) {
+					long archiveCount = archiveInfo.getLong("count");
+					long archiveDuration = archiveInfo.getLong("duration");
+					raw.put("archive_count", archiveCount);
+					raw.put("archive_duration", archiveDuration);
+					NoSQLUtils.addLong(planStat, "archive_count", archiveCount);
+					NoSQLUtils.addLong(planStat, "archive_duration", archiveDuration);
+					NoSQLUtils.addLong(perTypeStat, "archive_count", archiveCount);
+					NoSQLUtils.addLong(perTypeStat, "archive_duration", archiveDuration);
+					NoSQLUtils.addLong(perReporterStat, "archive_count", archiveCount);
+					NoSQLUtils.addLong(perReporterStat, "archive_duration", archiveDuration);
+				}
+
+				//skipped
+				if (sfCount > 0 && rdCount == 0) {
+					NoSQLUtils.addLong(planStat, "skip_count", 1);
+					NoSQLUtils.addLong(planStat, "skip_duration", duration);
+					NoSQLUtils.addLong(perTypeStat, "skip_count", 1);
+					NoSQLUtils.addLong(perTypeStat, "skip_duration", duration);
+					NoSQLUtils.addLong(perReporterStat, "skip_count", 1);
+					NoSQLUtils.addLong(perReporterStat, "skip_duration", duration);
+				}
+
+				//onair
+				if (rdCount > 0) {
+					NoSQLUtils.addLong(planStat, "onair_count", 1);
+					NoSQLUtils.addLong(planStat, "onair_duration", duration);
+					NoSQLUtils.addLong(perTypeStat, "onair_count", 1);
+					NoSQLUtils.addLong(perTypeStat, "onair_duration", duration);
+					NoSQLUtils.addLong(perReporterStat, "onair_count", 1);
+					NoSQLUtils.addLong(perReporterStat, "onair_duration", duration);
+				}
+
+			}
+		}
+
+		store(scheduledDate, rawData, typeStat, planStat, reporterStat);
+	}
+
 }
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/RecordingsArchiveItemBuilderStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/RecordingsArchiveItemBuilderStep.java
index daf8c1e0..2e0bfd0e 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/RecordingsArchiveItemBuilderStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/RecordingsArchiveItemBuilderStep.java
@@ -115,12 +115,12 @@ public class RecordingsArchiveItemBuilderStep extends JobStep {
 				public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
 					FileVisitResult result = FileVisitResult.SKIP_SUBTREE;
 
-					if (dir.equals(Paths.get(sourcePath)) || "HIRADO".equals(dir.toFile().getName().toUpperCase())
-							|| "NAPIAKT".equals(dir.toFile().getName().toUpperCase()))
+					if (dir.equals(Paths.get(sourcePath)) || "2017".equals(dir.toFile().getName().toUpperCase())
+							|| "2018".equals(dir.toFile().getName().toUpperCase()))
 						result = FileVisitResult.CONTINUE;
 					else {
-						if ("HIRADO".equals(dir.getParent().toFile().getName().toUpperCase())
-								|| "NAPIAKT".equals(dir.getParent().toFile().getName().toUpperCase())) {
+						if ("2017".equals(dir.getParent().toFile().getName().toUpperCase())
+								|| "2018".equals(dir.getParent().toFile().getName().toUpperCase())) {
 							try {
 								startDateformat.parse(dir.toFile().getName());
 								result = FileVisitResult.CONTINUE;
diff --git a/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java b/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java
index 20d0ec55..4938a66a 100644
--- a/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java
@@ -41,6 +41,15 @@ public class NoSQLUtils {
 		return result;
 	}
 
+	public static BasicDBObject asDBObjectOrCreate(BasicDBObject obj, String name) {
+		BasicDBObject result = asDBObject(obj, name);
+		if (result == null) {
+			result = new BasicDBObject();
+			obj.put(name, result);
+		}
+		return result;
+	}
+
 	public static List<BasicDBObject> asList(BasicDBList obj) {
 		List<BasicDBObject> result = null;
 		if (obj != null && obj.size() > 0)
diff --git a/server/user.jobengine.osgi.commons/test/user/common/octopus/test/OctopusDataMinerTest.java b/server/user.jobengine.osgi.commons/test/user/common/octopus/test/OctopusDataMinerTest.java
index 5956ab40..2b59abb5 100644
--- a/server/user.jobengine.osgi.commons/test/user/common/octopus/test/OctopusDataMinerTest.java
+++ b/server/user.jobengine.osgi.commons/test/user/common/octopus/test/OctopusDataMinerTest.java
@@ -295,6 +295,12 @@ public class OctopusDataMinerTest {
 		assertNotNull(stepClass);
 	}
 
+	//	@Test
+	//	public void test7() throws Exception {
+	//		String x = "aaaassss";
+	//		System.out.println(x.substring(0, 200));
+	//	}
+
 	@Test
 	public void testClient() {
 		ResteasyWebTarget webTarget = new ResteasyClientBuilder().build().target("http://10.10.1.28/services/rest/octopus/");
diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ArchivedMedia.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ArchivedMedia.java
index 75db953f..e6e0d5db 100644
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ArchivedMedia.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ArchivedMedia.java
@@ -3,6 +3,7 @@ package user.jobengine.db;
 public class ArchivedMedia {
 	private Item item;
 	private Media media;
+	private String relevant;
 
 	public Item getItem() {
 		return item;
@@ -12,6 +13,10 @@ public class ArchivedMedia {
 		return media;
 	}
 
+	public String getRelevant() {
+		return relevant;
+	}
+
 	public void setItem(Item item) {
 		this.item = item;
 	}
@@ -20,4 +25,8 @@ public class ArchivedMedia {
 		this.media = media;
 	}
 
+	public void setRelevant(String relevant) {
+		this.relevant = relevant;
+	}
+
 }
diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/IItemManager.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/IItemManager.java
index 7ac032f9..0a24ad30 100644
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/IItemManager.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/IItemManager.java
@@ -347,7 +347,7 @@ public interface IItemManager extends IEntityPersister {
 	 */
 	IEntityBase retrieveCached(Class<? extends IEntityBase> baseClass, Object key);
 
-	SearchResult<ArchivedMedia> search(String criteria, int fromResult, int toResult);
+	SearchResult<ArchivedMedia> search(String criteria, List<String> searchFilters, int fromResult, int toResult);
 
 	/**
 	 * A bemeneti paraméterként kapott keresési feltételeknek megfelelő Anyagokat lekéri az adatbázisból és SearchResult objektumba csomagolva visszatér.
diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
index 8357e775..4a248c2e 100644
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
@@ -3,6 +3,7 @@ package user.jobengine.db;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Formatter;
 import java.util.List;
@@ -57,6 +58,45 @@ public class ItemDAOEx {
 		return resultQuery.toString();
 	}
 
+	private PreparedStatement createArchiveMediaSearchStatement(Connection connection, String criteria, List<String> typeIDs) throws SQLException {
+		StringBuilder typeCriteria = new StringBuilder();
+		if (typeIDs != null) {
+			typeCriteria.append("(");
+			for (int i = 0; i < typeIDs.size(); i++) {
+				typeCriteria.append(typeIDs.get(i));
+				if (i < typeIDs.size() - 1)
+					typeCriteria.append(",");
+			}
+			typeCriteria.append(")");
+		}
+
+		StringBuilder sql = new StringBuilder();
+		sql.append("SELECT * FROM ((");
+		sql.append("SELECT DISTINCT m.id, m.title FROM ITEM i, MEDIA m, MEDIAFILE mf");
+		sql.append(" WHERE ((CONTAINS(i.title, ?) >= 1) OR (CONTAINS(i.description, ?) >= 1)) AND m.itemid = i.id AND mf.mediaid = m.id");
+		if (typeIDs != null)
+			sql.append(" AND m.itemtypeid IN ").append(typeCriteria.toString());
+		sql.append(")UNION(");
+		sql.append("SELECT DISTINCT m2.id,m2.title FROM ITEM i2, MEDIA m2, MEDIAFILE mf2");
+		sql.append(" WHERE ((CONTAINS(m2.title, ?) >= 1) OR (CONTAINS(m2.description, ?) >= 1)) AND m2.itemid = i2.id AND mf2.mediaid = m2.id");
+		if (typeIDs != null)
+			sql.append(" AND m2.itemtypeid IN ").append(typeCriteria.toString());
+		sql.append(")UNION(");
+		sql.append("SELECT DISTINCT m3.id,m3.title FROM ITEM i3, MEDIA m3, MEDIAFILE mf3");
+		sql.append(" WHERE (CONTAINS(mf3.houseId, ?) >= 1) AND m3.itemid = i3.id AND mf3.mediaid = m3.id");
+		if (typeIDs != null)
+			sql.append(" AND m3.itemtypeid IN ").append(typeCriteria.toString());
+		sql.append(")) ORDER BY title");
+
+		String query = sql.toString();
+		PreparedStatement st = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE);
+
+		for (int s = 1; s <= 5; s++) {
+			st.setString(s, criteria);
+		}
+		return st;
+	}
+
 	private List<SearchResult> getResultHeaders(Connection connection, QueryObject queryObject, String innerQuery) {
 		List<SearchResult> results = new ArrayList<SearchResult>();
 		String typeQuery;
@@ -103,6 +143,21 @@ public class ItemDAOEx {
 		return results;
 	}
 
+	private List<String> getTypeIDs(List<String> searchFilters) {
+		List<String> result = null;
+		if (searchFilters != null) {
+			for (String typeName : searchFilters) {
+				ItemType itemType = manager.getItemType(typeName);
+				if (itemType == null)
+					continue;
+				if (result == null)
+					result = new ArrayList<>();
+				result.add(String.valueOf(itemType.getId()));
+			}
+		}
+		return result;
+	}
+
 	public List<Media> getUntranscodedMedias() {
 		List<Media> result = null;
 
@@ -322,33 +377,18 @@ public class ItemDAOEx {
 		return result;
 	}
 
-	public SearchResult<ArchivedMedia> searchArchivedMedia(String criteria, int fromResult, int toResult) {
+	public SearchResult<ArchivedMedia> searchArchivedMedia(String criteria, List<String> searchFilters, int fromResult, int toResult) {
 		SearchResult<ArchivedMedia> result = new SearchResult<>();
 
+		List<String> typeIDs = getTypeIDs(searchFilters);
+
 		ResultSet rs = null;
 		PreparedStatement st = null;
 		DefaultContext context = manager.getDbContext();
 		Connection connection = context.getConnection();
-
 		try {
-			StringBuffer sql = new StringBuffer();
 
-			sql.append("SELECT * FROM ((");
-			sql.append("SELECT DISTINCT m.id,m.title FROM ITEM i, MEDIA m, MEDIAFILE mf");
-			sql.append(" WHERE ((CONTAINS(i.title, ?) >= 1) OR (CONTAINS(i.description, ?) >= 1)) AND m.itemid = i.id AND mf.mediaid = m.id");
-			sql.append(")UNION(");
-			sql.append("SELECT DISTINCT m2.id,m2.title FROM ITEM i2, MEDIA m2, MEDIAFILE mf2");
-			sql.append(" WHERE ((CONTAINS(m2.title, ?) >= 1) OR (CONTAINS(m2.description, ?) >= 1)) AND m2.itemid = i2.id AND mf2.MEDIAID = m2.id");
-			sql.append(")UNION(");
-			sql.append("SELECT DISTINCT m3.id,m3.title FROM ITEM i3, MEDIA m3, MEDIAFILE mf3");
-			sql.append(" WHERE (CONTAINS(mf3.houseId, ?) >= 1) AND m3.itemid = i3.id AND mf3.mediaid = m3.id");
-			sql.append(")) ORDER BY title");
-
-			String query = sql.toString();
-			st = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE);
-			for (int s = 1; s <= 5; s++) {
-				st.setString(s, criteria);
-			}
+			st = createArchiveMediaSearchStatement(connection, criteria, typeIDs);
 			rs = st.executeQuery();
 			rs.last();
 			result.setItemCount(rs.getRow());
@@ -363,7 +403,7 @@ public class ItemDAOEx {
 					}
 				} else {
 					if (result.getItemCount() > 0) {
-						throw new Exception("Invalid searchResult 'from' position: " + fromResult + " total records: " + result.getItemCount() + " " + query);
+						throw new Exception("Invalid searchResult 'from' position: " + fromResult + " total records: " + result.getItemCount());
 					}
 				}
 			} else {
@@ -372,6 +412,9 @@ public class ItemDAOEx {
 
 			int maxRecords = toResult - fromResult;
 
+			String[] criterias = criteria.replace("*", "").replace("+", " ").split(" ");
+			if (criteria.startsWith("\"") && criteria.endsWith("\""))
+				criterias = new String[] { criteria.replace("\"", "") };
 			List<ArchivedMedia> resultList = null;
 			logger.info("Processing query result, maxRecords {}", maxRecords);
 			while (rs.next() && maxRecords > 0) {
@@ -380,9 +423,16 @@ public class ItemDAOEx {
 				am.setMedia(media);
 				Item item = manager.getItem(media.getItemId());
 				am.setItem(item);
+
 				if (resultList == null)
 					resultList = new ArrayList<>();
 				resultList.add(am);
+
+				setRelevant(criterias, am, media.getDescription());
+				if (am.getRelevant() == null)
+					setRelevant(criterias, am, item.getDescription());
+
+				//media.setTitle(media.getTitle().replace("hirado", "<html><![CDATA[]]></html>"));
 				maxRecords--;
 			}
 			logger.info("Query result processed");
@@ -412,4 +462,37 @@ public class ItemDAOEx {
 
 		return result;
 	}
+
+	private void setRelevant(String[] criterias, ArchivedMedia am, String content) {
+		if (content == null)
+			return;
+		for (String c : criterias) {
+			if (c != null && c.length() > 2) {
+
+				int pos = content.toLowerCase().indexOf(c.toLowerCase());
+				if (pos > -1) {
+					int start = 0;
+					if (pos > 100)
+						start = pos - 100;
+					else
+						start = 0;
+					int end = pos + 200;
+					if (end > content.length() - 1)
+						end = content.length() - 1;
+
+					String relevant = content.substring(start, pos) + "<b>" + content.substring(pos, pos + c.length()) + "</b>"
+							+ content.substring(pos + c.length(), end);
+
+					if (start > 0)
+						relevant = "..." + relevant;
+					if (end < content.length() - 1)
+						relevant = relevant + "...";
+
+					am.setRelevant(relevant);
+					break;
+				}
+
+			}
+		}
+	}
 }
diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
index 831a1f13..3a52df5a 100644
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
@@ -947,11 +947,11 @@ public class ItemManager extends MemoryCache implements IItemManager {
 	}
 
 	@Override
-	public SearchResult<ArchivedMedia> search(String criteria, int fromResult, int toResult) {
+	public SearchResult<ArchivedMedia> search(String criteria, List<String> searchFilters, int fromResult, int toResult) {
 		traceIn();
 		SearchResult<ArchivedMedia> result = null;
 		ItemDAOEx itemDb = new ItemDAOEx(this);
-		result = itemDb.searchArchivedMedia(criteria, fromResult, toResult);
+		result = itemDb.searchArchivedMedia(criteria, searchFilters, fromResult, toResult);
 		traceOut();
 		return result;
 	}
diff --git a/server/user.jobengine.osgi.server/pages/newshistory.zul b/server/user.jobengine.osgi.server/pages/newshistory.zul
index a0933139..6b59d67e 100644
--- a/server/user.jobengine.osgi.server/pages/newshistory.zul
+++ b/server/user.jobengine.osgi.server/pages/newshistory.zul
@@ -3,7 +3,7 @@
 	<script>
 
 		function frameToTC(value) {
-			console.log('frameToTC '  + value)
+			//console.log('frameToTC '  + value)
 			var reminder = value;
 			var hour = Math.floor(reminder / (60 * 60 * 25));
             reminder = reminder % (60 * 60 * 25);
diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index bcc66e25..416fc3db 100644
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -34,6 +34,7 @@ div.z-row-content .rating {
 }
 	</style>
 	<div id="scdiv" width="100%" height="100%" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.SearchModel')">
+		<timer id="timer" delay="100" repeats="true" onTimer="@command('uiTick')" />
 		<borderlayout>
 			<west border="none" size="60%" splittable="true" minsize="250">
 				<div height="100%" width="100%">
@@ -42,22 +43,16 @@ div.z-row-content .rating {
 							tooltiptext="Gépelje be a keresendő kifejezést és nyomja meg az Enter-t." onOK="@command('doSearch')" />
 						<toolbar vflex="min" style="font-size:8px">
 							<checkbox checked="@bind(vm.allChecked)" />
-							<toolbarbutton label="Hír bejátszó" mode="toggle" checked="@bind(vm.newsFeedChecked)" />
-							<toolbarbutton label="Hír nyersanyag" mode="toggle" checked="@bind(vm.newsRawChecked)" />
-							<toolbarbutton label="Műsor" mode="toggle" checked="@bind(vm.materialChecked)" />
-							<toolbarbutton label="Műsor nyersanyag" mode="toggle" checked="@bind(vm.materialRawChecked)" />
-							<toolbarbutton label="Promo" mode="toggle" checked="@bind(vm.promoChecked)" />
-							<toolbarbutton label="Promo nyersanyag" mode="toggle" checked="@bind(vm.promoRawChecked)" />
-							<toolbarbutton label="Reklám" mode="toggle" checked="@bind(vm.adChecked)" />
-							<toolbarbutton label="Reklám nyersanyag" mode="toggle" checked="@bind(vm.adRawChecked)" />
-							<toolbarbutton label="Visszarögzített" mode="toggle" checked="@bind(vm.recordingChecked) " />
-							<toolbarbutton label="Egyéb" mode="toggle" checked="@bind(vm.otherChecked)" />
+							<forEach items="@load(vm.typeFilterNames)" >
+								<toolbarbutton label="@load(each)" mode="toggle" checked="@bind(vm.typeFilters[each]) @validator(vm.allFilterCheckedValidator)" />
+							</forEach>							
 						</toolbar>
 					</groupbox>
 					<groupbox vflex="true" closable="false">
 						<grid id="itemResults" sizedByContent="false" span="true" vflex="true" hflex="true" mold="paging" autopaging="false"
-							model="@load(vm.searchResult)" activePage="@bind(vm.activePage)" selectedItem="@bind(vm.selectedObject)"
-							style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" emptyMessage="Nincs találat!">
+							model="@load(vm.searchResult)" activePage="@bind(vm.activePage)" emptyMessage="Nincs találat!"
+							style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" sclass="listbox-normal-style"
+							onAfterRender="@command('onPaging')">
 							<columns>
 								<column hflex="min">
 									<checkbox checked="@bind(vm.rowsExpanded)"/>
@@ -67,12 +62,12 @@ div.z-row-content .rating {
 								<column label="Fájlnév" hflex="min" align="left" />
 								<column label="Megtekinthető" hflex="min" align="right" />
 							</columns>
-							<rows>
+							<rows id="rows">
 								<template name="model">
 									<row>
 										<detail open="@load(vm.rowsExpanded)">
 											<hlayout>
-												<image tooltiptext="Kattints a lejátszáshoz!" width="140px" height="90px" sclass="myimg" content="@load(each.media.poster) @converter('user.jobengine.zk.model.ByToImageConverter')" />
+												<image tooltiptext="Kattints a lejátszáshoz!" width="140px" height="90px" sclass="myimg" content="@load(each.media.poster) @converter('user.jobengine.zk.model.ByToImageConverter')" onClick="@command('selectMediaArchive', selectedObject=each)" />
 												<div sclass="details">
 													<div>
 														<label value="Típus:" sclass="heavy" />
@@ -83,7 +78,7 @@ div.z-row-content .rating {
 														<label value="@load(each.item.title)" />
 													</div>
 													<div>
-														<label value="@load(each.media.description)" maxlength="200" />
+														<label value="@load(each.relevant)" />
 													</div>
 												</div>
 											</hlayout>
diff --git a/server/user.jobengine.osgi.server/pages/statistics.zul b/server/user.jobengine.osgi.server/pages/statistics.zul
index 2a90328b..3b15ea61 100644
--- a/server/user.jobengine.osgi.server/pages/statistics.zul
+++ b/server/user.jobengine.osgi.server/pages/statistics.zul
@@ -15,10 +15,15 @@
 		
 		function statisticsYValue(value, series) {
 			var options = series[value - 1];
-			console.log("statisticsYValue", series.name, value, series);
+			//console.log("statisticsYValue", series.name, value, series);
 			return options == null ? "" : options.userOptions.name;
 		}
 	</script>
+	<style>
+	.highcharts-axis-labels {
+		background-color: red;
+	}	
+	</style>
 	<vlayout vflex="1" hflex="1" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.StatisticsModel')">
 		<hbox height="40px" align="center">
 			<space bar="false" />
@@ -29,7 +34,10 @@
 				<radio label="Műsorok" />
 			</radiogroup>
 		</hbox>
-		<div vflex="1" hflex="1" style="overflow:auto;" onAfterSize='chart.setWidth(new Integer(event.getWidth() - 20))'>
+ 		<div width="100%" height="70px" onAfterSize='legendChart.setWidth(new Integer(event.getWidth()));legendChart.setHeight(new Integer(event.getHeight()));'>
+ 			<charts id="legendChart" type="column" />
+ 		</div>
+		<div hflex="1" vflex="1" style="overflow:auto;" onAfterSize='chart.setWidth(new Integer(event.getWidth() - 20));'>
 			<charts id="chart" type="spline" zoomType="x" />
 		</div>
 	</vlayout>
diff --git a/server/user.jobengine.osgi.server/pages/statisticsdetails.zul b/server/user.jobengine.osgi.server/pages/statisticsdetails.zul
index 6e224cc1..bca2cb24 100644
--- a/server/user.jobengine.osgi.server/pages/statisticsdetails.zul
+++ b/server/user.jobengine.osgi.server/pages/statisticsdetails.zul
@@ -2,16 +2,19 @@
 <window id="wnd" title="Anyag életút" width="900px" sizable="true" border="normal" apply="org.zkoss.bind.BindComposer"
 	viewModel="@id('vm') @init('user.jobengine.zk.model.StatisticsDetailsModel')" forward="onCancel=closeButton.onClick">
 	<hlayout height="450px">
-		<grid sizedByContent="true" model="@load(vm.events)" vflex="true" hflex="true" style="border: none; background: #e3e3e3 !important;">
+		<grid id="grid" sizedByContent="true" model="@load(vm.events)" vflex="true" hflex="true" style="border: none; background: #e3e3e3 !important;">
 			<columns sizable="true">
 				<column forEach="${vm.columnList}" label="${each}"></column>
 			</columns>
-			<rows>
+			<rows id="rows">
 				<template name="model" var="r">
 					<row>
-						<label forEach="${vm.columnList}" value="${r.get(each)}">
+						<label forEach="${vm.columnList}" value="${r.get(each)}" >
 							<attribute name="style" if="${vm.isSelected(r)}">
-								color: green;
+								font-weight: bold;
+							</attribute>						
+							<attribute name="style" if="${each eq 'Tag'}">
+								background: ${r.get('Color')};
 							</attribute>						
 						</label>
 					</row>
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java
index 7fa9b1b4..026a3b34 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java
@@ -36,9 +36,11 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
 
 	private ArrayList<EventListener> eventListenerList = new ArrayList<EventListener>();
 	private IItemManager itemManager = null;
+	private List<String> searchFilters;
 
-	public CachedListModel(String _searchValue) {
-		this.searchValue = _searchValue;
+	public CachedListModel(String searchValue, List<String> searchFilters) {
+		this.searchValue = searchValue;
+		this.searchFilters = searchFilters;
 		this.itemManager = ItemManager.getInstance();
 		//this.setMultiple(true);
 		reinit();
@@ -79,6 +81,17 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
 		}
 	}
 
+	private String formatSearchValue(String value) {
+		String[] specials = new String[] { ":", "?", "%", "(", ")" };
+		String result = value;
+		for (String c : specials) {
+			result = result.replace(c, "\\" + c);
+		}
+		if (!(result.startsWith("\"") && result.endsWith("\"")))
+			result += "*";
+		return result;
+	}
+
 	public int getCacheEnd() {
 		return cacheEnd;
 	}
@@ -137,7 +150,7 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
 			int endPos = (startPos + rowLimit);
 			endPos = ((this.resultSetSize < 0) || (endPos <= this.resultSetSize)) ? endPos : this.resultSetSize;
 
-			SearchResult<ArchivedMedia> sr = this.itemManager.search(searchValue + "*", startPos, endPos);
+			SearchResult<ArchivedMedia> sr = this.itemManager.search(formatSearchValue(searchValue), searchFilters, startPos, endPos);
 
 			if (sr != null) {
 				if (this.resultSetSize < 0) {
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/NewsHistoryCharts.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/NewsHistoryCharts.java
index bb77a23b..559974f1 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/NewsHistoryCharts.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/NewsHistoryCharts.java
@@ -18,9 +18,8 @@ public class NewsHistoryCharts {
 
 	private static void fill(Charts charts, BasicDBObject datas, String member) {
 		Point maxPoint = null;
-		BasicDBObject rawData = (BasicDBObject) datas.get("rawData");
-		for (String name : rawData.keySet()) {
-			BasicDBObject dbo = NoSQLUtils.asDBObject(rawData, name);
+		for (String name : datas.keySet()) {
+			BasicDBObject dbo = NoSQLUtils.asDBObject(datas, name);
 			Number y = dbo.getLong(member);
 			Point point = new Point(name, y);
 			charts.getSeries().addPoint(point);
@@ -92,14 +91,14 @@ public class NewsHistoryCharts {
 		init(charts);
 		charts.setTitle("Adásbejátszók száma típus szerint");
 		charts.getSeries().getDataLabels().setFormat("{point.name} {point.y} db");
-		fill(charts, datas, "count");
+		fill(charts, datas, "onair_count");
 	}
 
 	static public void initTypeDuration(Charts charts, BasicDBObject datas) {
 		init(charts);
 		charts.setTitle("Adásbejátszók hossza típus szerint");
 		charts.getSeries().getDataLabels().addExtraAttr("formatter", new JavaScriptValue("function () { return this.point.name + ' ' + frameToTC(this.y); }"));
-		fill(charts, datas, "duration");
+		fill(charts, datas, "onair_duration");
 	}
 
 }
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/NewsHistoryModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/NewsHistoryModel.java
index 8b1372eb..241029fb 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/NewsHistoryModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/NewsHistoryModel.java
@@ -56,7 +56,9 @@ public class NewsHistoryModel {
 	@AfterCompose
 	public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {
 		Selectors.wireComponents(view, this, false);
-		setSelectedDate(new Date());
+		Calendar calendar = CalendarUtils.createZeroCalendar();
+		calendar.add(Calendar.DAY_OF_YEAR, -1);
+		setSelectedDate(calendar.getTime());
 	}
 
 	private void clearChart(Charts charts) {
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
index be3fc7e1..1603ecfa 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
@@ -2,17 +2,29 @@ package user.jobengine.zk.model;
 
 import java.net.URL;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.zkoss.bind.ValidationContext;
+import org.zkoss.bind.Validator;
+import org.zkoss.bind.annotation.AfterCompose;
+import org.zkoss.bind.annotation.BindingParam;
 import org.zkoss.bind.annotation.Command;
+import org.zkoss.bind.annotation.ContextParam;
+import org.zkoss.bind.annotation.ContextType;
 import org.zkoss.bind.annotation.NotifyChange;
+import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.select.Selectors;
+import org.zkoss.zk.ui.select.annotation.Wire;
 import org.zkoss.zul.Messagebox;
+import org.zkoss.zul.Rows;
 import org.zkoss.zul.Window;
 
 import user.commons.StoreUri;
@@ -23,28 +35,59 @@ import user.jobengine.db.Media;
 import user.jobengine.db.MediaFile;
 import user.jobengine.db.Store;
 
-public class SearchModel extends BaseModel {
+public class SearchModel extends AsyncBaseModel {
 	private static final Logger logger = LogManager.getLogger();
 	private static final String MEDIACUBEMEDIA = "mediaCubeMedia";
 	private static final String PAGES_RETRIEVESELECTOR_ZUL = "/pages/retrieveselector.zul";
 	private static final String PAGES_MEDIAPLAYER = "/pages/mediaplayer.jsp?mediaurl=";
-
+	private List<String> typeFilterNames;
 	private String searchValue = null;
 	private CachedListModel searchResult = null;
 	private ArchivedMedia selectedObject = null;
-	private boolean newsFeedChecked = true;
+	private Validator allFilterCheckedValidator;
+	private Map<String, Object> typeFilters;
 	private boolean allChecked = true;
-	private boolean newsRawChecked = true;
-	private boolean materialChecked = true;
-	private boolean materialRawChecked = true;
-	private boolean promoChecked = true;
-	private boolean promoRawChecked = true;
-	private boolean adChecked = true;
-	private boolean adRawChecked = true;
-	private boolean recordingChecked = true;
-	private boolean otherChecked = true;
 	private int activePage;
 	private boolean rowsExpanded = true;
+	@Wire
+	Rows rows;
+
+	public SearchModel() {
+		typeFilters = new LinkedHashMap<>();
+		typeFilters.put("Hír bejátszó", true);
+		typeFilters.put("Hír nyersanyag", true);
+		typeFilters.put("Műsor", true);
+		typeFilters.put("Műsor nyersanyag", true);
+		typeFilters.put("Promo", true);
+		typeFilters.put("Promo nyersanyag", true);
+		typeFilters.put("Reklám", true);
+		typeFilters.put("Reklám nyersanyag", true);
+		typeFilters.put("Visszarögzített", true);
+		typeFilters.put("Egyéb", true);
+		typeFilterNames = new ArrayList<>(typeFilters.keySet());
+
+		allFilterCheckedValidator = new Validator() {
+			@Override
+			public void validate(ValidationContext ctx) {
+				try {
+
+					String label = ctx.getProperty().getProperty();
+					boolean isChecked = (boolean) ctx.getProperty().getValue();
+					typeFilters.put(label, isChecked);
+					//logger.info("{} {}", label, isChecked);
+				} catch (Exception e) {
+
+				}
+				updateAllChecked();
+			}
+		};
+	}
+
+	@AfterCompose
+	public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {
+		Selectors.wireComponents(view, this, false);
+		Selectors.wireEventListeners(view, this);
+	}
 
 	@Command
 	@NotifyChange({ "activePage", "searchResult", "selectedObject", "hasLowresMediaFile" })
@@ -53,7 +96,10 @@ public class SearchModel extends BaseModel {
 			this.selectedObject = null;
 			if (StringUtils.isBlank(searchValue) || searchValue.length() < 3)
 				throw new Exception("Legalább 3 karakter megadása kötelező!");
-			searchResult = new CachedListModel(searchValue);
+
+			List<String> searchFilters = getSelectedFilters();
+
+			searchResult = new CachedListModel(searchValue, searchFilters);
 		} catch (Exception e) {
 			Messagebox.show(e.getMessage());
 			logger.catching(e);
@@ -74,6 +120,10 @@ public class SearchModel extends BaseModel {
 		return activePage;
 	}
 
+	public Validator getAllFilterCheckedValidator() {
+		return allFilterCheckedValidator;
+	}
+
 	public boolean getHasLowresMediaFile() {
 		boolean ret = false;
 		Media media = getMedia();
@@ -134,6 +184,21 @@ public class SearchModel extends BaseModel {
 		return searchValue;
 	}
 
+	private List<String> getSelectedFilters() {
+		List<String> result = null;
+		if (!allChecked) {
+			for (String label : typeFilters.keySet()) {
+				boolean isChecked = (boolean) typeFilters.get(label);
+				if (!isChecked)
+					continue;
+				if (result == null)
+					result = new ArrayList<>();
+				result.add(label);
+			}
+		}
+		return result;
+	}
+
 	public ArchivedMedia getSelectedObject() {
 		return selectedObject;
 	}
@@ -152,112 +217,52 @@ public class SearchModel extends BaseModel {
 		return ret;
 	}
 
-	public boolean isAdChecked() {
-		return adChecked;
+	public List<String> getTypeFilterNames() {
+		return typeFilterNames;
 	}
 
-	public boolean isAdRawChecked() {
-		return adRawChecked;
+	public Map<String, Object> getTypeFilters() {
+		return typeFilters;
 	}
 
 	public boolean isAllChecked() {
 		return allChecked;
 	}
 
-	public boolean isMaterialChecked() {
-		return materialChecked;
-	}
-
-	public boolean isMaterialRawChecked() {
-		return materialRawChecked;
-	}
-
-	public boolean isNewsFeedChecked() {
-		return newsFeedChecked;
-	}
-
-	public boolean isNewsRawChecked() {
-		return newsRawChecked;
-	}
-
-	public boolean isOtherChecked() {
-		return otherChecked;
-	}
-
-	public boolean isPromoChecked() {
-		return promoChecked;
-	}
-
-	public boolean isPromoRawChecked() {
-		return promoRawChecked;
-	}
-
-	public boolean isRecordingChecked() {
-		return recordingChecked;
-	}
-
 	public boolean isRowsExpanded() {
 		return rowsExpanded;
 	}
 
-	public void setActivePage(int activePage) {
-		this.activePage = activePage;
-	}
-
-	public void setAdChecked(boolean adChecked) {
-		this.adChecked = adChecked;
-	}
-
-	public void setAdRawChecked(boolean adRawChecked) {
-		this.adRawChecked = adRawChecked;
-	}
-
-	@NotifyChange({ "newsFeedChecked", "newsRawChecked", "materialChecked", "materialRawChecked", "promoChecked", "promoRawChecked", "adChecked",
-			"adRawChecked", "recordingChecked", "otherChecked" })
-	public void setAllChecked(boolean allFeedChecked) {
-		this.allChecked = allFeedChecked;
-		newsFeedChecked = allChecked;
-		newsRawChecked = allChecked;
-		materialChecked = allChecked;
-		materialRawChecked = allChecked;
-		promoChecked = allChecked;
-		promoRawChecked = allChecked;
-		adChecked = allChecked;
-		adRawChecked = allChecked;
-		recordingChecked = allChecked;
-		otherChecked = allChecked;
-	}
-
-	public void setMaterialChecked(boolean materialChecked) {
-		this.materialChecked = materialChecked;
-	}
-
-	public void setMaterialRawChecked(boolean materialRawChecked) {
-		this.materialRawChecked = materialRawChecked;
-	}
-
-	public void setNewsFeedChecked(boolean newsFeedChecked) {
-		this.newsFeedChecked = newsFeedChecked;
+	@Command
+	public void onPaging() {
+		//		if (rows != null)
+		//			Clients.scrollIntoView(rows);
 	}
 
-	public void setNewsRawChecked(boolean newsRawChecked) {
-		this.newsRawChecked = newsRawChecked;
+	@NotifyChange({ "selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath" })
+	public void selectedMediaArchive(ArchivedMedia selectedObject) {
+		this.selectedObject = selectedObject;
 	}
 
-	public void setOtherChecked(boolean otherChecked) {
-		this.otherChecked = otherChecked;
+	@Command
+	@NotifyChange({ "selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath" })
+	public void selectMediaArchive(@BindingParam("selectedObject") ArchivedMedia selectedObject) {
+		this.selectedObject = selectedObject;
 	}
 
-	public void setPromoChecked(boolean promoChecked) {
-		this.promoChecked = promoChecked;
+	public void setActivePage(int activePage) {
+		this.activePage = activePage;
 	}
 
-	public void setPromoRawChecked(boolean promoRawChecked) {
-		this.promoRawChecked = promoRawChecked;
+	@NotifyChange("*")
+	public void setAllChecked(boolean allChecked) {
+		this.allChecked = allChecked;
+		for (String key : typeFilters.keySet())
+			typeFilters.put(key, allChecked);
 	}
 
-	public void setRecordingChecked(boolean recordingChecked) {
-		this.recordingChecked = recordingChecked;
+	public void setAllFilterCheckedValidator(Validator allFilterCheckedValidator) {
+		this.allFilterCheckedValidator = allFilterCheckedValidator;
 	}
 
 	public void setRowsExpanded(boolean rowsExpanded) {
@@ -273,4 +278,26 @@ public class SearchModel extends BaseModel {
 		this.selectedObject = selectedObject;
 	}
 
+	public void setTypeFilterNames(List<String> typeFilterNames) {
+		this.typeFilterNames = typeFilterNames;
+	}
+
+	public void setTypeFilters(Map<String, Object> typeFilters) {
+		this.typeFilters = typeFilters;
+	}
+
+	public void updateAllChecked() {
+		final boolean[] check = { true };
+		for (String key : typeFilters.keySet()) {
+			if (!(boolean) typeFilters.get(key)) {
+				check[0] = false;
+				break;
+			}
+		}
+
+		registerTask(() -> {
+			allChecked = check[0];
+			NotifyChange("allChecked");
+		});
+	}
 }
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/StatisticsDetailsModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/StatisticsDetailsModel.java
index 95bbcd39..1bcdcfea 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/StatisticsDetailsModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/StatisticsDetailsModel.java
@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.zkoss.bind.annotation.AfterCompose;
 import org.zkoss.bind.annotation.Command;
 import org.zkoss.bind.annotation.ContextParam;
@@ -13,16 +15,26 @@ import org.zkoss.chart.Point;
 import org.zkoss.chart.Series;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.select.Selectors;
+import org.zkoss.zk.ui.select.annotation.Listen;
 import org.zkoss.zk.ui.select.annotation.Wire;
+import org.zkoss.zk.ui.util.Clients;
+import org.zkoss.zul.Grid;
+import org.zkoss.zul.Row;
+import org.zkoss.zul.Rows;
 import org.zkoss.zul.Window;
 
 import com.ibm.nosql.json.JSONUtil;
 import com.ibm.nosql.json.api.BasicDBObject;
 
 public class StatisticsDetailsModel extends BaseModel {
+	private static final Logger logger = LogManager.getLogger();
+
 	@Wire("#wnd")
 	private Window wnd;
+	@Wire("#rows")
+	private Rows rows;
 	private List<BasicDBObject> events;
 	private List<String> columnList = Arrays.asList("Touched", "Started", "Finished", "Tag", "Successful", "UserName", "Source", "Destination");
 	private BasicDBObject selectedEvent;
@@ -30,6 +42,8 @@ public class StatisticsDetailsModel extends BaseModel {
 	@AfterCompose
 	public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {
 		Selectors.wireComponents(view, this, false);
+		Selectors.wireEventListeners(view, this);
+
 		Series series = (Series) Executions.getCurrent().getArg().get("series");
 		wnd.setTitle(series.getName());
 		Point selectedPoint = (Point) Executions.getCurrent().getArg().get("point");
@@ -66,6 +80,29 @@ public class StatisticsDetailsModel extends BaseModel {
 		return event.equals(selectedEvent);
 	}
 
+	@Listen("onAfterRender = #grid")
+	public void onAfterRender(Event event) {
+		Grid grid = (Grid) event.getTarget();
+		grid.renderAll();
+
+		List<Component> children = rows.getChildren();
+		for (Component child : children) {
+			Row row = (Row) child;
+			if (row == null)
+				continue;
+			BasicDBObject value = row.getValue();
+			if (value == null)
+				continue;
+			logger.info("{}", value);
+			if (isSelected(value)) {
+				Clients.scrollIntoView(child);
+				break;
+			}
+
+		}
+
+	}
+
 	public void setColumnList(List<String> columnList) {
 		this.columnList = columnList;
 	}
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/StatisticsModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/StatisticsModel.java
index aa21702b..6171dd5f 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/StatisticsModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/StatisticsModel.java
@@ -1,9 +1,8 @@
 package user.jobengine.zk.model;
 
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -13,17 +12,18 @@ import org.apache.logging.log4j.Logger;
 import org.zkoss.bind.annotation.AfterCompose;
 import org.zkoss.bind.annotation.ContextParam;
 import org.zkoss.bind.annotation.ContextType;
-import org.zkoss.chart.AxisLabels;
 import org.zkoss.chart.Charts;
 import org.zkoss.chart.ChartsEvent;
 import org.zkoss.chart.Color;
 import org.zkoss.chart.Lang;
+import org.zkoss.chart.Legend;
 import org.zkoss.chart.Marker;
 import org.zkoss.chart.Options;
 import org.zkoss.chart.Point;
 import org.zkoss.chart.Series;
 import org.zkoss.chart.XAxis;
 import org.zkoss.chart.YAxis;
+import org.zkoss.chart.plotOptions.ColumnPlotOptions;
 import org.zkoss.chart.plotOptions.PlotOptions;
 import org.zkoss.chart.plotOptions.SplinePlotOptions;
 import org.zkoss.json.JavaScriptValue;
@@ -46,12 +46,14 @@ import user.jobengine.zk.model.MetadataTypeDetector.MetadataType;
 public class StatisticsModel {
 	private static final Logger logger = LogManager.getLogger();
 	private static final int XCOUNT = 60 * 24;
-	private static Map<String, Color> colors = new HashMap<>();
+	private static Map<String, Color> colors = new LinkedHashMap<>();
 	static {
-		colors.put("INGEST", new Color("red"));
-		colors.put("Betöltés", new Color("green"));
 		colors.put("Adáskész", new Color("blue"));
 		colors.put("Archiválás", new Color("orange"));
+		colors.put("Betöltés", new Color("green"));
+		colors.put("Nexio", new Color("red"));
+		colors.put("Online", new Color("yellow"));
+		colors.put("PLayout", new Color("lightblue"));
 		colors.put("Újravágás", new Color("brown"));
 	}
 
@@ -59,13 +61,27 @@ public class StatisticsModel {
 	private Date selectedDate;
 	private int selectedType;
 
-	@Wire
+	@Wire("#chart")
 	Charts chart;
+	@Wire("#legendChart")
+	Charts legendChart;
 
 	public StatisticsModel() {
 		this.itemManager = JobEngine.getStaticItemManager();
 	}
 
+	private Series addLegendSeries(int index, String name, Color color, boolean show) {
+		Series result = legendChart.getSeries(index);
+		result.setColor(color);
+		//result.getPlotOptions().setShowInLegend(show);
+		result.setName(name);
+		//marker.setLineColor(color);
+		//marker.setSymbol("square");
+		//marker.setRadius(3);
+		//marker.setLineWidth(0);
+		return result;
+	}
+
 	private void addPoint(Series series, int x, int y, String data, Color color) {
 		Point p = new Point(x, y);
 		p.setName(data);
@@ -91,9 +107,19 @@ public class StatisticsModel {
 		data.put("Tag", action.getTag());
 		data.put("Successful", action.isSuccessful());
 		data.put("UserName", action.getUserName());
+		data.put("Color", color == null ? "black" : color.stringValue());
 		addPoint(series, x, y, data.toString(), color);
 	}
 
+	//	private void clearChart() {
+	//		int size = chart.getSeriesSize();
+	//		for (int i = 0; i < size; i++)
+	//			chart.getSeries(i).setData(new ArrayList<Integer>());
+	//		size = legendChart.getSeriesSize();
+	//		for (int i = 0; i < size; i++)
+	//			legendChart.getSeries(i).setData(new ArrayList<Integer>());
+	//	}
+
 	@AfterCompose
 	public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {
 		Selectors.wireComponents(view, this, false);
@@ -101,17 +127,26 @@ public class StatisticsModel {
 		setSelectedDate(new Date());
 	}
 
-	private void clearChart() {
-		int size = chart.getSeriesSize();
-		for (int i = 0; i < size; i++)
-			chart.getSeries(i).setData(new ArrayList<Integer>());
+	private void clearChart(Charts charts) {
+		int seriesSize = charts.getSeriesSize();
+		for (int i = 0; i < seriesSize; i++) {
+			charts.getSeries(0).remove();
+		}
+
+		int axisSize = charts.getyAxisSize();
+		for (int i = 0; i < axisSize; i++) {
+			charts.getYAxis(0).remove();
+		}
+
+		charts.setTitle("");
+		charts.setSubtitle("");
 	}
 
 	private void configureChart() {
+
 		Options options = chart.getOptions();
 		if (options == null)
 			options = new Options();
-
 		Lang lang = options.getLang();
 		if (lang == null)
 			lang = new Lang();
@@ -123,12 +158,15 @@ public class StatisticsModel {
 		lang.setResetZoom("Nagyítás vége");
 		chart.getTooltip().setEnabled(false);
 		chart.getExporting().setEnabled(false);
+		chart.setTitle("");
 
-		chart.setTitle("Anyagok élettörténete");
-		chart.setSubtitle(CalendarUtils.toDateWithDayString(CalendarUtils.createCalendar(selectedDate), new Locale("hu")));
+		//		chart.setTheme(Theme.GRAY);
+		//chart.setSubtitle(CalendarUtils.toDateWithDayString(CalendarUtils.createCalendar(selectedDate), new Locale("hu")));
 		chart.getLegend().setEnabled(false);
+
 		PlotOptions plotOptions = chart.getPlotOptions();
 		plotOptions.getSeries().setAllowPointSelect(true);
+
 		SplinePlotOptions soptions = plotOptions.getSpline();
 		soptions.setLineWidth(0);
 		soptions.setAnimation(false);
@@ -141,6 +179,46 @@ public class StatisticsModel {
 		marker.setSymbol("square");
 	}
 
+	private void configureLegend() {
+		Options options = legendChart.getOptions();
+		if (options == null)
+			options = new Options();
+		Lang lang = options.getLang();
+		if (lang == null)
+			lang = new Lang();
+
+		options.setLang(lang);
+		legendChart.setOptions(options);
+		lang.setNoData("");
+
+		legendChart.setTitle("Anyagok élettörténete");
+		legendChart.setSubtitle(CalendarUtils.toDateWithDayString(CalendarUtils.createCalendar(selectedDate), new Locale("hu")));
+		//legendChart.setShowAxes(false);
+		legendChart.getXAxis().setShowEmpty(false);
+		legendChart.getXAxis().setLineWidth(0);
+		legendChart.getYAxis().setTitle("");
+		legendChart.getYAxis().setShowEmpty(false);
+
+		Legend legend = legendChart.getLegend();
+		legend.setEnabled(true);
+		legend.setVerticalAlign("bottom");
+		legend.setAlign("right");
+		legend.setBorderWidth(0);
+
+		legendChart.getTooltip().setEnabled(false);
+		legendChart.getExporting().setEnabled(false);
+		ColumnPlotOptions plot = legendChart.getPlotOptions().getColumn();
+		plot.setAnimation(false);
+		plot.setEnableMouseTracking(false);
+		plot.setAllowPointSelect(true);
+
+		int index = 0;
+		for (String name : colors.keySet()) {
+			addLegendSeries(index++, name, colors.get(name), true);
+		}
+
+	}
+
 	private int fillData(List<WorkflowAction> actions) {
 		int result = 0;
 		String lastHouseId = null;
@@ -177,6 +255,11 @@ public class StatisticsModel {
 		return selectedType;
 	}
 
+	@Listen("onPlotLegendItemClick = #legendChart")
+	public void onPlotLegendItemClick(ChartsEvent event) {
+		logger.info("{} {} {}", event.isChecked(), event.getSeries(), event.getSeries());
+	}
+
 	@Listen("onPlotSelect = #chart")
 	public void onPlotSelect(ChartsEvent event) {
 		Point point = event.getPoint();
@@ -198,13 +281,20 @@ public class StatisticsModel {
 	}
 
 	private void setupXAxis() {
-		XAxis xAxis = chart.getXAxis();
-		xAxis.setTickInterval(30);
-		xAxis.setMin(0);
-		xAxis.setMax(XCOUNT);
-		AxisLabels xLabels = xAxis.getLabels();
-		xLabels.setRotation(-45);
-		xAxis.getLabels().addExtraAttr("formatter", new JavaScriptValue("function () { return statisticsXValue(this.value); }"));
+		XAxis xAxisDown = chart.getXAxis(0);
+		xAxisDown.setTickInterval(30);
+		xAxisDown.setMin(0);
+		xAxisDown.setMax(XCOUNT);
+		xAxisDown.getLabels().setRotation(-70);
+		xAxisDown.getLabels().addExtraAttr("formatter", new JavaScriptValue("function () { return statisticsXValue(this.value); }"));
+
+		XAxis xAxisUp = chart.getXAxis(1);
+		xAxisUp.setTickInterval(30);
+		xAxisUp.setMin(0);
+		xAxisUp.setMax(XCOUNT);
+		xAxisUp.getLabels().setRotation(-70);
+		xAxisUp.getLabels().addExtraAttr("formatter", new JavaScriptValue("function () { return statisticsXValue(this.value); }"));
+		xAxisUp.setOpposite(true);
 	}
 
 	private void setupYAxis(int distinctCount) {
@@ -218,7 +308,7 @@ public class StatisticsModel {
 		} else {
 			yAxis.setGridLineWidth(1);
 			//Solid, ShortDash, ShortDot, ShortDashDot, ShortDashDotDot, Dot , Dash, LongDash, DashDot, LongDashDot, and LongDashDotDot
-			yAxis.setGridLineDashStyle("LongDashDot");
+			yAxis.setGridLineDashStyle("Solid");
 			yAxis.setGridLineColor(new Color("lightgray"));
 		}
 
@@ -226,8 +316,12 @@ public class StatisticsModel {
 	}
 
 	public void showChart() {
-		clearChart();
+		clearChart(legendChart);
+		configureLegend();
+
+		clearChart(chart);
 		configureChart();
+
 		setupXAxis();
 		List<WorkflowAction> actions = itemManager.getWorkflowActions(selectedDate);
 		if (actions == null || actions.size() == 0) {