Projects >> goobi-production >>c32cdb89fd6ef04576170cbabb6de3649c598d3c

Chunk
Conflicting content 
import java.io.File;
import java.io.IOException;

<<<<<<< HEAD
import org.apache.commons.configuration.ConfigurationException;
=======
import org.apache.commons.io.FilenameUtils;
>>>>>>> 263a6ba650ed239d4dc9577c7e110e1465efebdc
import org.apache.log4j.Logger;

import ugh.dl.DocStruct;
Solution content 
import java.io.File;
import java.io.IOException;

import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.io.FilenameUtils;
import org.apache.log4j.Logger;

import ugh.dl.DocStruct;
File
AutomaticDmsExportWithoutHibernate.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import java.io.File;
import java.io.IOException;

<<<<<<< HEAD
import org.apache.commons.configuration.ConfigurationException;
=======
import org.apache.commons.io.FilenameUtils;
>>>>>>> 263a6ba650ed239d4dc9577c7e110e1465efebdc
import org.apache.log4j.Logger;
import org.hibernate.Hibernate;
Solution content 
import java.io.File;
import java.io.IOException;

import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.io.FilenameUtils;
import org.apache.log4j.Logger;
import org.hibernate.Hibernate;
File
ExportDms.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import de.sub.goobi.beans.Prozess;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.config.ConfigProjects;
<<<<<<< HEAD
=======
import de.sub.goobi.export.dms.ExportDms;
>>>>>>> 263a6ba650ed239d4dc9577c7e110e1465efebdc
import de.sub.goobi.export.dms.ExportDms_CorrectRusdml;
import de.sub.goobi.forms.LoginForm;
import de.sub.goobi.helper.FilesystemHelper;
Solution content 
import de.sub.goobi.beans.Prozess;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.config.ConfigProjects;
import de.sub.goobi.export.dms.ExportDms;
import de.sub.goobi.export.dms.ExportDms_CorrectRusdml;
import de.sub.goobi.forms.LoginForm;
import de.sub.goobi.helper.FilesystemHelper;
File
ExportMets.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import de.sub.goobi.helper.exceptions.SwapException;
import de.sub.goobi.helper.exceptions.UghHelperException;
import de.sub.goobi.metadaten.MetadatenImagesHelper;
<<<<<<< HEAD
import de.sub.goobi.metadaten.copier.CopierData;
import de.sub.goobi.metadaten.copier.DataCopier;
=======
>>>>>>> 263a6ba650ed239d4dc9577c7e110e1465efebdc

