Modified the code based on Matthew's suggestion.

NCEAS · Apr 17, 2023 · 69089cc · 69089cc
1 parent f10fa4f
commit 69089cc
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ New features and bugs fixed in this release:
 * Sampling citation not showing up in view service
 * Mis-Formatting of Data Package Contents
 * Unhelpful error message when trying to create as a denied submitter 
-* Data objects miss after a package was published
+* Data objects missing after a package was published
 * Multiple updates on a single DOI happen when users use the metacat admin page to update DOIs
 * Metacat updated the DOI metadata (datacite) when the system metadata of an obsoleted object was updated if the obsolescent chain has a DOI Sid
 * getPackage fails to include system metadata 

diff --git a/metacat-index/pom.xml b/metacat-index/pom.xml
@@ -167,8 +167,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.3</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 

diff --git a/metacat-index/src/main/java/edu/ucsb/nceas/metacat/index/SolrIndex.java b/metacat-index/src/main/java/edu/ucsb/nceas/metacat/index/SolrIndex.java
@@ -780,10 +780,7 @@ private void removeDataPackage(String pid) throws Exception {
             try {
                 List<SolrDoc> docsToUpdate = getUpdatedSolrDocsByRemovingResourceMap(pid);
                 if (docsToUpdate != null && !docsToUpdate.isEmpty()) {
-                    //SolrElementAdd addCommand = new SolrElementAdd(docsToUpdate);
-                    //httpService.sendUpdate(solrIndexUri, addCommand);
                     for(SolrDoc doc : docsToUpdate) {
-                        //removeFromIndex(doc.getIdentifier());
                         insertToIndex(doc);
                     }
                 }
@@ -1058,7 +1055,6 @@ private void removeFromDataPackage(String pid) throws Exception  {
                         SolrDoc solrDoc = ResourceMapSubprocessor.getSolrDoc(documentsValue);
                         if (solrDoc != null) {
                             solrDoc.removeFieldsWithValue(SolrElementField.FIELD_ISDOCUMENTEDBY, pid);
-                            //removeFromIndex(documentsValue);
                             insertToIndex(solrDoc);
                         }
                         break;
@@ -1083,8 +1079,6 @@ private void removeFromDataPackage(String pid) throws Exception  {
                         SolrDoc solrDoc = ResourceMapSubprocessor.getSolrDoc(documentedByValue);
                         if (solrDoc != null) {
                             solrDoc.removeFieldsWithValue(SolrElementField.FIELD_DOCUMENTS, pid);
-                            //docsToUpdate.add(solrDoc);
-                            //removeFromIndex(documentedByValue);
                             insertToIndex(solrDoc);
                         }
                         break;

diff --git a/src/scripts/bash/checksum-data-file.sh b/src/scripts/bash/checksum-data-file.sh
@@ -6,7 +6,6 @@ prefix="$directory/"
 rm data-checksum.txt
 for file in "$directory"/*; do
     if [[  "$file" =~ ^$directory/auto ]]; then
-        #checksum=$(md5sum "$file" | awk '{print $1}')
         checksum=$(md5 "$file" | awk '{print $4}')
 
         # Extract the "foo.2" and "1" parts of the filename

diff --git a/src/scripts/bash/checksum-document-file.sh b/src/scripts/bash/checksum-document-file.sh
@@ -5,7 +5,6 @@ prefix="$directory/"
 
 rm document-checksum.txt
 for file in "$directory"/*; do
-        #checksum=$(md5sum "$file" | awk '{print $1}')
         checksum=$(md5 "$file" | awk '{print $4}')
 
         # Extract the "foo.2" and "1" parts of the filename