From 46ee42a3b0f448ebea77e59a6cecca74f0165444 Mon Sep 17 00:00:00 2001
From: Steffen Hankiewicz <steffen.hankiewicz@intranda.com>
Date: Tue, 21 Jun 2022 17:30:42 +0200
Subject: [PATCH] small updates

---
 plugin/plugin_intranda_step_doi.xml           | 120 +++++++++---------
 .../intranda/goobi/plugins/DoiStepPlugin.java |   6 -
 .../de/intranda/goobi/plugins/HelperHttp.java |   4 -
 3 files changed, 60 insertions(+), 70 deletions(-)

diff --git a/plugin/plugin_intranda_step_doi.xml b/plugin/plugin_intranda_step_doi.xml
index 3567ec5..3b6b877 100644
--- a/plugin/plugin_intranda_step_doi.xml
+++ b/plugin/plugin_intranda_step_doi.xml
@@ -8,24 +8,24 @@
 	-->
 
     <config>
-        <!-- which projects to use for (can be more then one, otherwise use *) -->
-        <project>*</project>
-        <step>*</step>
-
-        <!-- use debug mode if the temporary xml shall be saved in the Goobi tmp folder -->
-        <debugMode>true</debugMode>
-
+		<!-- which projects to use for (can be more then one, otherwise use *) -->
+		<project>*</project>
+		<step>*</step>
+		
+		<!-- use debug mode if the temporary xml shall be saved in the Goobi tmp folder -->
+		      <debugMode>true</debugMode>
+		
 		<!-- authentication and main information -->
-        <!-- For testing: https://mds.test.datacite.org/ -->
-        <!-- For production https://mds.datacite.org/ -->
+		<!-- For testing: https://mds.test.datacite.org/ -->
+		<!-- For production https://mds.datacite.org/ -->
 		<serviceAddress>https://mds.test.datacite.org/</serviceAddress>
-        
+		      
 		<!-- authentication and main information -->
 		<base>10.33510</base>
 		<viewer>https://viewer.example.org/resolver?field=MD_PI_DOI&amp;identifier=</viewer>
 		<username>USER</username>
 		<password>PASSWORD</password>
-
+		
 		<!-- name parts for DOI composition -->
 		<prefix>go</prefix>
 		<name>goobi</name>
@@ -33,55 +33,55 @@
 		
 		<!-- metadata field from ruleset where to store the DOI -->
 		<metadata>DOI</metadata>
-
-        <!-- Path to the xsl file that shall be used for the datacite xml generation 
-        (file must be located inside of the central Goobi xslt folder) -->
-        <xslt>doi.xsl</xslt>
-        
-        <field name="LANGUAGE" default="- UNKNOWN LANGUAGE -">
-        	<data content="{meta.DocLanguage)"/>
-        </field>
-
-        <field name="TITLE" default="- UNKNOWN TITLE -">
-        	<data content="{meta.TitleDocMain)"/>
-        </field>
-        
-        <field name="ANCHORTITLE" default="- UNKNOWN ANCHOR TITLE -">
-        	<data content="{meta.topstruct.TitleDocMain)"/>
-        </field>
-
-        <field name="ANCHORSUBTITLE" default="- UNKNOWN ANCHOR SUB TITLE -">
-        	<data content="{meta.topstruct.TitleDocSub1)"/>
-        </field>
-
-        <field name="IDENTIFIER" default="- NO IDENTIFIER DEFINED -">
-        	<data content="{meta.CatalogIDDigital)"/>
-        </field>
-        
-        <field name="FORMAT" default="- NO FORMAT DEFINED -">
-        	<data content="{meta.FormatSourcePrint)"/>
-        </field>
-
-        <field name="PUBLICATIONYEAR" default="- NO FORMAT DEFINED -">
-        	<data content="{meta.PublicationYear)"/>
-        </field>
-        
-        <field name="CREATOR" default="- NO CREATOR DEFINED -">
-        	<data content="{meta.Author)"/>
-        </field>
-
-        <field name="PUBLISHER" default="- NO PUBLISHER DEFINED -">
-        	<data content="{meta.PublisherName)"/>
-        </field>
-        
-        <field name="SERIES" default="- NO SERIES DEFINED -">
-        	<data content="{meta.PublicationSeries)"/>
-        </field>
-        
-        <field name="NUMBER">
-        	<data content="{meta.CurrentNo)"/>
-        	<data content="{meta.CurrentNoSorting)"/>
-        </field>
+		
+		      <!-- Path to the xsl file that shall be used for the datacite xml generation 
+		(file must be located inside of the central Goobi xslt folder) -->
+		<xslt>doi.xsl</xslt>
+		
+		<field name="LANGUAGE" default="- UNKNOWN LANGUAGE -">
+			<data content="{meta.DocLanguage)"/>
+		</field>
+		
+		<field name="TITLE" default="- UNKNOWN TITLE -">
+			<data content="{meta.TitleDocMain)"/>
+		</field>
+		
+		<field name="ANCHORTITLE" default="- UNKNOWN ANCHOR TITLE -">
+			<data content="{meta.topstruct.TitleDocMain)"/>
+		</field>
+		
+		<field name="ANCHORSUBTITLE" default="- UNKNOWN ANCHOR SUB TITLE -">
+			<data content="{meta.topstruct.TitleDocSub1)"/>
+		</field>
+		
+		<field name="IDENTIFIER" default="- NO IDENTIFIER DEFINED -">
+			<data content="{meta.CatalogIDDigital)"/>
+		</field>
+		
+		<field name="FORMAT" default="- NO FORMAT DEFINED -">
+			<data content="{meta.FormatSourcePrint)"/>
+		</field>
+		
+		<field name="PUBLICATIONYEAR" default="- NO FORMAT DEFINED -">
+			<data content="{meta.PublicationYear)"/>
+		</field>
+		
+		<field name="CREATOR" default="- NO CREATOR DEFINED -">
+			<data content="{meta.Author)"/>
+		</field>
+		
+		<field name="PUBLISHER" default="- NO PUBLISHER DEFINED -">
+			<data content="{meta.PublisherName)"/>
+		</field>
+		
+		<field name="SERIES" default="- NO SERIES DEFINED -">
+			<data content="{meta.PublicationSeries)"/>
+		</field>
+		
+		<field name="NUMBER">
+			<data content="{meta.CurrentNo)"/>
+			<data content="{meta.CurrentNoSorting)"/>
+		</field>
                 
     </config>
 
diff --git a/plugin/src/main/java/de/intranda/goobi/plugins/DoiStepPlugin.java b/plugin/src/main/java/de/intranda/goobi/plugins/DoiStepPlugin.java
index 50e38f1..fb47b26 100644
--- a/plugin/src/main/java/de/intranda/goobi/plugins/DoiStepPlugin.java
+++ b/plugin/src/main/java/de/intranda/goobi/plugins/DoiStepPlugin.java
@@ -31,13 +31,7 @@
 import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.commons.configuration.SubnodeConfiguration;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
 import org.apache.http.ParseException;
-import org.apache.http.client.fluent.Executor;
-import org.apache.http.client.fluent.Request;
-import org.apache.http.entity.ContentType;
-import org.apache.http.util.EntityUtils;
 import org.goobi.beans.Process;
 import org.goobi.beans.Step;
 import org.goobi.production.enums.LogType;
diff --git a/plugin/src/main/java/de/intranda/goobi/plugins/HelperHttp.java b/plugin/src/main/java/de/intranda/goobi/plugins/HelperHttp.java
index 2dd108e..56c36db 100644
--- a/plugin/src/main/java/de/intranda/goobi/plugins/HelperHttp.java
+++ b/plugin/src/main/java/de/intranda/goobi/plugins/HelperHttp.java
@@ -13,14 +13,10 @@
 import org.apache.http.client.fluent.Request;
 import org.apache.http.entity.ContentType;
 import org.apache.http.util.EntityUtils;
-import org.goobi.production.enums.LogType;
 import org.jdom2.Document;
 import org.jdom2.output.Format;
 import org.jdom2.output.XMLOutputter;
 
-import de.sub.goobi.helper.Helper;
-import ugh.dl.Metadata;
-
 public class HelperHttp {
 	
 	/**