details: http://www.bx.psu.edu/hg/galaxy/rev/ab5f39f838c0 changeset: 2597:ab5f39f838c0 user: Dan Blankenberg <dan@bx.psu.edu> date: Fri Aug 21 17:14:35 2009 -0400 description: Better naming for collected datasets in JobToOutputDatasetAssociation 1 file(s) affected in this change: lib/galaxy/tools/__init__.py diffs (21 lines): diff -r b77721ef035d -r ab5f39f838c0 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py Fri Aug 21 17:03:42 2009 -0400 +++ b/lib/galaxy/tools/__init__.py Fri Aug 21 17:14:35 2009 -0400 @@ -1543,7 +1543,7 @@ job = assoc.job break if job: - assoc = self.app.model.JobToOutputDatasetAssociation( '__new_child_file_%s__' % designation, child_dataset ) + assoc = self.app.model.JobToOutputDatasetAssociation( '__new_child_file_%s|%s__' % ( name, designation ), child_dataset ) assoc.job = job assoc.flush() child_dataset.state = outdata.state @@ -1594,7 +1594,7 @@ job = assoc.job break if job: - assoc = self.app.model.JobToOutputDatasetAssociation( '__new_primary_file_%s__' % designation, primary_data ) + assoc = self.app.model.JobToOutputDatasetAssociation( '__new_primary_file_%s|%s__' % ( name, designation ), primary_data ) assoc.job = job assoc.flush() primary_data.state = outdata.state