From: Sweidan Omar <TFS\sweidan.omar>
Date: Mon, 29 Nov 2021 15:21:25 +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=4599606ee58644dc0f26a95a428e58bdd794eb3f;p=mediacube.git

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

diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/CachedListModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/CachedListModel.java
index 9816c947..5ee6a7fe 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/model/CachedListModel.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/CachedListModel.java
@@ -6,7 +6,6 @@ import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.zkoss.bind.BindUtils;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
@@ -129,14 +128,16 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
 	 * indexhez kepest
 	 */
 	private void loadCache(int forIndex) {
-		if (cachedMode) {
-			try {
-				// logger.info("Loading {}", forIndex);
-				logger.info("clearCache()");
-				clearCache();
+		try {
+			// logger.info("Loading {}", forIndex);
+			logger.info("clearCache()");
+			clearCache();
+			SearchResult<ArchivedMedia> sr = null;
+			int startPos = 0;
+
+			if (cachedMode) {
 				int halfSize = this.cacheSize / 2;
 				int rowLimit = this.cacheSize; // 200
-				int startPos = 0;
 				if ((forIndex - halfSize) > 0) { // forIndex=60 startPos=0
 													// cache=0-200, forIndex=150
 													// startPos=50 cache=50-250
@@ -148,33 +149,33 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
 				endPos = ((this.resultSetSize < 0) || (endPos <= this.resultSetSize)) ? endPos : this.resultSetSize;
 				logger.info("endPos= {}", endPos);
 
-				SearchResult<ArchivedMedia> sr = createSearchResult(startPos, endPos);
+				sr = createSearchResult(startPos, endPos);
+			} else {
+				sr = createSearchResult(startPos, 0);
+			}
 
-				if (sr != null) {
+			if (sr != null) {
 
-					if (this.resultSetSize < 0) {
-						this.resultSetSize = (int) sr.getItemCount();
-					}
-//					this.cacheSize = resultSetSize;
-//					logger.info(cacheSize);
-
-					List<ArchivedMedia> resList = sr.getItems();
-					if (resList != null) {
-						for (int c = 0; c < resList.size(); c++) {
-							cache.put(startPos + c, resList.get(c));
-						}
-					}
+				if (this.resultSetSize < 0) {
+					this.resultSetSize = (int) sr.getItemCount();
+				}
 
-					cacheStart = startPos + 1;
-					cacheEnd = cacheStart + (cache.size() == 0 ? 0 : (cache.size() - 1));
-					BindUtils.postNotifyChange(null, null, this, "*");
-					fireCacheEvent(new Event(Events.ON_SCROLL));
+				List<ArchivedMedia> resList = sr.getItems();
+				if (resList != null) {
+					for (int c = 0; c < resList.size(); c++) {
+						cache.put(startPos + c, resList.get(c));
+					}
 				}
-			} catch (Exception e) {
-				fireCacheEvent(new Event(Events.ON_ERROR, null, e));
-				// ki kell nullazni, egybkent tobbszeros lekerdezes van
-				resultSetSize = 0;
+
+				cacheStart = startPos + 1;
+				cacheEnd = cacheStart + (cache.size() == 0 ? 0 : (cache.size() - 1));
+//				BindUtils.postNotifyChange(null, null, this, "*");
+//				fireCacheEvent(new Event(Events.ON_SCROLL));
 			}
+		} catch (Exception e) {
+			fireCacheEvent(new Event(Events.ON_ERROR, null, e));
+			// ki kell nullazni, egybkent tobbszeros lekerdezes van
+			resultSetSize = 0;
 		}
 	}