opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use absolute paths for references to datasets and associated files.

Browse Source 
NOTE:

Our cluster shouldn't have a problem with this since datasets live in the same
place on the web server and computer nodes. However for the long term we need
a better way to deal with this. Different compute nodes may have files in
different locations, a more complicated resolution strategy needs to be
developed.
This commit is contained in:
James Taylor
2007-09-26 18:47:01 +00:00
parent a3b137d94b
commit e9ccb4f549
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/model/__init__.py
+12 -4
View File
@@ -191,9 +191,12 @@ class Dataset( object ):
def get_file_name( self ):
if self.filename_id is None:
assert self.id is not None, "ID must be set before filename used (commit the object)"
return os.path.join( self.file_path, "dataset_%d.dat" % self.id )
filename = os.path.join( self.file_path, "dataset_%d.dat" % self.id )
else:
return self.dataset_file.filename
filename = self.dataset_file.filename
# Make filename absolute
return os.path.abspath( filename )
def set_file_name (self, filename):
if filename is None:
self.filename_id = None
@@ -205,12 +208,17 @@ class Dataset( object ):
self.filename_id = filename_obj.id
self.flush()
self.refresh()
file_name = property( get_file_name, set_file_name )
@property
def extra_files_path( self ):
if self.dataset_file and self.dataset_file.extra_files_path: return self.dataset_file.extra_files_path
return os.path.join( self.file_path, "dataset_%d_files" % self.id )
if self.dataset_file and self.dataset_file.extra_files_path:
path = self.dataset_file.extra_files_path
else:
path = os.path.join( self.file_path, "dataset_%d_files" % self.id )
# Make path absolute
return os.path.abspath( path )
@property
def datatype( self ):