Closing changes. I basically just removed extra loggers and unnecessa…

…ry comments #4782
IQSS · Jul 25, 2018 · 91abbc5 · 91abbc5
1 parent ca8e332
commit 91abbc5
Showing 1 changed file with 1 addition and 16 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterService.java b/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterService.java
@@ -45,9 +45,7 @@ private DataCiteRESTfullClient openClient() throws IOException {
     }
 
     public String createIdentifierLocal(String identifier, HashMap<String, String> metadata, DvObject dvObject) {
-        logger.info(identifier + "$$$$$");
-        logger.info(dvObject.getAuthorString());
-        logger.info(metadata.toString());
+
         String xmlMetadata = getMetadataFromDvObject(identifier, metadata, dvObject);
         String status = metadata.get("_status").trim();
         String target = metadata.get("_target");
@@ -301,7 +299,6 @@ class DataCiteMetadataTemplate {
     private static String template;
 
     static {
-        //use other template for files
         try (InputStream in = DataCiteMetadataTemplate.class.getResourceAsStream("datacite_metadata_template.xml")) {
             template = Util.readAndClose(in, "utf-8");
         } catch (Exception e) {
@@ -316,7 +313,6 @@ class DataCiteMetadataTemplate {
     private String xmlMetadata;
     private String identifier;
     private String datasetIdentifier;
-    //or possibly ………
     private List<String> datafileIdentifiers;
     private List<String> creators;
     private String title;
@@ -377,9 +373,6 @@ public DataCiteMetadataTemplate(String xmlMetaData) {
         Document doc = Jsoup.parseBodyFragment(xmlMetaData);
         Elements identifierElements = doc.select("identifier");
         if (identifierElements.size() > 0) {
-            //Why do we only get the first element. Is it because
-            //there should be only one element in here? If so, why
-            //does identifierElements need to be an ArrayList?
             identifier = identifierElements.get(0).html();
         }
         Elements creatorElements = doc.select("creatorName");
@@ -451,15 +444,10 @@ public String generateXML(DvObject dvObject) {
             contributorsElement.append("</contributor>");
         }
 
-       // StringBuilder fileIdentifiersElement = new StringBuilder();
-
-      //  generateFileIdentifiers(dvObject);
         String relIdentifiers = generateRelatedIdentifiers (dvObject);
 
         xmlMetadata = xmlMetadata.replace("${relatedIdentifiers}", relIdentifiers);
 
-
-
         xmlMetadata = xmlMetadata.replace("{$contributors}", contributorsElement.toString());
         return xmlMetadata;
     }
@@ -483,7 +471,6 @@ private String generateRelatedIdentifiers(DvObject dvObject) {
                         }
                         sb.append(add);
                     }
-
                 }
 
                 if (!sb.toString().isEmpty()) {
@@ -507,12 +494,10 @@ public void generateFileIdentifiers(DvObject dvObject) {
 
             if (!dataset.getFiles().isEmpty() && !(dataset.getFiles().get(0).getIdentifier() == null)) {
 
-                //t = "hello" + dataset.getFiles().get(0);
                 datafileIdentifiers = new ArrayList<>();
                 for (DataFile dataFile : dataset.getFiles()) {
                     datafileIdentifiers.add(dataFile.getIdentifier());
                     int x = xmlMetadata.indexOf("</relatedIdentifiers>") - 1;
-                    //Fails at line below. It goes through all this twice and since the "relatedIdentifier" line gets taken out the first time it is failing when it goes through the second time
                     xmlMetadata = xmlMetadata.replace("{relatedIdentifier}", dataFile.getIdentifier());
                     xmlMetadata = xmlMetadata.substring(0, x) + "<relatedIdentifier relatedIdentifierType=\"hasPart\" "
                             + "relationType=\"doi\">${relatedIdentifier}</relatedIdentifier>" + template.substring(x, template.length() - 1);