From: vasary.daniel Date: Tue, 12 Apr 2022 14:28:03 +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=e749bef875d0f66c06ff77f18fa94d57577bb1d6;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33149 --- diff --git a/server/user.mediacube.gui/pages/searchitems/listresults.zul b/server/user.mediacube.gui/pages/searchitems/listresults.zul index 7ff0a5c4..0a951e6d 100644 --- a/server/user.mediacube.gui/pages/searchitems/listresults.zul +++ b/server/user.mediacube.gui/pages/searchitems/listresults.zul @@ -19,8 +19,8 @@
-
-
+
+
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 a5ffc08d..b5388a8a 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 @@ -26,7 +26,7 @@ import user.jobengine.search.SearchResult; public class CachedListModel extends ListModelList { private static final long serialVersionUID = 1L; private static final Logger logger = LogManager.getLogger(); - private int cacheSize = 200; + private int cacheSize = 50; private HashMap cache = new HashMap(); private boolean cachedMode = true; diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java index 8590ebe5..0a0ccf56 100644 --- a/server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java +++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java @@ -16,7 +16,6 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.NoSuchElementException; import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.LogManager; @@ -600,19 +599,15 @@ public class ListSearchModel extends AsyncBaseModel { } private void handleSearchError(Exception e) { - if (e instanceof NullPointerException) - Clients.showNotification("Database query error!", "error", btnSearch, "start_center", 3000); - else if (e instanceof NoSuchElementException) { - Clients.showNotification("NoSuchElementException!", "error", btnSearch, "start_center", 3000); - } else { - Clients.showNotification(e.getMessage(), "error", btnSearch, "start_center", 3000); - } - if (e.getMessage() != null) { - logger.error(e.getMessage()); - } else { - logger.error("e.getMessage() == null"); + StringBuilder sb = new StringBuilder(); + sb.append(e.getClass().getSimpleName()); + if (e.getMessage() == null) { + sb.append(": System message not available."); } + + Clients.showNotification(sb.toString(), "error", btnSearch, "start_center", 3000); + logger.error(sb.toString()); } private void highlight(ArchivedMedia am, boolean highlight) {