Commit Graph
118 Commits
Author SHA1 Message Date
Greg Von Kuster 0b85700945 merging from central 2008-12-13 23:36:47 -05:00
Greg Von Kuster 2647f72e4a Add ability for data_source tools to append parameters passed in the initial response to the value of URL prior to Galaxy's post to the URL. This is a cleaner method for Biomart and also gets GBrowse to wrok. 2008-12-13 23:35:29 -05:00
Greg Von Kuster c3e009142a merging from central 2008-12-02 10:55:17 -05:00
Greg Von Kuster ffa719a9ab Call set_size() before set_peek() on datasets, changes to set_peek() to not read entire files for some datatypes. 2008-12-02 10:50:54 -05:00
Greg Von Kuster eeeab78b32 Fixes for accessing libraries from the analysis view. 2008-11-21 09:21:39 -05:00
Greg Von Kuster 32b4b77f74 Missed translating the primaryTable data type from UCSC in my last commit. 2008-11-13 15:17:42 -05:00
Greg Von Kuster edf88dd149 merging from central 2008-11-13 15:17:39 -05:00
Greg Von Kuster f6c9b706a2 merging from central 2008-11-13 15:02:30 -05:00
Greg Von Kuster c454370ff7 Add a new <data_type_translation> tag set to data_source tools that enable the translation of an unsupported data type to a supported one in Galaxy ( currently only used in UCSC ). Also some tweaks to the jobs reports. 2008-11-13 14:56:33 -05:00
Daniel Blankenberg 374936f7aa Merging heads 2008-10-31 14:53:20 -04:00
Daniel Blankenberg ad21aee2a0 Small typo in one of the encode import tools. 2008-10-31 14:52:41 -04:00
Daniel Blankenberg ec188a33cb Resolve a bunch of merge conflicts. 2008-10-31 11:28:09 -04:00
Daniel Blankenberg 35168f40a5 Fixes for dealing with UnvalidatedValues (i.e. when running workflows) and also when passing None trans to dynamic options. 2008-10-31 11:00:50 -04:00
Greg Von Kuster 12b40f7a36 merging from central 2008-10-28 11:28:15 -04:00
Greg Von Kuster 7b49309886 Add new EpiGRAPH tools that point to EpiGRAPH production server. 2008-10-28 11:27:42 -04:00
Greg Von Kuster f2d8ab1bc1 merging from central 2008-10-27 16:07:17 -04:00
Greg Von Kuster b74f176613 Add a new URL_method attribute to data_source tool types whose value is either "get" or "post" ( some require a get request while others require a post request ). This fixes the Biomart problem ( along with a new, well documented hack that can be eliminated when Biomart encodes the value of URL in the initial response - they'll tell us when they've fixed this ). Also added some requested info to the "send to EpiGRAPH" tool. 2008-10-27 16:03:43 -04:00
Daniel Blankenberg 4b24e13514 Resolving Merge 2008-10-22 14:03:41 -04:00
Daniel Blankenberg b9e242e4eb Add a new metadata type of Metadata Files.
These are now used to store the list of chromosomes for species as well as the index for MAF files.

MAF tools have been enhanced to make use of index files when available.

TODO: When datasets are purged from disk, these files should also be purged.
2008-10-22 13:49:22 -04:00
Daniel Blankenberg c0ebad5659 Merging heads 2008-10-17 13:33:46 -04:00
Greg Von Kuster 288912ee87 Fixes for data_source tools, data.name, data.info, data.dbkey, and data.extension should now be properly set. Eliminated fastq data type from datatypes_conf.xml.sample since it is not a supported data type. 2008-10-17 10:46:29 -04:00
Nate Coraor dfdbef9d36 Reintroduce roles. Unfinished stuff: setting default user and history
permissions, user-side permissions settings on datasets, viewing
associated datasets under the role page in the admin controler (is this
even necessary?), filtering out roles by type.  I haven't addressed
tests, so the security-related functional tests will fail.  I haven't
looked at history sharing yet either.  Cleanup to remove unused methods
is needed in the admin controller.  And the admin templates are a
bit messy.
2008-10-09 17:05:57 -04:00
Greg Von Kuster 2929432b92 my message 2008-10-07 15:29:30 -04:00
Greg Von Kuster b3b6c54247 Use only 1 underlying executable ( data_source.py ) for data source tools. A new tag set is added to the data source tool configs to handle tranlsation of request param names sent by remote apps ( something like <param_trans galaxy_name="dbkey" remote_name="GENOME" missing="?" /> ). 2008-10-07 15:21:46 -04:00
Daniel Blankenberg db11727228 Resolve Merging Conflicts 2008-10-07 12:09:28 -04:00
Greg Von Kuster c05f66d5ee Treat EpiGRAPH as a data source much like ucsc table browser. 2008-10-06 13:34:51 -04:00
Guruprasad Anada 4395c31fbc Merge changeset to security 2008-09-30 15:45:25 -04:00
Guruprasad Anada 550da8f952 Modified the way biomart tool runs: output generation will be completed before exec_afer_process hook is called. 2008-09-30 15:30:57 -04:00
Greg Von Kuster 44bc594079 my message 2008-09-22 10:39:47 -04:00
Greg Von Kuster b4890c1bbb Integrate with intermine ( data source ) and epigraph ( data destination ). Receiving data from epigraph coming soon. Data is sent to epigraph using a combination of DATA_URL and REDIRECT_URL tool params. This tool creates jobs, but does not queue them for execution. 2008-09-22 10:36:34 -04:00
Nate Coraor 4edc6d6626 Spiffy new library browser interface. Also, dim datasets in your
history on which you don't have permissions.
2008-09-10 10:10:13 -04:00
Nate Coraor 3802816b69 User interface to permissions, and a bunch of changes to ensure that
both permitted_actions and groups are set appropriately on datasets.
Somewhat tested and mostly working, but needs more testing.

