Browse Source

coder stuff

pull/756/head
Alan Stanley 5 years ago
parent
commit
cbab079fdc
  1. 2
      islandora.module
  2. 22
      modules/islandora_text_extraction/src/Controller/MediaSourceController.php
  3. 2
      src/Controller/MediaSourceController.php
  4. 2
      src/Plugin/Condition/MediaSourceHasMimetype.php

2
islandora.module

@ -313,8 +313,6 @@ function islandora_entity_view_mode_alter(&$view_mode, EntityInterface $entity)
} }
} }
/** /**
* Implements hook_preprocess_node(). * Implements hook_preprocess_node().
*/ */

22
modules/islandora_text_extraction/src/Controller/MediaSourceController.php

@ -43,11 +43,9 @@ class MediaSourceController extends ControllerBase {
/** /**
* MediaSourceController constructor. * MediaSourceController constructor.
* *
* @param \Drupal\Core\File\FileSystem * @param \Drupal\Core\File\FileSystem $fileSystem
* Filesystem service. * Filesystem service.
*/ */
public function __construct(FileSystem $fileSystem) { public function __construct(FileSystem $fileSystem) {
$this->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( public function attachToMedia(
Media $media, Media $media,
string $destination_field, string $destination_field,

2
src/Controller/MediaSourceController.php

@ -241,7 +241,7 @@ class MediaSourceController extends ControllerBase {
]); ]);
$media->save(); $media->save();
} }
else{ else {
$this->getLogger('islandora')->warning("Field $destination_field is not defined in Media Type {$media->bundle()}"); $this->getLogger('islandora')->warning("Field $destination_field is not defined in Media Type {$media->bundle()}");
} }
} }

2
src/Plugin/Condition/MediaSourceHasMimetype.php

@ -23,8 +23,6 @@ class MediaSourceHasMimetype extends ConditionPluginBase {
* {@inheritdoc} * {@inheritdoc}
*/ */
public function buildConfigurationForm(array $form, FormStateInterface $form_state) { public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
$form['mimetype'] = [ $form['mimetype'] = [
'#title' => $this->t('Source Media Mimetype'), '#title' => $this->t('Source Media Mimetype'),
'#type' => 'textfield', '#type' => 'textfield',

Loading…
Cancel
Save