From ed29469bd90fcf06079d9e10a35d1e605beb8235 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Wed, 24 Jan 2024 18:15:38 +0100 Subject: [PATCH] MediaFinder error handling improved --- server/-dependencies/jobengine-theme.target | 102 ++++++++++++++++++ server/-dependencies/jobengine.target | 2 - .../HIRTV/settings/application.yaml | 6 +- server/hu.user.theme.userdark/HOWTO.md | 3 +- .../build-db-module.launch | 36 ++++--- .../sql/3-EnableJSON.db2 | 7 +- .../user/jobengine/search/MediaFinder.java | 4 +- 7 files changed, 134 insertions(+), 26 deletions(-) create mode 100644 server/-dependencies/jobengine-theme.target diff --git a/server/-dependencies/jobengine-theme.target b/server/-dependencies/jobengine-theme.target new file mode 100644 index 00000000..16b24aa9 --- /dev/null +++ b/server/-dependencies/jobengine-theme.target @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + win32 + win32 + x86_64 + en_US + + + -Dosgi.requiredJavaVersion=1.8 -XX:+UseG1GC -XX:+UseStringDeduplication -Dosgi.requiredJavaVersion=1.8 -Xms256m -Xmx1024m -Dorg.eclipse.epp.logging.aeri.skipReports=true + + \ No newline at end of file diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target index faec11d7..019d6763 100644 --- a/server/-dependencies/jobengine.target +++ b/server/-dependencies/jobengine.target @@ -3,7 +3,6 @@ - @@ -87,7 +86,6 @@ - diff --git a/server/-product/production/HIRTV/settings/application.yaml b/server/-product/production/HIRTV/settings/application.yaml index 60d934f8..c64a284a 100644 --- a/server/-product/production/HIRTV/settings/application.yaml +++ b/server/-product/production/HIRTV/settings/application.yaml @@ -1,14 +1,14 @@ datasource: mediacube: - url: jdbc:db2://localvm:50000/mc + url: jdbc:db2://localhost:50000/testmc user: db2admin password: password external-indexer: false - simple-search: false + simple-search: true login-timeout: 3 #seconds pool-size: 10 mediacube-nosql: - url: jdbc:db2://localvm:50000/mc + url: jdbc:db2://localhost:50000/testmc user: db2admin password: password schema: test diff --git a/server/hu.user.theme.userdark/HOWTO.md b/server/hu.user.theme.userdark/HOWTO.md index d5cba281..b0355009 100644 --- 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" -* A projekt a -dependencies/libs alá fordul +* 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" * Az érvényesítéshez futtatni kell a -dependencies projekten az "mvn clean package p2:site" parancsot * 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 42ea8773..97454731 100644 --- a/server/user.jobengine.osgi.db/build-db-module.launch +++ b/server/user.jobengine.osgi.db/build-db-module.launch @@ -1,19 +1,21 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/server/user.jobengine.osgi.db/sql/3-EnableJSON.db2 b/server/user.jobengine.osgi.db/sql/3-EnableJSON.db2 index c584f2c8..96358b18 100644 --- 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: ./db2nosql.sh -setup disable -./db2nosql.sh -setup enable \ No newline at end of file +./db2nosql.sh -db TESTMC -user db2admin -password password -setup enable + + +------------------------------------------------ +./db2nosql.sh: line 190: java: command not found +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 7a42ba89..e57b6e8b 100644 --- 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--; } - mergeRelevantDescriptions(connection, result, options.getText()); + if (result.getKeys() != null && !result.getKeys().isEmpty()) { + mergeRelevantDescriptions(connection, result, options.getText()); + } logger.info("Query result processed"); connection.commit(); -- 2.54.0