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

diff --git a/server/user.mediacube.gui/pages/searchitems/listresults.zul b/server/user.mediacube.gui/pages/searchitems/listresults.zul
index 7ff0a5c45966b8ce7f994abab5381162e839ac16..0a951e6d389d49da375f2023b5ea88fa921b1995 100644 (file)
--- a/server/user.mediacube.gui/pages/searchitems/listresults.zul
+++ b/server/user.mediacube.gui/pages/searchitems/listresults.zul
@@ -19,8 +19,8 @@
                                        <vlayout>\r
                                                <hlayout>\r
                                                        <div><label value="@load(each.media.houseId)"/></div>\r
-                                                       <div><label value="@load(each.media.title)"/></div>\r
-                                                       <div><label value="@load(each.media.mediaFileRealName)"/></div>\r
+                                                       <div style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden;"><label value="@load(each.media.title)"/></div>\r
+                                                       <div style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden;"><label value="@load(each.media.mediaFileRealName)"/></div>\r
                                                        <div>\r
                                                                <label style="font-size: 10px;" value="@load(each.media.archived) @converter('user.jobengine.zk.model.ShortDateConverter')"/>\r
                                                        </div>\r

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 a5ffc08d1c779b0bf4924494c149bd025b6a35e9..b5388a8a71f3bca5c663552b591452b635bb22e5 100644 (file)
--- 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<ArchivedMedia> {\r
        private static final long serialVersionUID = 1L;\r
        private static final Logger logger = LogManager.getLogger();\r
-       private int cacheSize = 200;\r
+       private int cacheSize = 50;\r
        private HashMap<Integer, ArchivedMedia> cache = new HashMap<Integer, ArchivedMedia>();\r
        private boolean cachedMode = true;\r
 \r

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 8590ebe5e67bad477b1d36f4e4803d8d04dc3ac6..0a0ccf5698809b4839368085bbc2b5883441c21e 100644 (file)
--- 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;\r
 import java.util.List;\r
 import java.util.Map;\r
-import java.util.NoSuchElementException;\r
 \r
 import org.apache.commons.lang.StringUtils;\r
 import org.apache.logging.log4j.LogManager;\r
@@ -600,19 +599,15 @@ public class ListSearchModel extends AsyncBaseModel {
        }\r
 \r
        private void handleSearchError(Exception e) {\r
-               if (e instanceof NullPointerException)\r
-                       Clients.showNotification("Database query error!", "error", btnSearch, "start_center", 3000);\r
-               else if (e instanceof NoSuchElementException) {\r
-                       Clients.showNotification("NoSuchElementException!", "error", btnSearch, "start_center", 3000);\r
-               } else {\r
-                       Clients.showNotification(e.getMessage(), "error", btnSearch, "start_center", 3000);\r
-               }\r
 \r
-               if (e.getMessage() != null) {\r
-                       logger.error(e.getMessage());\r
-               } else {\r
-                       logger.error("e.getMessage() == null");\r
+               StringBuilder sb = new StringBuilder();\r
+               sb.append(e.getClass().getSimpleName());\r
+               if (e.getMessage() == null) {\r
+                       sb.append(": System message not available.");\r
                }\r
+\r
+               Clients.showNotification(sb.toString(), "error", btnSearch, "start_center", 3000);\r
+               logger.error(sb.toString());\r
        }\r
 \r
        private void highlight(ArchivedMedia am, boolean highlight) {\r