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

fix #10811: add templatePrefix to Fileset #1168

Merged
merged 2 commits into from Jun 12, 2013
Merged

Conversation

mtbc
Copy link
Member

@mtbc mtbc commented May 13, 2013

Fixes https://trac.openmicroscopy.org.uk/ome/ticket/10811

To test, try doing some imports and check that the templateprefix column in the fileset table in the database matches the appropriate prefix of the path column in originalfile.

@joshmoore
Copy link
Member

@mtbc: @qidane already used dbpatch 5, can you use 6 please?

@mtbc
Copy link
Member Author

mtbc commented May 13, 2013

Hmmm, experiencing github weirdness, will delete the branch and re-push.

@mtbc mtbc closed this May 13, 2013
@mtbc
Copy link
Member Author

mtbc commented May 13, 2013

Okay, maybe that fixed it...

@mtbc mtbc reopened this May 13, 2013
@mtbc
Copy link
Member Author

mtbc commented May 13, 2013

@joshmoore: okay, bumped to dbpatch 6, cc @chris-allan

@chris-allan
Copy link
Member

Did you just rebase and/or rewrite the history for this? That will have wiped out the discussion we've just been having.

@mtbc
Copy link
Member Author

mtbc commented May 13, 2013

Yeah, github seemed to get extremely buggily confused about further pushes and, though there were extra commits locally and git push said everything was up to date, they vanished from github's web interface. Very irritating.

The discussion is at mtbc@54829cf

@mtbc
Copy link
Member Author

mtbc commented May 13, 2013

@joshmoore how do I structure this so this dbpatch bump to 6 doesn't conflict with #1133, should I rebase against it?

@mtbc
Copy link
Member Author

mtbc commented May 13, 2013

I just cannot get this to rebase well against #1133. Please mark as excluded for now, I'll wait until #1133 is merged then try again.

@mtbc
Copy link
Member Author

mtbc commented May 28, 2013

Please remove the exclude tag.

@joshmoore
Copy link
Member

Done

@joshmoore
Copy link
Member

@mtbc: sorry, @pwalczysko has asked for PURGE_DATA to not occur tomorrow in which case this must be excluded again.

@mtbc
Copy link
Member Author

mtbc commented May 28, 2013

No problem, testing comes first; let me know when you unexclude it again and I'll add it to standup.

@joshmoore
Copy link
Member

Purging re-activated on gretzky; label removed.

@bpindelski
Copy link

Imported a dv folder to gretzky as user-1. In the Postgres console I found the fileset id of one of the imported files. Then executing

select o.path, f.templateprefix from fileset f join filesetentry fe on f.id = fe.fileset join originalfile o on o.id = fe.originalfile where f.id = 45;

results in

               path                |          templateprefix
-----------------------------------+-----------------------------------
 user-1_8/2013-06/04/10-21-54.547/ | user-1_8/2013-06/04/10-21-54.547/

Looks good to merge.

@joshmoore
Copy link
Member

It would require a significant refactoring (i.e. not a part of this PR), but I wonder if we wouldn't be better suited to have a third element (template+path+name) which is perhaps not even exposed to the user. But that's just thinking out loud...

@chris-allan: I would plan on merging this tomorrow morning if that won't cause you any headaches sans upgrade script.

@joshmoore
Copy link
Member

👍 from @chris-allan. Merging.

joshmoore added a commit that referenced this pull request Jun 12, 2013
fix #10811: add templatePrefix to Fileset
@joshmoore joshmoore merged commit 0f6ba67 into ome:develop Jun 12, 2013
@mtbc mtbc deleted the trac-10811 branch June 12, 2013 08:05
rgozim pushed a commit to rgozim/openmicroscopy that referenced this pull request Oct 8, 2018
fix #10811: add templatePrefix to Fileset
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants