Erikmitk / kitodo-presentation

modules/newclient/structures.inc.php

Indentation +348 added lines, -348 removed lines

@@ -12,352 +12,352 @@
 // Define structure elements.
 // @see http://dfg-viewer.de/en/structural-data-set/
 $structures = array (
-    'act' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'additional' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'address' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'album' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'annotation' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'article' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'atlas' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'bachelor_thesis' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'binding' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'bookplate' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'cartulary' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'chapter' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'collation' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'colophon' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'contained_work' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'contents' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'corrigenda' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'cover' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'cover_front' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'cover_back' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'day' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'dedication' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'diploma_thesis' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'doctoral_thesis' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'document' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'dossier' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'edge' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'endsheet' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'engraved_titlepage' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'entry' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'fascicle' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'file' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'folder' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'fragment' => array (
-        'toplevel' => 1,
-        'oai_name' => ''
-    ),
-    'ground_plan' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'habilitation_thesis' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'illustration' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'image' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'imprint' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'index' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'initial_decoration' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'issue' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'judgement' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'land_register' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'leaflet' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'lecture' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'letter' => array (
-        'toplevel' => 0,
-        'oai_name' => '',
-    ),
-    'magister_thesis' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'master_thesis' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'manuscript' => array (
-        'toplevel' => 1,
-        'oai_name' => ''
-    ),
-    'map' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'monograph' => array (
-        'toplevel' => 1,
-        'oai_name' => ''
-    ),
-    'month' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'multivolume_work' => array (
-        'toplevel' => 1,
-        'oai_name' => ''
-    ),
-    'musical_notation' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'newspaper' => array (
-        'toplevel' => 1,
-        'oai_name' => ''
-    ),
-    'note' => array (
-        'toplevel' => 0,
-        'oai_name' => '',
-    ),
-    'official_notification' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'ornament' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'paper' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'paste_down' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'periodical' => array (
-        'toplevel' => 1,
-        'oai_name' => ''
-    ),
-    'photograph' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'plan' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'poster' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'preface' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'preprint' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'printed_archives' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'printers_mark' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'privileges' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'proceeding' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'provenance' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'register' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'report' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'research_paper' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'scheme' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'seal' => array (
-        'toplevel' => 0,
-        'oai_name' => '',
-    ),
-    'section' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'spine' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'stamp' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'study' => array (
-        'toplevel' => 1,
-        'oai_name' => '',
-    ),
-    'table' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'text' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'title_page' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'verse' => array (
-        'toplevel' => 0,
-        'oai_name' => ''
-    ),
-    'volume' => array (
-        'toplevel' => 1,
-        'oai_name' => ''
-    ),
-    'year' => array (
-        'toplevel' => 1,
-        'oai_name' => ''
-    )
+	'act' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'additional' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'address' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'album' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'annotation' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'article' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'atlas' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'bachelor_thesis' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'binding' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'bookplate' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'cartulary' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'chapter' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'collation' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'colophon' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'contained_work' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'contents' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'corrigenda' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'cover' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'cover_front' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'cover_back' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'day' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'dedication' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'diploma_thesis' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'doctoral_thesis' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'document' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'dossier' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'edge' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'endsheet' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'engraved_titlepage' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'entry' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'fascicle' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'file' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'folder' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'fragment' => array (
+		'toplevel' => 1,
+		'oai_name' => ''
+	),
+	'ground_plan' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'habilitation_thesis' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'illustration' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'image' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'imprint' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'index' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'initial_decoration' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'issue' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'judgement' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'land_register' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'leaflet' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'lecture' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'letter' => array (
+		'toplevel' => 0,
+		'oai_name' => '',
+	),
+	'magister_thesis' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'master_thesis' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'manuscript' => array (
+		'toplevel' => 1,
+		'oai_name' => ''
+	),
+	'map' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'monograph' => array (
+		'toplevel' => 1,
+		'oai_name' => ''
+	),
+	'month' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'multivolume_work' => array (
+		'toplevel' => 1,
+		'oai_name' => ''
+	),
+	'musical_notation' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'newspaper' => array (
+		'toplevel' => 1,
+		'oai_name' => ''
+	),
+	'note' => array (
+		'toplevel' => 0,
+		'oai_name' => '',
+	),
+	'official_notification' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'ornament' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'paper' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'paste_down' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'periodical' => array (
+		'toplevel' => 1,
+		'oai_name' => ''
+	),
+	'photograph' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'plan' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'poster' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'preface' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'preprint' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'printed_archives' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'printers_mark' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'privileges' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'proceeding' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'provenance' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'register' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'report' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'research_paper' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'scheme' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'seal' => array (
+		'toplevel' => 0,
+		'oai_name' => '',
+	),
+	'section' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'spine' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'stamp' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'study' => array (
+		'toplevel' => 1,
+		'oai_name' => '',
+	),
+	'table' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'text' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'title_page' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'verse' => array (
+		'toplevel' => 0,
+		'oai_name' => ''
+	),
+	'volume' => array (
+		'toplevel' => 1,
+		'oai_name' => ''
+	),
+	'year' => array (
+		'toplevel' => 1,
+		'oai_name' => ''
+	)
 );

Spacing +88 added lines, -88 removed lines

@@ -11,352 +11,352 @@
 
 // Define structure elements.
 // @see http://dfg-viewer.de/en/structural-data-set/
