Do not map bibtex fields to more than one CSL field

Fixes #111

Author: michel-kraemer

citeproc-java/src/main/java/de/undercouch/citeproc/bibtex/BibTeXConverter.java

@@ -217,15 +217,11 @@ public CSLItemData toItemData(BibTeXEntry e) {
         // map journal/journaltitle, booktitle, series
         if (entries.containsKey(FIELD_JOURNAL)) {
             builder.containerTitle(entries.get(FIELD_JOURNAL));
-            builder.collectionTitle(entries.get(FIELD_JOURNAL));
         } else if (entries.containsKey(FIELD_JOURNALTITLE)) {
             builder.containerTitle(entries.get(FIELD_JOURNALTITLE));
-            builder.collectionTitle(entries.get(FIELD_JOURNALTITLE));
         } else if (entries.containsKey(FIELD_BOOKTITLE)) {
             builder.containerTitle(entries.get(FIELD_BOOKTITLE));
-            builder.collectionTitle(entries.get(FIELD_BOOKTITLE));
         } else {
-            builder.containerTitle(entries.get(FIELD_SERIES));
             builder.collectionTitle(entries.get(FIELD_SERIES));
         }
         if (entries.containsKey(FIELD_SERIES)) {
@@ -243,11 +239,7 @@ public CSLItemData toItemData(BibTeXEntry e) {
 
         // map number and issue
         builder.number(entries.get(FIELD_NUMBER));
-        if (entries.containsKey(FIELD_ISSUE)) {
-            builder.issue(entries.get(FIELD_ISSUE));
-        } else {
-            builder.issue(entries.get(FIELD_NUMBER));
-        }
+        builder.issue(entries.get(FIELD_ISSUE));
 
         // map publisher, institution, school, organisation
         if (type == CSLType.REPORT) {

citeproc-java/src/test/java/de/undercouch/citeproc/bibtex/BibTeXConverterTest.java

@@ -43,10 +43,8 @@ public void singleEntry() throws Exception {
         assertEquals("Dennis W.", cid.getAuthor()[0].getGiven());
         assertEquals("Thompson", cid.getAuthor()[1].getFamily());
         assertEquals("Ken", cid.getAuthor()[1].getGiven());
-        assertEquals("Communications of the Association for Computing Machinery", cid.getCollectionTitle());
         assertEquals("Communications of the Association for Computing Machinery", cid.getContainerTitle());
         assertEquals("17", cid.getVolume());
-        assertEquals("7", cid.getIssue());
         assertEquals("7", cid.getNumber());
         assertEquals("11", cid.getNumberOfPages());
         assertEquals("365-375", cid.getPage());
@@ -72,10 +70,8 @@ public void singleEntryWithDateRange() throws Exception {
         assertEquals(1, cid.getAuthor().length);
         assertEquals("Lycklama", cid.getAuthor()[0].getFamily());
         assertEquals("H.", cid.getAuthor()[0].getGiven());
-        assertEquals("The Bell System Technical Journal", cid.getCollectionTitle());
         assertEquals("The Bell System Technical Journal", cid.getContainerTitle());
         assertEquals("57", cid.getVolume());
-        assertEquals("6", cid.getIssue());
         assertEquals("6", cid.getNumber());
         assertEquals("15", cid.getNumberOfPages());
         assertEquals("2087-2101", cid.getPage());
@@ -103,10 +99,8 @@ public void allEntries() throws Exception {
         assertEquals("Dennis W.", cid.getAuthor()[0].getGiven());
         assertEquals("Thompson", cid.getAuthor()[1].getFamily());
         assertEquals("Ken", cid.getAuthor()[1].getGiven());
-        assertEquals("Communications of the Association for Computing Machinery", cid.getCollectionTitle());
         assertEquals("Communications of the Association for Computing Machinery", cid.getContainerTitle());
         assertEquals("17", cid.getVolume());
-        assertEquals("7", cid.getIssue());
         assertEquals("7", cid.getNumber());
         assertEquals("11", cid.getNumberOfPages());
         assertEquals("365-375", cid.getPage());

citeproc-java/src/test/java/de/undercouch/citeproc/bibtex/BibTeXItemDataProviderTest.java

@@ -75,14 +75,14 @@ public void bibliography() throws Exception {
         assertEquals("[1]S. C. Johnson and B. W. Kernighan, \u201cThe Programming Language B,\u201d "
                 + "Bell Laboratories, Murray Hill, NJ, USA, Technical report 8, 1973.\n", b.getEntries()[0]);
         assertEquals("[2]D. M. Ritchie and K. Thompson, \u201cThe UNIX time-sharing system,\u201d "
-                + "Operating Systems Review, vol. 7, no. 4, Art. no. 4, Oct. 1973.\n", b.getEntries()[1]);
+                + "Operating Systems Review, vol. 7, Art. no. 4, Oct. 1973.\n", b.getEntries()[1]);
         assertEquals("[3]D. W. Ritchie and K. Thompson, \u201cThe UNIX Time-Sharing System,\u201d "
-                + "Communications of the Association for Computing Machinery, vol. 17, no. 7, Art. no. 7, "
+                + "Communications of the Association for Computing Machinery, vol. 17, Art. no. 7, "
                 + "Jul. 1974.\n", b.getEntries()[2]);
         assertEquals("[4]H. Lycklama, \u201cUNIX Time-Sharing System: UNIX on a Microprocessor,\u201d "
-                + "The Bell System Technical Journal, vol. 57, no. 6, Art. no. 6, "
+                + "The Bell System Technical Journal, vol. 57, Art. no. 6, "
                 + "Jul.\u2013Aug. 1978, [Online]. Available: "
-                + "http://bstj.bell-labs.com/BSTJ/images/Vol57/bstj57-6-2087.pdf.\n", b.getEntries()[3]);
+                + "http://bstj.bell-labs.com/BSTJ/images/Vol57/bstj57-6-2087.pdf\n", b.getEntries()[3]);
     }
 
     /**
@@ -179,7 +179,7 @@ public void noCollectionAuthor() throws Exception {
 
         Bibliography b = citeproc.makeBibliography();
         assertEquals(1, b.getEntries().length);
-        assertEquals("Sterling, T. L. (Ed.). (2001). Beowulf Cluster Computing with Linux "
+        assertEquals("Sterling, T. L. (2001). Beowulf Cluster Computing with Linux "
                 + "(p. xxxiii + 496). MIT Press.\n", b.getEntries()[0]);
 
         // compare with another item from the unix database
@@ -200,13 +200,13 @@ public void noCollectionAuthor() throws Exception {
         BibTeXItemDataProvider sys = new BibTeXItemDataProvider();
         sys.addDatabase(db);
 
-        citeproc.reset();
+        citeproc = new CSL(sys, "apa");
         citeproc.setOutputFormat("text");
         sys.registerCitationItems(citeproc);
 
         Bibliography b2 = citeproc.makeBibliography();
         assertEquals(1, b2.getEntries().length);
-        assertEquals("Rice, J. (Ed.). (1993). Five steps to HP-UX. OnWord Press.\n", b2.getEntries()[0]);
+        assertEquals("Rice, J. (1993). Five steps to HP-UX. OnWord Press.\n", b2.getEntries()[0]);
     }
 
     /**