Keressel kapcsolatos idok naplozasa

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

diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/search/MediaFinder.java b/server/user.jobengine.osgi.db/src/user/jobengine/search/MediaFinder.java
index 0796129999c8d01ef47b4bced9e5bb10c9b04ffb..fa181e7d07b2e6bfe1664d81ce6743d9f720e582 100644 (file)
--- a/server/user.jobengine.osgi.db/src/user/jobengine/search/MediaFinder.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/search/MediaFinder.java
@@ -156,6 +156,7 @@ public class MediaFinder implements IMediaFinder {
        }\r
 \r
        private long getNumberOfRecords(SearchOptions options) {\r
+               long start = System.currentTimeMillis();\r
                long result = 0;\r
 \r
                ResultSet rs = null;\r
@@ -196,10 +197,13 @@ public class MediaFinder implements IMediaFinder {
 \r
                        manager.putDbContext(context);\r
                }\r
+               long end = System.currentTimeMillis();\r
+               logger.info("getNumberOfRecords execution time is {} s", (float) (end - start) / 1000);\r
                return result;\r
        }\r
 \r
        private void getSearchResults(SearchResult<ArchivedMedia> searchResults, SearchOptions options) {\r
+               long start = System.currentTimeMillis();\r
                ResultSet rs = null;\r
                PreparedStatement st = null;\r
 \r
@@ -245,6 +249,8 @@ public class MediaFinder implements IMediaFinder {
 \r
                        manager.putDbContext(context);\r
                }\r
+               long end = System.currentTimeMillis();\r
+               logger.info("getSearchResults execution time is {} s", (float) (end - start) / 1000);\r
        }\r
 \r
        private ArchivedMedia createArchiveMedia(ResultSet rs) throws SQLException {\r

diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/GridSearchModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/GridSearchModel.java
index adf3842ecc90ac628efcacadf8313c5f7ed2fc79..8cfb9b9ec022b8e699a69e48c7879c3eae8d24c4 100644 (file)
--- a/server/user.mediacube.gui/src/user/jobengine/zk/model/GridSearchModel.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/GridSearchModel.java
@@ -150,6 +150,7 @@ public class GridSearchModel extends AsyncBaseModel {
        private boolean missingProxy;\r
        private int selectedDateOption;\r
        private Window metaWindow;\r
+       private long startSearch;\r
 \r
        public GridSearchModel() {\r
                this.itemManager = ItemManager.getInstance();\r
@@ -226,16 +227,18 @@ public class GridSearchModel extends AsyncBaseModel {
                                search.setFocus(true);\r
                        }\r
 \r
-                       configureSearchResultGrid();\r
-                       showExternalMediaID();\r
-\r
                        searchHistory = new ListModelList<>(SessionUtil.getUserSearchHistory());\r
-                       setColumnOrder();\r
                        setUserSelectedFilters();\r
+                       setColumnOrder();\r
+                       showExternalMediaID();\r
+\r
+                       if (itemsGrid != null) {\r
+                               configureSearchResultGrid();\r
+                               if (SessionUtil.getUserPageSize() != 0)\r
+                                       itemsGrid.setPageSize(SessionUtil.getUserPageSize());\r
+                               setSettingsPageSize(itemsGrid.getPageSize());\r
+                       }\r
 \r
-                       if (SessionUtil.getUserPageSize() != 0)\r
-                               itemsGrid.setPageSize(SessionUtil.getUserPageSize());\r
-                       setSettingsPageSize(itemsGrid.getPageSize());\r
                        if (!allChecked)\r
                                showSearchTypeWarning();\r
 \r
@@ -318,6 +321,9 @@ public class GridSearchModel extends AsyncBaseModel {
        @Command\r
        @NotifyChange({ "searchResult", "selectedObject", "hasTSMMediaFile", "hasLowresMediaFile", "lowresMediaFilePath" })\r
        public void doSearch() {\r
+\r
+               startSearch = System.currentTimeMillis();\r
+\r
                try {\r
                        search.close();\r
                        search.select();\r
@@ -641,22 +647,20 @@ public class GridSearchModel extends AsyncBaseModel {
                                highlight(selectedObject, true);\r
                                notifyChange("selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath");\r
                                logger.info("onAfterRenderGrid end");\r
-                               return;\r
-                       }\r
-\r
-                       if (preventAfterRender) {\r
-                               logger.info("onAfterRenderGrid end");\r
-                               return;\r
-                       }\r
-                       preventAfterRender = true;\r
+                       } else {\r
+                               if (!preventAfterRender) {\r
+                                       preventAfterRender = true;\r
 \r
-                       if (positionToScroll != -1) {\r
-                               ensureVisible(positionToScroll);\r
+                                       if (positionToScroll != -1) {\r
+                                               ensureVisible(positionToScroll);\r
+                                       }\r
+                               }\r
                        }\r
                } catch (Exception e) {\r
                        handleSearchError(e);\r
                }\r
-               logger.info("onAfterRenderGrid end");\r
+               long endSearch = System.currentTimeMillis();\r
+               logger.info("onAfterRenderGrid end, ellapsed {} s", (float) (endSearch - startSearch) / 1000);\r
        }\r
 \r
        @Command\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 ef47b36f5114c9b97fefe5695e0c2cf50bcbfe49..52269e7e458f7209741d65588c1a4f9766ec889a 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
@@ -257,8 +257,8 @@ public class ListSearchModel extends AsyncBaseModel {
                        handleSearchError(e);\r
                }\r
 \r
-               Clients.evalJavaScript(\r
-                               "setSource('https://www.learningcontainer.com/wp-content/uploads/2020/05/sample-mp4-file.mp4', 'video/mp4')");\r
+//             Clients.evalJavaScript(\r
+//                             "setSource('https://www.learningcontainer.com/wp-content/uploads/2020/05/sample-mp4-file.mp4', 'video/mp4')");\r
 \r
        }\r
 \r