-$structures = array (
-    'act' => array (
+$structures = array(
+    'act' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'additional' => array (
+    'additional' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'address' => array (
+    'address' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'album' => array (
+    'album' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'annotation' => array (
+    'annotation' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'article' => array (
+    'article' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'atlas' => array (
+    'atlas' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'bachelor_thesis' => array (
+    'bachelor_thesis' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'binding' => array (
+    'binding' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'bookplate' => array (
+    'bookplate' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'cartulary' => array (
+    'cartulary' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'chapter' => array (
+    'chapter' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'collation' => array (
+    'collation' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'colophon' => array (
+    'colophon' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'contained_work' => array (
+    'contained_work' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'contents' => array (
+    'contents' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'corrigenda' => array (
+    'corrigenda' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'cover' => array (
+    'cover' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'cover_front' => array (
+    'cover_front' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'cover_back' => array (
+    'cover_back' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'day' => array (
+    'day' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'dedication' => array (
+    'dedication' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'diploma_thesis' => array (
+    'diploma_thesis' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'doctoral_thesis' => array (
+    'doctoral_thesis' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'document' => array (
+    'document' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'dossier' => array (
+    'dossier' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'edge' => array (
+    'edge' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'endsheet' => array (
+    'endsheet' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'engraved_titlepage' => array (
+    'engraved_titlepage' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'entry' => array (
+    'entry' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'fascicle' => array (
+    'fascicle' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'file' => array (
+    'file' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'folder' => array (
+    'folder' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'fragment' => array (
+    'fragment' => array(
         'toplevel' => 1,
         'oai_name' => ''
     ),
-    'ground_plan' => array (
+    'ground_plan' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'habilitation_thesis' => array (
+    'habilitation_thesis' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'illustration' => array (
+    'illustration' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'image' => array (
+    'image' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'imprint' => array (
+    'imprint' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'index' => array (
+    'index' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'initial_decoration' => array (
+    'initial_decoration' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'issue' => array (
+    'issue' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'judgement' => array (
+    'judgement' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'land_register' => array (
+    'land_register' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'leaflet' => array (
+    'leaflet' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'lecture' => array (
+    'lecture' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'letter' => array (
+    'letter' => array(
         'toplevel' => 0,
         'oai_name' => '',
     ),
-    'magister_thesis' => array (
+    'magister_thesis' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'master_thesis' => array (
+    'master_thesis' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'manuscript' => array (
+    'manuscript' => array(
         'toplevel' => 1,
         'oai_name' => ''
     ),
-    'map' => array (
+    'map' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'monograph' => array (
+    'monograph' => array(
         'toplevel' => 1,
         'oai_name' => ''
     ),
-    'month' => array (
+    'month' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'multivolume_work' => array (
+    'multivolume_work' => array(
         'toplevel' => 1,
         'oai_name' => ''
     ),
-    'musical_notation' => array (
+    'musical_notation' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'newspaper' => array (
+    'newspaper' => array(
         'toplevel' => 1,
         'oai_name' => ''
     ),
-    'note' => array (
+    'note' => array(
         'toplevel' => 0,
         'oai_name' => '',
     ),
-    'official_notification' => array (
+    'official_notification' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'ornament' => array (
+    'ornament' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'paper' => array (
+    'paper' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'paste_down' => array (
+    'paste_down' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'periodical' => array (
+    'periodical' => array(
         'toplevel' => 1,
         'oai_name' => ''
     ),
-    'photograph' => array (
+    'photograph' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'plan' => array (
+    'plan' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'poster' => array (
+    'poster' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'preface' => array (
+    'preface' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'preprint' => array (
+    'preprint' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'printed_archives' => array (
+    'printed_archives' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'printers_mark' => array (
+    'printers_mark' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'privileges' => array (
+    'privileges' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'proceeding' => array (
+    'proceeding' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'provenance' => array (
+    'provenance' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'register' => array (
+    'register' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'report' => array (
+    'report' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'research_paper' => array (
+    'research_paper' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'scheme' => array (
+    'scheme' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'seal' => array (
+    'seal' => array(
         'toplevel' => 0,
         'oai_name' => '',
     ),
-    'section' => array (
+    'section' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'spine' => array (
+    'spine' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'stamp' => array (
+    'stamp' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'study' => array (
+    'study' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'table' => array (
+    'table' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'text' => array (
+    'text' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'title_page' => array (
+    'title_page' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'verse' => array (
+    'verse' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'volume' => array (
+    'volume' => array(
         'toplevel' => 1,
         'oai_name' => ''
     ),
-    'year' => array (
+    'year' => array(
         'toplevel' => 1,
         'oai_name' => ''
     )

modules/newclient/index.php

Indentation +382 added lines, -382 removed lines

@@ -19,489 +19,489 @@
  */
 class tx_dlf_modNewclient extends tx_dlf_module {
 
-    protected $modPath = 'newclient/';
+	protected $modPath = 'newclient/';
 
-    protected $buttonArray = array (
-        'SHORTCUT' => '',
-    );
+	protected $buttonArray = array (
+		'SHORTCUT' => '',
+	);
 
-    protected $markerArray = array (
-        'CSH' => '',
-        'MOD_MENU' => '',
-        'CONTENT' => '',
-    );
+	protected $markerArray = array (
+		'CSH' => '',
+		'MOD_MENU' => '',
+		'CONTENT' => '',
+	);
 
-    /**
-     * Add access rights
-     *
-     * @access	protected
-     *
-     * @return	void
-     */
-    protected function cmdAddAccessRights() {
+	/**
+	 * Add access rights
+	 *
+	 * @access	protected
+	 *
+	 * @return	void
+	 */
+	protected function cmdAddAccessRights() {
 
-        // Get command line indexer's usergroup.
-        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                'uid,db_mountpoints',
-                'be_groups',
-                'title='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_groups').' AND '.$GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'].'=0'.\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_groups')
-        );
+		// Get command line indexer's usergroup.
+		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+				'uid,db_mountpoints',
+				'be_groups',
+				'title='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_groups').' AND '.$GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'].'=0'.\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_groups')
+		);
 
-        if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+		if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-            $resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
+			$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
-            // Add current page to mountpoints.
-            if (!\TYPO3\CMS\Core\Utility\GeneralUtility::inList($resArray['db_mountpoints'], $this->id)) {
+			// Add current page to mountpoints.
+			if (!\TYPO3\CMS\Core\Utility\GeneralUtility::inList($resArray['db_mountpoints'], $this->id)) {
 
-                $data['be_groups'][$resArray['uid']]['db_mountpoints'] = $resArray['db_mountpoints'].','.$this->id;
+				$data['be_groups'][$resArray['uid']]['db_mountpoints'] = $resArray['db_mountpoints'].','.$this->id;
 
-                tx_dlf_helper::processDBasAdmin($data);
+				tx_dlf_helper::processDBasAdmin($data);
 
-                // Fine.
-                $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    tx_dlf_helper::getLL('flash.usergroupAddedMsg'),
-                    tx_dlf_helper::getLL('flash.usergroupAdded', TRUE),
-                    \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                    FALSE
-                );
+				// Fine.
+				$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+					tx_dlf_helper::getLL('flash.usergroupAddedMsg'),
+					tx_dlf_helper::getLL('flash.usergroupAdded', TRUE),
+					\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+					FALSE
+				);
 
-                tx_dlf_helper::addMessage($_message);
+				tx_dlf_helper::addMessage($_message);
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Add metadata configuration
-     *
-     * @access	protected
-     *
-     * @return	void
-     */
-    protected function cmdAddMetadata() {
+	/**
+	 * Add metadata configuration
+	 *
+	 * @access	protected
+	 *
+	 * @return	void
+	 */
+	protected function cmdAddMetadata() {
 
-        // Include metadata definition file.
-        include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey).'modules/'.$this->modPath.'metadata.inc.php');
-
-        $i = 0;
+		// Include metadata definition file.
+		include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey).'modules/'.$this->modPath.'metadata.inc.php');
+
+		$i = 0;
 
-        // Build data array.
-        foreach ($metadata as $index_name => $values) {
+		// Build data array.
+		foreach ($metadata as $index_name => $values) {
 
-            $formatIds = array ();
+			$formatIds = array ();
 
-            foreach ($values['format'] as $format) {
-
-                $formatIds[] = uniqid('NEW');
-
-                $data['tx_dlf_metadataformat'][end($formatIds)] = $format;
-
-                $data['tx_dlf_metadataformat'][end($formatIds)]['pid'] = intval($this->id);
+			foreach ($values['format'] as $format) {
+
+				$formatIds[] = uniqid('NEW');
+
+				$data['tx_dlf_metadataformat'][end($formatIds)] = $format;
+
+				$data['tx_dlf_metadataformat'][end($formatIds)]['pid'] = intval($this->id);
 
-                $i++;
+				$i++;
 
-            }
+			}
 
-            $data['tx_dlf_metadata'][uniqid('NEW')] = array (
-                'pid' => intval($this->id),
-                'label' => $GLOBALS['LANG']->getLL($index_name),
-                'index_name' => $index_name,
-                'format' => implode(',', $formatIds),
-                'default_value' => $values['default_value'],
-                'wrap' => (!empty($values['wrap']) ? $values['wrap'] : $GLOBALS['TCA']['tx_dlf_metadata']['columns']['wrap']['config']['default']),
-                'index_tokenized' => $values['index_tokenized'],
-                'index_stored' => $values['index_stored'],
-                'index_indexed' => $values['index_indexed'],
-                'index_boost' => $values['index_boost'],
-                'is_sortable' => $values['is_sortable'],
-                'is_facet' => $values['is_facet'],
-                'is_listed' => $values['is_listed'],
-                'index_autocomplete' => $values['index_autocomplete'],
-            );
-
-            $i++;
-
-        }
-
-        $_ids = tx_dlf_helper::processDBasAdmin($data);
-
-        // Check for failed inserts.
-        if (count($_ids) == $i) {
-
-            // Fine.
-            $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                tx_dlf_helper::getLL('flash.metadataAddedMsg'),
-                tx_dlf_helper::getLL('flash.metadataAdded', TRUE),
-                \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                FALSE
-            );
+			$data['tx_dlf_metadata'][uniqid('NEW')] = array (
+				'pid' => intval($this->id),
+				'label' => $GLOBALS['LANG']->getLL($index_name),
+				'index_name' => $index_name,
+				'format' => implode(',', $formatIds),
+				'default_value' => $values['default_value'],
+				'wrap' => (!empty($values['wrap']) ? $values['wrap'] : $GLOBALS['TCA']['tx_dlf_metadata']['columns']['wrap']['config']['default']),
+				'index_tokenized' => $values['index_tokenized'],
+				'index_stored' => $values['index_stored'],
+				'index_indexed' => $values['index_indexed'],
+				'index_boost' => $values['index_boost'],
+				'is_sortable' => $values['is_sortable'],
+				'is_facet' => $values['is_facet'],
+				'is_listed' => $values['is_listed'],
+				'index_autocomplete' => $values['index_autocomplete'],
+			);
+
+			$i++;
+
+		}
+
+		$_ids = tx_dlf_helper::processDBasAdmin($data);
+
+		// Check for failed inserts.
+		if (count($_ids) == $i) {
+
+			// Fine.
+			$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+				tx_dlf_helper::getLL('flash.metadataAddedMsg'),
+				tx_dlf_helper::getLL('flash.metadataAdded', TRUE),
+				\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+				FALSE
+			);
 
-        } else {
+		} else {
 
-            // Something went wrong.
-            $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                tx_dlf_helper::getLL('flash.metadataNotAddedMsg'),
-                tx_dlf_helper::getLL('flash.metadataNotAdded', TRUE),
-                \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                FALSE
-            );
-
-        }
-
-        tx_dlf_helper::addMessage($_message);
-
-    }
-
-    /**
-     * Add Solr core
-     *
-     * @access	protected
-     *
-     * @return	void
-     */
-    protected function cmdAddSolrCore() {
+			// Something went wrong.
+			$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+				tx_dlf_helper::getLL('flash.metadataNotAddedMsg'),
+				tx_dlf_helper::getLL('flash.metadataNotAdded', TRUE),
+				\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+				FALSE
+			);
+
+		}
+
+		tx_dlf_helper::addMessage($_message);
+
+	}
+
+	/**
+	 * Add Solr core
+	 *
+	 * @access	protected
+	 *
+	 * @return	void
+	 */
+	protected function cmdAddSolrCore() {
 
-        // Build data array.
-        $data['tx_dlf_solrcores'][uniqid('NEW')] = array (
-            'pid' => intval($this->id),
-            'label' => $GLOBALS['LANG']->getLL('solrcore').' (PID '.$this->id.')',
-            'index_name' => '',
-        );
-
-        $_ids = tx_dlf_helper::processDBasAdmin($data);
-
-        // Check for failed inserts.
-        if (count($_ids) == 1) {
-
-            // Fine.
-            $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                tx_dlf_helper::getLL('flash.solrcoreAddedMsg'),
-                tx_dlf_helper::getLL('flash.solrcoreAdded', TRUE),
-                \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                FALSE
-            );
-
-        } else {
-
-            // Something went wrong.
-            $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                tx_dlf_helper::getLL('flash.solrcoreNotAddedMsg'),
-                tx_dlf_helper::getLL('flash.solrcoreNotAdded', TRUE),
-                \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                FALSE
-            );
-
-        }
-
-        tx_dlf_helper::addMessage($_message);
-
-    }
-
-    /**
-     * Add structure configuration
-     *
-     * @access	protected
-     *
-     * @return	void
-     */
-    protected function cmdAddStructure() {
+		// Build data array.
+		$data['tx_dlf_solrcores'][uniqid('NEW')] = array (
+			'pid' => intval($this->id),
+			'label' => $GLOBALS['LANG']->getLL('solrcore').' (PID '.$this->id.')',
+			'index_name' => '',
+		);
+
+		$_ids = tx_dlf_helper::processDBasAdmin($data);
+
+		// Check for failed inserts.
+		if (count($_ids) == 1) {
+
+			// Fine.
+			$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+				tx_dlf_helper::getLL('flash.solrcoreAddedMsg'),
+				tx_dlf_helper::getLL('flash.solrcoreAdded', TRUE),
+				\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+				FALSE
+			);
+
+		} else {
+
+			// Something went wrong.
+			$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+				tx_dlf_helper::getLL('flash.solrcoreNotAddedMsg'),
+				tx_dlf_helper::getLL('flash.solrcoreNotAdded', TRUE),
+				\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+				FALSE
+			);
+
+		}
+
+		tx_dlf_helper::addMessage($_message);
+
+	}
+
+	/**
+	 * Add structure configuration
+	 *
+	 * @access	protected
+	 *
+	 * @return	void
+	 */
+	protected function cmdAddStructure() {
 
-        // Include structure definition file.
-        include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey).'modules/'.$this->modPath.'structures.inc.php');
+		// Include structure definition file.
+		include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey).'modules/'.$this->modPath.'structures.inc.php');
 
-        // Build data array.
-        foreach ($structures as $index_name => $values) {
+		// Build data array.
+		foreach ($structures as $index_name => $values) {
 
-            $data['tx_dlf_structures'][uniqid('NEW')] = array (
-                'pid' => intval($this->id),
-                'toplevel' => $values['toplevel'],
-                'label' => $GLOBALS['LANG']->getLL($index_name),
-                'index_name' => $index_name,
-                'oai_name' => $values['oai_name'],
-                'thumbnail' => 0,
-            );
+			$data['tx_dlf_structures'][uniqid('NEW')] = array (
+				'pid' => intval($this->id),
+				'toplevel' => $values['toplevel'],
+				'label' => $GLOBALS['LANG']->getLL($index_name),
+				'index_name' => $index_name,
+				'oai_name' => $values['oai_name'],
+				'thumbnail' => 0,
+			);
 
-        }
-
-        $_ids = tx_dlf_helper::processDBasAdmin($data);
-
-        // Check for failed inserts.
-        if (count($_ids) == count($structures)) {
+		}
+
+		$_ids = tx_dlf_helper::processDBasAdmin($data);
+
+		// Check for failed inserts.
+		if (count($_ids) == count($structures)) {
 
-            // Fine.
-            $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                tx_dlf_helper::getLL('flash.structureAddedMsg'),
-                tx_dlf_helper::getLL('flash.structureAdded', TRUE),
-                \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                FALSE
-            );
+			// Fine.
+			$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+				tx_dlf_helper::getLL('flash.structureAddedMsg'),
+				tx_dlf_helper::getLL('flash.structureAdded', TRUE),
+				\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+				FALSE
+			);
 
-        } else {
+		} else {
 
-            // Something went wrong.
-            $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                tx_dlf_helper::getLL('flash.structureNotAddedMsg'),
-                tx_dlf_helper::getLL('flash.structureNotAdded', TRUE),
-                \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                FALSE
-            );
+			// Something went wrong.
+			$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+				tx_dlf_helper::getLL('flash.structureNotAddedMsg'),
+				tx_dlf_helper::getLL('flash.structureNotAdded', TRUE),
+				\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+				FALSE
+			);
 
-        }
+		}
 
-        tx_dlf_helper::addMessage($_message);
+		tx_dlf_helper::addMessage($_message);
 
-    }
+	}
 
-    /**
-     * Main function of the module
-     *
-     * @access	public
-     *
-     * @return	void
-     */
-    public function main() {
+	/**
+	 * Main function of the module
+	 *
+	 * @access	public
+	 *
+	 * @return	void
+	 */
+	public function main() {
 
-        // Is the user allowed to access this page?
-        $access = is_array($this->pageInfo) && $GLOBALS['BE_USER']->isAdmin();
+		// Is the user allowed to access this page?
+		$access = is_array($this->pageInfo) && $GLOBALS['BE_USER']->isAdmin();
 
-        if ($this->id && $access) {
+		if ($this->id && $access) {
 
-            // Check if page is sysfolder.
-            if ($this->pageInfo['doktype'] != 254) {
+			// Check if page is sysfolder.
+			if ($this->pageInfo['doktype'] != 254) {
 
-                $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    tx_dlf_helper::getLL('flash.wrongPageTypeMsg'),
-                    tx_dlf_helper::getLL('flash.wrongPageType', TRUE),
-                    \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                    FALSE
-                );
+				$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+					tx_dlf_helper::getLL('flash.wrongPageTypeMsg'),
+					tx_dlf_helper::getLL('flash.wrongPageType', TRUE),
+					\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+					FALSE
+				);
 
-                tx_dlf_helper::addMessage($_message);
+				tx_dlf_helper::addMessage($_message);
 
-                $this->markerArray['CONTENT'] .= tx_dlf_helper::renderFlashMessages();
+				$this->markerArray['CONTENT'] .= tx_dlf_helper::renderFlashMessages();
 
-                $this->printContent();
+				$this->printContent();
 
-                return;
+				return;
 
-            }
+			}
 
-            // Should we do something?
-            if (!empty($this->CMD)) {
+			// Should we do something?
+			if (!empty($this->CMD)) {
 
-                // Sanitize input...
-                $_method = 'cmd'.ucfirst($this->CMD);
+				// Sanitize input...
+				$_method = 'cmd'.ucfirst($this->CMD);
 
-                // ...and unset to prevent infinite looping.
-                unset ($this->CMD);
+				// ...and unset to prevent infinite looping.
+				unset ($this->CMD);
 
-                if (method_exists($this, $_method)) {
+				if (method_exists($this, $_method)) {
 
-                    $this->$_method();
+					$this->$_method();
 
-                }
+				}
 
-            }
+			}
 
-            // Check for existing structure configuration.
-            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                'uid',
-                'tx_dlf_structures',
-                'pid='.intval($this->id).tx_dlf_helper::whereClause('tx_dlf_structures')
-            );
+			// Check for existing structure configuration.
+			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+				'uid',
+				'tx_dlf_structures',
+				'pid='.intval($this->id).tx_dlf_helper::whereClause('tx_dlf_structures')
+			);
 
-            if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+			if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-                // Fine.
-                $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    tx_dlf_helper::getLL('flash.structureOkayMsg'),
-                    tx_dlf_helper::getLL('flash.structureOkay', TRUE),
-                    \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                    FALSE
-                );
+				// Fine.
+				$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+					tx_dlf_helper::getLL('flash.structureOkayMsg'),
+					tx_dlf_helper::getLL('flash.structureOkay', TRUE),
+					\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+					FALSE
+				);
 
-            } else {
+			} else {
 
-                // Configuration missing.
-                $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addStructure')));
+				// Configuration missing.
+				$_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addStructure')));
 
-                $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    sprintf(tx_dlf_helper::getLL('flash.structureNotOkayMsg'), $_url),
-                    tx_dlf_helper::getLL('flash.structureNotOkay', TRUE),
-                    \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                    FALSE
-                );
+				$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+					sprintf(tx_dlf_helper::getLL('flash.structureNotOkayMsg'), $_url),
+					tx_dlf_helper::getLL('flash.structureNotOkay', TRUE),
+					\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+					FALSE
+				);
 
-            }
+			}
 
-            tx_dlf_helper::addMessage($_message);
+			tx_dlf_helper::addMessage($_message);
 
-            // Check for existing metadata configuration.
-            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                'uid',
-                'tx_dlf_metadata',
-                'pid='.intval($this->id).tx_dlf_helper::whereClause('tx_dlf_metadata')
-            );
+			// Check for existing metadata configuration.
+			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+				'uid',
+				'tx_dlf_metadata',
+				'pid='.intval($this->id).tx_dlf_helper::whereClause('tx_dlf_metadata')
+			);
 
-            if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+			if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-                // Fine.
-                $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    tx_dlf_helper::getLL('flash.metadataOkayMsg'),
-                    tx_dlf_helper::getLL('flash.metadataOkay', TRUE),
-                    \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                    FALSE
-                );
+				// Fine.
+				$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+					tx_dlf_helper::getLL('flash.metadataOkayMsg'),
+					tx_dlf_helper::getLL('flash.metadataOkay', TRUE),
+					\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+					FALSE
+				);
 
-            } else {
+			} else {
 
-                // Configuration missing.
-                $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addMetadata')));
+				// Configuration missing.
+				$_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addMetadata')));
 
-                $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    sprintf(tx_dlf_helper::getLL('flash.metadataNotOkayMsg'), $_url),
-                    tx_dlf_helper::getLL('flash.metadataNotOkay', TRUE),
-                    \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                    FALSE
-                );
+				$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+					sprintf(tx_dlf_helper::getLL('flash.metadataNotOkayMsg'), $_url),
+					tx_dlf_helper::getLL('flash.metadataNotOkay', TRUE),
+					\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+					FALSE
+				);
 
-            }
+			}
 
-            tx_dlf_helper::addMessage($_message);
+			tx_dlf_helper::addMessage($_message);
 
-            // Check the access conditions for the command line indexer's user.
-            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                'uid,db_mountpoints',
-                'be_groups',
-                'title='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_groups').' AND '.$GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'].'=0'.\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_groups')
-            );
+			// Check the access conditions for the command line indexer's user.
+			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+				'uid,db_mountpoints',
+				'be_groups',
+				'title='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_groups').' AND '.$GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'].'=0'.\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_groups')
+			);
 
-            if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+			if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-                $resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
+				$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
-                if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList($resArray['db_mountpoints'], $this->id)) {
+				if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList($resArray['db_mountpoints'], $this->id)) {
 
-                    // Fine.
-                    $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        tx_dlf_helper::getLL('flash.usergroupOkayMsg'),
-                        tx_dlf_helper::getLL('flash.usergroupOkay', TRUE),
-                        \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                        FALSE
-                    );
+					// Fine.
+					$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+						tx_dlf_helper::getLL('flash.usergroupOkayMsg'),
+						tx_dlf_helper::getLL('flash.usergroupOkay', TRUE),
+						\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+						FALSE
+					);
 
-                } else {
+				} else {
 
-                    // Configuration missing.
-                    $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addAccessRights')));
+					// Configuration missing.
+					$_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addAccessRights')));
 
-                    $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        sprintf(tx_dlf_helper::getLL('flash.usergroupNotOkayMsg'), $_url),
-                        tx_dlf_helper::getLL('flash.usergroupNotOkay', TRUE),
-                        \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                        FALSE
-                    );
+					$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+						sprintf(tx_dlf_helper::getLL('flash.usergroupNotOkayMsg'), $_url),
+						tx_dlf_helper::getLL('flash.usergroupNotOkay', TRUE),
+						\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+						FALSE
+					);
 
-                }
+				}
 
-            } else {
+			} else {
 
-                // Usergoup missing.
-                $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    tx_dlf_helper::getLL('flash.usergroupMissingMsg'),
-                    tx_dlf_helper::getLL('flash.usergroupMissing', TRUE),
-                    \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                    FALSE
-                );
+				// Usergoup missing.
+				$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+					tx_dlf_helper::getLL('flash.usergroupMissingMsg'),
+					tx_dlf_helper::getLL('flash.usergroupMissing', TRUE),
+					\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+					FALSE
+				);
 
-            }
+			}
 
-            tx_dlf_helper::addMessage($_message);
+			tx_dlf_helper::addMessage($_message);
 
-            // Check for existing Solr core.
-            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                'uid,pid',
-                'tx_dlf_solrcores',
-                'pid IN ('.intval($this->id).',0)'.tx_dlf_helper::whereClause('tx_dlf_solrcores')
-            );
+			// Check for existing Solr core.
+			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+				'uid,pid',
+				'tx_dlf_solrcores',
+				'pid IN ('.intval($this->id).',0)'.tx_dlf_helper::whereClause('tx_dlf_solrcores')
+			);
 
-            if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+			if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-                $resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
+				$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
-                if ($resArray['pid']) {
+				if ($resArray['pid']) {
 
-                    // Fine.
-                    $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        tx_dlf_helper::getLL('flash.solrcoreOkayMsg'),
-                        tx_dlf_helper::getLL('flash.solrcoreOkay', TRUE),
-                        \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                        FALSE
-                    );
+					// Fine.
+					$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+						tx_dlf_helper::getLL('flash.solrcoreOkayMsg'),
+						tx_dlf_helper::getLL('flash.solrcoreOkay', TRUE),
+						\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+						FALSE
+					);
 
-                } else {
+				} else {
 
-                    // Default core available, but this is deprecated.
-                    $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addSolrcore')));
+					// Default core available, but this is deprecated.
+					$_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addSolrcore')));
 
-                    $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        sprintf(tx_dlf_helper::getLL('flash.solrcoreDeprecatedMsg'), $_url),
-                        tx_dlf_helper::getLL('flash.solrcoreDeprecatedOkay', TRUE),
-                        \TYPO3\CMS\Core\Messaging\FlashMessage::NOTICE,
-                        FALSE
-                    );
+					$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+						sprintf(tx_dlf_helper::getLL('flash.solrcoreDeprecatedMsg'), $_url),
+						tx_dlf_helper::getLL('flash.solrcoreDeprecatedOkay', TRUE),
+						\TYPO3\CMS\Core\Messaging\FlashMessage::NOTICE,
+						FALSE
+					);
 
-                }
+				}
 
-            } else {
+			} else {
 
-                // Solr core missing.
-                $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addSolrcore')));
+				// Solr core missing.
+				$_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addSolrcore')));
 
-                $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    sprintf(tx_dlf_helper::getLL('flash.solrcoreMissingMsg'), $_url),
-                    tx_dlf_helper::getLL('flash.solrcoreMissing', TRUE),
-                    \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
-                    FALSE
-                );
+				$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+					sprintf(tx_dlf_helper::getLL('flash.solrcoreMissingMsg'), $_url),
+					tx_dlf_helper::getLL('flash.solrcoreMissing', TRUE),
+					\TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
+					FALSE
+				);
 
-            }
+			}
 
-            tx_dlf_helper::addMessage($_message);
+			tx_dlf_helper::addMessage($_message);
 
-            $this->markerArray['CONTENT'] .= tx_dlf_helper::renderFlashMessages();
+			$this->markerArray['CONTENT'] .= tx_dlf_helper::renderFlashMessages();
 
-        } else {
+		} else {
 
-            // TODO: Ändern!
-            $this->markerArray['CONTENT'] .= 'You are not allowed to access this page or have not selected a page, yet.';
+			// TODO: Ändern!
+			$this->markerArray['CONTENT'] .= 'You are not allowed to access this page or have not selected a page, yet.';
 
-        }
+		}
 
-        $this->printContent();
+		$this->printContent();
 
-    }
+	}
 
 }
 

Spacing +11 added lines, -11 removed lines

@@ -21,11 +21,11 @@ 
 
     protected $modPath = 'newclient/';
 
-    protected $buttonArray = array (
+    protected $buttonArray = array(
         'SHORTCUT' => '',
     );
 
-    protected $markerArray = array (
+    protected $markerArray = array(
         'CSH' => '',
         'MOD_MENU' => '',
         'CONTENT' => '',
@@ -92,7 +92,7 @@ 
         // Build data array.
         foreach ($metadata as $index_name => $values) {
 
-            $formatIds = array ();
+            $formatIds = array();
 
             foreach ($values['format'] as $format) {
 
@@ -106,7 +106,7 @@ 
 
             }
 
-            $data['tx_dlf_metadata'][uniqid('NEW')] = array (
+            $data['tx_dlf_metadata'][uniqid('NEW')] = array(
                 'pid' => intval($this->id),
                 'label' => $GLOBALS['LANG']->getLL($index_name),
                 'index_name' => $index_name,
@@ -168,7 +168,7 @@ 
     protected function cmdAddSolrCore() {
 
         // Build data array.
-        $data['tx_dlf_solrcores'][uniqid('NEW')] = array (
+        $data['tx_dlf_solrcores'][uniqid('NEW')] = array(
             'pid' => intval($this->id),
             'label' => $GLOBALS['LANG']->getLL('solrcore').' (PID '.$this->id.')',
             'index_name' => '',
@@ -220,7 +220,7 @@ 
         // Build data array.
         foreach ($structures as $index_name => $values) {
 
-            $data['tx_dlf_structures'][uniqid('NEW')] = array (
+            $data['tx_dlf_structures'][uniqid('NEW')] = array(
                 'pid' => intval($this->id),
                 'toplevel' => $values['toplevel'],
                 'label' => $GLOBALS['LANG']->getLL($index_name),
@@ -335,7 +335,7 @@ 
             } else {
 
                 // Configuration missing.
-                $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addStructure')));
+                $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array('id' => $this->id, 'CMD' => 'addStructure')));
 
                 $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                     'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
@@ -370,7 +370,7 @@ 
             } else {
 
                 // Configuration missing.
-                $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addMetadata')));
+                $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array('id' => $this->id, 'CMD' => 'addMetadata')));
 
                 $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                     'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
@@ -409,7 +409,7 @@ 
                 } else {
 
                     // Configuration missing.
-                    $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addAccessRights')));
+                    $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array('id' => $this->id, 'CMD' => 'addAccessRights')));
 
                     $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                         'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
@@ -461,7 +461,7 @@ 
                 } else {
 
                     // Default core available, but this is deprecated.
-                    $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addSolrcore')));
+                    $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array('id' => $this->id, 'CMD' => 'addSolrcore')));
 
                     $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                         'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
@@ -476,7 +476,7 @@ 
             } else {
 
                 // Solr core missing.
-                $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addSolrcore')));
+                $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array('id' => $this->id, 'CMD' => 'addSolrcore')));
 
                 $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                     'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',

modules/newclient/metadata.inc.php

Indentation +324 added lines, -324 removed lines

@@ -12,328 +12,328 @@
 // Define metadata elements.
 // @see http://dfg-viewer.de/en/profile-of-the-metadata/
 $metadata = array (
-    'type' => array (
-        'format' => array (),
-        'default_value' => '',
-        'wrap' => '',
-        'index_tokenized' => 0,
-        'index_stored' => 1,
-        'index_indexed' => 0,
-        'index_boost' => 1.00,
-        'is_sortable' => 1,
-        'is_facet' => 1,
-        'is_listed' => 1,
-        'index_autocomplete' => 0,
-    ),
-    'title' => array (
-        'format' => array (
-            array (
-                'encoded' => 1,
-                'xpath' => 'concat(./mods:titleInfo/mods:nonSort," ",./mods:titleInfo/mods:title)',
-                'xpath_sorting' => './mods:titleInfo/mods:title',
-            ),
-            array (
-                'encoded' => 2,
-                'xpath' => './teihdr:fileDesc/teihdr:sourceDesc/teihdr:msDesc/teihdr:head/teihdr:note[@type="caption"]',
-                'xpath_sorting' => '',
-            ),
-        ),
-        'default_value' => '',
-        'wrap' => "key.wrap = <dt class=\"tx-dlf-metadata-title\">|</dt>\nvalue.required = 1\nvalue.wrap = <dd class=\"tx-dlf-metadata-title\">|</dd>",
-        'index_tokenized' => 1,
-        'index_stored' => 1,
-        'index_indexed' => 1,
-        'index_boost' => 2.00,
-        'is_sortable' => 1,
-        'is_facet' => 0,
-        'is_listed' => 1,
-        'index_autocomplete' => 1,
-    ),
-    'volume' => array (
-        'format' => array (
-            array (
-                'encoded' => 1,
-                'xpath' => './mods:part/mods:detail/mods:number',
-                'xpath_sorting' => './mods:part[@type="host"]/@order',
-            ),
-        ),
-        'default_value' => '',
-        'wrap' => '',
-        'index_tokenized' => 0,
-        'index_stored' => 1,
-        'index_indexed' => 0,
-        'index_boost' => 1.00,
-        'is_sortable' => 1,
-        'is_facet' => 0,
-        'is_listed' => 1,
-        'index_autocomplete' => 0,
-    ),
-    'author' => array (
-        'format' => array (
-            array (
-                'encoded' => 2,
-                'xpath' => './teihdr:fileDesc/teihdr:sourceDesc/teihdr:msDesc/teihdr:head/teihdr:name',
-                'xpath_sorting' => '',
-            ),
-        ),
-        'default_value' => '',
-        'wrap' => '',
-        'index_tokenized' => 1,
-        'index_stored' => 1,
-        'index_indexed' => 1,
-        'index_boost' => 2.00,
-        'is_sortable' => 1,
-        'is_facet' => 1,
-        'is_listed' => 1,
-        'index_autocomplete' => 1,
-    ),
-    'place' => array (
-        'format' => array (
-            array (
-                'encoded' => 2,
-                'xpath' => './teihdr:fileDesc/teihdr:sourceDesc/teihdr:msDesc/teihdr:head/teihdr:origPlace',
-                'xpath_sorting' => '',
-            ),
-        ),
-        'default_value' => '',
-        'wrap' => '',
-        'index_tokenized' => 1,
-        'index_stored' => 1,
-        'index_indexed' => 1,
-        'index_boost' => 1.00,
-        'is_sortable' => 1,
-        'is_facet' => 1,
-        'is_listed' => 1,
-        'index_autocomplete' => 0,
-    ),
-    'year' => array (
-        'format' => array (
-            array (
-                'encoded' => 2,
-                'xpath' => './teihdr:fileDesc/teihdr:sourceDesc/teihdr:msDesc/teihdr:head/teihdr:origDate',
-                'xpath_sorting' => './teihdr:fileDesc/teihdr:sourceDesc/teihdr:msDesc/teihdr:head/teihdr:origDate/@when',
-            ),
-        ),
-        'default_value' => '',
-        'wrap' => '',
-        'index_tokenized' => 0,
-        'index_stored' => 1,
-        'index_indexed' => 1,
-        'index_boost' => 1.00,
-        'is_sortable' => 1,
-        'is_facet' => 1,
-        'is_listed' => 1,
-        'index_autocomplete' => 0,
-    ),
-    'language' => array (
-        'format' => array (
-            array (
-                'encoded' => 1,
-                'xpath' => './mods:language/mods:languageTerm',
-                'xpath_sorting' => '',
-            ),
-        ),
-        'default_value' => '',
-        'wrap' => '',
-        'index_tokenized' => 0,
-        'index_stored' => 0,
-        'index_indexed' => 1,
-        'index_boost' => 1.00,
-        'is_sortable' => 0,
-        'is_facet' => 1,
-        'is_listed' => 0,
-        'index_autocomplete' => 0,
-    ),
-    'collection' => array (
-        'format' => array (
-            array (
-                'encoded' => 1,
-                'xpath' => './mods:classification',
-                'xpath_sorting' => '',
-            ),
-            array (
-                'encoded' => 2,
-                'xpath' => './teihdr:fileDesc/teihdr:sourceDesc/teihdr:msDesc/teihdr:msIdentifier/teihdr:collection',
-                'xpath_sorting' => '',
-            ),
-        ),
-        'default_value' => '',
-        'wrap' => '',
-        'index_tokenized' => 1,
-        'index_stored' => 0,
-        'index_indexed' => 1,
-        'index_boost' => 1.00,
-        'is_sortable' => 0,
-        'is_facet' => 1,
-        'is_listed' => 0,
-        'index_autocomplete' => 0,
-    ),
-    'owner' => array (
-        'format' => array (
-            array (
-                'encoded' => 1,
-                'xpath' => './mods:name[./mods:role/mods:roleTerm="own"]/mods:displayForm',
-                'xpath_sorting' => '',
-            ),
-            array (
-                'encoded' => 2,
-                'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:publisher',
-                'xpath_sorting' => '',
-            ),
-        ),
-        'default_value' => '',
-        'wrap' => '',
-        'index_tokenized' => 0,
-        'index_stored' => 0,
-        'index_indexed' => 1,
-        'index_boost' => 1.00,
-        'is_sortable' => 0,
-        'is_facet' => 1,
-        'is_listed' => 0,
-        'index_autocomplete' => 0,
-    ),
-    'purl' => array (
-        'format' => array (
-            array (
-                'encoded' => 1,
-                'xpath' => './mods:identifier[@type="purl"]',
-                'xpath_sorting' => '',
-            ),
-            array (
-                'encoded' => 2,
-                'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:idno[@type="purl"]',
-                'xpath_sorting' => '',
-            ),
-        ),
-        'default_value' => '',
-        'wrap' => "key.wrap = <dt>|</dt>\nvalue.required = 1\nvalue.setContentToCurrent = 1\nvalue.typolink.parameter.current = 1\nvalue.wrap = <dd>|</dd>",
-        'index_tokenized' => 0,
-        'index_stored' => 0,
-        'index_indexed' => 0,
-        'index_boost' => 1.00,
-        'is_sortable' => 0,
-        'is_facet' => 0,
-        'is_listed' => 0,
-        'index_autocomplete' => 0,
-    ),
-    'urn' => array (
-        'format' => array (
-            array (
-                'encoded' => 1,
-                'xpath' => './mods:identifier[@type="urn"]',
-                'xpath_sorting' => '',
-            ),
-            array (
-                'encoded' => 2,
-                'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:idno[@type="urn"]',
-                'xpath_sorting' => '',
-            ),
-        ),
-        'default_value' => '',
-        'wrap' => "key.wrap = <dt>|</dt>\nvalue.required = 1\nvalue.setContentToCurrent = 1\nvalue.typolink.parameter.current = 1\nvalue.typolink.parameter.prepend = TEXT\nvalue.typolink.parameter.prepend.value = http://nbn-resolving.de/\nvalue.wrap = <dd>|</dd>",
-        'index_tokenized' => 0,
-        'index_stored' => 0,
-        'index_indexed' => 1,
-        'index_boost' => 1.00,
-        'is_sortable' => 0,
-        'is_facet' => 0,
-        'is_listed' => 0,
-        'index_autocomplete' => 0,
-    ),
-    'opac_id' => array (
-        'format' => array (
-            array (
-                'encoded' => 1,
-                'xpath' => './mods:identifier[@type="opac"]',
-                'xpath_sorting' => '',
-            ),
-            array (
-                'encoded' => 2,
-                'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:idno[@type="opac"]',
-                'xpath_sorting' => '',
-            ),
-        ),
-        'default_value' => '',
-        'wrap' => '',
-        'index_tokenized' => 0,
-        'index_stored' => 0,
-        'index_indexed' => 1,
-        'index_boost' => 1.00,
-        'is_sortable' => 0,
-        'is_facet' => 0,
-        'is_listed' => 0,
-        'index_autocomplete' => 0,
-    ),
-    'union_id' => array (
-        'format' => array (
-            array (
-                'encoded' => 1,
-                'xpath' => './mods:identifier[@type="ppn"]',
-                'xpath_sorting' => '',
-            ),
-            array (
-                'encoded' => 2,
-                'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:idno[@type="mmid"]',
-                'xpath_sorting' => '',
-            ),
-        ),
-        'default_value' => '',
-        'wrap' => '',
-        'index_tokenized' => 0,
-        'index_stored' => 0,
-        'index_indexed' => 1,
-        'index_boost' => 1.00,
-        'is_sortable' => 0,
-        'is_facet' => 0,
-        'is_listed' => 0,
-        'index_autocomplete' => 0,
-    ),
-    'record_id' => array (
-        'format' => array (
-            array (
-                'encoded' => 1,
-                'xpath' => './mods:recordInfo/mods:recordIdentifier',
-                'xpath_sorting' => '',
-            ),
-            array (
-                'encoded' => 2,
-                'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:idno[@type="recordIdentifier"]',
-                'xpath_sorting' => '',
-            ),
-        ),
-        'default_value' => '',
-        'wrap' => '',
-        'index_tokenized' => 0,
-        'index_stored' => 0,
-        'index_indexed' => 1,
-        'index_boost' => 1.00,
-        'is_sortable' => 0,
-        'is_facet' => 0,
-        'is_listed' => 0,
-        'index_autocomplete' => 0,
-    ),
-    'prod_id' => array (
-        'format' => array (
-            array (
-                'encoded' => 1,
-                'xpath' => './mods:identifier[@type="goobi"]',
-                'xpath_sorting' => '',
-            ),
-            array (
-                'encoded' => 2,
-                'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:idno[@type="goobi"]',
-                'xpath_sorting' => '',
-            ),
-        ),
-        'default_value' => '',
-        'wrap' => '',
-        'index_tokenized' => 0,
-        'index_stored' => 0,
-        'index_indexed' => 0,
-        'index_boost' => 0.00,
-        'is_sortable' => 0,
-        'is_facet' => 0,
-        'is_listed' => 0,
-        'index_autocomplete' => 0,
-    )
+	'type' => array (
+		'format' => array (),
+		'default_value' => '',
+		'wrap' => '',
+		'index_tokenized' => 0,
+		'index_stored' => 1,
+		'index_indexed' => 0,
+		'index_boost' => 1.00,
+		'is_sortable' => 1,
+		'is_facet' => 1,
+		'is_listed' => 1,
+		'index_autocomplete' => 0,
+	),
+	'title' => array (
+		'format' => array (
+			array (
+				'encoded' => 1,
+				'xpath' => 'concat(./mods:titleInfo/mods:nonSort," ",./mods:titleInfo/mods:title)',
+				'xpath_sorting' => './mods:titleInfo/mods:title',
+			),
+			array (
+				'encoded' => 2,
+				'xpath' => './teihdr:fileDesc/teihdr:sourceDesc/teihdr:msDesc/teihdr:head/teihdr:note[@type="caption"]',
+				'xpath_sorting' => '',
+			),
+		),
+		'default_value' => '',
+		'wrap' => "key.wrap = <dt class=\"tx-dlf-metadata-title\">|</dt>\nvalue.required = 1\nvalue.wrap = <dd class=\"tx-dlf-metadata-title\">|</dd>",
+		'index_tokenized' => 1,
+		'index_stored' => 1,
+		'index_indexed' => 1,
+		'index_boost' => 2.00,
+		'is_sortable' => 1,
+		'is_facet' => 0,
+		'is_listed' => 1,
+		'index_autocomplete' => 1,
+	),
+	'volume' => array (
+		'format' => array (
+			array (
+				'encoded' => 1,
+				'xpath' => './mods:part/mods:detail/mods:number',
+				'xpath_sorting' => './mods:part[@type="host"]/@order',
+			),
+		),
+		'default_value' => '',
+		'wrap' => '',
+		'index_tokenized' => 0,
+		'index_stored' => 1,
+		'index_indexed' => 0,
+		'index_boost' => 1.00,
+		'is_sortable' => 1,
+		'is_facet' => 0,
+		'is_listed' => 1,
+		'index_autocomplete' => 0,
+	),
+	'author' => array (
+		'format' => array (
+			array (
+				'encoded' => 2,
+				'xpath' => './teihdr:fileDesc/teihdr:sourceDesc/teihdr:msDesc/teihdr:head/teihdr:name',
+				'xpath_sorting' => '',
+			),
+		),
+		'default_value' => '',
+		'wrap' => '',
+		'index_tokenized' => 1,
+		'index_stored' => 1,
+		'index_indexed' => 1,
+		'index_boost' => 2.00,
+		'is_sortable' => 1,
+		'is_facet' => 1,
+		'is_listed' => 1,
+		'index_autocomplete' => 1,
+	),
+	'place' => array (
+		'format' => array (
+			array (
+				'encoded' => 2,
+				'xpath' => './teihdr:fileDesc/teihdr:sourceDesc/teihdr:msDesc/teihdr:head/teihdr:origPlace',
+				'xpath_sorting' => '',
+			),
+		),
+		'default_value' => '',
+		'wrap' => '',
+		'index_tokenized' => 1,
+		'index_stored' => 1,
+		'index_indexed' => 1,
+		'index_boost' => 1.00,
+		'is_sortable' => 1,
+		'is_facet' => 1,
+		'is_listed' => 1,
+		'index_autocomplete' => 0,
+	),
+	'year' => array (
+		'format' => array (
+			array (
+				'encoded' => 2,
+				'xpath' => './teihdr:fileDesc/teihdr:sourceDesc/teihdr:msDesc/teihdr:head/teihdr:origDate',
+				'xpath_sorting' => './teihdr:fileDesc/teihdr:sourceDesc/teihdr:msDesc/teihdr:head/teihdr:origDate/@when',
+			),
+		),
+		'default_value' => '',
+		'wrap' => '',
+		'index_tokenized' => 0,
+		'index_stored' => 1,
+		'index_indexed' => 1,
+		'index_boost' => 1.00,
+		'is_sortable' => 1,
+		'is_facet' => 1,
+		'is_listed' => 1,
+		'index_autocomplete' => 0,
+	),
+	'language' => array (
+		'format' => array (
+			array (
+				'encoded' => 1,
+				'xpath' => './mods:language/mods:languageTerm',
+				'xpath_sorting' => '',
+			),
+		),
+		'default_value' => '',
+		'wrap' => '',
+		'index_tokenized' => 0,
+		'index_stored' => 0,
+		'index_indexed' => 1,
+		'index_boost' => 1.00,
+		'is_sortable' => 0,
+		'is_facet' => 1,
+		'is_listed' => 0,
+		'index_autocomplete' => 0,
+	),
+	'collection' => array (
+		'format' => array (
+			array (
+				'encoded' => 1,
+				'xpath' => './mods:classification',
+				'xpath_sorting' => '',
+			),
+			array (
+				'encoded' => 2,
+				'xpath' => './teihdr:fileDesc/teihdr:sourceDesc/teihdr:msDesc/teihdr:msIdentifier/teihdr:collection',
+				'xpath_sorting' => '',
+			),
+		),
+		'default_value' => '',
+		'wrap' => '',
+		'index_tokenized' => 1,
+		'index_stored' => 0,
+		'index_indexed' => 1,
+		'index_boost' => 1.00,
+		'is_sortable' => 0,
+		'is_facet' => 1,
+		'is_listed' => 0,
+		'index_autocomplete' => 0,
+	),
+	'owner' => array (
+		'format' => array (
+			array (
+				'encoded' => 1,
+				'xpath' => './mods:name[./mods:role/mods:roleTerm="own"]/mods:displayForm',
+				'xpath_sorting' => '',
+			),
+			array (
+				'encoded' => 2,
+				'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:publisher',
+				'xpath_sorting' => '',
+			),
+		),
+		'default_value' => '',
+		'wrap' => '',
+		'index_tokenized' => 0,
+		'index_stored' => 0,
+		'index_indexed' => 1,
+		'index_boost' => 1.00,
+		'is_sortable' => 0,
+		'is_facet' => 1,
+		'is_listed' => 0,
+		'index_autocomplete' => 0,
+	),
+	'purl' => array (
+		'format' => array (
+			array (
+				'encoded' => 1,
+				'xpath' => './mods:identifier[@type="purl"]',
+				'xpath_sorting' => '',
+			),
+			array (
+				'encoded' => 2,
+				'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:idno[@type="purl"]',
+				'xpath_sorting' => '',
+			),
+		),
+		'default_value' => '',
+		'wrap' => "key.wrap = <dt>|</dt>\nvalue.required = 1\nvalue.setContentToCurrent = 1\nvalue.typolink.parameter.current = 1\nvalue.wrap = <dd>|</dd>",
+		'index_tokenized' => 0,
+		'index_stored' => 0,
+		'index_indexed' => 0,
+		'index_boost' => 1.00,
+		'is_sortable' => 0,
+		'is_facet' => 0,
+		'is_listed' => 0,
+		'index_autocomplete' => 0,
+	),
+	'urn' => array (
+		'format' => array (
+			array (
+				'encoded' => 1,
+				'xpath' => './mods:identifier[@type="urn"]',
+				'xpath_sorting' => '',
+			),
+			array (
+				'encoded' => 2,
+				'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:idno[@type="urn"]',
+				'xpath_sorting' => '',
+			),
+		),
+		'default_value' => '',
+		'wrap' => "key.wrap = <dt>|</dt>\nvalue.required = 1\nvalue.setContentToCurrent = 1\nvalue.typolink.parameter.current = 1\nvalue.typolink.parameter.prepend = TEXT\nvalue.typolink.parameter.prepend.value = http://nbn-resolving.de/\nvalue.wrap = <dd>|</dd>",
+		'index_tokenized' => 0,
+		'index_stored' => 0,
+		'index_indexed' => 1,
+		'index_boost' => 1.00,
+		'is_sortable' => 0,
+		'is_facet' => 0,
+		'is_listed' => 0,
+		'index_autocomplete' => 0,
+	),
+	'opac_id' => array (
+		'format' => array (
+			array (
+				'encoded' => 1,
+				'xpath' => './mods:identifier[@type="opac"]',
+				'xpath_sorting' => '',
+			),
+			array (
+				'encoded' => 2,
+				'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:idno[@type="opac"]',
+				'xpath_sorting' => '',
+			),
+		),
+		'default_value' => '',
+		'wrap' => '',
+		'index_tokenized' => 0,
+		'index_stored' => 0,
+		'index_indexed' => 1,
+		'index_boost' => 1.00,
+		'is_sortable' => 0,
+		'is_facet' => 0,
+		'is_listed' => 0,
+		'index_autocomplete' => 0,
+	),
+	'union_id' => array (
+		'format' => array (
+			array (
+				'encoded' => 1,
+				'xpath' => './mods:identifier[@type="ppn"]',
+				'xpath_sorting' => '',
+			),
+			array (
+				'encoded' => 2,
+				'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:idno[@type="mmid"]',
+				'xpath_sorting' => '',
+			),
+		),
+		'default_value' => '',
+		'wrap' => '',
+		'index_tokenized' => 0,
+		'index_stored' => 0,
+		'index_indexed' => 1,
+		'index_boost' => 1.00,
+		'is_sortable' => 0,
+		'is_facet' => 0,
+		'is_listed' => 0,
+		'index_autocomplete' => 0,
+	),
+	'record_id' => array (
+		'format' => array (
+			array (
+				'encoded' => 1,
+				'xpath' => './mods:recordInfo/mods:recordIdentifier',
+				'xpath_sorting' => '',
+			),
+			array (
+				'encoded' => 2,
+				'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:idno[@type="recordIdentifier"]',
+				'xpath_sorting' => '',
+			),
+		),
+		'default_value' => '',
+		'wrap' => '',
+		'index_tokenized' => 0,
+		'index_stored' => 0,
+		'index_indexed' => 1,
+		'index_boost' => 1.00,
+		'is_sortable' => 0,
+		'is_facet' => 0,
+		'is_listed' => 0,
+		'index_autocomplete' => 0,
+	),
+	'prod_id' => array (
+		'format' => array (
+			array (
+				'encoded' => 1,
+				'xpath' => './mods:identifier[@type="goobi"]',
+				'xpath_sorting' => '',
+			),
+			array (
+				'encoded' => 2,
+				'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:idno[@type="goobi"]',
+				'xpath_sorting' => '',
+			),
+		),
+		'default_value' => '',
+		'wrap' => '',
+		'index_tokenized' => 0,
+		'index_stored' => 0,
+		'index_indexed' => 0,
+		'index_boost' => 0.00,
+		'is_sortable' => 0,
+		'is_facet' => 0,
+		'is_listed' => 0,
+		'index_autocomplete' => 0,
+	)
 );

Spacing +54 added lines, -54 removed lines

@@ -11,9 +11,9 @@ 
 
 // Define metadata elements.
 // @see http://dfg-viewer.de/en/profile-of-the-metadata/
-$metadata = array (
-    'type' => array (
-        'format' => array (),
+$metadata = array(
+    'type' => array(
+        'format' => array(),
         'default_value' => '',
         'wrap' => '',
         'index_tokenized' => 0,
@@ -25,14 +25,14 @@ 
         'is_listed' => 1,
         'index_autocomplete' => 0,
     ),
-    'title' => array (
-        'format' => array (
-            array (
+    'title' => array(
+        'format' => array(
+            array(
                 'encoded' => 1,
                 'xpath' => 'concat(./mods:titleInfo/mods:nonSort," ",./mods:titleInfo/mods:title)',
                 'xpath_sorting' => './mods:titleInfo/mods:title',
             ),
-            array (
+            array(
                 'encoded' => 2,
                 'xpath' => './teihdr:fileDesc/teihdr:sourceDesc/teihdr:msDesc/teihdr:head/teihdr:note[@type="caption"]',
                 'xpath_sorting' => '',
@@ -49,9 +49,9 @@ 
         'is_listed' => 1,
         'index_autocomplete' => 1,
     ),
-    'volume' => array (
-        'format' => array (
-            array (
+    'volume' => array(
+        'format' => array(
+            array(
                 'encoded' => 1,
                 'xpath' => './mods:part/mods:detail/mods:number',
                 'xpath_sorting' => './mods:part[@type="host"]/@order',
@@ -68,9 +68,9 @@ 
         'is_listed' => 1,
         'index_autocomplete' => 0,
     ),
-    'author' => array (
-        'format' => array (
-            array (
+    'author' => array(
+        'format' => array(
+            array(
                 'encoded' => 2,
                 'xpath' => './teihdr:fileDesc/teihdr:sourceDesc/teihdr:msDesc/teihdr:head/teihdr:name',
                 'xpath_sorting' => '',
@@ -87,9 +87,9 @@ 
         'is_listed' => 1,
         'index_autocomplete' => 1,
     ),
-    'place' => array (
-        'format' => array (
-            array (
+    'place' => array(
+        'format' => array(
+            array(
                 'encoded' => 2,
                 'xpath' => './teihdr:fileDesc/teihdr:sourceDesc/teihdr:msDesc/teihdr:head/teihdr:origPlace',
                 'xpath_sorting' => '',
@@ -106,9 +106,9 @@ 
         'is_listed' => 1,
         'index_autocomplete' => 0,
     ),
-    'year' => array (
-        'format' => array (
-            array (
+    'year' => array(
+        'format' => array(
+            array(
                 'encoded' => 2,
                 'xpath' => './teihdr:fileDesc/teihdr:sourceDesc/teihdr:msDesc/teihdr:head/teihdr:origDate',
                 'xpath_sorting' => './teihdr:fileDesc/teihdr:sourceDesc/teihdr:msDesc/teihdr:head/teihdr:origDate/@when',
@@ -125,9 +125,9 @@ 
         'is_listed' => 1,
         'index_autocomplete' => 0,
     ),
-    'language' => array (
-        'format' => array (
-            array (
+    'language' => array(
+        'format' => array(
+            array(
                 'encoded' => 1,
                 'xpath' => './mods:language/mods:languageTerm',
                 'xpath_sorting' => '',
@@ -144,14 +144,14 @@ 
         'is_listed' => 0,
         'index_autocomplete' => 0,
     ),
-    'collection' => array (
-        'format' => array (
-            array (
+    'collection' => array(
+        'format' => array(
+            array(
                 'encoded' => 1,
                 'xpath' => './mods:classification',
                 'xpath_sorting' => '',
             ),
-            array (
+            array(
                 'encoded' => 2,
                 'xpath' => './teihdr:fileDesc/teihdr:sourceDesc/teihdr:msDesc/teihdr:msIdentifier/teihdr:collection',
                 'xpath_sorting' => '',
@@ -168,14 +168,14 @@ 
         'is_listed' => 0,
         'index_autocomplete' => 0,
     ),
-    'owner' => array (
-        'format' => array (
-            array (
+    'owner' => array(
+        'format' => array(
+            array(
                 'encoded' => 1,
                 'xpath' => './mods:name[./mods:role/mods:roleTerm="own"]/mods:displayForm',
                 'xpath_sorting' => '',
             ),
-            array (
+            array(
                 'encoded' => 2,
                 'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:publisher',
                 'xpath_sorting' => '',
@@ -192,14 +192,14 @@ 
         'is_listed' => 0,
         'index_autocomplete' => 0,
     ),
-    'purl' => array (
-        'format' => array (
-            array (
+    'purl' => array(
+        'format' => array(
+            array(
                 'encoded' => 1,
                 'xpath' => './mods:identifier[@type="purl"]',
                 'xpath_sorting' => '',
             ),
-            array (
+            array(
                 'encoded' => 2,
                 'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:idno[@type="purl"]',
                 'xpath_sorting' => '',
@@ -216,14 +216,14 @@ 
         'is_listed' => 0,
         'index_autocomplete' => 0,
     ),
-    'urn' => array (
-        'format' => array (
-            array (
+    'urn' => array(
+        'format' => array(
+            array(
                 'encoded' => 1,
                 'xpath' => './mods:identifier[@type="urn"]',
                 'xpath_sorting' => '',
             ),
-            array (
+            array(
                 'encoded' => 2,
                 'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:idno[@type="urn"]',
                 'xpath_sorting' => '',
@@ -240,14 +240,14 @@ 
         'is_listed' => 0,
         'index_autocomplete' => 0,
     ),
-    'opac_id' => array (
-        'format' => array (
-            array (
+    'opac_id' => array(
+        'format' => array(
+            array(
                 'encoded' => 1,
                 'xpath' => './mods:identifier[@type="opac"]',
                 'xpath_sorting' => '',
             ),
-            array (
+            array(
                 'encoded' => 2,
                 'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:idno[@type="opac"]',
                 'xpath_sorting' => '',
@@ -264,14 +264,14 @@ 
         'is_listed' => 0,
         'index_autocomplete' => 0,
     ),
-    'union_id' => array (
-        'format' => array (
-            array (
+    'union_id' => array(
+        'format' => array(
+            array(
                 'encoded' => 1,
                 'xpath' => './mods:identifier[@type="ppn"]',
                 'xpath_sorting' => '',
             ),
-            array (
+            array(
                 'encoded' => 2,
                 'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:idno[@type="mmid"]',
                 'xpath_sorting' => '',
@@ -288,14 +288,14 @@ 
         'is_listed' => 0,
         'index_autocomplete' => 0,
     ),
-    'record_id' => array (
-        'format' => array (
-            array (
+    'record_id' => array(
+        'format' => array(
+            array(
                 'encoded' => 1,
                 'xpath' => './mods:recordInfo/mods:recordIdentifier',
                 'xpath_sorting' => '',
             ),
-            array (
+            array(
                 'encoded' => 2,
                 'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:idno[@type="recordIdentifier"]',
                 'xpath_sorting' => '',
@@ -312,14 +312,14 @@ 
         'is_listed' => 0,
         'index_autocomplete' => 0,
     ),
-    'prod_id' => array (
-        'format' => array (
-            array (
+    'prod_id' => array(
+        'format' => array(
+            array(
                 'encoded' => 1,
                 'xpath' => './mods:identifier[@type="goobi"]',
                 'xpath_sorting' => '',
             ),
-            array (
+            array(
                 'encoded' => 2,
                 'xpath' => './teihdr:fileDesc/teihdr:publicationStmt/teihdr:idno[@type="goobi"]',
                 'xpath_sorting' => '',

modules/indexing/index.php

Indentation +243 added lines, -243 removed lines

@@ -19,363 +19,363 @@
  */
 class tx_dlf_modIndexing extends tx_dlf_module {
 
-    protected $modPath = 'indexing/';
+	protected $modPath = 'indexing/';
 
-    protected $buttonArray = array (
-        'SHORTCUT' => '',
-    );
+	protected $buttonArray = array (
+		'SHORTCUT' => '',
+	);
 
-    protected $markerArray = array (
-        'CSH' => '',
-        'MOD_MENU' => '',
-        'CONTENT' => '',
-    );
+	protected $markerArray = array (
+		'CSH' => '',
+		'MOD_MENU' => '',
+		'CONTENT' => '',
+	);
 
-    /**
-     * This holds a list of documents to index
-     *
-     * @var	tx_dlf_list
-     * @access protected
-     */
-    protected $list;
+	/**
+	 * This holds a list of documents to index
+	 *
+	 * @var	tx_dlf_list
+	 * @access protected
+	 */
+	protected $list;
 
-    /**
-     * Builds HTML form for selecting a collection
-     *
-     * @access	protected
-     *
-     * @return	string		The HTML output
-     */
-    protected function getCollList() {
+	/**
+	 * Builds HTML form for selecting a collection
+	 *
+	 * @access	protected
+	 *
+	 * @return	string		The HTML output
+	 */
+	protected function getCollList() {
 
-        // Get all available Solr cores.
-        $_cores = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            'tx_dlf_solrcores.label AS label,tx_dlf_solrcores.uid AS uid',
-            'tx_dlf_solrcores',
-            'tx_dlf_solrcores.pid IN (0,'.intval($this->id).')'.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
-            '',
-            '',
-            ''
-        );
+		// Get all available Solr cores.
+		$_cores = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'tx_dlf_solrcores.label AS label,tx_dlf_solrcores.uid AS uid',
+			'tx_dlf_solrcores',
+			'tx_dlf_solrcores.pid IN (0,'.intval($this->id).')'.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+			'',
+			'',
+			''
+		);
 
-        // Get all available collections.
-        $_collections = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            'tx_dlf_collections.label AS label,tx_dlf_collections.uid AS uid',
-            'tx_dlf_collections',
-            'tx_dlf_collections.fe_cruser_id=0 AND tx_dlf_collections.pid='.intval($this->id).tx_dlf_helper::whereClause('tx_dlf_collections'),
-            '',
-            'tx_dlf_collections.label ASC',
-            ''
-        );
+		// Get all available collections.
+		$_collections = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'tx_dlf_collections.label AS label,tx_dlf_collections.uid AS uid',
+			'tx_dlf_collections',
+			'tx_dlf_collections.fe_cruser_id=0 AND tx_dlf_collections.pid='.intval($this->id).tx_dlf_helper::whereClause('tx_dlf_collections'),
+			'',
+			'tx_dlf_collections.label ASC',
+			''
+		);
 
-        // TODO: Ändern!
-        $form = '<label for="tx-dlf-modIndexing-id">Kollektion:</label>';
+		// TODO: Ändern!
+		$form = '<label for="tx-dlf-modIndexing-id">Kollektion:</label>';
 
-        $form .= '<select id="tx-dlf-modIndexing-collection" name="'.$this->prefixId.'[collection]">';
+		$form .= '<select id="tx-dlf-modIndexing-collection" name="'.$this->prefixId.'[collection]">';
 
-        $form .= '<option value="0">Alle</option>';
+		$form .= '<option value="0">Alle</option>';
 
-        while ($_collection = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_collections)) {
+		while ($_collection = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_collections)) {
 
-            $form .= '<option value="'.$_collection['uid'].'">'.htmlspecialchars($_collection['label']).'</option>';
+			$form .= '<option value="'.$_collection['uid'].'">'.htmlspecialchars($_collection['label']).'</option>';
 
-        }
+		}
 
-        $form .= '</select><br />';
+		$form .= '</select><br />';
 
-        $form .= '<select id="tx-dlf-modIndexing-core" name="'.$this->prefixId.'[core]">';
+		$form .= '<select id="tx-dlf-modIndexing-core" name="'.$this->prefixId.'[core]">';
 
-        $form .= '<option value="0">---</option>';
+		$form .= '<option value="0">---</option>';
 
-        while ($_core = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_cores)) {
+		while ($_core = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_cores)) {
 
-            $form .= '<option value="'.$_core['uid'].'">'.htmlspecialchars($_core['label']).'</option>';
+			$form .= '<option value="'.$_core['uid'].'">'.htmlspecialchars($_core['label']).'</option>';
 
-        }
+		}
 
-        $form .= '</select><br />';
+		$form .= '</select><br />';
 
-        $form .= '<input type="hidden" name="CMD" value="reindexDocs" />';
+		$form .= '<input type="hidden" name="CMD" value="reindexDocs" />';
 
-        $form .= '<input type="submit" name="'.$this->prefixId.'[submit]" value="'.$GLOBALS['LANG']->getLL('form.submit').'" />';
+		$form .= '<input type="submit" name="'.$this->prefixId.'[submit]" value="'.$GLOBALS['LANG']->getLL('form.submit').'" />';
 
-        return $form;
+		return $form;
 
-    }
+	}
 
-    /**
-     * Builds HTML form for selecting a file
-     *
-     * @access	protected
-     *
-     * @return	string		The HTML output
-     */
-    protected function getFileForm() {
+	/**
+	 * Builds HTML form for selecting a file
+	 *
+	 * @access	protected
+	 *
+	 * @return	string		The HTML output
+	 */
+	protected function getFileForm() {
 
-        // Get all available Solr cores.
-        $_cores = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            'tx_dlf_solrcores.label AS label,tx_dlf_solrcores.uid AS uid',
-            'tx_dlf_solrcores',
-            'tx_dlf_solrcores.pid IN (0,'.intval($this->id).')'.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
-            '',
-            '',
-            ''
-        );
+		// Get all available Solr cores.
+		$_cores = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'tx_dlf_solrcores.label AS label,tx_dlf_solrcores.uid AS uid',
+			'tx_dlf_solrcores',
+			'tx_dlf_solrcores.pid IN (0,'.intval($this->id).')'.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+			'',
+			'',
+			''
+		);
 
-        // TODO: Ändern!
-        $form = '<label for="tx-dlf-modIndexing-id">METS-Datei:</label>';
+		// TODO: Ändern!
+		$form = '<label for="tx-dlf-modIndexing-id">METS-Datei:</label>';
 
-        $form .= '<input type="text" id="tx-dlf-modIndexing-id" name="'.$this->prefixId.'[id]" value="" /><br />';
+		$form .= '<input type="text" id="tx-dlf-modIndexing-id" name="'.$this->prefixId.'[id]" value="" /><br />';
 
-        $form .= '<select id="tx-dlf-modIndexing-core" name="'.$this->prefixId.'[core]">';
+		$form .= '<select id="tx-dlf-modIndexing-core" name="'.$this->prefixId.'[core]">';
 
-        $form .= '<option value="0">---</option>';
+		$form .= '<option value="0">---</option>';
 
-        while ($_core = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_cores)) {
+		while ($_core = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_cores)) {
 
-            $form .= '<option value="'.$_core['uid'].'">'.htmlspecialchars($_core['label']).'</option>';
+			$form .= '<option value="'.$_core['uid'].'">'.htmlspecialchars($_core['label']).'</option>';
 
-        }
+		}
 
-        $form .= '</select><br />';
+		$form .= '</select><br />';
 
-        $form .= '<input type="hidden" name="CMD" value="indexFile" />';
+		$form .= '<input type="hidden" name="CMD" value="indexFile" />';
 
-        $form .= '<input type="submit" name="'.$this->prefixId.'[submit]" value="'.$GLOBALS['LANG']->getLL('form.submit').'" />';
+		$form .= '<input type="submit" name="'.$this->prefixId.'[submit]" value="'.$GLOBALS['LANG']->getLL('form.submit').'" />';
 
-        return $form;
+		return $form;
 
-    }
+	}
 
-    /**
-     * Iterates through list of documents and indexes them
-     *
-     * @access	protected
-     *
-     * @return	void
-     */
-    protected function indexLoop() {
+	/**
+	 * Iterates through list of documents and indexes them
+	 *
+	 * @access	protected
+	 *
+	 * @return	void
+	 */
+	protected function indexLoop() {
 
-        // Get document from list.
-        list ($uid, $title) = $this->list->remove(0);
+		// Get document from list.
+		list ($uid, $title) = $this->list->remove(0);
 
-        $this->list->save();
+		$this->list->save();
 
-        // Save document to database and index.
-        $doc =& tx_dlf_document::getInstance($uid, 0, TRUE);
+		// Save document to database and index.
+		$doc =& tx_dlf_document::getInstance($uid, 0, TRUE);
 
-        if ($doc->ready) {
+		if ($doc->ready) {
 
-            $doc->save($doc->pid, $this->data['core']);
+			$doc->save($doc->pid, $this->data['core']);
 
-        }
+		}
 
-        // Give feedback about progress.
-        $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-            'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-            htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.documentsToGo'), count($this->list))),
-            tx_dlf_helper::getLL('flash.running', TRUE),
-            \TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
-            TRUE
-        );
+		// Give feedback about progress.
+		$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+			'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+			htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.documentsToGo'), count($this->list))),
+			tx_dlf_helper::getLL('flash.running', TRUE),
+			\TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
+			TRUE
+		);
 
-        $this->markerArray['CONTENT'] .= $_message->render();
+		$this->markerArray['CONTENT'] .= $_message->render();
 
-        // Start next loop.
-        $this->markerArray['CONTENT'] .= '<script type="text/javascript">window.location.href=unescape("'.\TYPO3\CMS\Core\Utility\GeneralUtility::rawUrlEncodeJS(\TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'indexLoop', $this->prefixId => array ('core' => $this->data['core']), 'random' => uniqid())))).'");</script>';
+		// Start next loop.
+		$this->markerArray['CONTENT'] .= '<script type="text/javascript">window.location.href=unescape("'.\TYPO3\CMS\Core\Utility\GeneralUtility::rawUrlEncodeJS(\TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'indexLoop', $this->prefixId => array ('core' => $this->data['core']), 'random' => uniqid())))).'");</script>';
 
-        $this->printContent();
+		$this->printContent();
 
-    }
+	}
 
-    /**
-     * Main function of the module
-     *
-     * @access	public
-     *
-     * @return	void
-     */
-    public function main() {
+	/**
+	 * Main function of the module
+	 *
+	 * @access	public
+	 *
+	 * @return	void
+	 */
+	public function main() {
 
-        // Is the user allowed to access this page?
-        $access = is_array($this->pageInfo) || $GLOBALS['BE_USER']->isAdmin();
+		// Is the user allowed to access this page?
+		$access = is_array($this->pageInfo) || $GLOBALS['BE_USER']->isAdmin();
 
-        if ($this->id && $access) {
+		if ($this->id && $access) {
 
-            // Increase max_execution_time and max_input_time for large documents.
-            if (!ini_get('safe_mode')) {
+			// Increase max_execution_time and max_input_time for large documents.
+			if (!ini_get('safe_mode')) {
 
-                ini_set('max_execution_time', '0');
+				ini_set('max_execution_time', '0');
 
-                ini_set('max_input_time', '-1');
+				ini_set('max_input_time', '-1');
 
-            }
+			}
 
-            switch ($this->CMD) {
+			switch ($this->CMD) {
 
-                case 'indexFile':
+				case 'indexFile':
 
-                    if (!empty($this->data['id']) && isset($this->data['core'])
-                        && \TYPO3\CMS\Core\Utility\GeneralUtility::isValidUrl($this->data['id'])) {
+					if (!empty($this->data['id']) && isset($this->data['core'])
+						&& \TYPO3\CMS\Core\Utility\GeneralUtility::isValidUrl($this->data['id'])) {
 
-                        // Save document to database and index.
-                        $doc =& tx_dlf_document::getInstance($this->data['id'], $this->id, TRUE);
+						// Save document to database and index.
+						$doc =& tx_dlf_document::getInstance($this->data['id'], $this->id, TRUE);
 
-                        if ($doc->ready) {
+						if ($doc->ready) {
 
-                            $doc->save($this->id, $this->data['core']);
+							$doc->save($this->id, $this->data['core']);
 
-                        } else {
+						} else {
 
-                            $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                                htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.fileNotLoaded'), $this->data['id'])),
-                                tx_dlf_helper::getLL('flash.error', TRUE),
-                                \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                                TRUE
-                            );
+							$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+								'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+								htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.fileNotLoaded'), $this->data['id'])),
+								tx_dlf_helper::getLL('flash.error', TRUE),
+								\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+								TRUE
+							);
 
-                            tx_dlf_helper::addMessage($_message);
+							tx_dlf_helper::addMessage($_message);
 
-                        }
+						}
 
-                    }
+					}
 
-                    break;
+					break;
 
-                case 'reindexDocs':
+				case 'reindexDocs':
 
-                    if (isset($this->data['core'])) {
+					if (isset($this->data['core'])) {
 
-                        if (!empty($this->data['collection'])) {
+						if (!empty($this->data['collection'])) {
 
-                            // Get all documents in this collection.
-                            $_result = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
-                                'tx_dlf_documents.title AS title,tx_dlf_documents.uid AS uid',
-                                'tx_dlf_documents',
-                                'tx_dlf_relations',
-                                'tx_dlf_collections',
-                                'AND tx_dlf_documents.pid='.intval($this->id).' AND tx_dlf_collections.uid='.intval($this->data['collection']).' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
-                                'tx_dlf_documents.uid',
-                                '',
-                                ''
-                            );
+							// Get all documents in this collection.
+							$_result = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
+								'tx_dlf_documents.title AS title,tx_dlf_documents.uid AS uid',
+								'tx_dlf_documents',
+								'tx_dlf_relations',
+								'tx_dlf_collections',
+								'AND tx_dlf_documents.pid='.intval($this->id).' AND tx_dlf_collections.uid='.intval($this->data['collection']).' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
+								'tx_dlf_documents.uid',
+								'',
+								''
+							);
 
-                        } else {
+						} else {
 
-                            // Get all documents.
-                            $_result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                                'tx_dlf_documents.title AS title,tx_dlf_documents.uid AS uid',
-                                'tx_dlf_documents',
-                                'tx_dlf_documents.pid='.intval($this->id).tx_dlf_helper::whereClause('tx_dlf_documents'),
-                                '',
-                                '',
-                                ''
-                            );
+							// Get all documents.
+							$_result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+								'tx_dlf_documents.title AS title,tx_dlf_documents.uid AS uid',
+								'tx_dlf_documents',
+								'tx_dlf_documents.pid='.intval($this->id).tx_dlf_helper::whereClause('tx_dlf_documents'),
+								'',
+								'',
+								''
+							);
 
-                        }
+						}
 
-                        // Save them as a list object in user's session.
-                        $elements = array ();
+						// Save them as a list object in user's session.
+						$elements = array ();
 
-                        while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_result)) {
+						while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_result)) {
 
-                            $elements[] = array ($resArray['uid'], $resArray['title']);
+							$elements[] = array ($resArray['uid'], $resArray['title']);
 
-                        }
+						}
 
-                        $this->list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list', $elements);
+						$this->list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list', $elements);
 
-                        // Start index looping.
-                        if (count($this->list) > 0) {
+						// Start index looping.
+						if (count($this->list) > 0) {
 
-                            $this->indexLoop();
+							$this->indexLoop();
 
-                        }
+						}
 
-                    }
+					}
 
-                    break;
+					break;
 
-                case 'indexLoop':
+				case 'indexLoop':
 
-                    // Refresh user's session to prevent session timeout.
-                    $GLOBALS['BE_USER']->fetchUserSession();
+					// Refresh user's session to prevent session timeout.
+					$GLOBALS['BE_USER']->fetchUserSession();
 
-                    // Get document list from user's session.
-                    $this->list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
+					// Get document list from user's session.
+					$this->list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
 
-                    // Continue index looping.
-                    if (count($this->list) > 0 && isset($this->data['core'])) {
+					// Continue index looping.
+					if (count($this->list) > 0 && isset($this->data['core'])) {
 
-                        $this->indexLoop();
+						$this->indexLoop();
 
-                    } else {
+					} else {
 
-                        $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                            'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                            tx_dlf_helper::getLL('flash.seeLog', TRUE),
-                            tx_dlf_helper::getLL('flash.done', TRUE),
-                            \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                            TRUE
-                        );
+						$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+							'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+							tx_dlf_helper::getLL('flash.seeLog', TRUE),
+							tx_dlf_helper::getLL('flash.done', TRUE),
+							\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+							TRUE
+						);
 
-                        tx_dlf_helper::addMessage($_message);
+						tx_dlf_helper::addMessage($_message);
 
-                    }
+					}
 
-                    break;
+					break;
 
-            }
+			}
 
 
-            $this->markerArray['CONTENT'] .= tx_dlf_helper::renderFlashMessages();
+			$this->markerArray['CONTENT'] .= tx_dlf_helper::renderFlashMessages();
 
-            switch ($this->MOD_SETTINGS['function']) {
+			switch ($this->MOD_SETTINGS['function']) {
 
-                case 'indexFile':
+				case 'indexFile':
 
-                    $this->markerArray['CONTENT'] .= $this->getFileForm();
+					$this->markerArray['CONTENT'] .= $this->getFileForm();
 
-                    break;
+					break;
 
-                case 'reindexDocs':
+				case 'reindexDocs':
 
-                    $this->markerArray['CONTENT'] .= $this->getCollList();
+					$this->markerArray['CONTENT'] .= $this->getCollList();
 
-                    break;
+					break;
 
-            }
+			}
 
-        } else {
+		} else {
 
-            // TODO: Ändern!
-            $this->markerArray['CONTENT'] .= 'You are not allowed to access this page or have not selected a page, yet.';
+			// TODO: Ändern!
+			$this->markerArray['CONTENT'] .= 'You are not allowed to access this page or have not selected a page, yet.';
 
-        }
+		}
 
-        $this->printContent();
+		$this->printContent();
 
-    }
+	}
 
-    /**
-     * Sets the module's MOD_MENU configuration
-     *
-     * @access	protected
-     *
-     * @return	void
-     */
-    protected function setMOD_MENU() {
+	/**
+	 * Sets the module's MOD_MENU configuration
+	 *
+	 * @access	protected
+	 *
+	 * @return	void
+	 */
+	protected function setMOD_MENU() {
 
-        $this->MOD_MENU = array (
-            'function' => array (
-                'indexFile' => $GLOBALS['LANG']->getLL('function.indexFile'),
-                //'reindexDoc' => $GLOBALS['LANG']->getLL('function.reindexDoc'),
-                'reindexDocs' => $GLOBALS['LANG']->getLL('function.reindexDocs'),
-            )
-        );
+		$this->MOD_MENU = array (
+			'function' => array (
+				'indexFile' => $GLOBALS['LANG']->getLL('function.indexFile'),
+				//'reindexDoc' => $GLOBALS['LANG']->getLL('function.reindexDoc'),
+				'reindexDocs' => $GLOBALS['LANG']->getLL('function.reindexDocs'),
+			)
+		);
 
-    }
+	}
 
 }
 

Spacing +9 added lines, -9 removed lines

@@ -21,11 +21,11 @@ 
 
     protected $modPath = 'indexing/';
 
-    protected $buttonArray = array (
+    protected $buttonArray = array(
         'SHORTCUT' => '',
     );
 
-    protected $markerArray = array (
+    protected $markerArray = array(
         'CSH' => '',
         'MOD_MENU' => '',
         'CONTENT' => '',
@@ -162,7 +162,7 @@ 
         $this->list->save();
 
         // Save document to database and index.
-        $doc =& tx_dlf_document::getInstance($uid, 0, TRUE);
+        $doc = & tx_dlf_document::getInstance($uid, 0, TRUE);
 
         if ($doc->ready) {
 
@@ -182,7 +182,7 @@ 
         $this->markerArray['CONTENT'] .= $_message->render();
 
         // Start next loop.
-        $this->markerArray['CONTENT'] .= '<script type="text/javascript">window.location.href=unescape("'.\TYPO3\CMS\Core\Utility\GeneralUtility::rawUrlEncodeJS(\TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'indexLoop', $this->prefixId => array ('core' => $this->data['core']), 'random' => uniqid())))).'");</script>';
+        $this->markerArray['CONTENT'] .= '<script type="text/javascript">window.location.href=unescape("'.\TYPO3\CMS\Core\Utility\GeneralUtility::rawUrlEncodeJS(\TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array('id' => $this->id, 'CMD' => 'indexLoop', $this->prefixId => array('core' => $this->data['core']), 'random' => uniqid())))).'");</script>';
 
         $this->printContent();
 
@@ -219,7 +219,7 @@ 
                         && \TYPO3\CMS\Core\Utility\GeneralUtility::isValidUrl($this->data['id'])) {
 
                         // Save document to database and index.
-                        $doc =& tx_dlf_document::getInstance($this->data['id'], $this->id, TRUE);
+                        $doc = & tx_dlf_document::getInstance($this->data['id'], $this->id, TRUE);
 
                         if ($doc->ready) {
 
@@ -276,11 +276,11 @@ 
                         }
 
                         // Save them as a list object in user's session.
-                        $elements = array ();
+                        $elements = array();
 
                         while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_result)) {
 
-                            $elements[] = array ($resArray['uid'], $resArray['title']);
+                            $elements[] = array($resArray['uid'], $resArray['title']);
 
                         }
 
@@ -367,8 +367,8 @@ 
      */
     protected function setMOD_MENU() {
 
-        $this->MOD_MENU = array (
-            'function' => array (
+        $this->MOD_MENU = array(
+            'function' => array(
                 'indexFile' => $GLOBALS['LANG']->getLL('function.indexFile'),
                 //'reindexDoc' => $GLOBALS['LANG']->getLL('function.reindexDoc'),
                 'reindexDocs' => $GLOBALS['LANG']->getLL('function.reindexDocs'),

ext_autoload.php

Indentation +41 added lines, -41 removed lines

@@ -12,45 +12,45 @@
 $extensionPath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('dlf');
 
 return array (
-    'tx_dlf_cli' => $extensionPath.'cli/class.tx_dlf_cli.php',
-    'tx_dlf_alto' => $extensionPath.'common/class.tx_dlf_alto.php',
-    'tx_dlf_document' => $extensionPath.'common/class.tx_dlf_document.php',
-    'tx_dlf_format' => $extensionPath.'common/class.tx_dlf_format.php',
-    'tx_dlf_fulltext' => $extensionPath.'common/class.tx_dlf_fulltext.php',
-    'tx_dlf_helper' => $extensionPath.'common/class.tx_dlf_helper.php',
-    'tx_dlf_indexing' => $extensionPath.'common/class.tx_dlf_indexing.php',
-    'tx_dlf_list' => $extensionPath.'common/class.tx_dlf_list.php',
-    'tx_dlf_mods' => $extensionPath.'common/class.tx_dlf_mods.php',
-    'tx_dlf_module' => $extensionPath.'common/class.tx_dlf_module.php',
-    'tx_dlf_plugin' => $extensionPath.'common/class.tx_dlf_plugin.php',
-    'tx_dlf_solr' => $extensionPath.'common/class.tx_dlf_solr.php',
-    'tx_dlf_teihdr' => $extensionPath.'common/class.tx_dlf_teihdr.php',
-    'tx_dlf_doctype' => $extensionPath.'hooks/class.tx_dlf_doctype.php',
-    'tx_dlf_em' => $extensionPath.'hooks/class.tx_dlf_em.php',
-    'tx_dlf_hacks' => $extensionPath.'hooks/class.tx_dlf_hacks.php',
-    'tx_dlf_tceforms' => $extensionPath.'hooks/class.tx_dlf_tceforms.php',
-    'tx_dlf_tcemain' => $extensionPath.'hooks/class.tx_dlf_tcemain.php',
-    'tx_dlf_modIndexing' => $extensionPath.'modules/indexing/index.php',
-    'tx_dlf_modNewclient' => $extensionPath.'modules/newclient/index.php',
-    'tx_dlf_audioplayer' => $extensionPath.'plugins/audioplayer/class.tx_dlf_audioplayer.php',
-    'tx_dlf_basket' => $extensionPath.'plugins/basket/class.tx_dlf_basket.php',
-    'tx_dlf_collection' => $extensionPath.'plugins/collection/class.tx_dlf_collection.php',
-    'tx_dlf_feeds' => $extensionPath.'plugins/feeds/class.tx_dlf_feeds.php',
-    'tx_dlf_listview' => $extensionPath.'plugins/listview/class.tx_dlf_listview.php',
-    'tx_dlf_metadata' => $extensionPath.'plugins/metadata/class.tx_dlf_metadata.php',
-    'tx_dlf_navigation' => $extensionPath.'plugins/navigation/class.tx_dlf_navigation.php',
-    'tx_dlf_newspaper' => $extensionPath.'plugins/newspaper/class.tx_dlf_newspaper.php',
-    'tx_dlf_oai' => $extensionPath.'plugins/oai/class.tx_dlf_oai.php',
-    'tx_dlf_pagegrid' => $extensionPath.'plugins/pagegrid/class.tx_dlf_pagegrid.php',
-    'tx_dlf_pageview' => $extensionPath.'plugins/pageview/class.tx_dlf_pageview.php',
-    'tx_dlf_search' => $extensionPath.'plugins/search/class.tx_dlf_search.php',
-    'tx_dlf_search_suggest' => $extensionPath.'plugins/search/class.tx_dlf_search_suggest.php',
-    'tx_dlf_statistics' => $extensionPath.'plugins/statistics/class.tx_dlf_statistics.php',
-    'tx_dlf_toc' => $extensionPath.'plugins/toc/class.tx_dlf_toc.php',
-    'tx_dlf_toolbox' => $extensionPath.'plugins/toolbox/class.tx_dlf_toolbox.php',
-    'tx_dlf_toolsPdf' => $extensionPath.'plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php',
-    'tx_dlf_toolsFulltext' => $extensionPath.'plugins/toolbox/tools/fulltext/class.tx_dlf_toolsFulltext.php',
-    'tx_dlf_toolsImagemanipulation' => $extensionPath.'plugins/toolbox/tools/imagemanipulation/class.tx_dlf_toolsImagemanipulation.php',
-    'tx_dlf_toolsImagedownload' => $extensionPath.'plugins/toolbox/tools/imagedownload/class.tx_dlf_toolsImagedownload.php',
-    'tx_dlf_validator' => $extensionPath.'plugins/validator/class.tx_dlf_validator.php'
+	'tx_dlf_cli' => $extensionPath.'cli/class.tx_dlf_cli.php',
+	'tx_dlf_alto' => $extensionPath.'common/class.tx_dlf_alto.php',
+	'tx_dlf_document' => $extensionPath.'common/class.tx_dlf_document.php',
+	'tx_dlf_format' => $extensionPath.'common/class.tx_dlf_format.php',
+	'tx_dlf_fulltext' => $extensionPath.'common/class.tx_dlf_fulltext.php',
+	'tx_dlf_helper' => $extensionPath.'common/class.tx_dlf_helper.php',
+	'tx_dlf_indexing' => $extensionPath.'common/class.tx_dlf_indexing.php',
+	'tx_dlf_list' => $extensionPath.'common/class.tx_dlf_list.php',
+	'tx_dlf_mods' => $extensionPath.'common/class.tx_dlf_mods.php',
+	'tx_dlf_module' => $extensionPath.'common/class.tx_dlf_module.php',
+	'tx_dlf_plugin' => $extensionPath.'common/class.tx_dlf_plugin.php',
+	'tx_dlf_solr' => $extensionPath.'common/class.tx_dlf_solr.php',
+	'tx_dlf_teihdr' => $extensionPath.'common/class.tx_dlf_teihdr.php',
+	'tx_dlf_doctype' => $extensionPath.'hooks/class.tx_dlf_doctype.php',
+	'tx_dlf_em' => $extensionPath.'hooks/class.tx_dlf_em.php',
+	'tx_dlf_hacks' => $extensionPath.'hooks/class.tx_dlf_hacks.php',
+	'tx_dlf_tceforms' => $extensionPath.'hooks/class.tx_dlf_tceforms.php',
+	'tx_dlf_tcemain' => $extensionPath.'hooks/class.tx_dlf_tcemain.php',
+	'tx_dlf_modIndexing' => $extensionPath.'modules/indexing/index.php',
+	'tx_dlf_modNewclient' => $extensionPath.'modules/newclient/index.php',
+	'tx_dlf_audioplayer' => $extensionPath.'plugins/audioplayer/class.tx_dlf_audioplayer.php',
+	'tx_dlf_basket' => $extensionPath.'plugins/basket/class.tx_dlf_basket.php',
+	'tx_dlf_collection' => $extensionPath.'plugins/collection/class.tx_dlf_collection.php',
+	'tx_dlf_feeds' => $extensionPath.'plugins/feeds/class.tx_dlf_feeds.php',
+	'tx_dlf_listview' => $extensionPath.'plugins/listview/class.tx_dlf_listview.php',
+	'tx_dlf_metadata' => $extensionPath.'plugins/metadata/class.tx_dlf_metadata.php',
+	'tx_dlf_navigation' => $extensionPath.'plugins/navigation/class.tx_dlf_navigation.php',
+	'tx_dlf_newspaper' => $extensionPath.'plugins/newspaper/class.tx_dlf_newspaper.php',
+	'tx_dlf_oai' => $extensionPath.'plugins/oai/class.tx_dlf_oai.php',
+	'tx_dlf_pagegrid' => $extensionPath.'plugins/pagegrid/class.tx_dlf_pagegrid.php',
+	'tx_dlf_pageview' => $extensionPath.'plugins/pageview/class.tx_dlf_pageview.php',
+	'tx_dlf_search' => $extensionPath.'plugins/search/class.tx_dlf_search.php',
+	'tx_dlf_search_suggest' => $extensionPath.'plugins/search/class.tx_dlf_search_suggest.php',
+	'tx_dlf_statistics' => $extensionPath.'plugins/statistics/class.tx_dlf_statistics.php',
+	'tx_dlf_toc' => $extensionPath.'plugins/toc/class.tx_dlf_toc.php',
+	'tx_dlf_toolbox' => $extensionPath.'plugins/toolbox/class.tx_dlf_toolbox.php',
+	'tx_dlf_toolsPdf' => $extensionPath.'plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php',
+	'tx_dlf_toolsFulltext' => $extensionPath.'plugins/toolbox/tools/fulltext/class.tx_dlf_toolsFulltext.php',
+	'tx_dlf_toolsImagemanipulation' => $extensionPath.'plugins/toolbox/tools/imagemanipulation/class.tx_dlf_toolsImagemanipulation.php',
+	'tx_dlf_toolsImagedownload' => $extensionPath.'plugins/toolbox/tools/imagedownload/class.tx_dlf_toolsImagedownload.php',
+	'tx_dlf_validator' => $extensionPath.'plugins/validator/class.tx_dlf_validator.php'
 );

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
 $extensionPath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('dlf');
 
-return array (
+return array(
     'tx_dlf_cli' => $extensionPath.'cli/class.tx_dlf_cli.php',
     'tx_dlf_alto' => $extensionPath.'common/class.tx_dlf_alto.php',
     'tx_dlf_document' => $extensionPath.'common/class.tx_dlf_document.php',

common/class.tx_dlf_module.php

Indentation +154 added lines, -154 removed lines

@@ -20,115 +20,115 @@ 
  */
 abstract class tx_dlf_module extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 
-    public $extKey = 'dlf';
-
-    public $prefixId = 'tx_dlf';
-
-    /**
-     * Holds the path to this module relative to 'EXT:dlf/modules/' and with trailing slash
-     *
-     * @var	string
-     * @access protected
-     */
-    protected $modPath = '';
-
-    /**
-     * Holds the page record if access granted or FALSE if access denied
-     *
-     * @var	mixed
-     * @access protected
-     */
-    protected $pageInfo;
-
-    /**
-     * Holds the module's button array
-     *
-     * @var	array
-     * @access protected
-     */
-    protected $buttonArray = array ();
-
-    /**
-     * Holds the module's marker array
-     *
-     * @var	array
-     * @access protected
-     */
-    protected $markerArray = array ();
-
-    /**
-     * Holds the module's subpart array
-     *
-     * @var	array
-     * @access protected
-     */
-    protected $subpartArray = array ();
-
-    /**
-     * Holds the TYPO3_CONF_VARS array of this extension
-     *
-     * @var	array
-     * @access protected
-     */
-    protected $conf = array ();
-
-    /**
-     * Holds the submitted form's data
-     *
-     * @var	array
-     * @access protected
-     */
-    protected $data;
-
-    /**
-     * Initializes the backend module by setting internal variables, initializing the menu.
-     *
-     * @access public
-     *
-     * @return	void
-     */
-    public function __construct() {
-
-        $GLOBALS['BE_USER']->modAccess($GLOBALS['MCONF'], 1);
-
-        $GLOBALS['LANG']->includeLLFile('EXT:'.$this->extKey.'/modules/'.$this->modPath.'locallang.xml');
-
-        $this->setMOD_MENU();
-
-        parent::init();
-
-        $this->conf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$this->extKey]);
-
-        $this->pageInfo = \TYPO3\CMS\Backend\Utility\BackendUtility::readPageAccess($this->id, $this->perms_clause);
-
-        $this->doc = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Template\\DocumentTemplate');
-
-        $this->doc->setModuleTemplate('EXT:'.$this->extKey.'/modules/'.$this->modPath.'template.tmpl');
-
-        $this->doc->getPageRenderer()->addCssFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($this->extKey).'res/backend.css');
-
-        $this->doc->backPath = $GLOBALS['BACK_PATH'];
-
-        $this->doc->bodyTagAdditions = 'class="ext-'.$this->extKey.'-modules"';
-
-        $this->doc->form = '<form action="" method="post" enctype="multipart/form-data">';
-
-        $this->data = \TYPO3\CMS\Core\Utility\GeneralUtility::_GPmerged($this->prefixId);
-
-    }
-
-    /**
-     * Sets the module's MOD_MENU configuration.
-     *
-     * @access	protected
-     *
-     * @return	void
-     */
-    protected function setMOD_MENU() {
-
-        // Set $this->MOD_MENU array here or leave empty.
-
-        /* Example code:
+	public $extKey = 'dlf';
+
+	public $prefixId = 'tx_dlf';
+
+	/**
+	 * Holds the path to this module relative to 'EXT:dlf/modules/' and with trailing slash
+	 *
+	 * @var	string
+	 * @access protected
+	 */
+	protected $modPath = '';
+
+	/**
+	 * Holds the page record if access granted or FALSE if access denied
+	 *
+	 * @var	mixed
+	 * @access protected
+	 */
+	protected $pageInfo;
+
+	/**
+	 * Holds the module's button array
+	 *
+	 * @var	array
+	 * @access protected
+	 */
+	protected $buttonArray = array ();
+
+	/**
+	 * Holds the module's marker array
+	 *
+	 * @var	array
+	 * @access protected
+	 */
+	protected $markerArray = array ();
+
+	/**
+	 * Holds the module's subpart array
+	 *
+	 * @var	array
+	 * @access protected
+	 */
+	protected $subpartArray = array ();
+
+	/**
+	 * Holds the TYPO3_CONF_VARS array of this extension
+	 *
+	 * @var	array
+	 * @access protected
+	 */
+	protected $conf = array ();
+
+	/**
+	 * Holds the submitted form's data
+	 *
+	 * @var	array
+	 * @access protected
+	 */
+	protected $data;
+
+	/**
+	 * Initializes the backend module by setting internal variables, initializing the menu.
+	 *
+	 * @access public
+	 *
+	 * @return	void
+	 */
+	public function __construct() {
+
+		$GLOBALS['BE_USER']->modAccess($GLOBALS['MCONF'], 1);
+
+		$GLOBALS['LANG']->includeLLFile('EXT:'.$this->extKey.'/modules/'.$this->modPath.'locallang.xml');
+
+		$this->setMOD_MENU();
+
+		parent::init();
+
+		$this->conf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$this->extKey]);
+
+		$this->pageInfo = \TYPO3\CMS\Backend\Utility\BackendUtility::readPageAccess($this->id, $this->perms_clause);
+
+		$this->doc = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Template\\DocumentTemplate');
+
+		$this->doc->setModuleTemplate('EXT:'.$this->extKey.'/modules/'.$this->modPath.'template.tmpl');
+
+		$this->doc->getPageRenderer()->addCssFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($this->extKey).'res/backend.css');
+
+		$this->doc->backPath = $GLOBALS['BACK_PATH'];
+
+		$this->doc->bodyTagAdditions = 'class="ext-'.$this->extKey.'-modules"';
+
+		$this->doc->form = '<form action="" method="post" enctype="multipart/form-data">';
+
+		$this->data = \TYPO3\CMS\Core\Utility\GeneralUtility::_GPmerged($this->prefixId);
+
+	}
+
+	/**
+	 * Sets the module's MOD_MENU configuration.
+	 *
+	 * @access	protected
+	 *
+	 * @return	void
+	 */
+	protected function setMOD_MENU() {
+
+		// Set $this->MOD_MENU array here or leave empty.
+
+		/* Example code:
 		$this->MOD_MENU = array (
 			'function' => array (
 				'1' => $GLOBALS['LANG']->getLL('function1'),
@@ -137,30 +137,30 @@ 
 			)
 		); */
 
-    }
-
-    /**
-     * Main function of the module.
-     *
-     * @access	public
-     *
-     * @abstract
-     *
-     * @return	void
-     */
-    abstract public function main();
-
-    /**
-     * Outputs all contents.
-     *
-     * @access	protected
-     *
-     * @return	void
-     */
-    protected function printContent() {
-
-        // Add Javascript for function menu.
-        $this->doc->JScode .= '
+	}
+
+	/**
+	 * Main function of the module.
+	 *
+	 * @access	public
+	 *
+	 * @abstract
+	 *
+	 * @return	void
+	 */
+	abstract public function main();
+
+	/**
+	 * Outputs all contents.
+	 *
+	 * @access	protected
+	 *
+	 * @return	void
+	 */
+	protected function printContent() {
+
+		// Add Javascript for function menu.
+		$this->doc->JScode .= '
 		<script type="text/javascript">
 		script_ended = 0;
 		function jumpToUrl(URL)	{
@@ -168,46 +168,46 @@ 
 		}
 		</script>';
 
-        // Add Javascript for convenient module switch.
-        $this->doc->postCode .= '
+		// Add Javascript for convenient module switch.
+		$this->doc->postCode .= '
 		<script type="text/javascript">
 		script_ended = 1;
 		</script>';
 
-        // Render output.
-        $this->content .= $this->doc->startPage($GLOBALS['LANG']->getLL('title'));
+		// Render output.
+		$this->content .= $this->doc->startPage($GLOBALS['LANG']->getLL('title'));
 
-        // Set defaults for buttons and menu.
-        if (empty($this->buttonArray['RELOAD'])) {
+		// Set defaults for buttons and menu.
+		if (empty($this->buttonArray['RELOAD'])) {
 
-            $this->buttonArray['RELOAD'] = '<a href="'.$GLOBALS['MCONF']['_'].'" title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.reload', TRUE).'">'.\TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-system-refresh').'</a>';
+			$this->buttonArray['RELOAD'] = '<a href="'.$GLOBALS['MCONF']['_'].'" title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.reload', TRUE).'">'.\TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-system-refresh').'</a>';
 
-        }
+		}
 
-        if (empty($this->buttonArray['SHORTCUT'])) {
+		if (empty($this->buttonArray['SHORTCUT'])) {
 
-            $this->buttonArray['SHORTCUT'] = $this->doc->makeShortcutIcon('id', implode(',', array_keys($this->MOD_MENU)), $this->MCONF['name']);
+			$this->buttonArray['SHORTCUT'] = $this->doc->makeShortcutIcon('id', implode(',', array_keys($this->MOD_MENU)), $this->MCONF['name']);
 
-        }
+		}
 
-        if (empty($this->markerArray['CSH'])) {
+		if (empty($this->markerArray['CSH'])) {
 
-            $this->markerArray['CSH'] = \TYPO3\CMS\Backend\Utility\BackendUtility::cshItem('_MOD_'.$GLOBALS['MCONF']['name'], 'csh', $GLOBALS['BACK_PATH'], '', TRUE);
+			$this->markerArray['CSH'] = \TYPO3\CMS\Backend\Utility\BackendUtility::cshItem('_MOD_'.$GLOBALS['MCONF']['name'], 'csh', $GLOBALS['BACK_PATH'], '', TRUE);
 
-        }
+		}
 
-        if (empty($this->markerArray['MOD_MENU'])) {
+		if (empty($this->markerArray['MOD_MENU'])) {
 
-            $this->markerArray['MOD_MENU'] = \TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu($this->id, 'SET[function]', $this->MOD_SETTINGS['function'], $this->MOD_MENU['function']);
+			$this->markerArray['MOD_MENU'] = \TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu($this->id, 'SET[function]', $this->MOD_SETTINGS['function'], $this->MOD_MENU['function']);
 
-        }
+		}
 
-        $this->content .= $this->doc->moduleBody($this->pageInfo, $this->buttonArray, $this->markerArray, $this->subpartArray);
+		$this->content .= $this->doc->moduleBody($this->pageInfo, $this->buttonArray, $this->markerArray, $this->subpartArray);
 
-        $this->content .= $this->doc->endPage();
+		$this->content .= $this->doc->endPage();
 
-        echo $this->content;
+		echo $this->content;
 
-    }
+	}
 
 }

Spacing +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $buttonArray = array ();
+    protected $buttonArray = array();
 
     /**
      * Holds the module's marker array
@@ -54,7 +54,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $markerArray = array ();
+    protected $markerArray = array();
 
     /**
      * Holds the module's subpart array
@@ -62,7 +62,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $subpartArray = array ();
+    protected $subpartArray = array();
 
     /**
      * Holds the TYPO3_CONF_VARS array of this extension
@@ -70,7 +70,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $conf = array ();
+    protected $conf = array();
 
     /**
      * Holds the submitted form's data

common/class.tx_dlf_indexing.php

Indentation +558 added lines, -558 removed lines

@@ -19,870 +19,870 @@
  */
 class tx_dlf_indexing {
 
-    /**
-     * The extension key
-     *
-     * @var	string
-     * @access public
-     */
-    public static $extKey = 'dlf';
-
-    /**
-     * Array of metadata fields' configuration
-     * @see loadIndexConf()
-     *
-     * @var	array
-     * @access protected
-     */
-    protected static $fields = array (
-        'autocomplete' => array (),
-        'facets' => array (),
-        'sortables' => array (),
-        'indexed' => array (),
-        'stored' => array (),
-        'tokenized' => array (),
-        'fieldboost' => array ()
-    );
+	/**
+	 * The extension key
+	 *
+	 * @var	string
+	 * @access public
+	 */
+	public static $extKey = 'dlf';
+
+	/**
+	 * Array of metadata fields' configuration
+	 * @see loadIndexConf()
+	 *
+	 * @var	array
+	 * @access protected
+	 */
+	protected static $fields = array (
+		'autocomplete' => array (),
+		'facets' => array (),
+		'sortables' => array (),
+		'indexed' => array (),
+		'stored' => array (),
+		'tokenized' => array (),
+		'fieldboost' => array ()
+	);
 
-    /**
-     * Is the index configuration loaded?
-     * @see $fields
-     *
-     * @var	boolean
-     * @access protected
-     */
-    protected static $fieldsLoaded = FALSE;
+	/**
+	 * Is the index configuration loaded?
+	 * @see $fields
+	 *
+	 * @var	boolean
+	 * @access protected
+	 */
+	protected static $fieldsLoaded = FALSE;
 
-    /**
-     * List of already processed documents
-     *
-     * @var	array
-     * @access protected
-     */
-    protected static $processedDocs = array ();
+	/**
+	 * List of already processed documents
+	 *
+	 * @var	array
+	 * @access protected
+	 */
+	protected static $processedDocs = array ();
 
-    /**
-     * Instance of Apache_Solr_Service class
-     *
-     * @var	Apache_Solr_Service
-     * @access protected
-     */
-    protected static $solr;
+	/**
+	 * Instance of Apache_Solr_Service class
+	 *
+	 * @var	Apache_Solr_Service
+	 * @access protected
+	 */
+	protected static $solr;
 
-    /**
-     * Array of toplevel structure elements
-     * @see loadIndexConf()
-     *
-     * @var	array
-     * @access protected
-     */
-    protected static $toplevel = array ();
+	/**
+	 * Array of toplevel structure elements
+	 * @see loadIndexConf()
+	 *
+	 * @var	array
+	 * @access protected
+	 */
+	protected static $toplevel = array ();
 
-    /**
-     * Insert given document into Solr index
-     *
-     * @access	public
-     *
-     * @param	tx_dlf_document		&$doc: The document to add
-     * @param	integer		$core: UID of the Solr core to use
-     *
-     * @return	integer		0 on success or 1 on failure
-     */
-    public static function add(tx_dlf_document &$doc, $core = 0) {
+	/**
+	 * Insert given document into Solr index
+	 *
+	 * @access	public
+	 *
+	 * @param	tx_dlf_document		&$doc: The document to add
+	 * @param	integer		$core: UID of the Solr core to use
+	 *
+	 * @return	integer		0 on success or 1 on failure
+	 */
+	public static function add(tx_dlf_document &$doc, $core = 0) {
 
-        if (in_array($doc->uid, self::$processedDocs)) {
+		if (in_array($doc->uid, self::$processedDocs)) {
 
-            return 0;
+			return 0;
 
-        } elseif (self::solrConnect($core, $doc->pid)) {
+		} elseif (self::solrConnect($core, $doc->pid)) {
 
-            $errors = 0;
+			$errors = 0;
 
-            // Handle multi-volume documents.
-            if ($doc->parentId) {
+			// Handle multi-volume documents.
+			if ($doc->parentId) {
 
-                $parent =& tx_dlf_document::getInstance($doc->parentId, 0, TRUE);
+				$parent =& tx_dlf_document::getInstance($doc->parentId, 0, TRUE);
 
-                if ($parent->ready) {
+				if ($parent->ready) {
 
-                    $errors = self::add($parent, $core);
+					$errors = self::add($parent, $core);
 
-                } else {
+				} else {
 
-                    if (TYPO3_DLOG) {
+					if (TYPO3_DLOG) {
 
-                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Could not load parent document with UID "'.$doc->parentId.'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+						\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Could not load parent document with UID "'.$doc->parentId.'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
-                    }
+					}
 
-                    return 1;
+					return 1;
 
-                }
+				}
 
-            }
+			}
 
-            try {
+			try {
 
-                // Add document to list of processed documents.
-                self::$processedDocs[] = $doc->uid;
+				// Add document to list of processed documents.
+				self::$processedDocs[] = $doc->uid;
 
-                // Delete old Solr documents.
-                self::$solr->service->deleteByQuery('uid:'.$doc->uid);
+				// Delete old Solr documents.
+				self::$solr->service->deleteByQuery('uid:'.$doc->uid);
 
-                // Index every logical unit as separate Solr document.
-                foreach ($doc->tableOfContents as $logicalUnit) {
+				// Index every logical unit as separate Solr document.
+				foreach ($doc->tableOfContents as $logicalUnit) {
 
-                    if (!$errors) {
+					if (!$errors) {
 
-                        $errors = self::processLogical($doc, $logicalUnit);
+						$errors = self::processLogical($doc, $logicalUnit);
 
-                    } else {
+					} else {
 
-                        break;
+						break;
 
-                    }
+					}
 
-                }
+				}
 
-                // Index fulltext files if available.
-                if ($doc->hasFulltext) {
+				// Index fulltext files if available.
+				if ($doc->hasFulltext) {
 
-                    foreach ($doc->physicalStructure as $pageNumber => $xmlId) {
+					foreach ($doc->physicalStructure as $pageNumber => $xmlId) {
 
-                        if (!$errors) {
+						if (!$errors) {
 
-                            $errors = self::processPhysical($doc, $pageNumber, $doc->physicalStructureInfo[$xmlId]);
+							$errors = self::processPhysical($doc, $pageNumber, $doc->physicalStructureInfo[$xmlId]);
 
-                        } else {
+						} else {
 
-                            break;
+							break;
 
-                        }
+						}
 
-                    }
+					}
 
-                }
+				}
 
-                self::$solr->service->commit();
+				self::$solr->service->commit();
 
-                // Get document title from database.
-                $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                    'tx_dlf_documents.title AS title',
-                    'tx_dlf_documents',
-                    'tx_dlf_documents.uid='.intval($doc->uid).tx_dlf_helper::whereClause('tx_dlf_documents'),
-                    '',
-                    '',
-                    '1'
-                );
+				// Get document title from database.
+				$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+					'tx_dlf_documents.title AS title',
+					'tx_dlf_documents',
+					'tx_dlf_documents.uid='.intval($doc->uid).tx_dlf_helper::whereClause('tx_dlf_documents'),
+					'',
+					'',
+					'1'
+				);
 
-                $resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
+				$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
-                if (!defined('TYPO3_cliMode')) {
+				if (!defined('TYPO3_cliMode')) {
 
-                    if (!$errors) {
+					if (!$errors) {
 
-                        $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                            'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                            htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.documentIndexed'), $resArray['title'], $doc->uid)),
-                            tx_dlf_helper::getLL('flash.done', TRUE),
-                            \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                            TRUE
-                        );
+						$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+							'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+							htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.documentIndexed'), $resArray['title'], $doc->uid)),
+							tx_dlf_helper::getLL('flash.done', TRUE),
+							\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+							TRUE
+						);
 
-                    } else {
+					} else {
 
-                        $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                            'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                            htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.documentNotIndexed'), $resArray['title'], $doc->uid)),
-                            tx_dlf_helper::getLL('flash.error', TRUE),
-                            \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                            TRUE
-                        );
+						$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+							'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+							htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.documentNotIndexed'), $resArray['title'], $doc->uid)),
+							tx_dlf_helper::getLL('flash.error', TRUE),
+							\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+							TRUE
+						);
 
-                    }
+					}
 
-                    tx_dlf_helper::addMessage($message);
+					tx_dlf_helper::addMessage($message);
 
-                }
+				}
 
-                return $errors;
+				return $errors;
 
-            } catch (Exception $e) {
+			} catch (Exception $e) {
 
-                if (!defined('TYPO3_cliMode')) {
+				if (!defined('TYPO3_cliMode')) {
 
-                    $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
-                        tx_dlf_helper::getLL('flash.error', TRUE),
-                        \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                        TRUE
-                    );
+					$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+						tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
+						tx_dlf_helper::getLL('flash.error', TRUE),
+						\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+						TRUE
+					);
 
-                    tx_dlf_helper::addMessage($message);
+					tx_dlf_helper::addMessage($message);
 
-                }
+				}
 
-                if (TYPO3_DLOG) {
+				if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Apache Solr threw exception: "'.$e->getMessage().'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+					\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Apache Solr threw exception: "'.$e->getMessage().'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
-                }
+				}
 
-                return 1;
+				return 1;
 
-            }
+			}
 
-        } else {
+		} else {
 
-            if (!defined('TYPO3_cliMode')) {
+			if (!defined('TYPO3_cliMode')) {
 
-                $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    tx_dlf_helper::getLL('flash.solrNoConnection', TRUE),
-                    tx_dlf_helper::getLL('flash.warning', TRUE),
-                    \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
-                    TRUE
-                );
+				$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+					tx_dlf_helper::getLL('flash.solrNoConnection', TRUE),
+					tx_dlf_helper::getLL('flash.warning', TRUE),
+					\TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
+					TRUE
+				);
 
-                tx_dlf_helper::addMessage($message);
+				tx_dlf_helper::addMessage($message);
 
-            }
+			}
 
-            if (TYPO3_DLOG) {
+			if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
+				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
-            }
+			}
 
-            return 1;
+			return 1;
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Delete document from Solr index
-     *
-     * @access	public
-     *
-     * @param	integer		$uid: UID of the document to delete
-     *
-     * @return	integer		0 on success or 1 on failure
-     */
-    public static function delete($uid) {
+	/**
+	 * Delete document from Solr index
+	 *
+	 * @access	public
+	 *
+	 * @param	integer		$uid: UID of the document to delete
+	 *
+	 * @return	integer		0 on success or 1 on failure
+	 */
+	public static function delete($uid) {
 
-        // Save parameter for logging purposes.
-        $_uid = $uid;
+		// Save parameter for logging purposes.
+		$_uid = $uid;
 
-        // Sanitize input.
-        $uid = max(intval($uid), 0);
+		// Sanitize input.
+		$uid = max(intval($uid), 0);
 
-        // Get Solr core for document.
-        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            'tx_dlf_solrcores.uid AS uid,tx_dlf_documents.title AS title',
-            'tx_dlf_solrcores,tx_dlf_documents',
-            'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid='.$uid.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
-            '',
-            '',
-            '1'
-        );
+		// Get Solr core for document.
+		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'tx_dlf_solrcores.uid AS uid,tx_dlf_documents.title AS title',
+			'tx_dlf_solrcores,tx_dlf_documents',
+			'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid='.$uid.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+			'',
+			'',
+			'1'
+		);
 
-        if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+		if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-            list ($core, $title) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
+			list ($core, $title) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
 
-            // Establish Solr connection.
-            if (self::solrConnect($core)) {
+			// Establish Solr connection.
+			if (self::solrConnect($core)) {
 
-                try {
+				try {
 
-                    // Delete Solr document.
-                    self::$solr->service->deleteByQuery('uid:'.$uid);
+					// Delete Solr document.
+					self::$solr->service->deleteByQuery('uid:'.$uid);
 
-                    self::$solr->service->commit();
+					self::$solr->service->commit();
 
-                } catch (Exception $e) {
+				} catch (Exception $e) {
 
-                    if (!defined('TYPO3_cliMode')) {
+					if (!defined('TYPO3_cliMode')) {
 
-                        $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                            'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                            tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
-                            tx_dlf_helper::getLL('flash.error', TRUE),
-                            \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                            TRUE
-                        );
+						$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+							'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+							tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
+							tx_dlf_helper::getLL('flash.error', TRUE),
+							\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+							TRUE
+						);
 
-                        tx_dlf_helper::addMessage($message);
+						tx_dlf_helper::addMessage($message);
 
-                    }
+					}
 
-                    if (TYPO3_DLOG) {
+					if (TYPO3_DLOG) {
 
-                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete('.$_uid.')] Apache Solr threw exception: "'.$e->getMessage().'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+						\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete('.$_uid.')] Apache Solr threw exception: "'.$e->getMessage().'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
-                    }
+					}
 
-                    return 1;
+					return 1;
 
-                }
+				}
 
-            } else {
+			} else {
 
-                if (!defined('TYPO3_cliMode')) {
+				if (!defined('TYPO3_cliMode')) {
 
-                    $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        tx_dlf_helper::getLL('flash.solrNoConnection', TRUE),
-                        tx_dlf_helper::getLL('flash.error', TRUE),
-                        \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                        TRUE
-                    );
+					$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+						tx_dlf_helper::getLL('flash.solrNoConnection', TRUE),
+						tx_dlf_helper::getLL('flash.error', TRUE),
+						\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+						TRUE
+					);
 
-                    tx_dlf_helper::addMessage($message);
+					tx_dlf_helper::addMessage($message);
 
-                }
+				}
 
-                if (TYPO3_DLOG) {
+				if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete('.$_uid.')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
+					\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete('.$_uid.')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
-                }
+				}
 
-                return 1;
+				return 1;
 
-            }
+			}
 
-            if (!defined('TYPO3_cliMode')) {
+			if (!defined('TYPO3_cliMode')) {
 
-                $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.documentDeleted'), $title, $uid)),
-                    tx_dlf_helper::getLL('flash.done', TRUE),
-                    \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                    TRUE
-                );
+				$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+					htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.documentDeleted'), $title, $uid)),
+					tx_dlf_helper::getLL('flash.done', TRUE),
+					\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+					TRUE
+				);
 
-                tx_dlf_helper::addMessage($message);
+				tx_dlf_helper::addMessage($message);
 
-            }
+			}
 
-            return 0;
+			return 0;
 
-        } else {
+		} else {
 
-            if (TYPO3_DLOG) {
+			if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete('.$_uid.')] Invalid UID "'.$uid.'" for document deletion', self::$extKey, SYSLOG_SEVERITY_ERROR);
+				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete('.$_uid.')] Invalid UID "'.$uid.'" for document deletion', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
-            }
+			}
 
-            return 1;
+			return 1;
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Returns the dynamic index field name for the given metadata field.
-     *
-     * @access	public
-     *
-     * @param	string		$index_name: The metadata field's name in database
-     * @param	integer		$pid: UID of the configuration page
-     *
-     * @return	string		The field's dynamic index name
-     */
-    public static function getIndexFieldName($index_name, $pid = 0) {
+	/**
+	 * Returns the dynamic index field name for the given metadata field.
+	 *
+	 * @access	public
+	 *
+	 * @param	string		$index_name: The metadata field's name in database
+	 * @param	integer		$pid: UID of the configuration page
+	 *
+	 * @return	string		The field's dynamic index name
+	 */
+	public static function getIndexFieldName($index_name, $pid = 0) {
 
-        // Save parameter for logging purposes.
-        $_pid = $pid;
+		// Save parameter for logging purposes.
+		$_pid = $pid;
 
-        // Sanitize input.
-        $pid = max(intval($pid), 0);
+		// Sanitize input.
+		$pid = max(intval($pid), 0);
 
-        if (!$pid) {
+		if (!$pid) {
 
-            if (TYPO3_DLOG) {
+			if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->getIndexFieldName('.$index_name.', '.$_pid.')] Invalid PID "'.$pid.'" for metadata configuration', self::$extKey, SYSLOG_SEVERITY_ERROR);
+				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->getIndexFieldName('.$index_name.', '.$_pid.')] Invalid PID "'.$pid.'" for metadata configuration', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
-            }
+			}
 
-            return '';
+			return '';
 
-        }
+		}
 
-        // Load metadata configuration.
-        self::loadIndexConf($pid);
+		// Load metadata configuration.
+		self::loadIndexConf($pid);
 
-        // Build field's suffix.
-        $suffix = (in_array($index_name, self::$fields['tokenized']) ? 't' : 'u');
+		// Build field's suffix.
+		$suffix = (in_array($index_name, self::$fields['tokenized']) ? 't' : 'u');
 
-        $suffix .= (in_array($index_name, self::$fields['stored']) ? 's' : 'u');
+		$suffix .= (in_array($index_name, self::$fields['stored']) ? 's' : 'u');
 
-        $suffix .= (in_array($index_name, self::$fields['indexed']) ? 'i' : 'u');
+		$suffix .= (in_array($index_name, self::$fields['indexed']) ? 'i' : 'u');
 
-        $index_name .= '_'.$suffix;
+		$index_name .= '_'.$suffix;
 
-        return $index_name;
+		return $index_name;
 
-    }
+	}
 
-    /**
-     * Load indexing configuration
-     *
-     * @access	protected
-     *
-     * @param	integer		$pid: The configuration page's UID
-     *
-     * @return	void
-     */
-    protected static function loadIndexConf($pid) {
+	/**
+	 * Load indexing configuration
+	 *
+	 * @access	protected
+	 *
+	 * @param	integer		$pid: The configuration page's UID
+	 *
+	 * @return	void
+	 */
+	protected static function loadIndexConf($pid) {
 
-        if (!self::$fieldsLoaded) {
+		if (!self::$fieldsLoaded) {
 
-            // Get the list of toplevel structures.
-            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                'tx_dlf_structures.index_name AS index_name',
-                'tx_dlf_structures',
-                'tx_dlf_structures.toplevel=1 AND tx_dlf_structures.pid='.intval($pid).tx_dlf_helper::whereClause('tx_dlf_structures'),
-                '',
-                '',
-                ''
-            );
+			// Get the list of toplevel structures.
+			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+				'tx_dlf_structures.index_name AS index_name',
+				'tx_dlf_structures',
+				'tx_dlf_structures.toplevel=1 AND tx_dlf_structures.pid='.intval($pid).tx_dlf_helper::whereClause('tx_dlf_structures'),
+				'',
+				'',
+				''
+			);
 
-            while ($toplevel = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+			while ($toplevel = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-                self::$toplevel[] = $toplevel['index_name'];
+				self::$toplevel[] = $toplevel['index_name'];
 
-            }
+			}
 
-            // Get the metadata indexing options.
-            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.index_tokenized AS index_tokenized,tx_dlf_metadata.index_stored AS index_stored,tx_dlf_metadata.index_indexed AS index_indexed,tx_dlf_metadata.is_sortable AS is_sortable,tx_dlf_metadata.is_facet AS is_facet,tx_dlf_metadata.is_listed AS is_listed,tx_dlf_metadata.index_autocomplete AS index_autocomplete,tx_dlf_metadata.index_boost AS index_boost',
-                'tx_dlf_metadata',
-                'tx_dlf_metadata.pid='.intval($pid).tx_dlf_helper::whereClause('tx_dlf_metadata'),
-                '',
-                '',
-                ''
-            );
+			// Get the metadata indexing options.
+			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+				'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.index_tokenized AS index_tokenized,tx_dlf_metadata.index_stored AS index_stored,tx_dlf_metadata.index_indexed AS index_indexed,tx_dlf_metadata.is_sortable AS is_sortable,tx_dlf_metadata.is_facet AS is_facet,tx_dlf_metadata.is_listed AS is_listed,tx_dlf_metadata.index_autocomplete AS index_autocomplete,tx_dlf_metadata.index_boost AS index_boost',
+				'tx_dlf_metadata',
+				'tx_dlf_metadata.pid='.intval($pid).tx_dlf_helper::whereClause('tx_dlf_metadata'),
+				'',
+				'',
+				''
+			);
 
-            while ($indexing = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+			while ($indexing = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-                if ($indexing['index_tokenized']) {
+				if ($indexing['index_tokenized']) {
 
-                    self::$fields['tokenized'][] = $indexing['index_name'];
+					self::$fields['tokenized'][] = $indexing['index_name'];
 
-                }
+				}
 
-                if ($indexing['index_stored'] || $indexing['is_listed']) {
+				if ($indexing['index_stored'] || $indexing['is_listed']) {
 
-                    self::$fields['stored'][] = $indexing['index_name'];
+					self::$fields['stored'][] = $indexing['index_name'];
 
-                }
+				}
 
-                if ($indexing['index_indexed'] || $indexing['index_autocomplete']) {
+				if ($indexing['index_indexed'] || $indexing['index_autocomplete']) {
 
-                    self::$fields['indexed'][] = $indexing['index_name'];
+					self::$fields['indexed'][] = $indexing['index_name'];
 
-                }
+				}
 
-                if ($indexing['is_sortable']) {
+				if ($indexing['is_sortable']) {
 
-                    self::$fields['sortables'][] = $indexing['index_name'];
+					self::$fields['sortables'][] = $indexing['index_name'];
 
-                }
+				}
 
-                if ($indexing['is_facet']) {
+				if ($indexing['is_facet']) {
 
-                    self::$fields['facets'][] = $indexing['index_name'];
+					self::$fields['facets'][] = $indexing['index_name'];
 
-                }
+				}
 
-                if ($indexing['index_autocomplete']) {
+				if ($indexing['index_autocomplete']) {
 
-                    self::$fields['autocomplete'][] = $indexing['index_name'];
+					self::$fields['autocomplete'][] = $indexing['index_name'];
 
-                }
+				}
 
-                if ($indexing['index_boost'] > 0.0) {
+				if ($indexing['index_boost'] > 0.0) {
 
-                    self::$fields['fieldboost'][$indexing['index_name']] = floatval($indexing['index_boost']);
+					self::$fields['fieldboost'][$indexing['index_name']] = floatval($indexing['index_boost']);
 
-                } else {
+				} else {
 
-                    self::$fields['fieldboost'][$indexing['index_name']] = FALSE;
+					self::$fields['fieldboost'][$indexing['index_name']] = FALSE;
 
-                }
+				}
 
-            }
+			}
 
-            self::$fieldsLoaded = TRUE;
+			self::$fieldsLoaded = TRUE;
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Processes a logical unit (and its children) for the Solr index
-     *
-     * @access	protected
-     *
-     * @param	tx_dlf_document		&$doc: The METS document
-     * @param	array		$logicalUnit: Array of the logical unit to process
-     *
-     * @return	integer		0 on success or 1 on failure
-     */
-    protected static function processLogical(tx_dlf_document &$doc, array $logicalUnit) {
+	/**
+	 * Processes a logical unit (and its children) for the Solr index
+	 *
+	 * @access	protected
+	 *
+	 * @param	tx_dlf_document		&$doc: The METS document
+	 * @param	array		$logicalUnit: Array of the logical unit to process
+	 *
+	 * @return	integer		0 on success or 1 on failure
+	 */
+	protected static function processLogical(tx_dlf_document &$doc, array $logicalUnit) {
 
-        $errors = 0;
+		$errors = 0;
 
-        // Get metadata for logical unit.
-        $metadata = $doc->metadataArray[$logicalUnit['id']];
+		// Get metadata for logical unit.
+		$metadata = $doc->metadataArray[$logicalUnit['id']];
 
-        if (!empty($metadata)) {
+		if (!empty($metadata)) {
 
-            // Load class.
-            if (!class_exists('Apache_Solr_Document')) {
+			// Load class.
+			if (!class_exists('Apache_Solr_Document')) {
 
-                require_once(\TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName('EXT:'.self::$extKey.'/lib/SolrPhpClient/Apache/Solr/Document.php'));
+				require_once(\TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName('EXT:'.self::$extKey.'/lib/SolrPhpClient/Apache/Solr/Document.php'));
 
-            }
+			}
 
-            // Create new Solr document.
-            $solrDoc = new Apache_Solr_Document();
+			// Create new Solr document.
+			$solrDoc = new Apache_Solr_Document();
 
-            // Create unique identifier from document's UID and unit's XML ID.
-            $solrDoc->setField('id', $doc->uid.$logicalUnit['id']);
+			// Create unique identifier from document's UID and unit's XML ID.
+			$solrDoc->setField('id', $doc->uid.$logicalUnit['id']);
 
-            $solrDoc->setField('uid', $doc->uid);
+			$solrDoc->setField('uid', $doc->uid);
 
-            $solrDoc->setField('pid', $doc->pid);
+			$solrDoc->setField('pid', $doc->pid);
 
-            if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($logicalUnit['points'])) {
+			if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($logicalUnit['points'])) {
 
-                $solrDoc->setField('page', $logicalUnit['points']);
+				$solrDoc->setField('page', $logicalUnit['points']);
 
-            }
+			}
 
-            if ($logicalUnit['id'] == $doc->toplevelId) {
+			if ($logicalUnit['id'] == $doc->toplevelId) {
 
-                $solrDoc->setField('thumbnail', $doc->thumbnail);
+				$solrDoc->setField('thumbnail', $doc->thumbnail);
 
-            } elseif (!empty($logicalUnit['thumbnailId'])) {
+			} elseif (!empty($logicalUnit['thumbnailId'])) {
 
-                $solrDoc->setField('thumbnail', $doc->getFileLocation($logicalUnit['thumbnailId']));
+				$solrDoc->setField('thumbnail', $doc->getFileLocation($logicalUnit['thumbnailId']));
 
-            }
+			}
 
-            $solrDoc->setField('partof', $doc->parentId);
+			$solrDoc->setField('partof', $doc->parentId);
 
-            $solrDoc->setField('root', $doc->rootId);
+			$solrDoc->setField('root', $doc->rootId);
 
-            $solrDoc->setField('sid', $logicalUnit['id']);
+			$solrDoc->setField('sid', $logicalUnit['id']);
 
-            $solrDoc->setField('toplevel', in_array($logicalUnit['type'], self::$toplevel));
+			$solrDoc->setField('toplevel', in_array($logicalUnit['type'], self::$toplevel));
 
-            $solrDoc->setField('type', $logicalUnit['type'], self::$fields['fieldboost']['type']);
+			$solrDoc->setField('type', $logicalUnit['type'], self::$fields['fieldboost']['type']);
 
-            $solrDoc->setField('title', $metadata['title'][0], self::$fields['fieldboost']['title']);
+			$solrDoc->setField('title', $metadata['title'][0], self::$fields['fieldboost']['title']);
 
-            $solrDoc->setField('volume', $metadata['volume'][0], self::$fields['fieldboost']['volume']);
+			$solrDoc->setField('volume', $metadata['volume'][0], self::$fields['fieldboost']['volume']);
 
-            $solrDoc->setField('record_id', $metadata['record_id'][0]);
+			$solrDoc->setField('record_id', $metadata['record_id'][0]);
 
-            $solrDoc->setField('purl', $metadata['purl'][0]);
+			$solrDoc->setField('purl', $metadata['purl'][0]);
 
-            $solrDoc->setField('location',$doc->location);
+			$solrDoc->setField('location',$doc->location);
 
-            $solrDoc->setField('urn', $metadata['urn']);
+			$solrDoc->setField('urn', $metadata['urn']);
 
-            $solrDoc->setField('collection', $metadata['collection']);
+			$solrDoc->setField('collection', $metadata['collection']);
 
-            $autocomplete = array ();
+			$autocomplete = array ();
 
-            foreach ($metadata as $index_name => $data) {
+			foreach ($metadata as $index_name => $data) {
 
-                if (!empty($data) && substr($index_name, -8) !== '_sorting') {
+				if (!empty($data) && substr($index_name, -8) !== '_sorting') {
 
-                    $solrDoc->setField(self::getIndexFieldName($index_name, $doc->pid), $data, self::$fields['fieldboost'][$index_name]);
+					$solrDoc->setField(self::getIndexFieldName($index_name, $doc->pid), $data, self::$fields['fieldboost'][$index_name]);
 
-                    if (in_array($index_name, self::$fields['sortables'])) {
+					if (in_array($index_name, self::$fields['sortables'])) {
 
-                        // Add sortable fields to index.
-                        $solrDoc->setField($index_name.'_sorting', $metadata[$index_name.'_sorting'][0]);
+						// Add sortable fields to index.
+						$solrDoc->setField($index_name.'_sorting', $metadata[$index_name.'_sorting'][0]);
 
-                    }
+					}
 
-                    if (in_array($index_name, self::$fields['facets'])) {
+					if (in_array($index_name, self::$fields['facets'])) {
 
-                        // Add facets to index.
-                        $solrDoc->setField($index_name.'_faceting', $data);
+						// Add facets to index.
+						$solrDoc->setField($index_name.'_faceting', $data);
 
-                    }
+					}
 
-                    if (in_array($index_name, self::$fields['autocomplete'])) {
+					if (in_array($index_name, self::$fields['autocomplete'])) {
 
-                        $autocomplete = array_merge($autocomplete, $data);
+						$autocomplete = array_merge($autocomplete, $data);
 
-                    }
+					}
 
-                }
+				}
 
-            }
+			}
 
-            // Add autocomplete values to index.
-            if (!empty($autocomplete)) {
+			// Add autocomplete values to index.
+			if (!empty($autocomplete)) {
 
-                $solrDoc->setField('autocomplete', $autocomplete);
+				$solrDoc->setField('autocomplete', $autocomplete);
 
-            }
+			}
 
-            // Add collection information to logical sub-elements if applicable.
-            if (in_array('collection', self::$fields['facets'])
-                && empty($metadata['collection'])
-                && !empty($doc->metadataArray[$doc->toplevelId]['collection'])) {
+			// Add collection information to logical sub-elements if applicable.
+			if (in_array('collection', self::$fields['facets'])
+				&& empty($metadata['collection'])
+				&& !empty($doc->metadataArray[$doc->toplevelId]['collection'])) {
 
-                $solrDoc->setField('collection_faceting', $doc->metadataArray[$doc->toplevelId]['collection']);
+				$solrDoc->setField('collection_faceting', $doc->metadataArray[$doc->toplevelId]['collection']);
 
-            }
+			}
 
-            try {
+			try {
 
-                self::$solr->service->addDocument($solrDoc);
+				self::$solr->service->addDocument($solrDoc);
 
-            } catch (Exception $e) {
+			} catch (Exception $e) {
 
-                if (!defined('TYPO3_cliMode')) {
+				if (!defined('TYPO3_cliMode')) {
 
-                    $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
-                        tx_dlf_helper::getLL('flash.error', TRUE),
-                        \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                        TRUE
-                    );
+					$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+						tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
+						tx_dlf_helper::getLL('flash.error', TRUE),
+						\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+						TRUE
+					);
 
-                    tx_dlf_helper::addMessage($message);
+					tx_dlf_helper::addMessage($message);
 
-                }
+				}
 
-                return 1;
+				return 1;
 
-            }
+			}
 
-        }
+		}
 
-        // Check for child elements...
-        if (!empty($logicalUnit['children'])) {
+		// Check for child elements...
+		if (!empty($logicalUnit['children'])) {
 
-            foreach ($logicalUnit['children'] as $child) {
+			foreach ($logicalUnit['children'] as $child) {
 
-                if (!$errors) {
+				if (!$errors) {
 
-                    // ...and process them, too.
-                    $errors = self::processLogical($doc, $child);
+					// ...and process them, too.
+					$errors = self::processLogical($doc, $child);
 
-                } else {
+				} else {
 
-                    break;
+					break;
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-        return $errors;
+		return $errors;
 
-    }
+	}
 
-    /**
-     * Processes a physical unit for the Solr index
-     *
-     * @access	protected
-     *
-     * @param	tx_dlf_document		&$doc: The METS document
-     * @param	integer		$page: The page number
-     * @param	array		$physicalUnit: Array of the physical unit to process
-     *
-     * @return	integer		0 on success or 1 on failure
-     */
-    protected static function processPhysical(tx_dlf_document &$doc, $page, array $physicalUnit) {
+	/**
+	 * Processes a physical unit for the Solr index
+	 *
+	 * @access	protected
+	 *
+	 * @param	tx_dlf_document		&$doc: The METS document
+	 * @param	integer		$page: The page number
+	 * @param	array		$physicalUnit: Array of the physical unit to process
+	 *
+	 * @return	integer		0 on success or 1 on failure
+	 */
+	protected static function processPhysical(tx_dlf_document &$doc, $page, array $physicalUnit) {
 
-        $errors = 0;
+		$errors = 0;
 
-        // Read extension configuration.
-        $extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][self::$extKey]);
+		// Read extension configuration.
+		$extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][self::$extKey]);
 
-        if (!empty($physicalUnit['files'][$extConf['fileGrpFulltext']])) {
+		if (!empty($physicalUnit['files'][$extConf['fileGrpFulltext']])) {
 
-            $file = $doc->getFileLocation($physicalUnit['files'][$extConf['fileGrpFulltext']]);
+			$file = $doc->getFileLocation($physicalUnit['files'][$extConf['fileGrpFulltext']]);
 
-            // Load XML file.
-            if (\TYPO3\CMS\Core\Utility\GeneralUtility::isValidUrl($file)) {
+			// Load XML file.
+			if (\TYPO3\CMS\Core\Utility\GeneralUtility::isValidUrl($file)) {
 
-                // Set user-agent to identify self when fetching XML data.
-                if (!empty($extConf['useragent'])) {
+				// Set user-agent to identify self when fetching XML data.
+				if (!empty($extConf['useragent'])) {
 
-                    @ini_set('user_agent', $extConf['useragent']);
+					@ini_set('user_agent', $extConf['useragent']);
 
-                }
+				}
 
-                // Turn off libxml's error logging.
-                $libxmlErrors = libxml_use_internal_errors(TRUE);
+				// Turn off libxml's error logging.
+				$libxmlErrors = libxml_use_internal_errors(TRUE);
 
-                // disable entity loading
-                $previousValueOfEntityLoader = libxml_disable_entity_loader(TRUE);
+				// disable entity loading
+				$previousValueOfEntityLoader = libxml_disable_entity_loader(TRUE);
 
-                // Load XML from file.
-                $xml = simplexml_load_string(\TYPO3\CMS\Core\Utility\GeneralUtility::getUrl($file));
+				// Load XML from file.
+				$xml = simplexml_load_string(\TYPO3\CMS\Core\Utility\GeneralUtility::getUrl($file));
 
-                // reset entity loader setting
-                libxml_disable_entity_loader($previousValueOfEntityLoader);
+				// reset entity loader setting
+				libxml_disable_entity_loader($previousValueOfEntityLoader);
 
-                // Reset libxml's error logging.
-                libxml_use_internal_errors($libxmlErrors);
+				// Reset libxml's error logging.
+				libxml_use_internal_errors($libxmlErrors);
 
-                if ($xml === FALSE) {
+				if ($xml === FALSE) {
 
-                    return 1;
+					return 1;
 
-                }
+				}
 
-            } else {
+			} else {
 
-                return 1;
+				return 1;
 
-            }
+			}
 
-            // Load class.
-            if (!class_exists('Apache_Solr_Document')) {
+			// Load class.
+			if (!class_exists('Apache_Solr_Document')) {
 
-                require_once(\TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName('EXT:'.self::$extKey.'/lib/SolrPhpClient/Apache/Solr/Document.php'));
+				require_once(\TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName('EXT:'.self::$extKey.'/lib/SolrPhpClient/Apache/Solr/Document.php'));
 
-            }
+			}
 
-            // Create new Solr document.
-            $solrDoc = new Apache_Solr_Document();
+			// Create new Solr document.
+			$solrDoc = new Apache_Solr_Document();
 
-            // Create unique identifier from document's UID and unit's XML ID.
-            $solrDoc->setField('id', $doc->uid.$physicalUnit['id']);
+			// Create unique identifier from document's UID and unit's XML ID.
+			$solrDoc->setField('id', $doc->uid.$physicalUnit['id']);
 
-            $solrDoc->setField('uid', $doc->uid);
+			$solrDoc->setField('uid', $doc->uid);
 
-            $solrDoc->setField('pid', $doc->pid);
+			$solrDoc->setField('pid', $doc->pid);
 
-            $solrDoc->setField('page', $page);
+			$solrDoc->setField('page', $page);
 
-            if (!empty($physicalUnit['files'][$extConf['fileGrpThumbs']])) {
+			if (!empty($physicalUnit['files'][$extConf['fileGrpThumbs']])) {
 
-                $solrDoc->setField('thumbnail', $doc->getFileLocation($physicalUnit['files'][$extConf['fileGrpThumbs']]));
+				$solrDoc->setField('thumbnail', $doc->getFileLocation($physicalUnit['files'][$extConf['fileGrpThumbs']]));
 
-            }
+			}
 
-            $solrDoc->setField('partof', $doc->parentId);
+			$solrDoc->setField('partof', $doc->parentId);
 
-            $solrDoc->setField('root', $doc->rootId);
+			$solrDoc->setField('root', $doc->rootId);
 
-            $solrDoc->setField('sid', $physicalUnit['id']);
+			$solrDoc->setField('sid', $physicalUnit['id']);
 
-            $solrDoc->setField('toplevel', FALSE);
+			$solrDoc->setField('toplevel', FALSE);
 
-            $solrDoc->setField('type', $physicalUnit['type'], self::$fields['fieldboost']['type']);
+			$solrDoc->setField('type', $physicalUnit['type'], self::$fields['fieldboost']['type']);
 
-            $solrDoc->setField('fulltext', tx_dlf_alto::getRawText($xml));
+			$solrDoc->setField('fulltext', tx_dlf_alto::getRawText($xml));
 
-            // Add faceting information to physical sub-elements if applicable.
-            foreach ($doc->metadataArray[$doc->toplevelId] as $index_name => $data) {
+			// Add faceting information to physical sub-elements if applicable.
+			foreach ($doc->metadataArray[$doc->toplevelId] as $index_name => $data) {
 
-                if (!empty($data) && substr($index_name, -8) !== '_sorting') {
+				if (!empty($data) && substr($index_name, -8) !== '_sorting') {
 
-                    if (in_array($index_name, self::$fields['facets'])) {
+					if (in_array($index_name, self::$fields['facets'])) {
 
-                        // Add facets to index.
-                        $solrDoc->setField($index_name.'_faceting', $data);
+						// Add facets to index.
+						$solrDoc->setField($index_name.'_faceting', $data);
 
-                    }
+					}
 
-                }
+				}
 
-            }
+			}
 
-            try {
+			try {
 
-                self::$solr->service->addDocument($solrDoc);
+				self::$solr->service->addDocument($solrDoc);
 
-            } catch (Exception $e) {
+			} catch (Exception $e) {
 
-                if (!defined('TYPO3_cliMode')) {
+				if (!defined('TYPO3_cliMode')) {
 
-                    $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
-                        tx_dlf_helper::getLL('flash.error', TRUE),
-                        \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                        TRUE
-                    );
+					$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+						tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
+						tx_dlf_helper::getLL('flash.error', TRUE),
+						\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+						TRUE
+					);
 
-                    tx_dlf_helper::addMessage($message);
+					tx_dlf_helper::addMessage($message);
 
-                }
+				}
 
-                return 1;
+				return 1;
 
-            }
+			}
 
-        }
+		}
 
-        return $errors;
+		return $errors;
 
-    }
+	}
 
-    /**
-     * Connects to Solr server.
-     *
-     * @access	protected
-     *
-     * @param	integer		$core: UID of the Solr core
-     * @param	integer		$pid: UID of the configuration page
-     *
-     * @return	boolean		TRUE on success or FALSE on failure
-     */
-    protected static function solrConnect($core, $pid = 0) {
+	/**
+	 * Connects to Solr server.
+	 *
+	 * @access	protected
+	 *
+	 * @param	integer		$core: UID of the Solr core
+	 * @param	integer		$pid: UID of the configuration page
+	 *
+	 * @return	boolean		TRUE on success or FALSE on failure
+	 */
+	protected static function solrConnect($core, $pid = 0) {
 
-        // Get Solr instance.
-        if (!self::$solr) {
+		// Get Solr instance.
+		if (!self::$solr) {
 
-            // Connect to Solr server.
-            if (self::$solr = tx_dlf_solr::getInstance($core)) {
+			// Connect to Solr server.
+			if (self::$solr = tx_dlf_solr::getInstance($core)) {
 
-                // Load indexing configuration if needed.
-                if ($pid) {
+				// Load indexing configuration if needed.
+				if ($pid) {
 
-                    self::loadIndexConf($pid);
+					self::loadIndexConf($pid);
 
-                }
+				}
 
-            } else {
+			} else {
 
-                return FALSE;
+				return FALSE;
 
-            }
+			}
 
-        }
+		}
 
-        return TRUE;
+		return TRUE;
 
-    }
+	}
 
-    /**
-     * This is a static class, thus no instances should be created
-     *
-     * @access private
-     */
-    private function __construct() {}
+	/**
+	 * This is a static class, thus no instances should be created
+	 *
+	 * @access private
+	 */
+	private function __construct() {}
 
 }

Spacing +13 added lines, -13 removed lines

@@ -34,14 +34,14 @@ 
      * @var	array
      * @access protected
      */
-    protected static $fields = array (
-        'autocomplete' => array (),
-        'facets' => array (),
-        'sortables' => array (),
-        'indexed' => array (),
-        'stored' => array (),
-        'tokenized' => array (),
-        'fieldboost' => array ()
+    protected static $fields = array(
+        'autocomplete' => array(),
+        'facets' => array(),
+        'sortables' => array(),
+        'indexed' => array(),
+        'stored' => array(),
+        'tokenized' => array(),
+        'fieldboost' => array()
     );
 
     /**
@@ -59,7 +59,7 @@ 
      * @var	array
      * @access protected
      */
-    protected static $processedDocs = array ();
+    protected static $processedDocs = array();
 
     /**
      * Instance of Apache_Solr_Service class
@@ -76,7 +76,7 @@ 
      * @var	array
      * @access protected
      */
-    protected static $toplevel = array ();
+    protected static $toplevel = array();
 
     /**
      * Insert given document into Solr index
@@ -101,7 +101,7 @@ 
             // Handle multi-volume documents.
             if ($doc->parentId) {
 
-                $parent =& tx_dlf_document::getInstance($doc->parentId, 0, TRUE);
+                $parent = & tx_dlf_document::getInstance($doc->parentId, 0, TRUE);
 
                 if ($parent->ready) {
 
@@ -595,13 +595,13 @@ 
 
             $solrDoc->setField('purl', $metadata['purl'][0]);
 
-            $solrDoc->setField('location',$doc->location);
+            $solrDoc->setField('location', $doc->location);
 
             $solrDoc->setField('urn', $metadata['urn']);
 
             $solrDoc->setField('collection', $metadata['collection']);
 
-            $autocomplete = array ();
+            $autocomplete = array();
 
             foreach ($metadata as $index_name => $data) {
 

common/class.tx_dlf_mods.php

Indentation +88 added lines, -88 removed lines

@@ -19,159 +19,159 @@
  */
 class tx_dlf_mods implements tx_dlf_format {
 
-    /**
-     * This extracts the essential MODS metadata from XML
-     *
-     * @access	public
-     *
-     * @param	SimpleXMLElement		$xml: The XML to extract the metadata from
-     * @param	array		&$metadata: The metadata array to fill
-     *
-     * @return	void
-     */
-    public function extractMetadata(SimpleXMLElement $xml, array &$metadata) {
+	/**
+	 * This extracts the essential MODS metadata from XML
+	 *
+	 * @access	public
+	 *
+	 * @param	SimpleXMLElement		$xml: The XML to extract the metadata from
+	 * @param	array		&$metadata: The metadata array to fill
+	 *
+	 * @return	void
+	 */
+	public function extractMetadata(SimpleXMLElement $xml, array &$metadata) {
 
-        $xml->registerXPathNamespace('mods', 'http://www.loc.gov/mods/v3');
+		$xml->registerXPathNamespace('mods', 'http://www.loc.gov/mods/v3');
 
-        // Get "author" and "author_sorting".
-        $authors = $xml->xpath('./mods:name[./mods:role/mods:roleTerm[@type="code" and @authority="marcrelator"]="aut"]');
+		// Get "author" and "author_sorting".
+		$authors = $xml->xpath('./mods:name[./mods:role/mods:roleTerm[@type="code" and @authority="marcrelator"]="aut"]');
 
-        // Get "author" and "author_sorting" again if that was to sophisticated.
-        if (!$authors) {
+		// Get "author" and "author_sorting" again if that was to sophisticated.
+		if (!$authors) {
 
-            // Get all names which do not have any role term assigned and assume these are authors.
-            $authors = $xml->xpath('./mods:name[not(./mods:role)]');
+			// Get all names which do not have any role term assigned and assume these are authors.
+			$authors = $xml->xpath('./mods:name[not(./mods:role)]');
 
-        }
+		}
 
-        if (is_array($authors)) {
+		if (is_array($authors)) {
 
-            for ($i = 0, $j = count($authors); $i < $j; $i++) {
+			for ($i = 0, $j = count($authors); $i < $j; $i++) {
 
-                $authors[$i]->registerXPathNamespace('mods', 'http://www.loc.gov/mods/v3');
+				$authors[$i]->registerXPathNamespace('mods', 'http://www.loc.gov/mods/v3');
 
-                // Check if there is a display form.
-                if (($displayForm = $authors[$i]->xpath('./mods:displayForm'))) {
+				// Check if there is a display form.
+				if (($displayForm = $authors[$i]->xpath('./mods:displayForm'))) {
 
-                    $metadata['author'][$i] = (string) $displayForm[0];
+					$metadata['author'][$i] = (string) $displayForm[0];
 
-                } elseif (($nameParts = $authors[$i]->xpath('./mods:namePart'))) {
+				} elseif (($nameParts = $authors[$i]->xpath('./mods:namePart'))) {
 
-                    $name = array ();
+					$name = array ();
 
-                    $k = 4;
+					$k = 4;
 
-                    foreach ($nameParts as $namePart) {
+					foreach ($nameParts as $namePart) {
 
-                        if (isset($namePart['type']) && (string) $namePart['type'] == 'family') {
+						if (isset($namePart['type']) && (string) $namePart['type'] == 'family') {
 
-                            $name[0] = (string) $namePart;
+							$name[0] = (string) $namePart;
 
-                        } elseif (isset($namePart['type']) && (string) $namePart['type'] == 'given') {
+						} elseif (isset($namePart['type']) && (string) $namePart['type'] == 'given') {
 
-                            $name[1] = (string) $namePart;
+							$name[1] = (string) $namePart;
 
-                        } elseif (isset($namePart['type']) && (string) $namePart['type'] == 'termsOfAddress') {
+						} elseif (isset($namePart['type']) && (string) $namePart['type'] == 'termsOfAddress') {
 
-                            $name[2] = (string) $namePart;
+							$name[2] = (string) $namePart;
 
-                        } elseif (isset($namePart['type']) && (string) $namePart['type'] == 'date') {
+						} elseif (isset($namePart['type']) && (string) $namePart['type'] == 'date') {
 
-                            $name[3] = (string) $namePart;
+							$name[3] = (string) $namePart;
 
-                        } else {
+						} else {
 
-                            $name[$k] = (string) $namePart;
+							$name[$k] = (string) $namePart;
 
-                        }
+						}
 
-                        $k++;
+						$k++;
 
-                    }
+					}
 
-                    ksort($name);
+					ksort($name);
 
-                    $metadata['author'][$i] = trim(implode(', ', $name));
+					$metadata['author'][$i] = trim(implode(', ', $name));
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-        // Get "place" and "place_sorting".
-        $places = $xml->xpath('./mods:originInfo[not(./mods:edition="[Electronic ed.]")]/mods:place/mods:placeTerm');
+		// Get "place" and "place_sorting".
+		$places = $xml->xpath('./mods:originInfo[not(./mods:edition="[Electronic ed.]")]/mods:place/mods:placeTerm');
 
-        // Get "place" and "place_sorting" again if that was to sophisticated.
-        if (!$places) {
+		// Get "place" and "place_sorting" again if that was to sophisticated.
+		if (!$places) {
 
-            // Get all places and assume these are places of publication.
-            $places = $xml->xpath('./mods:originInfo/mods:place/mods:placeTerm');
+			// Get all places and assume these are places of publication.
+			$places = $xml->xpath('./mods:originInfo/mods:place/mods:placeTerm');
 
-        }
+		}
 
-        if (is_array($places)) {
+		if (is_array($places)) {
 
-            foreach ($places as $place) {
+			foreach ($places as $place) {
 
-                $metadata['place'][] = (string) $place;
+				$metadata['place'][] = (string) $place;
 
-                if (!$metadata['place_sorting'][0]) {
+				if (!$metadata['place_sorting'][0]) {
 
-                    $metadata['place_sorting'][0] = preg_replace('/[[:punct:]]/', '', (string) $place);
+					$metadata['place_sorting'][0] = preg_replace('/[[:punct:]]/', '', (string) $place);
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-        // Get "year_sorting".
-        if (($years_sorting = $xml->xpath('./mods:originInfo[not(./mods:edition="[Electronic ed.]")]/mods:dateOther[@type="order" and @encoding="w3cdtf"]'))) {
+		// Get "year_sorting".
+		if (($years_sorting = $xml->xpath('./mods:originInfo[not(./mods:edition="[Electronic ed.]")]/mods:dateOther[@type="order" and @encoding="w3cdtf"]'))) {
 
-            foreach ($years_sorting as $year_sorting) {
+			foreach ($years_sorting as $year_sorting) {
 
-                $metadata['year_sorting'][0] = intval($year_sorting);
+				$metadata['year_sorting'][0] = intval($year_sorting);
 
-            }
+			}
 
-        }
+		}
 
-        // Get "year" and "year_sorting" if not specified separately.
-        $years = $xml->xpath('./mods:originInfo[not(./mods:edition="[Electronic ed.]")]/mods:dateIssued[@keyDate="yes"]');
+		// Get "year" and "year_sorting" if not specified separately.
+		$years = $xml->xpath('./mods:originInfo[not(./mods:edition="[Electronic ed.]")]/mods:dateIssued[@keyDate="yes"]');
 
-        // Get "year" and "year_sorting" again if that was to sophisticated.
-        if (!$years) {
+		// Get "year" and "year_sorting" again if that was to sophisticated.
+		if (!$years) {
 
-            // Get all dates and assume these are dates of publication.
-            $years = $xml->xpath('./mods:originInfo/mods:dateIssued');
+			// Get all dates and assume these are dates of publication.
+			$years = $xml->xpath('./mods:originInfo/mods:dateIssued');
 
-        }
+		}
 
-        if (is_array($years)) {
+		if (is_array($years)) {
 
-            foreach ($years as $year) {
+			foreach ($years as $year) {
 
-                $metadata['year'][] = (string) $year;
+				$metadata['year'][] = (string) $year;
 
-                if (!$metadata['year_sorting'][0]) {
+				if (!$metadata['year_sorting'][0]) {
 
-                    $year_sorting = str_ireplace('x', '5', preg_replace('/[^\d.x]/i', '', (string) $year));
+					$year_sorting = str_ireplace('x', '5', preg_replace('/[^\d.x]/i', '', (string) $year));
 
-                    if (strpos($year_sorting, '.') || strlen($year_sorting) < 3) {
+					if (strpos($year_sorting, '.') || strlen($year_sorting) < 3) {
 
-                        $year_sorting = ((intval(trim($year_sorting, '.')) - 1) * 100) + 50;
+						$year_sorting = ((intval(trim($year_sorting, '.')) - 1) * 100) + 50;
 
-                    }
+					}
 
-                    $metadata['year_sorting'][0] = intval($year_sorting);
+					$metadata['year_sorting'][0] = intval($year_sorting);
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 
                 } elseif (($nameParts = $authors[$i]->xpath('./mods:namePart'))) {
 
-                    $name = array ();
+                    $name = array();
 
                     $k = 4;
 

common/class.tx_dlf_teihdr.php

Indentation +13 added lines, -13 removed lines

@@ -19,20 +19,20 @@
  */
 class tx_dlf_teihdr implements tx_dlf_format {
 
-    /**
-     * This extracts the essential TEIHDR metadata from XML
-     *
-     * @access	public
-     *
-     * @param	SimpleXMLElement		$xml: The XML to extract the metadata from
-     * @param	array		&$metadata: The metadata array to fill
-     *
-     * @return	void
-     */
-    public function extractMetadata(SimpleXMLElement $xml, array &$metadata) {
+	/**
+	 * This extracts the essential TEIHDR metadata from XML
+	 *
+	 * @access	public
+	 *
+	 * @param	SimpleXMLElement		$xml: The XML to extract the metadata from
+	 * @param	array		&$metadata: The metadata array to fill
+	 *
+	 * @return	void
+	 */
+	public function extractMetadata(SimpleXMLElement $xml, array &$metadata) {
 
-        $xml->registerXPathNamespace('teihdr', 'http://www.tei-c.org/ns/1.0');
+		$xml->registerXPathNamespace('teihdr', 'http://www.tei-c.org/ns/1.0');
 
-    }
+	}
 
 }