details: http://www.bx.psu.edu/hg/galaxy/rev/50631e30ede2 changeset: 2914:50631e30ede2 user: Greg Von Kuster <greg@bx.psu.edu> date: Fri Oct 23 13:58:56 2009 -0400 description: 2 more sqlalchemy 0.5 query fixes. 2 file(s) affected in this change: lib/galaxy/jobs/__init__.py lib/galaxy/tools/__init__.py diffs (24 lines): diff -r a559bdff7fdc -r 50631e30ede2 lib/galaxy/jobs/__init__.py --- a/lib/galaxy/jobs/__init__.py Fri Oct 23 13:54:15 2009 -0400 +++ b/lib/galaxy/jobs/__init__.py Fri Oct 23 13:58:56 2009 -0400 @@ -533,7 +533,7 @@ #since if it is edited, the metadata changed on the running output will no longer match #the metadata that was stored to disk for use via the external process, #and the changes made by the user will be lost, without warning or notice - dataset.metadata.from_JSON_dict( self.external_output_metadata.get_output_filenames_by_dataset( dataset ).filename_out ) + dataset.metadata.from_JSON_dict( self.external_output_metadata.get_output_filenames_by_dataset( dataset, self.sa_session ).filename_out ) try: assert context.get( 'line_count', None ) is not None if ( not dataset.datatype.composite_type and dataset.dataset.is_multi_byte() ) or self.tool.is_multi_byte: diff -r a559bdff7fdc -r 50631e30ede2 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py Fri Oct 23 13:54:15 2009 -0400 +++ b/lib/galaxy/tools/__init__.py Fri Oct 23 13:58:56 2009 -0400 @@ -1568,7 +1568,7 @@ for name, dataset in inp_data.iteritems(): external_metadata = galaxy.datatypes.metadata.JobExternalOutputMetadataWrapper( job ) if external_metadata.external_metadata_set_successfully( dataset, app.model.context ): - dataset.metadata.from_JSON_dict( external_metadata.get_output_filenames_by_dataset( dataset ).filename_out ) + dataset.metadata.from_JSON_dict( external_metadata.get_output_filenames_by_dataset( dataset, app.model.context ).filename_out ) # If setting external metadata has failed, how can we inform the user? # For now, we'll leave the default metadata and set the state back to its original. dataset.datatype.after_edit( dataset )