← Back to branch summary

~ralf-claussnitzer-deactivatedaccount/goobi-production/1.10.x

« back to all changes in this revision

Viewing changes to Goobi/src/de/sub/goobi/export/dms/AutomaticDmsExportWithoutHibernate.java

  • Committer: Henning Gerhardt
  • Date: 2014-11-14 12:28:25 UTC
  • mfrom: (520.2.15)
  • Revision ID: git-v1:a20401d39141649b31d2f22e3ebdcd95fabd26ad
Merge remote-tracking branch 'matthias-ronge/issue_172' into 1.10.x

Conflicts:
        Goobi/src/de/sub/goobi/metadaten/copier/MetadataPathSelector.java

Show diffs side-by-side

added added

removed removed

Lines of Context:
Goobi/src/de/sub/goobi/export/dms/AutomaticDmsExportWithoutHibernate.java
30
30
import java.io.File;
31
31
import java.io.IOException;
32
32
 
 
33
import org.apache.commons.configuration.ConfigurationException;
33
34
import org.apache.log4j.Logger;
34
35
 
35
36
import ugh.dl.DocStruct;
54
55
import de.sub.goobi.helper.exceptions.SwapException;
55
56
import de.sub.goobi.helper.exceptions.UghHelperException;
56
57
import de.sub.goobi.metadaten.MetadatenVerifizierungWithoutHibernate;
 
58
import de.sub.goobi.metadaten.copier.CopierData;
 
59
import de.sub.goobi.metadaten.copier.DataCopier;
57
60
import de.sub.goobi.persistence.apache.FolderInformation;
58
61
import de.sub.goobi.persistence.apache.ProcessManager;
59
62
import de.sub.goobi.persistence.apache.ProcessObject;
142
145
                        return false;
143
146
                }
144
147
 
 
148
                String rules = ConfigMain.getParameter("copyData.onExport");
 
149
                if (rules != null && !rules.equals("- keine Konfiguration gefunden -")) {
 
150
                        try {
 
151
                                new DataCopier(rules).process(new CopierData(newfile, process));
 
152
                        } catch (ConfigurationException e) {
 
153
                                // TODO: When merging with issue #166, add this:
 
154
                                // if (task != null) {
 
155
                                //     task.setException(e);
 
156
                                // }                                    
 
157
                                Helper.setFehlerMeldung("dataCopier.syntaxError", e.getMessage());
 
158
                                return false;
 
159
                        } catch (RuntimeException e) {
 
160
                                // TODO: When merging with issue #166, add this:
 
161
                                // if (task != null) {
 
162
                                //     task.setException(e);
 
163
                                // }                                    
 
164
                                Helper.setFehlerMeldung("dataCopier.runtimeException", e.getMessage());
 
165
                                return false;
 
166
                        }
 
167
                }
 
168
 
145
169
                trimAllMetadata(gdzfile.getDigitalDocument().getLogicalDocStruct());
146
170
 
147
171
                /*