public class ExportMets {
	protected Helper help = new Helper();
Solution content 
import de.sub.goobi.helper.exceptions.SwapException;
import de.sub.goobi.helper.exceptions.UghHelperException;
import de.sub.goobi.metadaten.MetadatenImagesHelper;
import de.sub.goobi.metadaten.copier.CopierData;
import de.sub.goobi.metadaten.copier.DataCopier;

public class ExportMets {
	protected Helper help = new Helper();
File
ExportMets.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import javax.faces.model.SelectItem;
import javax.naming.NamingException;

<<<<<<< HEAD
import org.apache.commons.configuration.ConfigurationException;
=======
import org.apache.commons.io.FilenameUtils;
>>>>>>> 263a6ba650ed239d4dc9577c7e110e1465efebdc
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.SystemUtils;
import org.apache.log4j.Logger;
Solution content 
import javax.faces.model.SelectItem;
import javax.naming.NamingException;

import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.SystemUtils;
import org.apache.log4j.Logger;
File
ProzesskopieForm.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
			if (!pluginAvailableFor(opacKatalog)) {
				return "";
			}
<<<<<<< HEAD
			this.atstsl = this.myImportOpac.getAtstsl();
			applyCopyingRules(new CopierData(myRdf, prozessVorlage));
			fillFieldsFromMetadataFile();
			/* über die Treffer informieren */
			if (this.myImportOpac.getHitcount() == 0) {
=======

			String query = QueryBuilder.restrictToField(opacSuchfeld, opacSuchbegriff);
			query = QueryBuilder.appendAll(query, ConfigOpac.getRestrictionsForCatalogue(opacKatalog));

			hitlist = importCatalogue.find(query, timeout);
			hits = importCatalogue.getNumberOfHits(hitlist, timeout);

			switch ((int) Math.min(hits, Integer.MAX_VALUE)) {
			case 0:
>>>>>>> 263a6ba650ed239d4dc9577c7e110e1465efebdc
				Helper.setFehlerMeldung("No hit found", "");
				break;
			case 1:
Solution content 
			if (!pluginAvailableFor(opacKatalog)) {
				return "";
			}

			String query = QueryBuilder.restrictToField(opacSuchfeld, opacSuchbegriff);
			query = QueryBuilder.appendAll(query, ConfigOpac.getRestrictionsForCatalogue(opacKatalog));

			hitlist = importCatalogue.find(query, timeout);
			hits = importCatalogue.getNumberOfHits(hitlist, timeout);

			switch ((int) Math.min(hits, Integer.MAX_VALUE)) {
			case 0:
				Helper.setFehlerMeldung("No hit found", "");
				break;
			case 1:
File
ProzesskopieForm.java
Developer's decision
Version 2
Kind of conflict
Attribute
Case statement
Comment
If statement
Method invocation
Switch statement
Variable
Chunk
Conflicting content 
	}

	/**
<<<<<<< HEAD
	 * Creates a DataCopier with the given configuration, lets it process the
	 * given data and wraps any errors to display in the front end.
	 * 
	 * @param data
	 *            data to process
	 */
	private void applyCopyingRules(CopierData data) {
		String rules = ConfigMain.getParameter("copyData.onCatalogueQuery");
		if (rules != null && !rules.equals("- keine Konfiguration gefunden -")) {
			try {
				new DataCopier(rules).process(data);
			} catch (ConfigurationException e) {
				Helper.setFehlerMeldung("dataCopier.syntaxError", e.getMessage());
			} catch (RuntimeException exception) {
				if (RuntimeException.class.equals(exception.getClass())) {
					Helper.setFehlerMeldung("dataCopier.runtimeException", exception.getMessage());
				} else {
					throw exception;
				}
			}
		}
=======
	 * alle Konfigurationseigenschaften und Felder zurücksetzen
	 * ================================================================
	 */
	private void clearValues() {
		if (this.opacKatalog == null) {
			this.opacKatalog = "";
		}
		this.standardFields = new HashMap();
		this.standardFields.put("collections", true);
		this.standardFields.put("doctype", true);
		this.standardFields.put("regelsatz", true);
		this.standardFields.put("images", true);
		this.additionalFields = new ArrayList();
		this.tifHeader_documentname = "";
		this.tifHeader_imagedescription = "";
	}

	/**
	 * The method importHit() loads a hit into the display.
	 * 
	 * @param hit
	 *            Hit to load
	 * @throws PreferencesException
	 */
	protected void importHit(Hit hit) throws PreferencesException {
		myRdf = hit.getFileformat();
		docType = hit.getDocType();
		fillFieldsFromMetadataFile();
		atstsl = createAtstsl(hit.getTitle(), hit.getAuthors());
>>>>>>> 263a6ba650ed239d4dc9577c7e110e1465efebdc
	}

	/**
Solution content 
	}

	/**
	 * alle Konfigurationseigenschaften und Felder zurücksetzen
	 * ================================================================
	 */
	private void clearValues() {
		if (this.opacKatalog == null) {
			this.opacKatalog = "";
		}
		this.standardFields = new HashMap();
		this.standardFields.put("collections", true);
		this.standardFields.put("doctype", true);
		this.standardFields.put("regelsatz", true);
		this.standardFields.put("images", true);
		this.additionalFields = new ArrayList();
		this.tifHeader_documentname = "";
		this.tifHeader_imagedescription = "";
	}

	/**
	 * The method importHit() loads a hit into the display.
	 * 
	 * @param hit
	 *            Hit to load
	 * @throws PreferencesException
	 */
	protected void importHit(Hit hit) throws PreferencesException {
		myRdf = hit.getFileformat();
		docType = hit.getDocType();
		fillFieldsFromMetadataFile();
		applyCopyingRules(new CopierData(myRdf, prozessVorlage));
		atstsl = createAtstsl(hit.getTitle(), hit.getAuthors());
	}

	/**
	 * Creates a DataCopier with the given configuration, lets it process the
	 * given data and wraps any errors to display in the front end.
	 * 
	 * @param data
	 *            data to process
	 */
	private void applyCopyingRules(CopierData data) {
		String rules = ConfigMain.getParameter("copyData.onCatalogueQuery");
		if (rules != null && !rules.equals("- keine Konfiguration gefunden -")) {
			try {
				new DataCopier(rules).process(data);
			} catch (ConfigurationException e) {
				Helper.setFehlerMeldung("dataCopier.syntaxError", e.getMessage());
			} catch (RuntimeException exception) {
				if (RuntimeException.class.equals(exception.getClass())) {
					Helper.setFehlerMeldung("dataCopier.runtimeException", exception.getMessage());
				} else {
					throw exception;
				}
			}
		}
	}

	/**
File
ProzesskopieForm.java
Developer's decision
Manual
Kind of conflict
Attribute
Comment
If statement
Method declaration
Method invocation
Method signature
Variable
Chunk
Conflicting content 
			return frame.getLocale();
		}
	}
<<<<<<< HEAD
}
=======

	/**
	 * The function getGroupingSeparator() returns the character used for
	 * thousands separator for the current locale as read-only property
	 * "groupingSeparator".
	 * 
	 * @return the character used for thousands separator
	 */
	public char getGroupingSeparator() {
		return DecimalFormatSymbols.getInstance(getLocale()).getGroupingSeparator();
	}
}
>>>>>>> 263a6ba650ed239d4dc9577c7e110e1465efebdc
Solution content 
			return frame.getLocale();
		}
	}

	/**
	 * The function getGroupingSeparator() returns the character used for
	 * thousands separator for the current locale as read-only property
	 * "groupingSeparator".
	 * 
	 * @return the character used for thousands separator
	 */
	public char getGroupingSeparator() {
		return DecimalFormatSymbols.getInstance(getLocale()).getGroupingSeparator();
	}
}
File
SpracheForm.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration