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

diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/SearchResult.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ComplexSearchResult.java
similarity index 90%
rename from server/user.jobengine.osgi.db/src/user/jobengine/db/SearchResult.java
rename to server/user.jobengine.osgi.db/src/user/jobengine/db/ComplexSearchResult.java
index b684c1ceab8d647fe2b2fe8c1779f70e5b925d20..51b53a9c3651f4f1fe938ca420439caa231dbaa4 100644 (file)
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/SearchResult.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ComplexSearchResult.java
@@ -2,7 +2,7 @@ package user.jobengine.db;
 \r
 import java.util.List;\r
 \r
-public class SearchResult<T> {\r
+public class ComplexSearchResult<T> {\r
 \r
        private long itemCount;\r
        private ItemType itemType;\r

diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
index 27d2f0b4a528e6291c7244b3074c2aeee1731e29..d3df32088315407085e377f3e9c0163eed679626 100644 (file)
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
@@ -27,7 +27,7 @@ public class ItemDAOEx {
                return queryBuilder.getQuery();\r
        }\r
 \r
-       private String buildResultQuery(QueryObject queryObject, String innerQuery, SearchResult csr) {\r
+       private String buildResultQuery(QueryObject queryObject, String innerQuery, ComplexSearchResult csr) {\r
                StringBuilder resultQuery = new StringBuilder();\r
                Formatter qf = new Formatter(resultQuery, Locale.getDefault());\r
                RenderParameter rp = queryObject.getParameters();\r
@@ -57,8 +57,8 @@ public class ItemDAOEx {
                return resultQuery.toString();\r
        }\r
 \r
-       private List<SearchResult> getResultHeaders(Connection connection, QueryObject queryObject, String innerQuery) {\r
-               List<SearchResult> results = new ArrayList<SearchResult>();\r
+       private List<ComplexSearchResult> getResultHeaders(Connection connection, QueryObject queryObject, String innerQuery) {\r
+               List<ComplexSearchResult> results = new ArrayList<ComplexSearchResult>();\r
                String typeQuery;\r
                if (queryObject.getParameters() == null)\r
                        typeQuery = String.format("SELECT CAST(COUNT(DISTINCT(ii.ID)) AS BIGINT) %s", innerQuery);\r
@@ -72,7 +72,7 @@ public class ItemDAOEx {
                        st = connection.prepareStatement(typeQuery);\r
                        rs = st.executeQuery();\r
                        while (rs.next()) {\r
-                               SearchResult sr = new SearchResult();\r
+                               ComplexSearchResult sr = new ComplexSearchResult();\r
                                if (queryObject.getParameters() == null) {\r
                                        sr.setItemCount(rs.getLong(1));\r
                                } else {\r
@@ -174,12 +174,12 @@ public class ItemDAOEx {
        }\r
 \r
        @SuppressWarnings("unchecked")\r
-       public List<SearchResult> search(QueryObject queryObject) {\r
+       public List<ComplexSearchResult> search(QueryObject queryObject) {\r
                manager.traceIn();\r
                if (queryObject == null || queryObject.getFilters() == null || queryObject.getFilters().size() == 0)\r
                        throw new IllegalArgumentException("QueryObject not specified.");\r
 \r
-               List<SearchResult> results = new ArrayList<SearchResult>();\r
+               List<ComplexSearchResult> results = new ArrayList<ComplexSearchResult>();\r
 \r
                ResultSet rs = null;\r
                PreparedStatement st = null;\r
@@ -196,7 +196,7 @@ public class ItemDAOEx {
                                // ItemType-onk�nt t�bbe\r
                                results = getResultHeaders(connection, queryObject, innerQuery);\r
                        } else {\r
-                               SearchResult sr = new SearchResult();\r
+                               ComplexSearchResult sr = new ComplexSearchResult();\r
                                ItemType itemType = (ItemType) manager.get(ItemType.class, queryObject.getActiveItemTypeId());\r
                                sr.setItemType(itemType);\r
                                // TODO\r
@@ -206,7 +206,7 @@ public class ItemDAOEx {
                        }\r
 \r
                        if (results.size() != 0) {\r
-                               SearchResult csr = results.get(0);\r
+                               ComplexSearchResult csr = results.get(0);\r
                                String resultQuery = buildResultQuery(queryObject, innerQuery, csr);\r
                                st = connection.prepareStatement(resultQuery);\r
 \r
@@ -247,8 +247,8 @@ public class ItemDAOEx {
                return results;\r
        }\r
 \r
-       public SearchResult<Item> search(String criteria, int fromResult, int toResult) {\r
-               SearchResult<Item> result = new SearchResult<Item>();\r
+       public ComplexSearchResult<Item> search(String criteria, int fromResult, int toResult) {\r
+               ComplexSearchResult<Item> result = new ComplexSearchResult<Item>();\r
 \r
                ResultSet rs = null;\r
                PreparedStatement st = null;\r

diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
index e7f4c55291d7ef060b4d45687bff5fb062b5da36..73db46f8bcc20a9acc29fec29e80a05f3a354425 100644 (file)
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
@@ -76,6 +76,7 @@ public class ItemManager extends MemoryCache implements IItemManager {
        String dbPassword = null;\r
 \r
        private SignalServer signalServer;\r
+       private boolean useLucene;\r
        private IMediaFinder finder;\r
 \r
        public ItemManager() {\r
@@ -86,28 +87,23 @@ public class ItemManager extends MemoryCache implements IItemManager {
                // System.getProperty("jobengine.mediafinder.external") == true\r
                // System.getProperty("jobengine.mediafinder.external.url")\r
 \r
-               boolean useLucene = false;\r
                try {\r
                        useLucene = Boolean.parseBoolean(System.getProperty(JOBENGINE_MEDIAFINDER_EXTERNAL));\r
                } catch (Exception e) {\r
                        logger.info("Configuration property {} mising", JOBENGINE_MEDIAFINDER_EXTERNAL);\r
                }\r
 \r
-               if (useLucene) {\r
-                       finder = new LuceneMediaFinder();\r
-               } else {\r
-                       finder = new MediaFinder(this);\r
-               }\r
+               finder = createFinder();\r
        }\r
 \r
-       // public ItemManager(SignalServer signalServer) {\r
-       // initializeItemManager(signalServer);\r
-       // }\r
-\r
        public void activate() {\r
                // logger.info("ItemManager activated.");\r
        }\r
 \r
+       // public ItemManager(SignalServer signalServer) {\r
+       // initializeItemManager(signalServer);\r
+       // }\r
+\r
        @Override\r
        public void add(IEntityBase entity) {\r
                traceIn();\r
@@ -161,6 +157,16 @@ public class ItemManager extends MemoryCache implements IItemManager {
                return entity;\r
        }\r
 \r
+       private IMediaFinder createFinder() {\r
+               IMediaFinder finder = null;\r
+               if (useLucene) {\r
+                       finder = new LuceneMediaFinder();\r
+               } else {\r
+                       finder = new MediaFinder(this);\r
+               }\r
+               return finder;\r
+       }\r
+\r
        @Override\r
        public Item createItem(String name, String description, String houseId) {\r
                return createItem(null, name, description, houseId);\r
@@ -1013,6 +1019,7 @@ public class ItemManager extends MemoryCache implements IItemManager {
                        int toResult) {\r
                traceIn();\r
                SearchResult<ArchivedMedia> result = finder.search(criteria, searchFilters, orderBy, orderAscending, fromResult, toResult);\r
+\r
                traceOut();\r
                return result;\r
        }\r

diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/search/SearchResult.java b/server/user.jobengine.osgi.db/src/user/jobengine/search/SearchResult.java
index 8940c762926c3a3cdb9461f561bed7d2b82ff8ae..4e34f4fdfadbde20c989cdb7786c440021d132e8 100644 (file)
--- a/server/user.jobengine.osgi.db/src/user/jobengine/search/SearchResult.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/search/SearchResult.java
@@ -8,11 +8,11 @@ public class SearchResult<T> {
        private List<T> items;\r
 \r
        public long getItemCount() {\r
-               return this.itemCount;\r
+               return itemCount;\r
        }\r
 \r
        public List<T> getItems() {\r
-               return this.items;\r
+               return items;\r
        }\r
 \r
        public void setItemCount(long itemCount) {\r