From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Fri, 13 Jul 2018 09:01:41 +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=9e3c16d8a2054ee3c2f17f6044524bc2756b830d;p=mediacube.git

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

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 c0448ffb..4ed74109 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
@@ -1,6 +1,7 @@
 package user.jobengine.zk.model;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
@@ -17,6 +18,7 @@ import user.jobengine.db.ArchivedMedia;
 import user.jobengine.db.IItemManager;
 import user.jobengine.db.Item;
 import user.jobengine.db.ItemManager;
+import user.jobengine.db.Media;
 import user.jobengine.db.SearchResult;
 
 /**
@@ -68,6 +70,24 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
 		docSelection.clear();
 	}
 
+	protected SearchResult<ArchivedMedia> createSearchResult(int startPos, int endPos) {
+		SearchResult<ArchivedMedia> sr = this.itemManager.search(formatSearchValue(searchValue), searchFilters, orderBy, orderAscending, startPos, endPos);
+		return sr;
+	}
+
+	//TODO szarmaztatott osztalyba
+	protected SearchResult<ArchivedMedia> createSearchResult1(int startPos, int endPos) {
+		long mediaID = 0;
+		Media media = itemManager.getMedia(mediaID);
+		SearchResult<ArchivedMedia> sr = new SearchResult<>();
+		sr.setItemCount(1);
+		ArchivedMedia archivedMedia = new ArchivedMedia();
+		archivedMedia.setMedia(media);
+		archivedMedia.setItem(itemManager.getItem(media.getItemId()));
+		sr.setItems(Arrays.asList(archivedMedia));
+		return sr;
+	}
+
 	public void fireListEvent() {
 		clearCache();
 		fireEvent(ListDataEvent.STRUCTURE_CHANGED, -1, -1);
@@ -153,7 +173,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(formatSearchValue(searchValue), searchFilters, orderBy, orderAscending, startPos, endPos);
+			SearchResult<ArchivedMedia> sr = createSearchResult(startPos, endPos);
 
 			if (sr != null) {
 				if (this.resultSetSize < 0) {
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 26a10251..b686def4 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
@@ -149,6 +149,14 @@ public class SearchModel extends AsyncBaseModel {
 			Column column = (Column) child;
 			column.addEventListener("onSort", evt -> doSort(evt));
 		}
+		//TODO
+		//? mediaID = Executions.getCurrent().getParameter("showMediaID")
+		// doSearchByMedia(mediaID)
+		// selectMediaArchive()
+
+		//TODO ??? kellhet
+		//NotifyChange("selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath");
+
 	}
 
 	@Command