From cbab079fdca84f25a0c156ea9ca3fb7828186edd Mon Sep 17 00:00:00 2001 From: Alan Stanley Date: Tue, 18 Aug 2020 00:14:40 +0000 Subject: [PATCH] coder stuff --- islandora.module | 2 -- .../src/Controller/MediaSourceController.php | 22 ++++++++++++++++--- src/Controller/MediaSourceController.php | 2 +- .../Condition/MediaSourceHasMimetype.php | 2 -- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/islandora.module b/islandora.module index b057a866..98762248 100644 --- a/islandora.module +++ b/islandora.module @@ -313,8 +313,6 @@ function islandora_entity_view_mode_alter(&$view_mode, EntityInterface $entity) } } - - /** * Implements hook_preprocess_node(). */ diff --git a/modules/islandora_text_extraction/src/Controller/MediaSourceController.php b/modules/islandora_text_extraction/src/Controller/MediaSourceController.php index f716dd0c..da934ea5 100644 --- a/modules/islandora_text_extraction/src/Controller/MediaSourceController.php +++ b/modules/islandora_text_extraction/src/Controller/MediaSourceController.php @@ -43,11 +43,9 @@ class MediaSourceController extends ControllerBase { /** * MediaSourceController constructor. * - * @param \Drupal\Core\File\FileSystem + * @param \Drupal\Core\File\FileSystem $fileSystem * Filesystem service. */ - - public function __construct(FileSystem $fileSystem) { $this->fileSystem = $fileSystem; } @@ -67,6 +65,24 @@ class MediaSourceController extends ControllerBase { ); } + /** + * Attaches incoming file to existing media. + * + * @param \Drupal\media\Entity\Media $media + * Media to hold file. + * @param string $destination_field + * Media field to hold file. + * @param string $destination_text_field + * Media field to hold extracted text. + * @param \Symfony\Component\HttpFoundation\Request $request + * HTTP Request from Karaf. + * + * @return \Symfony\Component\HttpFoundation\Response + * HTTP response. + * + * @throws \Drupal\Core\Entity\EntityStorageException + * @throws \Drupal\Core\TypedData\Exception\ReadOnlyException + */ public function attachToMedia( Media $media, string $destination_field, diff --git a/src/Controller/MediaSourceController.php b/src/Controller/MediaSourceController.php index ff6e9821..374d0f8b 100644 --- a/src/Controller/MediaSourceController.php +++ b/src/Controller/MediaSourceController.php @@ -241,7 +241,7 @@ class MediaSourceController extends ControllerBase { ]); $media->save(); } - else{ + else { $this->getLogger('islandora')->warning("Field $destination_field is not defined in Media Type {$media->bundle()}"); } } diff --git a/src/Plugin/Condition/MediaSourceHasMimetype.php b/src/Plugin/Condition/MediaSourceHasMimetype.php index 53e20200..815e59e2 100644 --- a/src/Plugin/Condition/MediaSourceHasMimetype.php +++ b/src/Plugin/Condition/MediaSourceHasMimetype.php @@ -23,8 +23,6 @@ class MediaSourceHasMimetype extends ConditionPluginBase { * {@inheritdoc} */ public function buildConfigurationForm(array $form, FormStateInterface $form_state) { - - $form['mimetype'] = [ '#title' => $this->t('Source Media Mimetype'), '#type' => 'textfield',