Greg: If a userless session has a history, if that user logs in,
the DefaultHistoryGroupAssociation for the current history as well
as the datasets in that history are supposed to be updated with the
permissions in DefaultUserGroupAssociation, but this isn't happening.
Possibly because the default permissions on userless histories create
datasets in the public group with only the DATASET_ACCESS permission
(or possibly for another reason).  What are the implications of giving
public users DATASET_MANAGE_PERMISSIONS?
2008-08-20 18:11:04 -04:00
Greg Von Kuster f50ee0fff3 Added security to libraries. Non-admin users can now only see libraries that contain datasets associated with the user's groups, and each library will only display those datasets that are associated with the user's groups. 2008-08-19 10:04:30 -04:00
Daniel Blankenberg da0b09039c Initial check in of library functionality.
The ui is Very rough, at best.

Libraries can be accessed by users through a new tool under datasources.

Libraries can be created and accessed for modification via a link on the admin page.

Currently, all library datasets are currently associated with the public group.

Tags have been defined (tables and mappings) and can be associated with a dataset or a folder, but there is currenty no interface for displaying or creating these.

Creation and editing of a library should be an admin only function, however this check is not currently present.

The creation/editing page for a dataset is currently hard coded, it should be dynamic (i.e. datatypes and dbkeys)

Brief description of a library:
A library is composed of a name, description and a root folder.
A folder is composed of a name, description, and a parent folder (none when is the root), where a folder can have many or none child folders and datasets.
A library dataset is composed of most of the same attributes as a history dataset, but it is linked via a folder_id to a folder (instead of a history_id to a history).

Ordering of the library is maintained by the 'order_id' attribute of each folder and dataset object (which is populated by the item_count attribute of a folder)
2008-08-12 16:56:26 -04:00
Greg Von Kuster 85909a2aad Eliminated Roles and all associated components from dataset security implementation. Additional testing, possible cleanup needed - see TODO comments in code. Committing so Nate can take over... 2008-08-11 09:03:34 -04:00
Daniel Blankenberg c546f50963 Properly set permissions on tools that create new datasets in their post job hooks (this is deprecated). 2008-08-06 15:41:38 -04:00
Greg Von Kuster 8d679d6541 Change C Elegans server URL to wormbase using GBrowse version 1.69. 2008-07-24 13:59:23 -04:00
Daniel Blankenberg 28b89d686f Change database schema to separate Dataset and HistoryDatasetAssociation. This is a significant change, be sure to follow the migration notes exactly.
Make sure to backup your database before updating.


Also fix a long standing bug in the async controller dealing with updating output datasets upon job completion.


Credit for database migration directions go to Greg.

*** This is a significant change, be sure to follow the migration steps below exactly and in order: ***

---------------

0. Stop Galaxy server

---------------

1. Backup database and galaxy_root/database directory

---------------

2. The current validation_error table is not being used, it is left over from Ian's work that was not made functional.  However, if we want to keep it around, we should drop the old version of the table so it will get re-created correctly when the Galaxy server is restarted:

any database - sql command(s):
------------------------------
DROP TABLE validation_error;

---------------

3. Stop server, perform svn update to get latest code, start server to create new history_dataset_association and implicitly_converted_dataset_association tables

