[refactor] minor stringutils, printout improvements

Author: atla5

main/java/dc_metadata/Contributor.java

@@ -73,7 +73,7 @@ public static Contributor createContributor(String qualifierText, String fullNam
         String qualifier = determineContributorQualifier(qualifierText);
         String value = determineName(fullName).trim();
 
-        LOGGER.info(String.format("CONTRIBUTOR created | qualifier: %s, value: %s.", qualifier, value));
+        //LOGGER.info(String.format("CONTRIBUTOR created | qualifier: %s, value: %s.", qualifier, value));
 
         return new Contributor(qualifier, value);
     }

main/java/export/CSVExporter.java

@@ -1,11 +1,10 @@
 package export;
 
+import com.sun.deploy.util.StringUtils;
 import dc_metadata.Element;
 import main.Item;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Export to CSV file for use with `DSpace/SAFBuildier`
@@ -23,27 +22,13 @@ public CSVExporter(){
 
     @Override
     protected String processHeader(){
-
-        ArrayList<String> lsElements = new ArrayList<String>();
-        lsElements.addAll(this.lsUniqueElementNames);
-
-        String toReturn = ""; int i;
-        for (i = 0; i < lsElements.size() - 1; i++)
-            toReturn += lsElements.get(i) + ",";
-
-        return toReturn + lsElements.get(i) + "\n";
+        return StringUtils.join(this.lsUniqueElementNames,",") + "\n";
     }
 
     @Override
     protected String processItemHeader(Item item){
-        String toReturn = "\"" + item.id + "\",";
-
-        List<String> filenames = item.lsFilenames; int i;
-        toReturn += "\"";
-        for(i = 0; i < filenames.size()-1; i++)
-            toReturn += filenames.get(i) + "||";
-
-        return toReturn + filenames.get(i) + "\",";
+        String filenames = StringUtils.join(item.lsFilenames, "||");
+        return String.format("%d,\"%s\",", item.id, filenames);
 
     }
 

main/java/export/TXTExporter.java

@@ -1,5 +1,6 @@
 package export;
 
+import com.sun.deploy.util.StringUtils;
 import dc_metadata.Element;
 import main.Item;
 
@@ -10,15 +11,7 @@ public class TXTExporter extends main.Exporter {
 
     @Override
     protected String processItemHeader(Item item){
-        String toReturn = "---- Item " + item.id + ": ";
-
-        //list filenames
-        int i = 0;
-        for(i = 0; i < item.lsFilenames.size()-1; i++){
-            toReturn += item.lsFilenames.get(i) + ", ";
-        } toReturn += item.lsFilenames.get(i);
-
-        return toReturn + " ----\n";
+        return String.format("---- Item %d: %s ----", item.id, StringUtils.join(item.lsFilenames, ", "));
     }
 
     @Override

main/java/main/Main.java

@@ -11,30 +11,24 @@
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
 
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
-
 /**
  * main.Main user-facing class. Directs all actions.
  */
 public class Main {
 
     //delimiters
-    public static String DELIM_SHARED = "|";
     public static String DIRECTORY_PATH_IN  = "./main/sample_data/"; //TODO allow custom path
     public static String DIRECTORY_PATH_CONF  = "./main/config/";    //TODO allow custom path
     public static String DIRECTORY_PATH_OUT   = "../output/";        //TODO allow custom path
-    private String EXPORT_FILENAME     = "export"; //name of each exported file in 'output/' (collection name)
+    private String EXPORT_FILENAME = "export"; //name of each exported file in 'output/' (collection name)
 
     // configure logger
     private static Logger LOGGER = Logger.getLogger(Main.class.getName());
 
 
-    // - public facing back end
-
     /**
      * Main function responsible for taking in user input at the command line,
      *   handling flags, and directing overall behavior of the program.
-     * @param args list of files (?)
      * @throws IOException
      * @throws ParseException
      */
@@ -43,7 +37,7 @@ public static void main(String[] args) throws IOException, ParseException {
         // - get input from the user command line - //
         String header = "A cataloguing tool for converting specially formatted text files containing dublin " +
                 "core metadata into various formats\n";
-        String footer = "";
+        String footer = "-- developed by @atla5 on behalf of RIT Wallace and BU Mugar libraries.";
         CommandLineParser posixParser = new PosixParser();
         Options options = new Options();
 
@@ -101,13 +95,6 @@ public static void main(String[] args) throws IOException, ParseException {
             System.exit(0);
         }
 
-        //display help information for dublin core
-        if(commandLine.hasOption('d')) {
-            throw new NotImplementedException();
-            //System.exit(0);
-        }
-
-
         /* - run the program in the absence of these tags */
 
         //instantiate a new parser
@@ -141,16 +128,14 @@ public static void main(String[] args) throws IOException, ParseException {
 
         int id = 1;
         //foreach file in the directory...
+        File folder = new File(DIRECTORY_PATH_IN);
+        File[] lsFiles = folder.listFiles();
 
-            String waldo = "sample-metadata-file.txt";
-            String sample= "1990-v123n04.txt";
-            String[] lsFiles = { waldo, sample };
-
-            for(String filename : lsFiles) {
-                String path = DIRECTORY_PATH_IN + filename;
+            for(File filename : lsFiles) {
+                String path =  filename.getAbsolutePath();
 
                 //todo: harvest metadata from file and use it to populate provenance information
-                p.processMetadataFile(processFileIntoStringArray(DIRECTORY_PATH_IN + filename), id);
+                p.processMetadataFile(processFileIntoStringArray(path), id);
                 id++;
             }
         //end foreach file in directory...