MediaFinder error handling improved

diff --git a/server/-dependencies/jobengine-theme.target b/server/-dependencies/jobengine-theme.target
new file mode 100644 (file)
index 0000000..16b24aa
--- /dev/null
+++ b/server/-dependencies/jobengine-theme.target
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="JobEngine" sequenceNumber="486">
+<locations>
+<location path="${workspace_loc}/-dependencies/target/repository/plugins" type="Directory"/>
+       <location path="${workspace_loc}/hu.user.theme.userdark/target/" type="Directory"/>
+</locations>
+<includeBundles>
+<plugin id="cglib"/>
+<plugin id="com.fasterxml.jackson.core.jackson-annotations" version="2.4.5"/>
+<plugin id="com.fasterxml.jackson.core.jackson-core" version="2.4.5"/>
+<plugin id="com.fasterxml.jackson.core.jackson-databind" version="2.4.5"/>
+<plugin id="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml"/>
+<plugin id="com.fasterxml.jackson.datatype.jackson-datatype-joda"/>
+<plugin id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.4.5"/>
+<plugin id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.4.5"/>
+<plugin id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.4.5"/>
+<plugin id="com.ibm.db2.jcc"/>
+<plugin id="com.ibm.nosql"/>
+<plugin id="com.microsoft.sqlserver.sqljdbc"/>
+<plugin id="com.sun.jna"/>
+<plugin id="groovy"/>
+<plugin id="javax.annotation-api"/>
+<plugin id="javax.mail"/>
+<plugin id="javax.servlet-api"/>
+<plugin id="javax.ws.rs-api"/>
+<plugin id="jcifs"/>
+<plugin id="joda-time"/>
+<plugin id="junit"/>
+<plugin id="org.apache.aries.spifly.dynamic.bundle"/>
+<plugin id="org.apache.aries.util"/>
+<plugin id="org.apache.commons.beanutils"/>
+<plugin id="org.apache.commons.collections"/>
+<plugin id="org.apache.commons.digester"/>
+<plugin id="org.apache.commons.io" version="2.2.0"/>
+<plugin id="org.apache.commons.lang"/>
+<plugin id="org.apache.commons.net"/>
+<plugin id="org.apache.felix.gogo.command"/>
+<plugin id="org.apache.felix.gogo.runtime" version="0.12.0"/>
+<plugin id="org.apache.felix.gogo.shell" version="0.12.0"/>
+<plugin id="org.apache.httpcomponents.httpclient"/>
+<plugin id="org.apache.httpcomponents.httpcore"/>
+<plugin id="org.apache.servicemix.bundles.quartz"/>
+<plugin id="org.eclipse.equinox.cm"/>
+<plugin id="org.eclipse.equinox.common"/>
+<plugin id="org.eclipse.equinox.console"/>
+<plugin id="org.eclipse.equinox.ds"/>
+<plugin id="org.eclipse.equinox.launcher"/>
+<plugin id="org.eclipse.equinox.util"/>
+<plugin id="org.eclipse.jetty.annotations"/>
+<plugin id="org.eclipse.jetty.continuation"/>
+<plugin id="org.eclipse.jetty.deploy"/>
+<plugin id="org.eclipse.jetty.http"/>
+<plugin id="org.eclipse.jetty.io"/>
+<plugin id="org.eclipse.jetty.jndi"/>
+<plugin id="org.eclipse.jetty.osgi.boot"/>
+<plugin id="org.eclipse.jetty.plus"/>
+<plugin id="org.eclipse.jetty.schemas"/>
+<plugin id="org.eclipse.jetty.security"/>
+<plugin id="org.eclipse.jetty.server"/>
+<plugin id="org.eclipse.jetty.servlet"/>
+<plugin id="org.eclipse.jetty.util"/>
+<plugin id="org.eclipse.jetty.webapp"/>
+<plugin id="org.eclipse.jetty.websocket.api"/>
+<plugin id="org.eclipse.jetty.websocket.client"/>
+<plugin id="org.eclipse.jetty.websocket.common"/>
+<plugin id="org.eclipse.jetty.websocket.server"/>
+<plugin id="org.eclipse.jetty.websocket.servlet"/>
+<plugin id="org.eclipse.jetty.xml"/>
+<plugin id="org.eclipse.osgi" version="3.11.2.v20161107-1947"/>
+<plugin id="org.eclipse.osgi.services"/>
+<plugin id="org.eclipse.osgi.util"/>
+<plugin id="org.hamcrest.core" version="1.3.0"/>
+<plugin id="org.jboss.resteasy.client"/>
+<plugin id="org.jboss.resteasy.jaxb-provider"/>
+<plugin id="org.jboss.resteasy.jaxrs"/>
+<plugin id="org.jboss.resteasy.jaxrs-api"/>
+<plugin id="org.jboss.resteasy.multipart-provider"/>
+<plugin id="org.jboss.resteasy.validator-provider-11"/>
+<plugin id="org.jmock"/>
+<plugin id="org.jmock.junit4"/>
+<plugin id="org.mybatis.mybatis"/>
+<plugin id="org.omnifaces"/>
+<plugin id="slf4j.api" version="1.7.2"/>
+<plugin id="slf4j.simple" version="1.7.2"/>
+       <plugin id="org.objectweb.asm"/>
+       <plugin id="org.objectweb.asm.tree"/>
+       <plugin id="org.objectweb.asm.commons"/>
+       <plugin id="com.sun.jna.platform"/>
+       <plugin id="org.apache.felix.fileinstall"/>
+       <plugin id="user.theme.userdark"/>
+</includeBundles>
+<environment>
+       <os>win32</os>
+       <ws>win32</ws>
+       <arch>x86_64</arch>
+       <nl>en_US</nl>
+</environment>
+       <launcherArgs>
+       <vmArgs>-Dosgi.requiredJavaVersion=1.8 -XX:+UseG1GC -XX:+UseStringDeduplication -Dosgi.requiredJavaVersion=1.8 -Xms256m -Xmx1024m -Dorg.eclipse.epp.logging.aeri.skipReports=true</vmArgs>
+</launcherArgs>
+</target>
\ No newline at end of file

diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target
index faec11d7202a64b0841e59eab8556125b084e8d6..019d6763743b98540f0cb3a7130c32900afae2f3 100644 (file)
--- a/server/-dependencies/jobengine.target
+++ b/server/-dependencies/jobengine.target
@@ -3,7 +3,6 @@
 <target name="JobEngine" sequenceNumber="486">\r
 <locations>\r
 <location path="${workspace_loc}/-dependencies/target/repository/plugins" type="Directory"/>\r
-       <location path="${workspace_loc}/hu.user.theme.userdark/target/" type="Directory"/>\r
 </locations>\r
 <includeBundles>\r
 <plugin id="cglib"/>\r
@@ -87,7 +86,6 @@
        <plugin id="org.objectweb.asm.tree"/>\r
        <plugin id="org.objectweb.asm.commons"/>\r
        <plugin id="com.sun.jna.platform"/>\r
-       <plugin id="user.theme.userdark"/>\r
        <plugin id="org.apache.felix.fileinstall"/>\r
 </includeBundles>\r
 <environment>\r

diff --git a/server/-product/production/HIRTV/settings/application.yaml b/server/-product/production/HIRTV/settings/application.yaml
index 60d934f8ccacd48632f08e91e555930e86e3179f..c64a284a175201362f672a83f8ef17e0c4ba9035 100644 (file)
--- a/server/-product/production/HIRTV/settings/application.yaml
+++ b/server/-product/production/HIRTV/settings/application.yaml
@@ -1,14 +1,14 @@
 datasource:\r
    mediacube:\r
-      url: jdbc:db2://localvm:50000/mc\r
+      url: jdbc:db2://localhost:50000/testmc\r
       user: db2admin\r
       password: password\r
       external-indexer: false\r
-      simple-search: false\r
+      simple-search: true\r
       login-timeout: 3 #seconds\r
       pool-size: 10\r
    mediacube-nosql:\r
-      url: jdbc:db2://localvm:50000/mc\r
+      url: jdbc:db2://localhost:50000/testmc\r
       user: db2admin\r
       password: password\r
       schema: test\r

diff --git a/server/hu.user.theme.userdark/HOWTO.md b/server/hu.user.theme.userdark/HOWTO.md
index d5cba28135972d8ca84c14304a92136fd5e48e0d..b03550097a5f098dd2b138c6e531ac0aad0df264 100644 (file)
--- a/server/hu.user.theme.userdark/HOWTO.md
+++ b/server/hu.user.theme.userdark/HOWTO.md
@@ -1,4 +1,3 @@
-* Fordítés előtt telepíteni kell a nodejs appot és globálisan a lessjs library korábbi verzióját: "npm install less@2.7.2 -g" \r
-* A projekt a -dependencies/libs alá fordul\r
+* Fordítás előtt telepíteni kell a nodejs appot és globálisan a lessjs library korábbi verzióját: "npm install less@2.7.2 -g" \r
 * Az érvényesítéshez futtatni kell a -dependencies projekten az "mvn clean package p2:site" parancsot \r
 * Deploy előtt target platform frissítés szükséges  
\ No newline at end of file

diff --git a/server/user.jobengine.osgi.db/build-db-module.launch b/server/user.jobengine.osgi.db/build-db-module.launch
index 42ea8773357be5e2f75790cb99e3644f2af8c55c..97454731895e942159c8e27f504450825262358c 100644 (file)
--- a/server/user.jobengine.osgi.db/build-db-module.launch
+++ b/server/user.jobengine.osgi.db/build-db-module.launch
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-       <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">\r
-       <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
-       <stringAttribute key="M2_GOALS" value="clean install"/>\r
-       <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
-       <booleanAttribute key="M2_OFFLINE" value="false"/>\r
-       <stringAttribute key="M2_PROFILES" value=""/>\r
-       <listAttribute key="M2_PROPERTIES"/>\r
-       <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>\r
-       <booleanAttribute key="M2_SKIP_TESTS" value="true"/>\r
-       <intAttribute key="M2_THREADS" value="1"/>\r
-       <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>\r
-       <stringAttribute key="M2_USER_SETTINGS" value=""/>\r
-       <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>\r
-       <listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
-               <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
-       </listAttribute>\r
-       <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/user.jobengine.osgi.db}"/>\r
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">\r
+    <intAttribute key="M2_COLORS" value="0"/>\r
+    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
+    <stringAttribute key="M2_GOALS" value="clean install"/>\r
+    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
+    <booleanAttribute key="M2_OFFLINE" value="false"/>\r
+    <stringAttribute key="M2_PROFILES" value=""/>\r
+    <listAttribute key="M2_PROPERTIES"/>\r
+    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>\r
+    <booleanAttribute key="M2_SKIP_TESTS" value="true"/>\r
+    <intAttribute key="M2_THREADS" value="1"/>\r
+    <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>\r
+    <stringAttribute key="M2_USER_SETTINGS" value=""/>\r
+    <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>\r
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>\r
+    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
+        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
+    </listAttribute>\r
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/user.jobengine.osgi.db}"/>\r
 </launchConfiguration>\r

diff --git a/server/user.jobengine.osgi.db/sql/3-EnableJSON.db2 b/server/user.jobengine.osgi.db/sql/3-EnableJSON.db2
index c584f2c806ea0557e43ff1d5c3828ed8b29d4f36..96358b1830ce7b5f2f9e43fb51be990b7f0ac955 100644 (file)
--- a/server/user.jobengine.osgi.db/sql/3-EnableJSON.db2
+++ b/server/user.jobengine.osgi.db/sql/3-EnableJSON.db2
@@ -7,4 +7,9 @@
 11.5-től:\r
 \r
 ./db2nosql.sh -setup disable\r
-./db2nosql.sh -setup enable
\ No newline at end of file
+./db2nosql.sh -db TESTMC -user db2admin -password password -setup enable\r
+\r
+\r
+------------------------------------------------\r
+./db2nosql.sh: line 190: java: command not found\r
+export PATH=/home/db2admin/sqllib/java/jdk64/jre/bin:$PATH
\ No newline at end of file

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 7a42ba89864a5645fbce4a3bf0632508b6eb377f..e57b6e8b59a0d58979ea36c12df7b87d8d0545ab 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
@@ -179,7 +179,9 @@ public class MediaFinder implements IMediaFinder {
                                maxRecords--;\r
                        }\r
 \r
-                       mergeRelevantDescriptions(connection, result, options.getText());\r
+                       if (result.getKeys() != null && !result.getKeys().isEmpty()) {\r
+                               mergeRelevantDescriptions(connection, result, options.getText());\r
+                       }\r
 \r
                        logger.info("Query result processed");\r
                        connection.commit();\r