Aktueller Stand Importer Publikationen

git-svn-id: https://svn.libreccm.org/ccm/trunk@1908 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2012-11-02 16:07:03 +00:00
parent 575c9d3dd7
commit 6abbc6715e
16 changed files with 544 additions and 375 deletions

View File

@ -36,7 +36,9 @@ import java.util.List;
*/
public class ImporterUtil {
public AuthorImportReport processAuthor(final Publication publication, final AuthorData authorData) {
public AuthorImportReport processAuthor(final Publication publication,
final AuthorData authorData,
final boolean pretend) {
final AuthorImportReport report = new AuthorImportReport();
final Session session = SessionManager.getSession();
@ -44,140 +46,156 @@ public class ImporterUtil {
collection.addEqualsFilter("surname", authorData.getSurname());
collection.addEqualsFilter("givenname", authorData.getGivenName());
final GenericPerson author;
report.setSurname(authorData.getSurname());
report.setGivenName(authorData.getGivenName());
report.setEditor(authorData.isEditor());
if (collection.isEmpty()) {
if (!pretend) {
final Integer folderId = Publication.getConfig().getDefaultAuthorsFolder();
final Folder folder = new Folder(new BigDecimal(folderId));
if (folder == null) {
throw new IllegalArgumentException("Error getting folders for authors.");
}
final SciAuthor newAuthor = new SciAuthor();
newAuthor.setSurname(authorData.getSurname());
newAuthor.setGivenName(authorData.getGivenName());
newAuthor.setName(GenericPerson.urlSave(String.format("%s %s",
final SciAuthor author = new SciAuthor();
author.setSurname(authorData.getSurname());
author.setGivenName(authorData.getGivenName());
author.setName(GenericPerson.urlSave(String.format("%s %s",
authorData.getSurname(),
authorData.getGivenName())));
newAuthor.setContentSection(folder.getContentSection());
newAuthor.setLanguage(Kernel.getConfig().getLanguagesIndependentCode());
newAuthor.save();
author.setContentSection(folder.getContentSection());
author.setLanguage(Kernel.getConfig().getLanguagesIndependentCode());
author.save();
final GenericPersonBundle bundle = new GenericPersonBundle(newAuthor);
final GenericPersonBundle bundle = new GenericPersonBundle(author);
bundle.setParent(folder);
bundle.setContentSection(folder.getContentSection());
bundle.save();
publication.addAuthor(author, authorData.isEditor());
}
report.setCreated(true);
author = newAuthor;
} else {
if (!pretend) {
final GenericPerson author;
collection.next();
author = new GenericPerson(collection.getDataObject());
publication.addAuthor(author, authorData.isEditor());
}
report.setCreated(false);
}
publication.addAuthor(author, authorData.isEditor());
collection.close();
return report;
}
public PublisherImportReport processPublisher(final PublicationWithPublisher publication,
final String place,
final String publisherName) {
final String publisherName,
final boolean pretend) {
final PublisherImportReport report = new PublisherImportReport();
final Session session = SessionManager.getSession();
final DataCollection collection = session.retrieve(Publisher.BASE_DATA_OBJECT_TYPE);
collection.addEqualsFilter("title", publisherName);
collection.addEqualsFilter("place", place);
final Publisher publisher;
report.setPublisherName(publisherName);
report.setPlace(place);
if (collection.isEmpty()) {
if (!pretend) {
final Integer folderId = Publication.getConfig().getDefaultPublisherFolder();
final Folder folder = new Folder(new BigDecimal(folderId));
if (folder == null) {
throw new IllegalArgumentException("Error getting folders for publishers");
}
final Publisher newPublisher = new Publisher();
newPublisher.setPublisherName(publisherName);
newPublisher.setPlace(place);
newPublisher.setTitle(String.format("%s %s", publisherName, place));
newPublisher.setName(Publisher.urlSave(String.format("%s %s", publisherName, place)));
newPublisher.setContentSection(folder.getContentSection());
newPublisher.setLanguage(Kernel.getConfig().getLanguagesIndependentCode());
newPublisher.save();
final Publisher publisher = new Publisher();
publisher.setPublisherName(publisherName);
publisher.setPlace(place);
publisher.setTitle(String.format("%s %s", publisherName, place));
publisher.setName(Publisher.urlSave(String.format("%s %s", publisherName, place)));
publisher.setContentSection(folder.getContentSection());
publisher.setLanguage(Kernel.getConfig().getLanguagesIndependentCode());
publisher.save();
final PublisherBundle bundle = new PublisherBundle(newPublisher);
final PublisherBundle bundle = new PublisherBundle(publisher);
bundle.setParent(folder);
bundle.setContentSection(folder.getContentSection());
bundle.save();
publication.setPublisher(publisher);
}
report.setCreated(true);
publisher = newPublisher;
} else {
if (!pretend) {
collection.next();
publisher = new Publisher(collection.getDataObject());
final Publisher publisher = new Publisher(collection.getDataObject());
publication.setPublisher(publisher);
}
report.setCreated(false);
}
publication.setPublisher(publisher);
collection.close();
return report;
}
public CollectedVolumeImportReport processCollectedVolume(final ArticleInCollectedVolume article,
final String title,
final int year,
final List<AuthorData> authors) {
final List<AuthorData> authors,
final boolean pretend) {
final CollectedVolumeImportReport report = new CollectedVolumeImportReport();
final Session session = SessionManager.getSession();
final DataCollection collection = session.retrieve(CollectedVolume.BASE_DATA_OBJECT_TYPE);
collection.addEqualsFilter("title", title);
collection.addEqualsFilter("yearOfPublication", year);
final CollectedVolume collectedVolume;
report.setCollectedVolumeTitle(title);
if (collection.isEmpty()) {
if (!pretend) {
final Integer folderId = Publication.getConfig().getDefaultCollectedVolumesFolder();
final Folder folder = new Folder(new BigDecimal(folderId));
if (folder == null) {
throw new IllegalArgumentException("Error getting foldes for collected volumes.");
}
final CollectedVolume newCollectedVolume = new CollectedVolume();
newCollectedVolume.setTitle(title);
newCollectedVolume.setName(normalizeString(title));
newCollectedVolume.setContentSection(folder.getContentSection());
newCollectedVolume.setLanguage(Kernel.getConfig().getLanguagesIndependentCode());
newCollectedVolume.save();
final CollectedVolume collectedVolume = new CollectedVolume();
collectedVolume.setTitle(title);
collectedVolume.setName(normalizeString(title));
collectedVolume.setContentSection(folder.getContentSection());
collectedVolume.setLanguage(Kernel.getConfig().getLanguagesIndependentCode());
collectedVolume.save();
final CollectedVolumeBundle bundle = new CollectedVolumeBundle(newCollectedVolume);
final CollectedVolumeBundle bundle = new CollectedVolumeBundle(collectedVolume);
bundle.setParent(folder);
bundle.setContentSection(folder.getContentSection());
bundle.save();
newCollectedVolume.setYearOfPublication(year);
for(AuthorData author : authors) {
report.addAuthor(processAuthor(newCollectedVolume, author));
collectedVolume.setYearOfPublication(year);
for (AuthorData author : authors) {
report.addAuthor(processAuthor(collectedVolume, author, pretend));
}
newCollectedVolume.save();
collectedVolume.save();
article.setCollectedVolume(collectedVolume);
}
report.setCreated(true);
collectedVolume = newCollectedVolume;
} else {
if (!pretend) {
collection.next();
collectedVolume = new CollectedVolume(collection.getDataObject());
final CollectedVolume collectedVolume = new CollectedVolume(collection.getDataObject());
article.setCollectedVolume(collectedVolume);
}
report.setCreated(false);
}
article.setCollectedVolume(collectedVolume);
collection.close();
return report;
}
@ -185,63 +203,71 @@ public class ImporterUtil {
final String title,
final int year,
final String conference,
final List<AuthorData> authors) {
final List<AuthorData> authors,
final boolean pretend) {
final ProceedingsImportReport report = new ProceedingsImportReport();
final Session session = SessionManager.getSession();
final DataCollection collection = session.retrieve(Proceedings.BASE_DATA_OBJECT_TYPE);
collection.addEqualsFilter("title", title);
collection.addEqualsFilter("yearOfPublication", year);
final Proceedings proceedings;
report.setProceedingsTitle(title);
if (collection.isEmpty()) {
if (!pretend) {
final Integer folderId = Publication.getConfig().getDefaultProceedingsFolder();
final Folder folder = new Folder(new BigDecimal(folderId));
if (folder == null) {
throw new IllegalArgumentException("Failed to get folder for proceedings.");
}
final Proceedings newProceedings = new Proceedings();
newProceedings.setTitle(title);
newProceedings.setName(normalizeString(title));
newProceedings.setNameOfConference(conference);
final Proceedings proceedings = new Proceedings();
proceedings.setTitle(title);
proceedings.setName(normalizeString(title));
proceedings.setNameOfConference(conference);
report.setConference(conference);
newProceedings.setContentSection(folder.getContentSection());
newProceedings.setLanguage(Kernel.getConfig().getLanguagesIndependentCode());
newProceedings.save();
proceedings.setContentSection(folder.getContentSection());
proceedings.setLanguage(Kernel.getConfig().getLanguagesIndependentCode());
proceedings.save();
final ProceedingsBundle bundle = new ProceedingsBundle(newProceedings);
final ProceedingsBundle bundle = new ProceedingsBundle(proceedings);
bundle.setContentSection(folder.getContentSection());
bundle.setParent(folder);
bundle.save();
newProceedings.setYearOfPublication(year);
for(AuthorData author : authors) {
report.addAuthor(processAuthor(newProceedings, author));
proceedings.setYearOfPublication(year);
for (AuthorData author : authors) {
report.addAuthor(processAuthor(proceedings, author, pretend));
}
inProceedings.setProceedings(proceedings);
}
report.setCreated(true);
proceedings = newProceedings;
} else {
if (!pretend) {
collection.next();
proceedings = new Proceedings(collection.getDataObject());
final Proceedings proceedings = new Proceedings(collection.getDataObject());
inProceedings.setProceedings(proceedings);
}
report.setCreated(false);
}
inProceedings.setProceedings(proceedings);
collection.close();
return report;
}
public JournalImportReport processJournal(final ArticleInJournal article, final String title) {
public JournalImportReport processJournal(final ArticleInJournal article,
final String title,
final boolean pretend) {
final JournalImportReport report = new JournalImportReport();
final Session session = SessionManager.getSession();
final DataCollection collection = session.retrieve(Journal.BASE_DATA_OBJECT_TYPE);
collection.addEqualsFilter("title", title);
final Journal journal;
report.setJournalTitle(title);
if (collection.isEmpty()) {
if (!pretend) {
final Integer folderId = Publication.getConfig().getDefaultJournalsFolder();
final Folder folder = new Folder(new BigDecimal(folderId));
if (folder == null) {
@ -259,16 +285,19 @@ public class ImporterUtil {
bundle.setContentSection(folder.getContentSection());
bundle.save();
article.setJournal(newJournal);
}
report.setCreated(true);
journal = newJournal;
} else {
if (!pretend) {
collection.next();
journal = new Journal(collection.getDataObject());
final Journal journal = new Journal(collection.getDataObject());
article.setJournal(journal);
}
report.setCreated(false);
}
article.setJournal(journal);
collection.close();
return report;
}

View File

@ -31,11 +31,13 @@ abstract class AbstractPublicationImporter<T extends Publication> {
private static final String EDITOR_STR = "(Hrsg.)";
private final CsvLine data;
private final PublicationImportReport report;
private final boolean pretend;
private final ImporterUtil importerUtil = new ImporterUtil();
public AbstractPublicationImporter(final CsvLine data, final PublicationImportReport report) {
public AbstractPublicationImporter(final CsvLine data, final PublicationImportReport report, final boolean pretend) {
this.data = data;
this.report = report;
this.pretend = pretend;
}
protected CsvLine getData() {
@ -50,23 +52,30 @@ abstract class AbstractPublicationImporter<T extends Publication> {
return report;
}
protected boolean isPretend() {
return pretend;
}
/**
* This method is called by {@link PublicationsImporter}.
*/
public final void doImport(final boolean publishNewItems) {
final T publication = importPublication();
if (!pretend) {
publication.save();
assignCategories(publication.getPublicationBundle());
if (publishNewItems) {
final Calendar now = new GregorianCalendar();
final LifecycleDefinitionCollection lifecycles = publication.getContentSection().getLifecycleDefinitions();
final LifecycleDefinitionCollection lifecycles = publication.getContentSection().
getLifecycleDefinitions();
lifecycles.next();
final LifecycleDefinition lifecycleDef = lifecycles.getLifecycleDefinition();
publication.publish(lifecycleDef, now.getTime());
}
}
report.setSuccessful(true);
@ -94,7 +103,9 @@ abstract class AbstractPublicationImporter<T extends Publication> {
final T publication = createPublication();
processTitleAndName(publication);
processReviewed(publication);
if (!pretend) {
publication.save();
final Integer folderId = Publication.getConfig().getDefaultPublicationsFolder();
@ -112,10 +123,11 @@ abstract class AbstractPublicationImporter<T extends Publication> {
publication.setAbstract(data.getAbstract());
publication.setMisc(data.getMisc());
processReviewed(publication);
processAuthors(publication);
publication.save();
}
processAuthors(publication);
return publication;
}
@ -130,9 +142,11 @@ abstract class AbstractPublicationImporter<T extends Publication> {
protected abstract PublicationBundle createBundle(final T publication);
private void processTitleAndName(final T publication) {
if (!pretend) {
publication.setTitle(data.getTitle());
publication.setName(normalizeString(data.getTitle()));
report.setTitle(publication.getTitle());
}
report.setTitle(data.getTitle());
}
private void processReviewed(final T publication) {
@ -155,7 +169,9 @@ abstract class AbstractPublicationImporter<T extends Publication> {
reviewed = false;
}
if (!pretend) {
publication.setReviewed(reviewed);
}
report.addField(new FieldImportReport("reviewed", Boolean.toString(reviewed)));
}
@ -164,7 +180,7 @@ abstract class AbstractPublicationImporter<T extends Publication> {
AuthorImportReport authorReport;
for (AuthorData authorData : authorsData) {
authorReport = importerUtil.processAuthor(publication, authorData);
authorReport = importerUtil.processAuthor(publication, authorData, pretend);
report.addAuthor(authorReport);
}
}

View File

@ -13,8 +13,9 @@ abstract class AbstractPublicationWithPublisherImporter<T extends PublicationWit
extends AbstractPublicationImporter<T> {
public AbstractPublicationWithPublisherImporter(final CsvLine data,
final PublicationImportReport report) {
super(data, report);
final PublicationImportReport report,
final boolean pretend) {
super(data, report, pretend);
}
@Override
@ -23,7 +24,9 @@ abstract class AbstractPublicationWithPublisherImporter<T extends PublicationWit
final CsvLine data = getData();
if ((data.getIsbn() != null) && !data.getIsbn().isEmpty()) {
if (!isPretend()) {
publication.setISBN(data.getIsbn());
}
getReport().addField(new FieldImportReport("isbn", data.getIsbn()));
}
@ -31,10 +34,13 @@ abstract class AbstractPublicationWithPublisherImporter<T extends PublicationWit
processNumberOfVolumes(publication);
processNumberOfPages(publication);
if ((data.getEdition() != null) && !data.getEdition().isEmpty()) {
if (!isPretend()) {
publication.setEdition(data.getEdition());
}
getReport().addField(new FieldImportReport("edition", data.getEdition()));
}
getImporterUtil().processPublisher(publication, getData().getPlace(), getData().getPublisher());
getImporterUtil().processPublisher(publication, getData().getPlace(), getData().getPublisher(), isPretend());
return publication;
}
@ -43,7 +49,9 @@ abstract class AbstractPublicationWithPublisherImporter<T extends PublicationWit
if ((getData().getVolume() != null) && !getData().getVolume().isEmpty()) {
try {
final int volume = Integer.parseInt(getData().getVolume());
if (!isPretend()) {
publication.setVolume(volume);
}
getReport().addField(new FieldImportReport("Volume", getData().getVolume()));
} catch (NumberFormatException ex) {
getReport().addMessage(String.format("Failed to parse volume data in line %d.", getData().
@ -56,7 +64,9 @@ abstract class AbstractPublicationWithPublisherImporter<T extends PublicationWit
if ((getData().getNumberOfVolumes() != null) && !getData().getNumberOfVolumes().isEmpty()) {
try {
final int volume = Integer.parseInt(getData().getNumberOfVolumes());
if (!isPretend()) {
publication.setNumberOfVolumes(volume);
}
getReport().addField(new FieldImportReport("Number of volumes", getData().getNumberOfVolumes()));
} catch (NumberFormatException ex) {
getReport().addMessage(String.format(
@ -69,7 +79,9 @@ abstract class AbstractPublicationWithPublisherImporter<T extends PublicationWit
if ((getData().getNumberOfPages() != null) && !getData().getNumberOfPages().isEmpty()) {
try {
final int volume = Integer.parseInt(getData().getNumberOfPages());
if (!isPretend()) {
publication.setNumberOfPages(volume);
}
getReport().addField(new FieldImportReport("Number of pages", getData().getNumberOfPages()));
} catch (NumberFormatException ex) {
getReport().addMessage(String.format("Failed to parse numberOfPages data in line %d.",
@ -77,52 +89,4 @@ abstract class AbstractPublicationWithPublisherImporter<T extends PublicationWit
}
}
}
// private void processPublisher(final T publication) {
// final String publisherName = getData().getPublisher();
// final String place = getData().getPlace();
//
// final Session session = SessionManager.getSession();
// final DataCollection collection = session.retrieve(Publisher.BASE_DATA_OBJECT_TYPE);
// collection.addEqualsFilter("title", publisherName);
// collection.addEqualsFilter("place", place);
// final Publisher publisher;
// if (collection.isEmpty()) {
// getReportWriter().printf("Publisher %s: %s not found in database. Creating...\n",
// getData().getPlace(),
// getData().getPublisher());
//
// final Integer folderId = Publication.getConfig().getDefaultPublisherFolder();
// final Folder folder = new Folder(new BigDecimal(folderId));
// if (folder == null) {
// throw new IllegalArgumentException("Error getting folders for publishers");
// }
//
// final Publisher newPublisher = new Publisher();
// newPublisher.setPublisherName(publisherName);
// newPublisher.setPlace(place);
// newPublisher.setTitle(String.format("%s %s", publisherName, place));
// newPublisher.setName(Publisher.urlSave(String.format("%s %s", publisherName, place)));
// newPublisher.setContentSection(folder.getContentSection());
// newPublisher.setLanguage(Kernel.getConfig().getLanguagesIndependentCode());
// newPublisher.save();
//
// final PublisherBundle bundle = new PublisherBundle(newPublisher);
// bundle.setParent(folder);
// bundle.setContentSection(folder.getContentSection());
// bundle.save();
//
// publisher = newPublisher;
// } else {
// getReportWriter().printf("Publisher %s: %s found in database. Using existing item.\n",
// getData().getPlace(),
// getData().getPublisher());
// collection.next();
// final DataObject dobj = collection.getDataObject();
// publisher = new Publisher(dobj);
// }
//
// publication.setPublisher(publisher);
// }
}

View File

@ -12,8 +12,9 @@ import com.arsdigita.cms.scipublications.importer.report.PublicationImportReport
abstract class AbstractUnPublishedImporter<T extends UnPublished> extends AbstractPublicationImporter<T> {
protected AbstractUnPublishedImporter(final CsvLine data,
final PublicationImportReport report) {
super(data, report);
final PublicationImportReport report,
final boolean pretend) {
super(data, report, pretend);
}
@Override
@ -23,7 +24,9 @@ abstract class AbstractUnPublishedImporter<T extends UnPublished> extends Abstra
final PublicationImportReport report = getReport();
if ((data.getPlace() != null) && !data.getPlace().isEmpty()) {
if (!isPretend()) {
publication.setPlace(data.getPlace());
}
report.addField(new FieldImportReport("place", data.getPlace()));
}
@ -36,7 +39,9 @@ abstract class AbstractUnPublishedImporter<T extends UnPublished> extends Abstra
if ((getData().getNumberOfPages() != null) && !getData().getNumberOfPages().isEmpty()) {
try {
final int volume = Integer.parseInt(getData().getNumberOfPages());
if (!isPretend()) {
publication.setNumberOfPages(volume);
}
getReport().addField(new FieldImportReport("Number of pages", getData().getNumberOfPages()));
} catch (NumberFormatException ex) {
getReport().addMessage(String.format("Failed to parse numberOfPages data in line %d.",

View File

@ -14,8 +14,8 @@ import com.arsdigita.cms.scipublications.importer.util.ImporterUtil;
*/
class ArticleInCollectedVolumeImporter extends AbstractPublicationImporter<ArticleInCollectedVolume> {
public ArticleInCollectedVolumeImporter(CsvLine data, PublicationImportReport report) {
super(data, report);
public ArticleInCollectedVolumeImporter(CsvLine data, PublicationImportReport report, final boolean pretend) {
super(data, report, pretend);
}
@Override
@ -29,14 +29,18 @@ class ArticleInCollectedVolumeImporter extends AbstractPublicationImporter<Artic
processPagesTo(article);
if ((data.getChapter() != null) && !data.getChapter().isEmpty()) {
if (!isPretend()) {
article.setChapter(data.getChapter());
}
report.addField(new FieldImportReport("Chapter", data.getChapter()));
}
report.setCollectedVolume(importerUtil.processCollectedVolume(article,
report.setCollectedVolume(importerUtil.processCollectedVolume(
article,
data.getCollectedVolume(),
article.getYearOfPublication(),
parseAuthors(data.getAuthors())));
parseAuthors(data.getCollectedVolumeAuthors()),
isPretend()));
return article;
@ -46,7 +50,9 @@ class ArticleInCollectedVolumeImporter extends AbstractPublicationImporter<Artic
if ((getData().getPageFrom() != null) && !getData().getPageFrom().isEmpty()) {
try {
final int pagesFrom = Integer.parseInt(getData().getPageFrom());
if (!isPretend()) {
publication.setPagesFrom(pagesFrom);
}
getReport().addField(new FieldImportReport("Pages from", getData().getPageFrom()));
} catch (NumberFormatException ex) {
getReport().addMessage(String.format("Failed to parse pageFrom data in line '%d'.",
@ -58,7 +64,9 @@ class ArticleInCollectedVolumeImporter extends AbstractPublicationImporter<Artic
private void processPagesTo(final ArticleInCollectedVolume publication) {
try {
final int pagesTo = Integer.parseInt(getData().getPageTo());
if (!isPretend()) {
publication.setPagesFrom(pagesTo);
}
getReport().addField(new FieldImportReport("Pages to", getData().getPageFrom()));
} catch (NumberFormatException ex) {
getReport().addMessage(String.format("Failed to parse pageTo data in line '%d'.",
@ -68,11 +76,20 @@ class ArticleInCollectedVolumeImporter extends AbstractPublicationImporter<Artic
@Override
protected ArticleInCollectedVolume createPublication() {
if (isPretend()) {
return null;
} else {
return new ArticleInCollectedVolume();
}
}
@Override
protected PublicationBundle createBundle(final ArticleInCollectedVolume article) {
if (isPretend()) {
return null;
} else {
return new ArticleInCollectedVolumeBundle(article);
}
}
}

View File

@ -17,8 +17,10 @@ import java.util.Date;
*/
class ArticleInJournalImporter extends AbstractPublicationImporter<ArticleInJournal> {
protected ArticleInJournalImporter(final CsvLine data, final PublicationImportReport report) {
super(data, report);
protected ArticleInJournalImporter(final CsvLine data,
final PublicationImportReport report,
final boolean pretend) {
super(data, report, pretend);
}
@Override
@ -30,7 +32,9 @@ class ArticleInJournalImporter extends AbstractPublicationImporter<ArticleInJour
processVolume(article);
if ((data.getIssue() != null) && !data.getIssue().isEmpty()) {
if (!isPretend()) {
article.setIssue(data.getIssue());
}
report.addField(new FieldImportReport("Issue", data.getIssue()));
}
processPagesFrom(article);
@ -38,7 +42,7 @@ class ArticleInJournalImporter extends AbstractPublicationImporter<ArticleInJour
processPublicationDate(article);
if ((data.getJournal() != null) && !data.getJournal().isEmpty()) {
importerUtil.processJournal(article, data.getJournal());
importerUtil.processJournal(article, data.getJournal(), isPretend());
}
@ -49,7 +53,9 @@ class ArticleInJournalImporter extends AbstractPublicationImporter<ArticleInJour
if ((getData().getVolume() != null) && !getData().getVolume().isEmpty()) {
try {
final int volume = Integer.parseInt(getData().getVolume());
if (!isPretend()) {
article.setVolume(volume);
}
getReport().addField(new FieldImportReport("Volume", getData().getVolume()));
} catch (NumberFormatException ex) {
getReport().addMessage(String.format("Failed to parse volume data in line '%d'.",
@ -62,7 +68,9 @@ class ArticleInJournalImporter extends AbstractPublicationImporter<ArticleInJour
if ((getData().getPageFrom() != null) && !getData().getPageFrom().isEmpty()) {
try {
final int pagesFrom = Integer.parseInt(getData().getPageFrom());
if (!isPretend()) {
publication.setPagesFrom(pagesFrom);
}
getReport().addField(new FieldImportReport("Pages from", getData().getPageFrom()));
} catch (NumberFormatException ex) {
getReport().addMessage(String.format("Failed to parse pageFrom data in line '%d'.",
@ -74,7 +82,9 @@ class ArticleInJournalImporter extends AbstractPublicationImporter<ArticleInJour
private void processPagesTo(final ArticleInJournal publication) {
try {
final int pagesTo = Integer.parseInt(getData().getPageTo());
if (!isPretend()) {
publication.setPagesFrom(pagesTo);
}
getReport().addField(new FieldImportReport("Pages to", getData().getPageFrom()));
} catch (NumberFormatException ex) {
getReport().addMessage(String.format("Failed to parse pageTo data in line '%d'.",
@ -87,7 +97,9 @@ class ArticleInJournalImporter extends AbstractPublicationImporter<ArticleInJour
final DateFormat dateFormat = new SimpleDateFormat("yyyy-mm-dd");
try {
final Date date = dateFormat.parse(getData().getPublicationDate());
if (!isPretend()) {
article.setPublicationDate(date);
}
getReport().addField(new FieldImportReport("Publication date", getData().getPublicationDate()));
} catch (java.text.ParseException ex) {
getReport().addMessage(String.format("Failed to parse publication date in line %d.",
@ -98,12 +110,20 @@ class ArticleInJournalImporter extends AbstractPublicationImporter<ArticleInJour
@Override
protected ArticleInJournal createPublication() {
if (isPretend()) {
return null;
} else {
return new ArticleInJournal();
}
}
@Override
protected PublicationBundle createBundle(final ArticleInJournal article) {
if (isPretend()) {
return null;
} else {
return new ArticleInJournalBundle(article);
}
}
}

View File

@ -12,18 +12,28 @@ import com.arsdigita.cms.scipublications.importer.report.PublicationImportReport
*/
class CollectedVolumeImporter extends AbstractPublicationWithPublisherImporter<CollectedVolume> {
protected CollectedVolumeImporter(final CsvLine data, final PublicationImportReport report) {
super(data, report);
protected CollectedVolumeImporter(final CsvLine data,
final PublicationImportReport report,
final boolean pretend) {
super(data, report, pretend);
}
@Override
protected CollectedVolume createPublication() {
if (isPretend()) {
return null;
} else {
return new CollectedVolume();
}
}
@Override
protected PublicationBundle createBundle(final CollectedVolume collectedVolume) {
if (isPretend()) {
return null;
} else {
return new CollectedVolumeBundle(collectedVolume);
}
}
}

View File

@ -12,8 +12,8 @@ import com.arsdigita.cms.scipublications.importer.report.PublicationImportReport
*/
class ExpertiseImporter extends AbstractPublicationImporter<Expertise> {
protected ExpertiseImporter(final CsvLine data, final PublicationImportReport report) {
super(data, report);
protected ExpertiseImporter(final CsvLine data, final PublicationImportReport report, final boolean pretend) {
super(data, report, pretend);
}
@Override
@ -23,7 +23,9 @@ class ExpertiseImporter extends AbstractPublicationImporter<Expertise> {
final PublicationImportReport report = getReport();
if ((data.getPlace() != null) && !data.getPlace().isEmpty()) {
if (!isPretend()) {
expertise.setPlace(data.getPlace());
}
report.addField(new FieldImportReport("Place", data.getPlace()));
}
@ -36,7 +38,9 @@ class ExpertiseImporter extends AbstractPublicationImporter<Expertise> {
if ((getData().getNumberOfPages() != null) && !getData().getNumberOfPages().isEmpty()) {
try {
final int volume = Integer.parseInt(getData().getNumberOfPages());
if (!isPretend()) {
publication.setNumberOfPages(volume);
}
getReport().addField(new FieldImportReport("Number of pages", getData().getNumberOfPages()));
} catch (NumberFormatException ex) {
getReport().addMessage(String.format("Failed to parse numberOfPages data in line %d.",
@ -47,12 +51,20 @@ class ExpertiseImporter extends AbstractPublicationImporter<Expertise> {
@Override
protected Expertise createPublication() {
if (isPretend()) {
return null;
} else {
return new Expertise();
}
}
@Override
protected PublicationBundle createBundle(final Expertise expertise) {
if (isPretend()) {
return null;
} else {
return new PublicationBundle(expertise);
}
}
}

View File

@ -12,8 +12,8 @@ import com.arsdigita.cms.scipublications.importer.report.PublicationImportReport
*/
class GreyLiteratureImporter extends AbstractUnPublishedImporter<GreyLiterature> {
protected GreyLiteratureImporter(final CsvLine data, final PublicationImportReport report) {
super(data, report);
protected GreyLiteratureImporter(final CsvLine data, final PublicationImportReport report, final boolean pretend) {
super(data, report, pretend);
}
@Override
@ -30,7 +30,9 @@ class GreyLiteratureImporter extends AbstractUnPublishedImporter<GreyLiterature>
if ((getData().getPageFrom() != null) && !getData().getPageFrom().isEmpty()) {
try {
final int pagesFrom = Integer.parseInt(getData().getPageFrom());
if (!isPretend()) {
publication.setPagesFrom(pagesFrom);
}
getReport().addField(new FieldImportReport("Pages from", getData().getPageFrom()));
} catch (NumberFormatException ex) {
getReport().addMessage(String.format("Failed to parse pageFrom data in line '%d'.",
@ -42,7 +44,9 @@ class GreyLiteratureImporter extends AbstractUnPublishedImporter<GreyLiterature>
private void processPagesTo(final GreyLiterature publication) {
try {
final int pagesTo = Integer.parseInt(getData().getPageTo());
if (!isPretend()) {
publication.setPagesFrom(pagesTo);
}
getReport().addField(new FieldImportReport("Pages to", getData().getPageFrom()));
} catch (NumberFormatException ex) {
getReport().addMessage(String.format("Failed to parse pageTo data in line '%d'.",
@ -52,12 +56,20 @@ class GreyLiteratureImporter extends AbstractUnPublishedImporter<GreyLiterature>
@Override
protected GreyLiterature createPublication() {
if (isPretend()) {
return null;
} else {
return new GreyLiterature();
}
}
@Override
protected PublicationBundle createBundle(final GreyLiterature greyLiterature) {
if (isPretend()) {
return null;
} else {
return new PublicationBundle(greyLiterature);
}
}
}

View File

@ -14,8 +14,8 @@ import com.arsdigita.cms.scipublications.importer.util.ImporterUtil;
*/
class InProceedingsImporter extends AbstractPublicationImporter<InProceedings> {
public InProceedingsImporter(final CsvLine data, final PublicationImportReport report) {
super(data, report);
public InProceedingsImporter(final CsvLine data, final PublicationImportReport report, final boolean pretend) {
super(data, report, pretend);
}
@Override
@ -28,11 +28,12 @@ class InProceedingsImporter extends AbstractPublicationImporter<InProceedings> {
processPagesFrom(inProceedings);
processPagesTo(inProceedings);
importerUtil.processProceedings(inProceedings,
report.setProceedings(importerUtil.processProceedings(inProceedings,
data.getCollectedVolume(),
inProceedings.getYearOfPublication(),
data.getConference(),
parseAuthors(data.getCollectedVolumeAuthors()));
parseAuthors(data.getCollectedVolumeAuthors()),
isPretend()));
return inProceedings;
}
@ -41,7 +42,9 @@ class InProceedingsImporter extends AbstractPublicationImporter<InProceedings> {
if ((getData().getPageFrom() != null) && !getData().getPageFrom().isEmpty()) {
try {
final int pagesFrom = Integer.parseInt(getData().getPageFrom());
if (!isPretend()) {
publication.setPagesFrom(pagesFrom);
}
getReport().addField(new FieldImportReport("Pages from", getData().getPageFrom()));
} catch (NumberFormatException ex) {
getReport().addMessage(String.format("Failed to parse pageFrom data in line '%d'.",
@ -53,7 +56,9 @@ class InProceedingsImporter extends AbstractPublicationImporter<InProceedings> {
private void processPagesTo(final InProceedings publication) {
try {
final int pagesTo = Integer.parseInt(getData().getPageTo());
if (!isPretend()) {
publication.setPagesFrom(pagesTo);
}
getReport().addField(new FieldImportReport("Pages to", getData().getPageFrom()));
} catch (NumberFormatException ex) {
getReport().addMessage(String.format("Failed to parse pageTo data in line '%d'.",
@ -63,13 +68,21 @@ class InProceedingsImporter extends AbstractPublicationImporter<InProceedings> {
@Override
protected InProceedings createPublication() {
if (isPretend()) {
return null;
} else {
return new InProceedings();
}
}
@Override
protected PublicationBundle createBundle(final InProceedings inProceedings) {
if (isPretend()) {
return null;
} else {
return new InProceedingsBundle(inProceedings);
}
}
}

View File

@ -16,8 +16,8 @@ import java.util.Date;
*/
class InternetArticleImporter extends AbstractPublicationImporter<InternetArticle> {
public InternetArticleImporter(final CsvLine data, final PublicationImportReport report) {
super(data, report);
public InternetArticleImporter(final CsvLine data, final PublicationImportReport report, final boolean pretend) {
super(data, report, pretend);
}
@Override
@ -27,19 +27,25 @@ class InternetArticleImporter extends AbstractPublicationImporter<InternetArticl
final PublicationImportReport report = getReport();
if ((data.getPlace() != null) && !data.getPlace().isEmpty()) {
if (!isPretend()) {
article.setPlace(data.getPlace());
}
report.addField(new FieldImportReport("Place", data.getPlace()));
}
processNumberOfPages(article);
if ((data.getEdition() != null) && !data.getEdition().isEmpty()) {
if (!isPretend()) {
article.setEdition(data.getEdition());
}
report.addField(new FieldImportReport("Edition", data.getEdition()));
}
if ((data.getIssn() != null) && !data.getIssn().isEmpty()) {
if (!isPretend()) {
article.setISSN(data.getIssn());
}
report.addField(new FieldImportReport("ISSN", data.getIssn()));
}
@ -47,17 +53,23 @@ class InternetArticleImporter extends AbstractPublicationImporter<InternetArticl
processPublicationDate(article);
if ((data.getUrl() != null) && !data.getUrl().isEmpty()) {
if (!isPretend()) {
article.setUrl(data.getUrl());
}
report.addField(new FieldImportReport("URL", data.getUrl()));
}
if ((data.getUrn() != null) && !data.getUrn().isEmpty()) {
if (!isPretend()) {
article.setUrn(data.getUrn());
}
report.addField(new FieldImportReport("URN", data.getUrn()));
}
if ((data.getDoi() != null) && !data.getDoi().isEmpty()) {
if (!isPretend()) {
article.setDoi(data.getDoi());
}
report.addField(new FieldImportReport("DOI", data.getDoi()));
}
@ -68,7 +80,9 @@ class InternetArticleImporter extends AbstractPublicationImporter<InternetArticl
if ((getData().getNumberOfPages() != null) && !getData().getNumberOfPages().isEmpty()) {
try {
final int volume = Integer.parseInt(getData().getNumberOfPages());
if (!isPretend()) {
publication.setNumberOfPages(volume);
}
getReport().addField(new FieldImportReport("Number of pages", getData().getNumberOfPages()));
} catch (NumberFormatException ex) {
getReport().addMessage(String.format("Failed to parse numberOfPages data in line %d.",
@ -82,7 +96,9 @@ class InternetArticleImporter extends AbstractPublicationImporter<InternetArticl
final DateFormat dateFormat = new SimpleDateFormat("yyyy-mm-dd");
try {
final Date date = dateFormat.parse(getData().getLastAccess());
if (!isPretend()) {
article.setLastAccessed(date);
}
getReport().addField(new FieldImportReport("Last access", getData().getLastAccess()));
} catch (java.text.ParseException ex) {
getReport().addMessage(String.format("Failed to parse date of last access in line %d.",
@ -96,7 +112,9 @@ class InternetArticleImporter extends AbstractPublicationImporter<InternetArticl
final DateFormat dateFormat = new SimpleDateFormat("yyyy-mm-dd");
try {
final Date date = dateFormat.parse(getData().getPublicationDate());
if (!isPretend()) {
article.setPublicationDate(date);
}
getReport().addField(new FieldImportReport("Publication date", getData().getPublicationDate()));
} catch (java.text.ParseException ex) {
getReport().addMessage(String.format("Failed to parse publication date in line %d.",
@ -107,11 +125,20 @@ class InternetArticleImporter extends AbstractPublicationImporter<InternetArticl
@Override
protected InternetArticle createPublication() {
if (isPretend()) {
return null;
} else {
return new InternetArticle();
}
}
@Override
protected PublicationBundle createBundle(final InternetArticle article) {
if (isPretend()) {
return null;
} else {
return new InternetArticleBundle(article);
}
}
}

View File

@ -12,18 +12,26 @@ import com.arsdigita.cms.scipublications.importer.report.PublicationImportReport
*/
class MonographImporter extends AbstractPublicationWithPublisherImporter<Monograph> {
protected MonographImporter(final CsvLine data, final PublicationImportReport report) {
super(data, report);
protected MonographImporter(final CsvLine data, final PublicationImportReport report, final boolean pretend) {
super(data, report, pretend);
}
@Override
protected Monograph createPublication() {
if (isPretend()) {
return null;
} else {
return new Monograph();
}
}
@Override
protected PublicationBundle createBundle(final Monograph monograph) {
if (isPretend()) {
return null;
} else {
return new PublicationWithPublisherBundle(monograph);
}
}
}

View File

@ -13,8 +13,8 @@ import com.arsdigita.cms.scipublications.importer.report.PublicationImportReport
*/
class ProceedingsImporter extends AbstractPublicationWithPublisherImporter<Proceedings> {
public ProceedingsImporter(final CsvLine data, final PublicationImportReport report) {
super(data, report);
public ProceedingsImporter(final CsvLine data, final PublicationImportReport report, final boolean pretend) {
super(data, report, pretend);
}
@Override
@ -24,7 +24,9 @@ class ProceedingsImporter extends AbstractPublicationWithPublisherImporter<Proce
final PublicationImportReport report = getReport();
if ((data.getConference() != null) && !data.getConference().isEmpty()) {
if (!isPretend()) {
proceedings.setNameOfConference(data.getConference());
}
report.addField(new FieldImportReport("Name of conference", data.getConference()));
}
@ -33,11 +35,20 @@ class ProceedingsImporter extends AbstractPublicationWithPublisherImporter<Proce
@Override
protected Proceedings createPublication() {
if (isPretend()) {
return null;
} else {
return new Proceedings();
}
}
@Override
protected PublicationBundle createBundle(final Proceedings proceedings) {
if (isPretend()) {
return null;
} else {
return new ProceedingsBundle(proceedings);
}
}
}

View File

@ -100,7 +100,7 @@ public class PublicationsImporter implements SciPublicationsImporter {
try {
int lineNumber = 2; //Because we are starting at line 2 of the CSV file (line 1 contains the column headers)
for (String line : lines) {
final PublicationImportReport result = importPublication(line, lineNumber, publishNewItems);
final PublicationImportReport result = importPublication(line, lineNumber, publishNewItems, pretend);
report.addPublication(result);
lineNumber++;
}
@ -120,7 +120,8 @@ public class PublicationsImporter implements SciPublicationsImporter {
private PublicationImportReport importPublication(final String line,
final int lineNumber,
final boolean publishNewItems) {
final boolean publishNewItems,
final boolean pretend) {
final PublicationImportReport report = new PublicationImportReport();
final String[] cols = line.split(COL_SEP, -30);
@ -139,28 +140,28 @@ public class PublicationsImporter implements SciPublicationsImporter {
System.err.println("Calling importer...");
if (ArticleInCollectedVolume.class.getSimpleName().equals(data.getType())) {
processArticleInCollectedVolume(publishNewItems, data, report);
processArticleInCollectedVolume(publishNewItems, data, report, pretend);
} else if (ArticleInCollectedVolume.class.getSimpleName().equals(data.getType())) {
processArticleInJournal(publishNewItems, data, report);
processArticleInJournal(publishNewItems, data, report, pretend);
} else if (CollectedVolume.class.getSimpleName().equals(data.getType())) {
processCollectedVolume(publishNewItems, data, report);
processCollectedVolume(publishNewItems, data, report, pretend);
} else if (Expertise.class.getSimpleName().equals(data.getType())) {
processExpertise(publishNewItems, data, report);
processExpertise(publishNewItems, data, report, pretend);
} else if (GreyLiterature.class.getSimpleName().equals(data.getType())) {
processGreyLiterature(publishNewItems, data, report);
processGreyLiterature(publishNewItems, data, report, pretend);
} else if (InProceedings.class.getSimpleName().equals(data.getType())) {
processInProceedings(publishNewItems, data, report);
processInProceedings(publishNewItems, data, report, pretend);
} else if (InternetArticle.class.getSimpleName().equals(data.getType())) {
processInternetArticle(publishNewItems, data, report);
processInternetArticle(publishNewItems, data, report, pretend);
} else if (Monograph.class.getSimpleName().equals(data.getType())) {
System.err.println("CAlling monograph importer...");
processMonograph(publishNewItems, data, report);
processMonograph(publishNewItems, data, report, pretend);
} else if (Proceedings.class.getSimpleName().equals(data.getType())) {
processProceedings(publishNewItems, data, report);
processProceedings(publishNewItems, data, report, pretend);
} else if (Review.class.getSimpleName().equals(data.getType())) {
processReview(publishNewItems, data, report);
processReview(publishNewItems, data, report, pretend);
} else if (WorkingPaper.class.getSimpleName().equals(data.getType())) {
processWorkingPaper(publishNewItems, data, report);
processWorkingPaper(publishNewItems, data, report, pretend);
}
return report;
@ -168,123 +169,134 @@ public class PublicationsImporter implements SciPublicationsImporter {
private void processArticleInCollectedVolume(final boolean publishNewItems,
final CsvLine data,
final PublicationImportReport report) {
final PublicationImportReport report,
final boolean pretend) {
if (isPublicationAlreadyInDatabase(data, ArticleInCollectedVolume.class.getSimpleName(), report)) {
return;
}
final ArticleInCollectedVolumeImporter importer = new ArticleInCollectedVolumeImporter(data, report);
final ArticleInCollectedVolumeImporter importer = new ArticleInCollectedVolumeImporter(data, report, pretend);
importer.doImport(publishNewItems);
}
private void processArticleInJournal(final boolean publishNewItems,
final CsvLine data,
final PublicationImportReport report) {
final PublicationImportReport report,
final boolean pretend) {
if (isPublicationAlreadyInDatabase(data, ArticleInJournal.class.getSimpleName(), report)) {
return;
}
final ArticleInJournalImporter importer = new ArticleInJournalImporter(data, report);
final ArticleInJournalImporter importer = new ArticleInJournalImporter(data, report, pretend);
importer.doImport(publishNewItems);
}
private void processCollectedVolume(final boolean publishNewItems,
final CsvLine data,
final PublicationImportReport report) {
final PublicationImportReport report,
final boolean pretend) {
if (isPublicationAlreadyInDatabase(data, CollectedVolume.class.getSimpleName(), report)) {
return;
}
final CollectedVolumeImporter importer = new CollectedVolumeImporter(data, report);
final CollectedVolumeImporter importer = new CollectedVolumeImporter(data, report, pretend);
importer.doImport(publishNewItems);
}
private void processExpertise(final boolean publishNewItems, final CsvLine data,
final PublicationImportReport report) {
final PublicationImportReport report,
final boolean pretend) {
if (isPublicationAlreadyInDatabase(data, Expertise.class.getSimpleName(), report)) {
return;
}
final ExpertiseImporter importer = new ExpertiseImporter(data, report);
final ExpertiseImporter importer = new ExpertiseImporter(data, report, pretend);
importer.doImport(publishNewItems);
}
private void processGreyLiterature(final boolean publishNewItems,
final CsvLine data,
final PublicationImportReport report) {
final PublicationImportReport report,
final boolean pretend) {
if (isPublicationAlreadyInDatabase(data, GreyLiterature.class.getSimpleName(), report)) {
return;
}
final GreyLiteratureImporter importer = new GreyLiteratureImporter(data, report);
final GreyLiteratureImporter importer = new GreyLiteratureImporter(data, report, pretend);
importer.doImport(publishNewItems);
}
private void processInProceedings(final boolean publishNewItems,
final CsvLine data,
final PublicationImportReport report) {
final PublicationImportReport report,
final boolean pretend) {
if (isPublicationAlreadyInDatabase(data, InProceedings.class.getSimpleName(), report)) {
return;
}
final InProceedingsImporter importer = new InProceedingsImporter(data, report);
final InProceedingsImporter importer = new InProceedingsImporter(data, report, pretend);
importer.doImport(publishNewItems);
}
private void processInternetArticle(final boolean publishNewItems,
final CsvLine data,
final PublicationImportReport report) {
final PublicationImportReport report,
final boolean pretend) {
if (isPublicationAlreadyInDatabase(data, InternetArticle.class.getSimpleName(), report)) {
return;
}
final InternetArticleImporter importer = new InternetArticleImporter(data, report);
final InternetArticleImporter importer = new InternetArticleImporter(data, report, pretend);
importer.doImport(publishNewItems);
}
private void processMonograph(final boolean publishNewItems,
final CsvLine data,
final PublicationImportReport report) {
final PublicationImportReport report,
final boolean pretend) {
if (isPublicationAlreadyInDatabase(data, Monograph.class.getSimpleName(), report)) {
return;
}
final MonographImporter importer = new MonographImporter(data, report);
final MonographImporter importer = new MonographImporter(data, report, pretend);
importer.doImport(publishNewItems);
}
private void processProceedings(final boolean publishNewItems,
final CsvLine data,
final PublicationImportReport report) {
final PublicationImportReport report,
final boolean pretend) {
if (isPublicationAlreadyInDatabase(data, Proceedings.class.getSimpleName(), report)) {
return;
}
System.err.println("Publication is not in database");
final ProceedingsImporter importer = new ProceedingsImporter(data, report);
final ProceedingsImporter importer = new ProceedingsImporter(data, report, pretend);
importer.doImport(publishNewItems);
}
private void processReview(final boolean publishNewItems,
final CsvLine data,
final PublicationImportReport report) {
final PublicationImportReport report,
final boolean pretend) {
if (isPublicationAlreadyInDatabase(data, Review.class.getSimpleName(), report)) {
return;
}
final ReviewImporter importer = new ReviewImporter(data, report);
final ReviewImporter importer = new ReviewImporter(data, report, pretend);
importer.doImport(publishNewItems);
}
private void processWorkingPaper(final boolean publishNewItems,
final CsvLine data,
final PublicationImportReport report) {
final PublicationImportReport report,
final boolean pretend) {
if (isPublicationAlreadyInDatabase(data, WorkingPaper.class.getSimpleName(), report)) {
return;
}
final WorkingPaperImporter importer = new WorkingPaperImporter(data, report);
final WorkingPaperImporter importer = new WorkingPaperImporter(data, report, pretend);
importer.doImport(publishNewItems);
}

View File

@ -11,13 +11,17 @@ import com.arsdigita.cms.scipublications.importer.report.PublicationImportReport
*/
class ReviewImporter extends ArticleInJournalImporter {
public ReviewImporter(final CsvLine data, final PublicationImportReport report) {
super(data, report);
public ReviewImporter(final CsvLine data, final PublicationImportReport report, final boolean pretend) {
super(data, report, pretend);
}
@Override
protected ArticleInJournal createPublication() {
if (isPretend()) {
return null;
} else {
return new Review();
}
}
}

View File

@ -11,17 +11,26 @@ import com.arsdigita.cms.scipublications.importer.report.PublicationImportReport
*/
class WorkingPaperImporter extends AbstractUnPublishedImporter<WorkingPaper> {
protected WorkingPaperImporter(final CsvLine data, final PublicationImportReport report) {
super(data, report);
protected WorkingPaperImporter(final CsvLine data, final PublicationImportReport report, final boolean pretend) {
super(data, report, pretend);
}
@Override
protected WorkingPaper createPublication() {
if (isPretend()) {
return null;
} else {
return new WorkingPaper();
}
}
@Override
protected PublicationBundle createBundle(final WorkingPaper workingPaper) {
if (isPretend()) {
return null;
} else {
return new PublicationBundle(workingPaper);
}
}
}