Merge branch 'master' into ufladerer-patch-1
This commit is contained in:
commit
f539df807a
@ -55,7 +55,6 @@ final class MDConcMarkingPosition implements MDImporterConcordanceListInterface
|
||||
"unterer Blattrand" => "bottom",
|
||||
"Boden" => "bottom",
|
||||
"Boden und Standring" => "bottom",
|
||||
"Unterseite" => "bottom",
|
||||
"untere Passpartoutkante und untere linke Ecke auf Foto" => "bottom",
|
||||
"Unterboden" => "bottom",
|
||||
"vs unten" => "bottom",
|
||||
@ -68,7 +67,6 @@ final class MDConcMarkingPosition implements MDImporterConcordanceListInterface
|
||||
"oben" => "top",
|
||||
"oben mittig" => "top",
|
||||
"Oben mittig" => "top",
|
||||
"Oberseite" => "top",
|
||||
"oberer Rand" => "top",
|
||||
"oberer Balken" => "top",
|
||||
"Flasche und Verschluß" => "top",
|
||||
@ -300,7 +298,6 @@ final class MDConcMarkingPosition implements MDImporterConcordanceListInterface
|
||||
"Oberseite Holzsohle, mittig im oberer Drittel" => "other",
|
||||
"Vorderseite Ziffernblatt" => "other",
|
||||
"Boden, außen" => "other",
|
||||
"innen" => "other",
|
||||
"außen" => "other",
|
||||
"aussen" => "other",
|
||||
"am Gehäuse" => "other",
|
||||
|
@ -150,6 +150,11 @@ final class MDConcMeasurementTypes implements MDImporterConcordanceListInterface
|
||||
"Andere",
|
||||
"Prefix",
|
||||
"Auflagekarton Standardformat",
|
||||
"Bruttomass",
|
||||
"Kistenmass",
|
||||
"Kistenmass (Höhe)",
|
||||
"Kistenmass (Tiefe)",
|
||||
"Kistenmass (Breite)",
|
||||
"Suffix",
|
||||
"HxBxT",
|
||||
"CC",
|
||||
@ -163,7 +168,10 @@ final class MDConcMeasurementTypes implements MDImporterConcordanceListInterface
|
||||
"Höhe (gesamt)",
|
||||
"Höhe (ausgeklappt)",
|
||||
"height",
|
||||
"Bruttomass (Höhe)",
|
||||
"Außenmaß (Höhe)",
|
||||
"Objektmaß (Höhe)",
|
||||
"Objektmass (Höhe)",
|
||||
"Reliefhöhe" => MDMeasurementType::height,
|
||||
|
||||
"Länge",
|
||||
@ -181,6 +189,12 @@ final class MDConcMeasurementTypes implements MDImporterConcordanceListInterface
|
||||
"Tiefe (Rahmen)",
|
||||
"Teife",
|
||||
"length",
|
||||
"Bruttomass (Länge)",
|
||||
"Bruttomass (Tiefe)",
|
||||
"Objektmaß (Länge)",
|
||||
"Objektmaß (Tiefe)",
|
||||
"Objektmass (Länge)",
|
||||
"Objektmass (Tiefe)",
|
||||
"depth",
|
||||
"Dicke" => MDMeasurementType::length,
|
||||
|
||||
@ -192,6 +206,9 @@ final class MDConcMeasurementTypes implements MDImporterConcordanceListInterface
|
||||
"Breite (gesamt)",
|
||||
"width",
|
||||
"Außenmaß (Breite)",
|
||||
"Bruttomass (Breite)",
|
||||
"Objektmaß (Breite)",
|
||||
"Objektmass (Breite)",
|
||||
"Stärke",
|
||||
"Schenkelbreite (Breite)" => MDMeasurementType::width,
|
||||
|
||||
@ -208,6 +225,12 @@ final class MDConcMeasurementTypes implements MDImporterConcordanceListInterface
|
||||
"Durchmesser Oben",
|
||||
"Durchmesser oben",
|
||||
"Durchmesser unten",
|
||||
"Durchmesser (Höhe)",
|
||||
"Durchmesser (Breite)",
|
||||
"Durchmesser (Tiefe)",
|
||||
"Durchmesser (Länge)",
|
||||
"Objektmaß (Durchmesser)",
|
||||
"Objektmass (Durchmesser)",
|
||||
"d",
|
||||
"Ø" => MDMeasurementType::diameter,
|
||||
|
||||
@ -216,11 +239,47 @@ final class MDConcMeasurementTypes implements MDImporterConcordanceListInterface
|
||||
"Stärke",
|
||||
"Wandstärke (Durchmesser)" => MDMeasurementType::wall,
|
||||
|
||||
"Blattmaß (Höhe)",
|
||||
"Blattmass (Höhe)" => MDMeasurementType::height_sheet_size,
|
||||
|
||||
"Blattmaß (Breite)",
|
||||
"Blattmass (Breite)" => MDMeasurementType::width_sheet_size,
|
||||
|
||||
"Blattmaß (Länge)",
|
||||
"Blattmaß (Tiefe)",
|
||||
"Blattmass (Länge)",
|
||||
"Blattmass (Tiefe)" => MDMeasurementType::length_sheet_size,
|
||||
|
||||
"Bildmaß (Höhe)",
|
||||
"Bildmass (Höhe)" => MDMeasurementType::height_image_size,
|
||||
|
||||
"Bildmaß (Breite)",
|
||||
"Bildmass (Breite)" => MDMeasurementType::width_image_size,
|
||||
|
||||
"Bildmaß (Länge)",
|
||||
"Bildmaß (Tiefe)",
|
||||
"Bildmass (Länge)",
|
||||
"Bildmass (Tiefe)" => MDMeasurementType::length_image_size,
|
||||
|
||||
"Rahmenmaß (Höhe)",
|
||||
"Rahmenmass (Höhe)" => MDMeasurementType::height_frame,
|
||||
|
||||
"Rahmenmaß (Breite)",
|
||||
"Rahmenmass (Breite)" => MDMeasurementType::width_frame,
|
||||
|
||||
"Rahmenmaß (Länge)",
|
||||
"Rahmenmaß (Tiefe)",
|
||||
"Rahmenmass (Länge)",
|
||||
"Rahmenmass (Tiefe)" => MDMeasurementType::length_frame,
|
||||
|
||||
"weight",
|
||||
"Gewicht" => MDMeasurementType::weight,
|
||||
|
||||
"number of pages",
|
||||
"Seitenzahl",
|
||||
"Seitenzahl (Höhe)",
|
||||
"Seitenzahl (Breite)",
|
||||
"Seitenzahl (Tiefe)",
|
||||
"Paginierung" => MDMeasurementType::number_of_parts,
|
||||
|
||||
"Die Axis",
|
||||
|
@ -14,15 +14,22 @@ final class MDConcOwnershipStatus implements MDImporterConcordanceListInterface
|
||||
private const OWNERSHIP_TYPES_VERBOSE = [
|
||||
|
||||
// 0: No known entry type
|
||||
"Eigentum" => "owned",
|
||||
"Geschenk" => "owned",
|
||||
"Besitz" => "owned",
|
||||
"Dauerleihe" => "permanent_loan",
|
||||
"Dauerleihgabe" => "permanent_loan",
|
||||
"Kauf" => "owned",
|
||||
"Fund" => "owned",
|
||||
"Eigenleistung" => "owned",
|
||||
"Eigentum des Museums" => "owned",
|
||||
|
||||
// Permanent loans
|
||||
"Dauerleihe" => "permanent_loan",
|
||||
"Dauerleihgabe" => "permanent_loan",
|
||||
|
||||
// Loans
|
||||
"Leihe" => "borrowed",
|
||||
"Leihgabe" => "borrowed",
|
||||
|
||||
];
|
||||
|
||||
/**
|
||||
@ -35,6 +42,9 @@ final class MDConcOwnershipStatus implements MDImporterConcordanceListInterface
|
||||
public static function getConcordanceTarget(string $input):string {
|
||||
|
||||
if (!isset(self::OWNERSHIP_TYPES_VERBOSE[$input])) {
|
||||
if (isset(self::OWNERSHIP_TYPES_VERBOSE[trim($input)])) {
|
||||
return self::OWNERSHIP_TYPES_VERBOSE[trim($input)];
|
||||
}
|
||||
throw new MDImporterMissingConcordance("Unknown ownership type: " . $input);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user