LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Weitere Korrekturen am CSV-Importer 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1937 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2012-11-15 21:18:32 +00:00
parent 15c6fb0328
commit 53e796b724
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/report/ProceedingsImportReport.java
View File

@ -73,7 +73,7 @@ public class ProceedingsImportReport {
public void setPublisher(final PublisherImportReport publisher) { public void setPublisher(final PublisherImportReport publisher) {
this.publisher = publisher; this.publisher = publisher;
} }
public boolean isCreated() { public boolean isCreated() {
return created; return created;
} }
@ -87,7 +87,7 @@ public class ProceedingsImportReport {
if (created) { if (created) {
final StringWriter strWriter = new StringWriter(); final StringWriter strWriter = new StringWriter();
final PrintWriter writer = new PrintWriter(strWriter); final PrintWriter writer = new PrintWriter(strWriter);
for (int i = 0; i < 40; i++) { for (int i = 0; i < 40; i++) {
writer.append("- "); writer.append("- ");
} }
@ -98,13 +98,15 @@ public class ProceedingsImportReport {
//writer.printf("Date from of conference: %s\n", dateToOfConference.toString()); //writer.printf("Date from of conference: %s\n", dateToOfConference.toString());
//writer.printf("Date to of conference..: %s\n", dateToOfConference.toString()); //writer.printf("Date to of conference..: %s\n", dateToOfConference.toString());
writer.print("Authors:\n"); writer.print("Authors:\n");
for(AuthorImportReport author : authors) { for (AuthorImportReport author : authors) {
writer.printf("%s\n", author.toString()); writer.printf("%s\n", author.toString());
} }
writer.append(publisher.toString()); if (publisher != null) {
writer.append('\n'); writer.append(publisher.toString());
}
writer.append('\n');
for (int i = 0; i < 40; i++) { for (int i = 0; i < 40; i++) {
writer.append("- "); writer.append("- ");
} }
@ -116,5 +118,4 @@ public class ProceedingsImportReport {
proceedingsTitle); proceedingsTitle);
} }
} }
} }

8
ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/util/ImporterUtil.java
View File

@ -242,7 +242,9 @@ public class ImporterUtil {
collectedVolume.setYearOfPublication(yearOfPub); collectedVolume.setYearOfPublication(yearOfPub);
for (AuthorData author : authors) { for (AuthorData author : authors) {
report.addAuthor(processAuthor(collectedVolume, author, pretend)); if ((author.getSurname() != null) && !author.getSurname().isEmpty()) {
report.addAuthor(processAuthor(collectedVolume, author, pretend));
}
} }
if ((publisherName != null) && !publisherName.isEmpty()) { if ((publisherName != null) && !publisherName.isEmpty()) {
@ -329,7 +331,9 @@ public class ImporterUtil {
} }
proceedings.setYearOfPublication(yearOfPub); proceedings.setYearOfPublication(yearOfPub);
for (AuthorData author : authors) { for (AuthorData author : authors) {
report.addAuthor(processAuthor(proceedings, author, pretend)); if ((author.getSurname() != null) && !author.getSurname().isEmpty()) {
report.addAuthor(processAuthor(proceedings, author, pretend));
}
} }
if ((publisherName != null) && !publisherName.isEmpty()) { if ((publisherName != null) && !publisherName.isEmpty()) {

2
ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/PublicationsImporter.java
View File

@ -113,7 +113,7 @@ public class PublicationsImporter implements SciPublicationsImporter {
importerUtil); importerUtil);
report.addPublication(result); report.addPublication(result);
} catch (Exception ex) { } catch (Exception ex) {
tctx.abortTxn(); tctx.abortTxn();
throw new SciPublicationsImportException(ex); throw new SciPublicationsImportException(ex);
} }