From 5778a2c82921b8150a9e56bc2c26e24bc6411ae6 Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Wed, 10 Jul 2024 13:35:08 +0200 Subject: [PATCH 1/4] Change project version to 24.07-SNAPSHOT --- module-base/pom.xml | 4 ++-- module-gui/pom.xml | 4 ++-- module-lib/pom.xml | 4 ++-- pom.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/module-base/pom.xml b/module-base/pom.xml index 10223a5..6e2df6d 100644 --- a/module-base/pom.xml +++ b/module-base/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-dashboard-entity - 24.06 + 24.07-SNAPSHOT plugin-dashboard-entity-base jar @@ -19,4 +19,4 @@ 2.3.9 - \ No newline at end of file + diff --git a/module-gui/pom.xml b/module-gui/pom.xml index 1d25e26..685c4b4 100644 --- a/module-gui/pom.xml +++ b/module-gui/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-dashboard-entity - 24.06 + 24.07-SNAPSHOT plugin-dashboard-entity-gui jar @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/module-lib/pom.xml b/module-lib/pom.xml index 841273d..0598596 100644 --- a/module-lib/pom.xml +++ b/module-lib/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-dashboard-entity - 24.06 + 24.07-SNAPSHOT plugin-dashboard-entity-lib jar @@ -14,4 +14,4 @@ ${project.version} - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 1a45eba..4b7ec2c 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow workflow-base - 24.06 + 24.07-SNAPSHOT io.goobi.workflow.plugin @@ -28,4 +28,4 @@ classes - \ No newline at end of file + From 19aa02c569a018abe36e0e1743a25f05da7de38a Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Mon, 12 Aug 2024 08:32:54 +0200 Subject: [PATCH 2/4] fix: show error on exception --- .../de/intranda/beans/EntityDatabaseBean.java | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/module-lib/src/main/java/de/intranda/beans/EntityDatabaseBean.java b/module-lib/src/main/java/de/intranda/beans/EntityDatabaseBean.java index 451074a..5944fad 100644 --- a/module-lib/src/main/java/de/intranda/beans/EntityDatabaseBean.java +++ b/module-lib/src/main/java/de/intranda/beans/EntityDatabaseBean.java @@ -1,21 +1,21 @@ package de.intranda.beans; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import javax.enterprise.context.SessionScoped; -import javax.inject.Named; - -import org.apache.commons.configuration.XMLConfiguration; -import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine; -import org.apache.commons.lang.StringUtils; - import de.intranda.goobi.plugins.model.EntityConfig; import de.intranda.goobi.plugins.model.EntityType; import de.sub.goobi.config.ConfigPlugins; +import de.sub.goobi.helper.Helper; import de.sub.goobi.persistence.managers.ProcessManager; import lombok.Getter; +import org.apache.commons.configuration.XMLConfiguration; +import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine; +import org.apache.commons.lang.StringUtils; + +import javax.enterprise.context.SessionScoped; +import javax.inject.Named; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; @Named @SessionScoped @@ -35,12 +35,16 @@ private void loadConfiguration() { } public List getAllEntityTypes() { - - if (configuration == null) { - loadConfiguration(); + try { + if (configuration == null) { + loadConfiguration(); + } + + return configuration.getAllTypes(); + } catch (RuntimeException e) { + Helper.setFehlerMeldung(e.getMessage()); + return Collections.emptyList(); } - - return configuration.getAllTypes(); } public List getEntityData(EntityType type) { From 0d336f276b01006089bb0bc562a3cefc5b129b27 Mon Sep 17 00:00:00 2001 From: Steffen Hankiewicz Date: Sun, 18 Aug 2024 10:34:07 +0200 Subject: [PATCH 3/4] updated readme file --- README.md | 84 ++++++++++++++++++++++++++----------------------------- 1 file changed, 39 insertions(+), 45 deletions(-) diff --git a/README.md b/README.md index a0fa8c4..30b4998 100644 --- a/README.md +++ b/README.md @@ -1,45 +1,39 @@ -Goobi workflow Plugin: goobi-plugin-dashboard-entity -=========================================================================== - -Plugin for Goobi workflow - -This is a dashboard plugin for Goobi workflow to allow indexing of interconnected entities like persons, corporates, awards etc. (aka Artist Dictionary) - -This is a plugin for Goobi workflow, the open source workflow tracking software for digitisation projects. More information about Goobi workflow is available under https://goobi.io. If you want to get in touch with the user community simply go to https://community.goobi.io. - - -Plugin details ---------------------------------------------------------------------------- - -More information about the functionality of this plugin and the complete documentation can be found in the central documentation area at https://docs.goobi.io - -Detail | Description ---------------------------- | ------------------------------- -**Plugin identifier** | intranda_dashboard_entity -**Plugin type** | Dashboard Plugin -**Licence** | GPL 2.0 or newer -**Documentation (German)** | - no documentation available - -**Documentation (English)** | - no documentation available - - - -Goobi details ---------------------------------------------------------------------------- -Goobi workflow is an open source web application to manage small and large digitisation projects mostly in cultural heritage institutions all around the world. More information about Goobi can be found here: - -Detail | Description -------------------- | -------------------------- -**Goobi web site** | https://www.goobi.io -**Twitter** | https://twitter.com/goobi -**Goobi community** | https://community.goobi.io - - -Development ---------------------------------------------------------------------------- -This plugin was developed by intranda. If you have any issues, feedback, question or if you are looking for more information about Goobi workflow, Goobi viewer and all our other developments that are used in digitisation projects please get in touch with us. - -Contact | Details ------------------ | ---------------------------------------------------- -**Company name** | intranda GmbH -**Address** | Bertha-von-Suttner-Str. 9, 37085 Göttingen, Germany -**Web site** | https://www.intranda.com -**Twitter** | https://twitter.com/intranda \ No newline at end of file +# Goobi workflow Plugin: goobi-plugin-dashboard-entity + +Plugin for Goobi workflow + +This Dashboard plugin for Goobi workflow allows indexing of interconnected entities like persons, corporates, awards etc. (aka Artist Dictionary) + +This is a plugin for Goobi workflow, the open source workflow tracking software for digitisation projects. More information about Goobi workflow is available under https://goobi.io. If you want to get in touch with the user community simply go to https://community.goobi.io. + +## Plugin details + +More information about the functionality of this plugin and the complete documentation can be found in the central documentation area at https://docs.goobi.io + +Detail | Description +--------------------------- | ---------------------- +**Plugin identifier** | - +**Plugin type** | dashboard +**Licence** | GPL 2.0 or newer +**Documentation (German)** | This plugin is not yet documented. +**Documentation (English)** | This plugin is not yet documented. + +## Goobi details + +Goobi workflow is an open source web application to manage small and large digitisation projects mostly in cultural heritage institutions all around the world. More information about Goobi can be found here: + +Detail | Description +--------------------------- | --------------------------- +**Goobi web site** | https://www.goobi.io +**Goobi community** | https://community.goobi.io +**Goobi documentation** | https://docs.goobi.io + +## Development + +This plugin was developed by intranda. If you have any issues, feedback, question or if you are looking for more information about Goobi workflow, Goobi viewer and all our other developments that are used in digitisation projects please get in touch with us. + +Contact | Details +--------------------------- | ---------------------------------------------------- +**Company name** | intranda GmbH +**Address** | Bertha-von-Suttner-Str. 9, 37085 Göttingen, Germany +**Web site** | https://www.intranda.com From 5b07a2317025699d92c4ac2f8f08087e1c3b9d6f Mon Sep 17 00:00:00 2001 From: Release-Tool Date: Tue, 20 Aug 2024 13:36:39 +0200 Subject: [PATCH 4/4] Change project version to 24.07 --- module-base/pom.xml | 2 +- module-gui/pom.xml | 2 +- module-lib/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module-base/pom.xml b/module-base/pom.xml index 6e2df6d..7fef0ec 100644 --- a/module-base/pom.xml +++ b/module-base/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-dashboard-entity - 24.07-SNAPSHOT + 24.07 plugin-dashboard-entity-base jar diff --git a/module-gui/pom.xml b/module-gui/pom.xml index 685c4b4..c1d4160 100644 --- a/module-gui/pom.xml +++ b/module-gui/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-dashboard-entity - 24.07-SNAPSHOT + 24.07 plugin-dashboard-entity-gui jar diff --git a/module-lib/pom.xml b/module-lib/pom.xml index 0598596..02e7b96 100644 --- a/module-lib/pom.xml +++ b/module-lib/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-dashboard-entity - 24.07-SNAPSHOT + 24.07 plugin-dashboard-entity-lib jar diff --git a/pom.xml b/pom.xml index 4b7ec2c..78db03b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow workflow-base - 24.07-SNAPSHOT + 24.07 io.goobi.workflow.plugin