---------------

4. Add new columns to dataset table:

postgres sql command(s):
------------------------
ALTER TABLE dataset ADD COLUMN purgable boolean DEFAULT 't';
ALTER TABLE dataset ADD COLUMN external_filename text;
ALTER TABLE dataset ADD COLUMN _extra_files_path text;

mysql sql command(s):
---------------------
ALTER TABLE dataset ADD COLUMN purgable boolean DEFAULT TRUE;
ALTER TABLE dataset ADD COLUMN external_filename text;
ALTER TABLE dataset ADD COLUMN _extra_files_path text;

sqlite sql command(s):
----------------------
ALTER TABLE dataset ADD COLUMN purgable boolean DEFAULT 0;
ALTER TABLE dataset ADD COLUMN external_filename text;
ALTER TABLE dataset ADD COLUMN _extra_files_path text;

---------------

5. Populate new columns:

postgres sql command(s):
------------------------
UPDATE
dataset
SET
external_filename = dataset_filename.filename,
_extra_files_path = dataset_filename.extra_files_path
FROM
dataset_filename
WHERE
dataset.filename_id = dataset_filename.id;

mysql or sqlite sql command(s):
-------------------------------
UPDATE
dataset,
dataset_filename
SET
dataset.external_filename = dataset_filename.filename,
dataset._extra_files_path = dataset_filename.extra_files_path
WHERE
dataset.filename_id = dataset_filename.id;

---------------

6. Populate dataset table with info from dataset_child_association table:

postgres sql command(s):
------------------------
UPDATE
dataset
SET
parent_id = dataset_child_association.parent_dataset_id
FROM
dataset_child_association
WHERE
dataset.id = dataset_child_association.child_dataset_id;

mysql or sqlite sql command(s):
-------------------------------
UPDATE
dataset,
dataset_child_association
SET
dataset.parent_id = dataset_child_association.parent_dataset_id
WHERE
dataset.id = dataset_child_association.child_dataset_id;

---------------

7. Drop dataset_child_association table:

any database - sql command(s):
------------------------------
DROP TABLE dataset_child_association;

---------------

8. Copy parts of the current dataset table to the new history_dataset_association table:

postgres sql command(s):
------------------------
INSERT INTO history_dataset_association
SELECT
id,
history_id,
id AS dataset_id,
create_time,
update_time,
hid,
name,
info,
blurb,
peek,
extension,
metadata,
parent_id,
designation,
deleted,
visible
FROM dataset
ORDER BY id;

mysql or sqlite sql command(s):
-------------------------------
INSERT INTO
history_dataset_association
(
history_id,
dataset_id,
create_time,
update_time,
hid,
name,
info,
blurb,
peek,
extension,
metadata,
parent_id,
designation,
deleted,
visible
)
SELECT
history_id,
id,
create_time,
update_time,
hid,
name,
info,
blurb,
peek,
extension,
metadata,
parent_id,
designation,
deleted,
visible
FROM
dataset
ORDER BY
id;

---------------

9. Update the nextval value of the primary key sequence in the history_dataset_association table

NOTE: THIS IS NOT NECESSARY FOR MYSQL OR SQLITE!

postgres sql command(s):
------------------------
SELECT
setval('history_dataset_association_id_seq', max(id))
FROM
history_dataset_association;

---------------

10. Update dataset table to mark dataset_associated_file dataset as deleted:

postgres sql command(s):
------------------------
UPDATE dataset
SET
deleted = 't'
WHERE
id IN
(SELECT dataset_id FROM dataset_associated_file ORDER BY dataset_id DESC);

mysql or sqlite sql command(s):
-------------------------------
UPDATE dataset
SET
deleted = TRUE
WHERE
id IN
(SELECT dataset_id FROM dataset_associated_file ORDER BY dataset_id DESC);

---------------

11. Drop the dataset_associated_file table:

any database - sql command(s):
------------------------------
DROP TABLE dataset_associated_file;

---------------

12. Alter foreign keys on job_to_input_dataset table:

postgres or sqlite sql command(s):
------------------------
ALTER TABLE
job_to_input_dataset
DROP CONSTRAINT
job_to_input_dataset_dataset_id_fkey;

ALTER TABLE
job_to_input_dataset
ADD CONSTRAINT job_to_input_dataset_dataset_id_fkey
FOREIGN KEY
(dataset_id)
REFERENCES
history_dataset_association(id);


mysql sql command(s):
-------------------------------
ALTER TABLE
job_to_input_dataset
DROP FOREIGN KEY
ix_job_to_input_dataset_dataset_id;

