diff --git a/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java b/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java index fd7d940bc..2a7754333 100644 --- a/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java +++ b/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java @@ -2144,7 +2144,12 @@ public class DaBInImporter extends Program { Term term; term = termsDomain.getTerm(currentProjectsTerm.getUniqueID()); - term.addObject(project); + if (projectDe != null) { + term.addObject(projectDe); + } + if (projectEn != null) { + term.addObject(projectEn); + } term.save(); } @@ -2629,13 +2634,19 @@ public class DaBInImporter extends Program { } insertIntoAZFolder(publication, publicationsAlpha); - Term term = termsDomain.getTerm(publicationTerms.get(Integer. - toString(((Publication) publication.getPrimaryInstance()). - getYearOfPublication())).getUniqueID()); + Term term = publicationTerms.get(Integer.toString(((Publication) publication. + getPrimaryInstance()). + getYearOfPublication())); if (term == null) { term = publicationsTerm; } - term.addObject(publication); + term = termsDomain.getTerm(term.getUniqueID()); + if (publicationDe != null) { + term.addObject(publicationDe); + } + if (publicationEn != null) { + term.addObject(publicationEn); + } term.save(); } }; @@ -2738,19 +2749,29 @@ public class DaBInImporter extends Program { //publications.addItem(workingPaper); workingPaperMap.put(workingPaperData.getDabinId(), workingPaper); insertIntoAZFolder(workingPaper, publicationsAlpha); - WorkingPaper primary = (WorkingPaper) workingPaper.getPrimaryInstance(); - String yearStr = Integer.toString(primary.getYearOfPublication()); + WorkingPaper primary = (WorkingPaper) workingPaper. + getPrimaryInstance(); + String yearStr = + Integer.toString(primary.getYearOfPublication()); Term term = workingPaperTerms.get(yearStr); if (term == null) { + System.out.printf( + "***WARNING: Term for year '%s' not found. Using basic term.", + yearStr); term = workingPapersTerm; } - term = termsDomain.getTerm(term.getUniqueID()); - term.addObject(workingPaper); + term = termsDomain.getTerm(term.getUniqueID()); + if (workingPaperDe != null) { + term.addObject(workingPaperDe); + } + if (workingPaperEn != null) { + term.addObject(workingPaperEn); + } term.save(); System.out.println("\tOK"); - System.out.print("\tAssigning file..."); + System.out.print("\tAssigning file...\n "); if (workingPaperData.getFile() == null) { System.out.println("No file found."); } else { @@ -2791,23 +2812,23 @@ public class DaBInImporter extends Program { getPrimaryInstance()). getTitle()); if (title.length() > 200) { - fsi.setTitle(title.substring(0, 199)); + fsi.setTitle(title.substring(0, 200)); } else { fsi.setTitle(title); } - String name = String.format("datei_%s", + String name = String.format("datei_%s.pdf", ((WorkingPaper) workingPaper. getPrimaryInstance()). getName()); if (name.length() > 200) { - fsi.setName(name.substring(0, 199)); - } else { - fsi.setName(name); - } + name = name.substring(0, 200); + } + fsi.setName(name); FileAsset file = new FileAsset(); - file.loadFromFile(workingPaper.getPrimaryInstance(). - getName(), pdf, "application/octet-stream"); + file.loadFromFile(name, + pdf, + "application/pdf"); fsi.setFile(file); file.setContentSection(section); fsi.setContentSection(section); @@ -2818,13 +2839,13 @@ public class DaBInImporter extends Program { bundle.setDefaultLanguage("de"); RelatedLink download = new RelatedLink(); - download.setTitle("download"); + download.setTitle("Download"); download.setTargetType(Link.INTERNAL_LINK); download.setTargetItem(fsi); download.setLinkOwner(workingPaperDe); download = new RelatedLink(); - download.setTitle("download"); + download.setTitle("Download"); download.setTargetType(Link.INTERNAL_LINK); download.setTargetItem(fsi); download.setLinkOwner(workingPaperEn); @@ -2895,10 +2916,10 @@ public class DaBInImporter extends Program { myPublication.setTargetType(Link.INTERNAL_LINK); myPublication.setTargetItem(workingPaperEn); if (workingPaperEn.getTitle().length() > 180) { - myPublication.setTitle(workingPaperDe.getTitle(). + myPublication.setTitle(workingPaperEn.getTitle(). substring(0, 180)); } else { - myPublication.setTitle(workingPaperDe.getTitle()); + myPublication.setTitle(workingPaperEn.getTitle()); } myPublication.setLinkListName("MyPublications"); myPublication.save(); @@ -3227,6 +3248,7 @@ public class DaBInImporter extends Program { System.out.printf("Term '%s' does not exist. Creating...\n", token); createTerm(uniqueId, name, termsDomain, prevTerm); + term = termsDomain.getTerm(uniqueId); } } @@ -3329,7 +3351,8 @@ public class DaBInImporter extends Program { } } } catch (SQLException ex) { - System.err.println("Query for publication years of working papers failed."); + System.err.println( + "Query for publication years of working papers failed."); ex.printStackTrace(System.err); } diff --git a/ccm-core/lib/PDFBox-0.7.2-log4j.jar b/ccm-core/lib/PDFBox-0.7.2-log4j.jar deleted file mode 100755 index ff7c854d0..000000000 Binary files a/ccm-core/lib/PDFBox-0.7.2-log4j.jar and /dev/null differ diff --git a/ccm-core/lib/bcmail-jdk15-1.44.jar b/ccm-core/lib/bcmail-jdk15-1.44.jar new file mode 100644 index 000000000..838ca731b Binary files /dev/null and b/ccm-core/lib/bcmail-jdk15-1.44.jar differ diff --git a/ccm-core/lib/commons-logging-1.0.jar b/ccm-core/lib/commons-logging-1.0.jar deleted file mode 100755 index b73a80fab..000000000 Binary files a/ccm-core/lib/commons-logging-1.0.jar and /dev/null differ diff --git a/ccm-core/lib/commons-logging-1.1.1.jar b/ccm-core/lib/commons-logging-1.1.1.jar new file mode 100644 index 000000000..1deef144c Binary files /dev/null and b/ccm-core/lib/commons-logging-1.1.1.jar differ diff --git a/ccm-core/lib/fontbox-1.4.0.jar b/ccm-core/lib/fontbox-1.4.0.jar new file mode 100644 index 000000000..46db54cd9 Binary files /dev/null and b/ccm-core/lib/fontbox-1.4.0.jar differ diff --git a/ccm-core/lib/icu4j-3.8.jar b/ccm-core/lib/icu4j-3.8.jar new file mode 100644 index 000000000..26654862d Binary files /dev/null and b/ccm-core/lib/icu4j-3.8.jar differ diff --git a/ccm-core/lib/jempbox-1.4.0.jar b/ccm-core/lib/jempbox-1.4.0.jar new file mode 100644 index 000000000..c6cd7243b Binary files /dev/null and b/ccm-core/lib/jempbox-1.4.0.jar differ diff --git a/ccm-core/lib/pdfbox-1.4.0.jar b/ccm-core/lib/pdfbox-1.4.0.jar new file mode 100644 index 000000000..4cebf0b11 Binary files /dev/null and b/ccm-core/lib/pdfbox-1.4.0.jar differ diff --git a/ccm-core/src/com/arsdigita/search/converter/PDFConverter.java b/ccm-core/src/com/arsdigita/search/converter/PDFConverter.java index c53839dcd..77874d4c9 100755 --- a/ccm-core/src/com/arsdigita/search/converter/PDFConverter.java +++ b/ccm-core/src/com/arsdigita/search/converter/PDFConverter.java @@ -20,9 +20,9 @@ package com.arsdigita.search.converter; import java.io.InputStream; import java.io.IOException; -import org.pdfbox.pdfparser.PDFParser; -import org.pdfbox.util.PDFTextStripper; -import org.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.pdfparser.PDFParser; +import org.apache.pdfbox.util.PDFTextStripper; +import org.apache.pdfbox.pdmodel.PDDocument; /** * This class provides the mechanism to perform a conversion from