[bugfix] first set of updates and fixes post-transfer

atla5 · atla5 · commit 6b38dbb485c7 · 2016-12-18T02:30:03.000-05:00
diff --git a/main/java/dc_metadata/Contributor.java b/main/java/dc_metadata/Contributor.java
@@ -67,7 +67,7 @@ private Contributor(String qualifier, String value){
     /**
      * Return a contributor object whose qualifier has been selected with care.
      * @param qualifierText the raw text from the metadata file
-     * @param fullName TODO switch to pass a 'Person' object
+     * @param fullName TODO switch to pass a 'main.Person' object
      */
     public static Contributor createContributor(String qualifierText, String fullName) {
         String qualifier = determineContributorQualifier(qualifierText);
@@ -161,7 +161,7 @@ else if( matchManaging(line)){
         }
 
         //OTHER
-        else{ q = AUTHOR
+        else{ q = AUTHOR; }
 
         return q;
     }
diff --git a/main/java/export/CSVExporter.java b/main/java/export/CSVExporter.java
@@ -0,0 +1,21 @@
+package export;
+
+import main.Collection;
+import main.Item;
+import java.io.File;
+
+/**
+ * Export to CSV file for use with `DSpace/SAFBuildier`
+ */
+public class CSVExporter extends main.Exporter{
+
+    @Override
+    protected String processItem(Item i) {
+        return null;
+    }
+
+    @Override
+    public File publish(File directory, String filename) {
+        return null;
+    }
+}
diff --git a/main/java/main/Collection.java b/main/java/main/Collection.java
@@ -1,7 +1,8 @@
+package main;
+
 import org.pmw.tinylog.Logger;
 
 import java.io.*;
-import java.lang.reflect.Array;
 import java.util.ArrayList;
 
 /**
@@ -59,10 +60,6 @@ public int processDirectory(String directoryPath) {
         return 0; //TODO
     }
 
-    public int processFile(File f){
-        return 0; //TODO
-    }
-
     // -- CONFIG -- //
 
 
diff --git a/main/java/main/Exporter.java b/main/java/main/Exporter.java
@@ -0,0 +1,27 @@
+package main;
+
+import sun.reflect.generics.reflectiveObjects.NotImplementedException;
+
+import java.io.File;
+
+/**
+ * Abstract class for exporting to various formats
+ */
+public abstract class Exporter {
+
+    protected String fileText;
+
+    // parts of the exported document, possibly reused
+    protected static String header;
+    protected static String footer;
+
+    //
+    public String processCollection(Collection c){
+        throw new NotImplementedException();
+    }
+
+    // process
+    protected abstract String processItem(Item i);
+
+    public abstract File publish(File directory, String filename);
+}
diff --git a/main/java/main/Item.java b/main/java/main/Item.java
@@ -1,3 +1,5 @@
+package main;
+
 import dc_metadata.*;
 import org.pmw.tinylog.Logger;
 import sun.reflect.generics.reflectiveObjects.NotImplementedException;
diff --git a/main/java/main/Main.java b/main/java/main/Main.java
@@ -1,3 +1,5 @@
+package main;
+
 import java.io.*;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -8,16 +10,17 @@
 import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 /**
- * Main user-facing class. Directs all actions.
+ * main.Main user-facing class. Directs all actions.
  */
 public class Main {
 
-    //delimitors
+    //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 String DIRECTORY_PATH_OUT   = "./main/output/";    //TODO allow custom path
+    public static String DIRECTORY_PATH_OUT   = "./main/output/";    //TODO allow custom patt
     public String DIRECTORY_PATH_LOG   = "./main/logs/";
+    private String EXPORT_FILENAME     = "export"; //name of each exported file in 'output/' (collection name)
 
 
     // - public facing back end
@@ -122,11 +125,9 @@ public static void main(String[] args) throws IOException, ParseException {
         int id = 1;
         //foreach file in the directory...
 
-            String report= "1993-v74n03.txt";
-            String focus = "NTIDFocus-1976-11.txt";
             String waldo = "sample-metadata-file.txt";
             String sample= "1990-v123n04.txt";
-            String[] lsFiles = {report, focus, waldo, sample };
+            String[] lsFiles = { waldo, sample };
 
             for(String filename : lsFiles) {
                 String path = DIRECTORY_PATH_IN + filename;
@@ -138,12 +139,26 @@ public static void main(String[] args) throws IOException, ParseException {
 
         // - export in desired formats - //
 
+        String exportFilename = "export";
+
+        // get desired format/s from command line
         boolean exp_csv = commandLine.hasOption('C');
         boolean exp_XML = commandLine.hasOption('X');   boolean exp_xml = commandLine.hasOption('x');
-        boolean exp_MRK = commandLine.hasOption('M');   boolean exp_mrk = commandLine.hasOption('m');
+        //boolean exp_MRK = commandLine.hasOption('M');   boolean exp_mrk = commandLine.hasOption('m');
         boolean exp_JSN = commandLine.hasOption('J');   boolean exp_jsn = commandLine.hasOption('j');
 
-        //...
+        //
+        List<Exporter> lsExporters = new ArrayList<Exporter>();
+
+        if(exp_csv){ lsExporters.add( new export.CSVExporter() ); }
+        //if(exp_XML){ lsExporters.add( new XMLExporter() ); }
+        //if(exp_JSN){ lsExporters.add( new JSNExporter() ); }
+        //if(exp_bib){ lsExporters.add( new BibExporter() ); }
+
+        for(Exporter e : lsExporters){
+            //e.processCollection(p);
+            e.publish(new File(DIRECTORY_PATH_OUT), exportFilename);
+        }
 
         for(Item i : p.getLsItems()){ System.out.println(i); } //TODO change out.
     }
diff --git a/main/java/main/Parser.java b/main/java/main/Parser.java
@@ -1,11 +1,13 @@
+package main;
+
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 /**
- * Parser object which interprets a given text file and creates an interpreted 'Item' object
+ * main.Parser object which interprets a given text file and creates an interpreted 'main.Item' object
  */
 public class Parser {
 
@@ -32,13 +34,13 @@ public class Parser {
     public static String SUBJECT        = "SUBJECT";
     public static String TITLE          = "TITLE";
     public static String TYPE           = "TYPE";
-    public static String[] ALL_OPTIONS =
+    public static String[] ALL_OPTIONS  =
             { AUDIENCE, COVERAGE, DATE, DESCRIPTION, FILENAME, FORMAT, IDENTIFIER, LANGUAGE,
                 NOTE, PUBLISHER, RELATION, RIGHTS, RIGHTSHOLDER, SUBJECT, TITLE, TYPE };
 
     //modes
-    protected enum mode { CONTRIBUTORS, ARTICLES, SUBJECT, NULL }
-    private mode current_mode = mode.NULL;
+    public enum mode { CONTRIBUTORS, ARTICLES, SUBJECT, NULL }
+    protected mode current_mode = mode.NULL;
 
     //critical elements
     private ArrayList<String> lsHeaderOptions;
@@ -47,28 +49,16 @@ protected enum mode { CONTRIBUTORS, ARTICLES, SUBJECT, NULL }
     private String current_qualifier;
 
 
+
     // - constructors - //
 
     /**
      * base constructor which initializes object state and sets defaults
      */
     public Parser(){
 
-        //initialize header options
-        lsHeaderOptions = new ArrayList<String>();
-
-        /* set to default header:
-         * 0: title                     |   'Title of the Issue'
-         * 1: relation.isPartOfSeries   |   'Volume ##, Number ##, "
-         * 2: date.issued               |   '1993-03-26'
-         * 3: title.alternative         |   ''
-         * 4: filename                  |   'filename.pdf'
-         */
-        lsHeaderOptions.add(TITLE);
-        lsHeaderOptions.add(RELATION + SPLIT_OPTION + "ISPARTOFSERIES");
-        lsHeaderOptions.add(DATE + SPLIT_OPTION + "ISSUED");
-        lsHeaderOptions.add(TITLE + SPLIT_OPTION + "ALTERNATIVE");
-        lsHeaderOptions.add(FILENAME);
+        //initialize header
+        initHeader();
 
         //initialize list of shared values
         lsShared = new ArrayList<String[]>();
@@ -212,6 +202,24 @@ else if (current_mode == mode.CONTRIBUTORS) {
 
     // - helpers - //
 
+    private void initHeader(){
+        //initialize header options
+        lsHeaderOptions = new ArrayList<String>();
+
+        /* set to default header:
+         * 0: title                     |   'Title of the Issue'
+         * 1: relation.isPartOfSeries   |   'Volume ##, Number ##, "
+         * 2: date.issued               |   '1993-03-26'
+         * 3: title.alternative         |   ''
+         * 4: filename                  |   'filename.pdf'
+         */
+        lsHeaderOptions.add(TITLE);
+        lsHeaderOptions.add(RELATION + SPLIT_OPTION + "ISPARTOFSERIES");
+        lsHeaderOptions.add(DATE + SPLIT_OPTION + "ISSUED");
+        lsHeaderOptions.add(TITLE + SPLIT_OPTION + "ALTERNATIVE");
+        lsHeaderOptions.add(FILENAME);
+    }
+
     /**
      * check list of header options sent in to see if they are valid
      * @param lsOptions the set of custom options the user established for the header
@@ -250,7 +258,7 @@ private static boolean containsAny(String[] target, String given){
 
     /* - Mode Entry - */
 
-    protected static mode determineMode(String str){
+    public static mode determineMode(String str){
 
         if(matchTableOfContents(str) ){ return mode.ARTICLES; }
         else if(matchContributor(str)){ return mode.CONTRIBUTORS; }
diff --git a/main/java/main/Person.java b/main/java/main/Person.java
@@ -0,0 +1,62 @@
+package main;
+
+/**
+ *
+ */
+public class Person {
+
+    //Name Pre-fixes and titles
+    static {
+
+        //traditional
+        String MR   = "Mr.";    //mister
+        String MRS  = "Mrs.";   //missus
+        String MS   = "Ms.";    //miss
+        String MISS = "Miss";   //miss
+        String DR   = "Dr.";    //doctor
+
+        //professional
+        String COACH= "Coach";  //coach
+        String SUPT = "Supt.";  //superintendent
+        String ADM  = "Adm.";   //administrator
+
+        //governmental
+        String ATTY = "Atty.";  //attorney
+        String HON  = "Hon.";   //honorable
+        String PRES = "Pres.";  //president
+        String GOV  = "Gov.";   //governor
+        String OFC  = "Ofc.";   //officer
+        String AMB  = "Amb.";   //ambassador
+        String REP  = "Rep.";   //representative
+
+        //familial/religious
+        String MSGR = "Msgr.";  //Monsignor
+        String REV  = "Rev.";   //reverend
+        String FR   = "Fr.";    //father
+        String SR   = "Sr.";    //sister
+        String BR   = "Br.";    //brother
+
+        //military
+        String MAJ  = "Maj.";   //major
+        String CAPT = "Capt.";  //captain
+        String CMDR = "Cmdr.";  //commander
+        String LT   = "Lt.";    //lieutenant
+        String LTOCL= "Lt Col.";//lieutenant colonel
+        String COL  = "Col.";   //colonel
+        String GEN  = "Gen.";   //general
+
+    }
+
+    private String uid;
+    private String title;
+    private String first;
+    private String middle;
+    private String last;
+    private String suffix;
+    private String buffer;
+
+    public Person(String oneName){  }
+
+
+
+}
diff --git a/main/output/output.txt b/main/output/output.txt
diff --git a/test/java/TestParser.java b/test/java/TestParser.java

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package main;`
	`2`	`+`
`1`	`3`	`import dc_metadata.*;`
`2`	`4`	`import org.pmw.tinylog.Logger;`
`3`	`5`	`import sun.reflect.generics.reflectiveObjects.NotImplementedException;`