Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drupal modeling refactor #618

Closed
13 tasks done
dannylamb opened this issue May 5, 2017 · 5 comments
Closed
13 tasks done

Drupal modeling refactor #618

dannylamb opened this issue May 5, 2017 · 5 comments
Assignees

Comments

@dannylamb
Copy link
Contributor

dannylamb commented May 5, 2017

I'm in the midst of refactoring for presenation at Islandoracon and am using this ticket to track my progress. This will also partially resolve #572 because it will provide JP2 / TIFF binaries.

  • Remove fedora_has_parent from FedoraResource entity until it gets used
  • Remove ldp:contains field and storage, same as above
  • Push common fields and storage down to the islandora module (description and memberOf)
  • Add TN media entity, and a field to hold it for FedoraResource's
  • Update the OBJ bundle to be a generic file instead of Image field.
  • Add JP2 media bundle and a field to hold it for the Islandora Image
  • Add MEDIUM_SIZE media bundle and a field to hold it for Islandora Image
  • Add appropriate form and display modes for the media and FedoraResource entities we have
  • Add islandora_image to drupal-project
  • Add islandora_image to vagrant install
  • Add rdf mappings for all the media bundles
  • Add membership view
  • Add islandora-indexing-fcrepo to vagrant install

And I'm sure other things... I'll update the list if possible.

There'll be a slew of PRs against multiple repos for this, so heads up. I'll probably put a single set of testing instructions on the issue directly instead of a single PR.

@dannylamb
Copy link
Contributor Author

Testing Instructions

  • Reset your claw_vagrant to master and pull in Adding fcrepo indexing and an extra inference triple for fileOf islandora-deprecated/claw_vagrant#39
  • vagrant up
  • Disable islandora, islandora_collection, and islandora_image on the freshly minted vagrant environment
  • vagrant ssh
  • Pull Add new committers; Diego Pino and Aaron Coburn #59 into /var/www/html/drupal/web/modules/contrib/islandora
  • Pull Islandora-CLAW/islandora_collection#20 into /var/www/html/drupal/web/modules/contrib/islandora_collection
  • Pull Config for Islandora-CLAW/CLAW#618 islandora-deprecated/islandora_image#13 into /var/www/html/drupal/web/modules/contrib/islandora_image
  • Enable islandora_image which will enable the other two modules
  • Visit http://localhost:8000/admin/content/fedora_resource and add a Collection
    screenshot from 2017-05-10 11-55-39
    screenshot from 2017-05-10 11-56-11
  • Visit http://localhost:8000/admin/content/fedora_resource and add an Islandora Image, filling out files where possible (I put a tiff in Fedora and used Houdini to generate a JP2, MEDIUM_SIZE jpg, and TN png, FYI). Set the image to be a member of the collection you just created.
    screenshot from 2017-05-10 11-57-42
    screenshot from 2017-05-10 11-58-02
  • Visit your collection and you should see a 'Members' tab. Click on it, and you should see a list with a single entry, the image you just created.
    screenshot from 2017-05-10 11-58-27
  • Go to Blazegraph at http://localhost:8080/bigdata and query for the collection you made. You should be able to follow around the links in the results to see the full PCDM graph you've just made in your triplestore.
    screenshot from 2017-05-10 11-59-04
  • Go to Fedora at http://localhost:8080/fcrepo/rest and you should be able to see the metadata for the Collection and Islandora Image objects.
    screenshot from 2017-05-10 11-59-53

@ruebot
Copy link
Member

ruebot commented May 10, 2017

Good to go! Nice work @dannylamb!

ubuntu@claw:$ cd /var/www/html/drupal

ubuntu@claw:/var/www/html/drupal$ drush pmu islandora_image
The following extensions will be uninstalled: islandora_image
Do you really want to continue? (y/n): y
The Image OBJ bundle (entity type: media) was deleted. As a result, the field_obj entity reference field (entity_type: fedora_resource, bundle: islandora_image) no longer has any valid bundle it can   [error]
reference. The field is not working correctly anymore and has to be adjusted.
islandora_image was successfully uninstalled.                                                                                                                                                            [ok]

