From 7358682b1f83f9514c00235cf2cd8ff030dbc8e0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?D=C3=A9nes=20Horv=C3=A1th?= Date: Mon, 30 Sep 2019 14:01:47 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31553 --- .../run-mediacube-server.launch | 2 +- .../src/user/jobengine/db/ItemManager.java | 36 ++++++++++++++----- .../META-INF/MANIFEST.MF | 15 +++++++- 3 files changed, 42 insertions(+), 11 deletions(-) diff --git a/server/-configuration/run-mediacube-server.launch b/server/-configuration/run-mediacube-server.launch index 6cb781e0..1698aedc 100644 --- a/server/-configuration/run-mediacube-server.launch +++ b/server/-configuration/run-mediacube-server.launch @@ -18,7 +18,7 @@ - + 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 809ff5cd..c8077db7 100644 --- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java +++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java @@ -18,6 +18,9 @@ import java.util.Map; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.jboss.resteasy.client.jaxrs.BasicAuthentication; +import org.jboss.resteasy.client.jaxrs.ResteasyClient; +import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; import com.ibm.nosql.json.api.BasicDBObject; @@ -71,16 +74,24 @@ public class ItemManager extends MemoryCache implements IItemManager { private SignalServer signalServer; private MediaFinder finder; + private LuceneMediaFinder luceneFinder; public ItemManager() { initializeItemManager(signalServer); connect(); - //TODO mediafinder lokalis valtozo helyett private field. - //System.getProperty("jobengine.mediafinder.external") == true - //System.getProperty("jobengine.mediafinder.external.url") + // TODO mediafinder lokalis valtozo helyett private field. + // System.getProperty("jobengine.mediafinder.external") == true + // System.getProperty("jobengine.mediafinder.external.url") - finder = new MediaFinder(this); + if (System.getProperty("jobengine.mediafinder.external") == "false") { + finder = new MediaFinder(this); + } else { + luceneFinder = new LuceneMediaFinder(); + } + + ResteasyClient client = new ResteasyClientBuilder().build(); + webTarget = client.target(apiAddress).register(new BasicAuthentication(apiUser, apiPwd)); } @@ -428,7 +439,7 @@ public class ItemManager extends MemoryCache implements IItemManager { while (rs.next()) { if (!consumer.process(rs)) { - //ha nem megyunk vevig pool exception a tranzakcio miatt + // ha nem megyunk vevig pool exception a tranzakcio miatt connection.rollback(); break; } @@ -534,11 +545,14 @@ public class ItemManager extends MemoryCache implements IItemManager { // public long getExistingRundownMedia(String houseid) { // final long[] result = { 0 }; // StringBuilder query = new StringBuilder(); - // query.append("select itemid, mediaid, replace(mediafilehouseid, concat('-', concat(itemhouseid,'.MXF')), '') filename"); + // query.append("select itemid, mediaid, replace(mediafilehouseid, + // concat('-', concat(itemhouseid,'.MXF')), '') filename"); // query.append(" "); - // query.append("from vw_items where replace(mediafilehouseid, concat('-', itemhouseid), '') != mediafilehouseid"); + // query.append("from vw_items where replace(mediafilehouseid, concat('-', + // itemhouseid), '') != mediafilehouseid"); // query.append(" "); - // query.append("and replace(mediafilehouseid, concat('-', concat(itemhouseid,'.MXF')), '') = ?"); + // query.append("and replace(mediafilehouseid, concat('-', + // concat(itemhouseid,'.MXF')), '') = ?"); // IStatementDecorator decorator = st -> { // st.setString(1, houseid); // }; @@ -987,7 +1001,11 @@ public class ItemManager extends MemoryCache implements IItemManager { int toResult) { traceIn(); SearchResult result = null; - result = finder.search(criteria, searchFilters, orderBy, orderAscending, fromResult, toResult); + if (System.getProperty("jobengine.mediafinder.external") == "false") { + result = finder.search(criteria, searchFilters, orderBy, orderAscending, fromResult, toResult); + } else { + result = luceneFinder.search(criteria, searchFilters, orderBy, orderAscending, fromResult, toResult); + } traceOut(); return result; } diff --git a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF index c0fcecad..eb87cb54 100644 --- a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF +++ b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF @@ -4,12 +4,25 @@ Bundle-Name: Server Bundle-SymbolicName: user.jobengine.osgi.server;singleton:=true Bundle-Version: 1.0.0 Service-Component: OSGI-INF/component.xml, OSGI-INF/componentBinder.xml -Import-Package: javax.servlet;version="3.1.0", +Import-Package: com.fasterxml.jackson.annotation;version="2.4.5", + com.fasterxml.jackson.core;version="2.4.5", + com.fasterxml.jackson.databind;version="2.4.5", + com.fasterxml.jackson.databind.util;version="2.4.5", + com.fasterxml.jackson.datatype.joda;version="2.4.5", + com.fasterxml.jackson.jaxrs.json;version="2.4.5", + javax.servlet;version="3.1.0", javax.servlet.http;version="3.1.0", + javax.ws.rs.client, + javax.ws.rs.core;version="2.0.1", org.apache.logging.log4j;version="2.8.2", org.apache.logging.log4j.message;version="2.8.2", org.eclipse.core.runtime.adaptor, org.eclipse.osgi.framework.console;version="1.1.0", + org.jboss.resteasy.client.jaxrs, + org.jboss.resteasy.plugins.providers, + org.jboss.resteasy.spi, + org.joda.time;version="2.2.0", + org.joda.time.base;version="2.2.0", org.osgi.framework;version="1.5.0", org.osgi.framework.wiring;version="1.2.0", org.osgi.util.tracker;version="1.4.0", -- 2.54.0