two names for digitalCollections file

[Matthias Ronge]

The name of digitalCollections.xml was changed to goobi_digitalCollections.xml recently. However, in de.sub.goobi.config.DigitalCollections, line 46, the file is still referenced by its old name and the method fails with a java.io.FileNotFoundException if the new filename is used.

Workaround: The file needs to be present twice (or linked, if supported by operating and file system)

[Henning Gerhardt (henning-gerhardt)]

As the grep shows, both configuration files get actually used. That's certainly a bug due to missed renaming. Fix would be to rename 'digitalCollections.xml' to 'goobi_digitalCollections.xml' in src/de/sub/goobi/config/DigitalCollections.java as well.

goobi-production-1.10.x $: grep "digitalCollections.xml" * -r

src/org/goobi/production/cli/helper/CopyProcess.java:
  String filename = new Helper().getGoobiConfigDirectory() + "goobi_digitalCollections.xml";
src/de/sub/goobi/config/DigitalCollections.java:
  String filename = ConfigMain.getParameter("KonfigurationVerzeichnis") + "digitalCollections.xml";
src/de/sub/goobi/forms/ProzesskopieForm.java:
  String filename = this.help.getGoobiConfigDirectory() + "goobi_digitalCollections.xml";
src/de/sub/goobi/forms/MassImportForm.java:
        String filename = this.help.getGoobiConfigDirectory() + "goobi_digitalCollections.xml";

[Henning Gerhardt (henning-gerhardt)]

Pull request sent: https://github.com/goobi/goobi-production/pull/17