From d275eb43a446d60423f3566afb5e547bc0dcee73 Mon Sep 17 00:00:00 2001 From: willtp87 Date: Mon, 29 Sep 2014 11:15:31 -0300 Subject: [PATCH 1/6] potx no longer having recomended dl --- tests/scripts/travis_setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index 5a8c78ef..84b6c44c 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -39,7 +39,7 @@ mv sites/all/modules/islandora/tests/travis.test_config.ini sites/all/modules/is mkdir sites/all/libraries ln -s $HOME/tuque sites/all/libraries/tuque drush dl --yes coder -drush dl --yes potx +drush dl --yes potx-7.x-1.0 drush en --yes coder_review drush en --yes simpletest drush en --yes potx From 3f9ed4cf461dd2619fd5952bb1d43f53dcea3ef3 Mon Sep 17 00:00:00 2001 From: Matthew Perry Date: Thu, 2 Oct 2014 10:52:37 -0300 Subject: [PATCH 2/6] Fixing spelling mistake in ingest message: notifiy changed to notify. --- includes/ingest.form.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/ingest.form.inc b/includes/ingest.form.inc index b5a4740d..6c802f44 100644 --- a/includes/ingest.form.inc +++ b/includes/ingest.form.inc @@ -799,7 +799,7 @@ function islandora_ingest_form_submit(array $form, array &$form_state) { WATCHDOG_ERROR ); drupal_set_message( - t('A problem occured while ingesting "@label" (ID: @pid), please notifiy the administrator.', + t('A problem occured while ingesting "@label" (ID: @pid), please notify the administrator.', array('@label' => $object->label, '@pid' => $object->id)), 'error' ); From d2a86da5457ae45fe5c7fc0a048a1c1280c4f0ed Mon Sep 17 00:00:00 2001 From: Jordan Dukart Date: Thu, 2 Oct 2014 14:56:40 -0300 Subject: [PATCH 3/6] Fix the invalid markup generated by the printer icon. --- islandora.module | 2 ++ 1 file changed, 2 insertions(+) diff --git a/islandora.module b/islandora.module index b692438e..207c9367 100644 --- a/islandora.module +++ b/islandora.module @@ -1940,6 +1940,8 @@ function islandora_menu_local_tasks_alter(&$data, $router_item, $root_path) { if ($tab['#link']['path'] == 'islandora/object/%/print_object') { if ($root_path == 'islandora/object/%') { $islandora_path = drupal_get_path('module', 'islandora'); + $tab['#prefix'] = '
  • '; + $tab['#suffix'] = '
    • '; $tab['#theme'] = 'link'; $tab['#text'] = theme('image', array( 'path' => "$islandora_path/images/print-icon.png", From 35e965c7b874f998839d85bb9fab7f4dfa2b5ba7 Mon Sep 17 00:00:00 2001 From: willtp87 Date: Thu, 2 Oct 2014 16:11:29 -0300 Subject: [PATCH 4/6] datastream entity --- islandora.module | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/islandora.module b/islandora.module index b692438e..3e4525d4 100644 --- a/islandora.module +++ b/islandora.module @@ -1511,6 +1511,14 @@ function islandora_entity_info() { 'label' => 'label', ), ); + $entities['islandora_datastream'] = array( + 'label' => t('Islandora Datastream'), + 'fieldable' => FALSE, + 'entity keys' => array( + 'id' => 'id', + 'label' => 'label', + ), + ); return $entities; } @@ -1523,39 +1531,56 @@ function islandora_entity_info() { function islandora_entity_property_info() { $info = array(); - $p = &$info['islandora_object']['properties']; + $object_properties = &$info['islandora_object']['properties']; + $datastream_properties = &$info['islandora_datastream']['properties']; - $p['id'] = array( + $object_properties['id'] = array( 'type' => 'text', 'label' => t('ID'), 'description' => t('The identifier of the object.'), ); - $p['label'] = array( + $object_properties['label'] = array( 'type' => 'text', 'label' => t('Object Label'), 'description' => t('The label of the object.'), ); - $p['owner'] = array( + $object_properties['owner'] = array( 'type' => 'text', 'label' => t('Object Owner'), 'description' => t('The name of the owner of the object.'), ); - $p['state'] = array( + $object_properties['state'] = array( 'type' => 'text', 'label' => t('Object State'), 'description' => t('An initial representing the state of the object.'), ); - $p['models'] = array( + $object_properties['models'] = array( 'type' => 'list', 'label' => t('Content Models'), 'description' => t('The list of content models which the object has.'), ); - $p['createdDate'] = array( + $object_properties['createdDate'] = array( 'type' => 'text', 'label' => t('Created Date'), 'description' => t('When the object was created.'), ); + $datastream_properties['id'] = array( + 'type' => 'text', + 'label' => t('ID'), + 'description' => t('The identifier of the datastream.'), + ); + $datastream_properties['label'] = array( + 'type' => 'text', + 'label' => t('Datastream Label'), + 'description' => t('The label of the datastream.'), + ); + $datastream_properties['mimetype'] = array( + 'type' => 'text', + 'label' => t('MIME type'), + 'description' => t('Content type of the datastream.'), + ); + return $info; } From f548041cf7dbea2234e4b9d91720a77441dc03a6 Mon Sep 17 00:00:00 2001 From: MorganDawe Date: Fri, 3 Oct 2014 13:59:12 -0300 Subject: [PATCH 5/6] Updated mimetype mappings. --- includes/mime_detect.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/mime_detect.inc b/includes/mime_detect.inc index da2c69f3..a0c3dcf2 100644 --- a/includes/mime_detect.inc +++ b/includes/mime_detect.inc @@ -214,7 +214,6 @@ class MimeDetect { // OpenDX Grid. "dx" => "chemical/x-jcamp-dx", // MOPAC Cartesian. - "mop" => "chemical/x-mopac-input", // Compressed formats: // (note: http://svn.cleancode.org/svn/email/trunk/mime.types) "tgz" => "application/x-gzip", @@ -222,6 +221,7 @@ class MimeDetect { "tar" => "application/x-tar", "gtar" => "application/x-gtar", "zip" => "application/x-zip", + "dat" => "application/octet-stream", // others: 'bin' => 'application/octet-stream', // Web Archives: From 4d9a1ce26ef558c53d5b95d7975d95b7530d6fb2 Mon Sep 17 00:00:00 2001 From: MorganDawe Date: Fri, 3 Oct 2014 14:14:22 -0300 Subject: [PATCH 6/6] added mop back to mimedetect. --- includes/mime_detect.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/includes/mime_detect.inc b/includes/mime_detect.inc index a0c3dcf2..8da0ebe7 100644 --- a/includes/mime_detect.inc +++ b/includes/mime_detect.inc @@ -214,6 +214,7 @@ class MimeDetect { // OpenDX Grid. "dx" => "chemical/x-jcamp-dx", // MOPAC Cartesian. + "mop" => "chemical/x-mopac-input", // Compressed formats: // (note: http://svn.cleancode.org/svn/email/trunk/mime.types) "tgz" => "application/x-gzip",