ALTER TABLE
job_to_input_dataset
ADD FOREIGN KEY
ix_job_to_input_dataset_dataset_id (dataset_id)
REFERENCES
history_dataset_association(id);

---------------

13. Alter foreign keys on job_to_output_dataset table:

postgres or sqlite sql command(s):
------------------------
ALTER TABLE
job_to_output_dataset
DROP CONSTRAINT
job_to_output_dataset_dataset_id_fkey;

ALTER TABLE
job_to_output_dataset
ADD CONSTRAINT
job_to_output_dataset_dataset_id_fkey
FOREIGN KEY (dataset_id)
REFERENCES history_dataset_association(id);

mysql sql command(s):
-------------------------------
ALTER TABLE
job_to_output_dataset
DROP FOREIGN KEY
ix_job_to_output_dataset_dataset_id;

ALTER TABLE
job_to_output_dataset
ADD FOREIGN KEY
ix_job_to_output_dataset_dataset_id
FOREIGN KEY (dataset_id)
REFERENCES history_dataset_association(id);

---------------

14. Eliminate columns from the dataset table previously copied to history_dataset_association:

any database - sql command(s):
------------------------------
ALTER TABLE dataset DROP COLUMN hid;
ALTER TABLE dataset DROP COLUMN history_id;
ALTER TABLE dataset DROP COLUMN name;
ALTER TABLE dataset DROP COLUMN info;
ALTER TABLE dataset DROP COLUMN blurb;
ALTER TABLE dataset DROP COLUMN peek;
ALTER TABLE dataset DROP COLUMN extension;
ALTER TABLE dataset DROP COLUMN dbkey;
ALTER TABLE dataset DROP COLUMN metadata;
ALTER TABLE dataset DROP COLUMN parent_id;
ALTER TABLE dataset DROP COLUMN designation;
ALTER TABLE dataset DROP COLUMN visible;
ALTER TABLE dataset DROP COLUMN filename_id;
2008-07-09 17:41:08 +00:00
Greg Von Kuster 666de20b4d Cleanup for fastqsolexa data type converters. We are currently supporting only the Solexa variant and will add support for other variants when the formats stabilize. 2008-06-09 20:15:04 +00:00
Greg Von Kuster 74da99d8f2 Fix a typo in Chromatin and Chromosomes exec_after_process hook. 2008-06-09 17:13:38 +00:00
Wen-Yu Chung 782d7db6be Update fastq format.
Now we only support FastqSolexa variants.
If the quality scores are presented as characters,
the integer values are obtained by their ascii code subtract 64.
2008-06-06 18:52:11 +00:00
Greg Von Kuster 04e0834500 Revert 2715. 2008-06-04 13:02:15 +00:00
Greg Von Kuster dedc7278a1 Requires config change, temporary files are now created in a configurable location - affects many tools. 2008-06-03 20:29:54 +00:00
Greg Von Kuster 1a23f9e55d Requires config modification - Add Fastq sniffer, add support for fastqsolexa data type, rename convert_fatsq2fasta tool to be fastq_to_fasta_qual, add functional tests for both fastq and fastqsolexa data types, misc code cleanup. 2008-05-29 19:12:36 +00:00
Daniel Blankenberg 11a2c767c3 Rewrite of dynamic options for select lists. There are no more 'special cases' and new filters are much easier to incorporate, as neeeded.
MAF tool interfaces now support the use of index species and all species existing in cached alignment sets.
Until main is updated and the old maf_location files can be overwritten, these symbolic links are required:
maf_index.loc -> /depot/data2/galaxy/maf_index_new.loc
maf_pairwise.loc -> /depot/data2/galaxy/maf_pairwise_new.loc
2008-05-29 17:38:46 +00:00
Greg Von Kuster 711af7a4f2 Fix for sniffing datatypes, sniff order is now retrieved from app.datatypes_registry rather than the default sniff_order list in the Registry class. 2008-05-28 21:20:15 +00:00
Greg Von Kuster 84c5c4387d Add support ( sans sniffer ) for FASTQ data type. 2008-05-27 19:25:54 +00:00
Greg Von Kuster 8f944ef045 Changed URL for communicating with elegans server. 2008-05-16 12:15:04 +00:00
Greg Von Kuster b0a4a72315 Eliminate hack in tool_runner for gbrowse. 2008-05-15 19:51:21 +00:00
Greg Von Kuster c424782fb4 More fixes for GBrowse / GMOD communication, tool now includes command line, display in GBrowse links now functional. 2008-05-15 18:46:51 +00:00