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

DESTROY ISLANDORACM!!! #90

Merged
merged 3 commits into from
Sep 22, 2014
Merged

DESTROY ISLANDORACM!!! #90

merged 3 commits into from
Sep 22, 2014

Conversation

ruebot
Copy link
Member

@ruebot ruebot commented Sep 5, 2014

No description provided.

xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Newspaper collection"
xsi:schemaLocation="http://www.islandora.ca http://syn.lib.umanitoba.ca/collection_policy.xsd">
<content_models>
<content_model dsid="ISLANDORACM" name="New TIFF" namespace="islandora:collection"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After applying this locally I can no longer view the newspaper collection object. I get schema validation collection policy is not valid. Does this depend on a pull request to islandora collection or islandora. I think I pulled all the latest last friday (sept 12 2014)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hrm. Islandora/islandora_solution_pack_collection#117 was merged 4 days ago, and should take care of it. Testing out on my VM right now.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have the latest from islandora_solution_pack_collection 7.x. is that the right branch? I'll try running update.php again just in case something is cached.

You may have to update the solutions pack required objects as well.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not having any issues with HEAD and this pull request.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you do a drush cc all?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is something weird happening as I'm getting an error:
Warning: DOMDocument::schemaValidate(): Element '{http://www.islandora.ca}collection_policy': Missing child element(s). Expected is one of ( {http://www.islandora.ca}content_models, {http://www.islandora.ca}staging_area ). in CollectionPolicy->__construct() (line 50 of /var/www/drupal/htdocs/sites/all/modules/islandora_solution_pack_collection/includes/collection_policy.inc). InvalidArgumentException: The given collection policy is not valid. in CollectionPolicy->__construct() (line 51 of /var/www/drupal/htdocs/sites/all/modules/islandora_solution_pack_collection/includes/collection_policy.inc).

Which to me makes sense as after I apply the pull request my collection policy looks like:
<collection_policy xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Newspaper collection" xsi:schemaLocation="http://www.islandora.ca http://syn.lib.umanitoba.ca/collection_policy.xsd"> <search_terms></search_terms> <relationship>isMemberOfCollection</relationship> </collection_policy>

If I load that in oxygen and try to validate it against the xsd located in the collection solution packs xml directory it fails. The xsd looks like it hasn't been updated in 2 years and it also looks like our code still tries to use it. If I look at line 50 of collection_policy.inc it still has code to load the xsd and tries to validate the collection_policy datastream. I'm looking at the 7.x branch of collection solution pack and the 7.x branch of the newspaper solution pack with this pull request applied.

I'll poke around some more to see what I'm missing.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't completely nuke the line for content models they are critical. Related: Islandora/islandora_solution_pack_collection#117 (comment)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is what I thought as well which is why i was confused when it seemed to be working for Nick.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm firing up a clean VM with HEAD. I'll work through all of the ISLANDORA-962 pull requests, and do some more thorough testing. My apologies for any frustrations/wasted time.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed 😄

screenshot from 2014-09-15 21 52 00

I'll put the collection policy back the way it was, and if that works, I'll update this pull request, and the others. And, create 7.x-1.4 pull requests as well.

@ruebot
Copy link
Member Author

ruebot commented Sep 16, 2014

As a related note to all of this, has anybody seen this:

An AJAX HTTP error occurred. HTTP Result Code: 500 Debugging information follows. Path: /batch?render=overlay&id=93&op=do StatusText: Service unavailable (with message) ResponseText: Recoverable fatal error: Argument 2 passed to islandora_sync_islandora_datastream_ingested() must be an instance of FedoraDatastream, instance of IslandoraNewFedoraDatastream given in islandora_sync_islandora_datastream_ingested() (line 141 of /var/www/drupal/htdocs/sites/all/modules/islandora_sync/islandora_sync.module).

When re-adding solution pack objects? They successfully re-install, but I get that error occasionally. Not sure if it related or not.

@ppound
Copy link
Member

ppound commented Sep 16, 2014

I was getting an ajax error on reordering pages etc until i updated tuque to the 1.4 branch not sure if that is what is causing your issues or not.

ppound added a commit that referenced this pull request Sep 22, 2014
@ppound ppound merged commit a4806e8 into Islandora:7.x Sep 22, 2014
ppound added a commit that referenced this pull request Sep 22, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants