Merge branch 'development' into feature-streaming-zip

PASTAplus · May 1, 2023 · 8994894 · 8994894
2 parents 03fe365 + 5bcaae5
commit 8994894
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 11 deletions.
diff --git a/DataPackageManager/src/edu/lternet/pasta/doi/DataCiteMetadata.java b/DataPackageManager/src/edu/lternet/pasta/doi/DataCiteMetadata.java
@@ -254,14 +254,8 @@ else if (userIdDirectory.matches("https?://www.grid.ac.*")) {
 					}
 					if (addNameIdentifier) {
 						sb.append(String.format(
-								"            <nameIdentifier>%s</nameIdentifier>\n",
-								nameIdentifier));
-						sb.append(String.format(
-								"            <nameIdentifierScheme>%s</nameIdentifierScheme>\n",
-								nameIdentifierScheme));
-						sb.append(String.format(
-								"            <schemeUri>%s</schemeUri>\n",
-								schemeUri));
+								"            <nameIdentifier nameIdentifierScheme=\"%s\" schemeURI=\"%s\">%s</nameIdentifier>\n",
+								nameIdentifierScheme, schemeUri, nameIdentifier));
 					}
 				}
 

diff --git a/DataPackageManager/test/data/DataCiteMetadataSample.xml b/DataPackageManager/test/data/DataCiteMetadataSample.xml
@@ -10,6 +10,7 @@
         </creator>
     </creators>
     <titles>
+        <title>A new method for estimating the global oceanic heat content</title>
     </titles>
     <publisher>Environmental Data Initiative</publisher>
     <publicationYear>2018</publicationYear>

diff --git a/DataPackageManager/test/edu/lternet/pasta/doi/DataCiteMetadataTest.java b/DataPackageManager/test/edu/lternet/pasta/doi/DataCiteMetadataTest.java
@@ -3,6 +3,7 @@
 import edu.lternet.pasta.common.FileUtility;
 import edu.lternet.pasta.common.eml.EMLParser;
 import edu.lternet.pasta.common.eml.ResponsibleParty;
+import edu.lternet.pasta.common.eml.Title;
 import edu.lternet.pasta.datapackagemanager.JournalCitation;
 import junit.framework.TestCase;
 
@@ -14,7 +15,7 @@ public class DataCiteMetadataTest extends TestCase {
   public static final String DATA_CITE_METADATA_SAMPLE_XML =
       "test/data/DataCiteMetadataSample.xml";
 
-  public void testToDataCiteXml() throws ConfigurationException
+  public void testToDataCiteXml() throws Exception
   {
     DataCiteMetadata dcm = new DataCiteMetadata();
 
@@ -28,6 +29,15 @@ public void testToDataCiteXml() throws ConfigurationException
     dcm.setPublicationYear("2018");
     dcm.setLocationUrl("https://pasta.lternet.edu/package/data/eml/knb-lter-lno/1/1");
 
+    Title title = new Title();
+    title.setTitle("A new method for estimating the global oceanic heat content");
+    title.setTitleType("Subtitle");
+
+    ArrayList<Title> titles = new ArrayList<>();
+    titles.add(title);
+
+    dcm.setTitles(titles);
+
     JournalCitation jc = new JournalCitation();
     jc.setArticleDoi("10.1002/2017GL075000");
     jc.setArticleTitle("A new method for estimating the global oceanic heat content");

diff --git a/common/build.xml b/common/build.xml
@@ -52,7 +52,7 @@
         <include name="serializer.jar"/>
       </fileset>
       <fileset dir="${shared.lib.dir}/unboundid">
-        <include name="unboundid-ldapsdk-se.jar"/>
+        <include name="unboundid-ldapsdk.jar"/>
       </fileset>
       <fileset dir="${shared.lib.dir}/jaxb-eml-2.1.0">
         <include name="eml-2.1.0.jar"/>
@@ -67,14 +67,15 @@
         <include name="quickcheck-0.6.jar"/>
       </fileset>
       <fileset dir="${shared.lib.dir}/postgresql">
-        <include name="postgresql-42.2.5.jre7.jar"/>
+          <include name="**/*.jar"/>
       </fileset>
     </copy>
   </target>
 
   <target name="clean" description="Deletes compiled classes">
     <delete dir="${classes.dir}"/>
     <delete dir="${jar.dir}"/>
+    <delete dir="${lib.dir}"/>
   </target>
 
   <target name="jar" depends="compile">

diff --git a/lib/postgresql/postgresql-42.2.5.jre7.jar b/lib/postgresql/postgresql-42.2.5.jre7.jar
diff --git a/lib/postgresql/postgresql-42.6.0.jar b/lib/postgresql/postgresql-42.6.0.jar
diff --git a/lib/slf4j/slf4j-api-2.0.7.jar b/lib/slf4j/slf4j-api-2.0.7.jar