ubuntu@claw:/var/www/html/drupal$ drush pmu islandora_collection
The following extensions will be uninstalled: islandora_collection
Do you really want to continue? (y/n): y
The Collection bundle (entity type: fedora_resource) was deleted. As a result, the field_memberof entity reference field (entity_type: fedora_resource, bundle: collection) no longer has any valid      [error]
bundle it can reference. The field is not working correctly anymore and has to be adjusted.
islandora_collection was successfully uninstalled.                                                                                                                                                       [ok]

ubuntu@claw:/var/www/html/drupal$ drush pmu islandora
The following extensions will be uninstalled: islandora
Do you really want to continue? (y/n): y
islandora was successfully uninstalled.

ubuntu@claw:/var/www/html/drupal$ cd web/modules/contrib/

ubuntu@claw:/var/www/html/drupal/web/modules/contrib$ rm -rf islandora islandora_collection islandora_image

ubuntu@claw:/var/www/html/drupal/web/modules/contrib$ git clone -b image-modeling https://github.com/dannylamb/islandora.git
Cloning into 'islandora'...
remote: Counting objects: 1654, done.
remote: Compressing objects: 100% (117/117), done.
remote: Total 1654 (delta 52), reused 0 (delta 0), pack-reused 1533
Receiving objects: 100% (1654/1654), 379.27 KiB | 0 bytes/s, done.
Resolving deltas: 100% (876/876), done.
Checking connectivity... done.

ubuntu@claw:/var/www/html/drupal/web/modules/contrib$ git clone -b image-modeling https://github.com/dannylamb/islandora_collection.git
Cloning into 'islandora_collection'...
remote: Counting objects: 212, done.
remote: Compressing objects: 100% (39/39), done.
remote: Total 212 (delta 24), reused 0 (delta 0), pack-reused 166
Receiving objects: 100% (212/212), 50.44 KiB | 0 bytes/s, done.
Resolving deltas: 100% (98/98), done.
Checking connectivity... done.

ubuntu@claw:/var/www/html/drupal/web/modules/contrib$ git clone -b image-modeling https://github.com/dannylamb/islandora_image.git
Cloning into 'islandora_image'...
remote: Counting objects: 151, done.
remote: Compressing objects: 100% (58/58), done.
remote: Total 151 (delta 34), reused 0 (delta 0), pack-reused 88
Receiving objects: 100% (151/151), 39.49 KiB | 0 bytes/s, done.
Resolving deltas: 100% (70/70), done.
Checking connectivity... done.

ubuntu@claw:/var/www/html/drupal/web/modules/contrib$ drush en islandora
The following extensions will be enabled: islandora
Do you really want to continue? (y/n): y
islandora was enabled successfully.                                                                                                                                                                      [ok]
islandora defines the following permissions: administer fedora resource type entities, administer fedora resource entities, add fedora resource entities, delete fedora resource entities, edit fedora resource entities, view published fedora resource entities, view unpublished fedora resource entities

ubuntu@claw:/var/www/html/drupal/web/modules/contrib$ drush en islandora_collection
The following extensions will be enabled: islandora_collection
Do you really want to continue? (y/n): y
islandora_collection was enabled successfully.  

ubuntu@claw:/var/www/html/drupal/web/modules/contrib$ drush en islandora_image
The following extensions will be enabled: islandora_image
Do you really want to continue? (y/n): y
islandora_image was enabled successfully.

screenshot from 2017-05-10 11-12-58
screenshot from 2017-05-10 11-18-31

screenshot from 2017-05-10 11-19-03
screenshot from 2017-05-10 11-19-41
screenshot from 2017-05-10 11-20-04
screenshot from 2017-05-10 11-20-14

@dannylamb
Copy link
Contributor Author

When ready, those PR's will have to get merged in the following order to keep Travis happy since there's dependencies between the configs.

  1. Add new committers; Diego Pino and Aaron Coburn #59
  2. Islandora-CLAW/islandora_collection#20
  3. Config for Islandora-CLAW/CLAW#618 islandora-deprecated/islandora_image#13

@ruebot
Copy link
Member

ruebot commented May 10, 2017

I'll restart TravisCI as I go.

ruebot pushed a commit to islandora-deprecated/islandora_image that referenced this issue May 10, 2017
* Committing to test on a clean environment

* Updates from testing

* More tweaks from testing

* Rdf mappings

* Touching up rdf mapping
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants