Quellcode durchsuchen

Fixed bug with stock config reseting default vocabs and added documentation to GFF loader function

Stephen Ficklin vor 11 Jahren
Ursprung
Commit
ac4f1545e5

+ 2 - 2
tripal_feature/includes/tripal_feature.gff_loader.inc

@@ -316,7 +316,7 @@ function tripal_feature_gff3_load_form_submit($form, &$form_state) {
  * @param $update
  *   Set to 1 to update existing features. New features will be added. Attributes 
  *   for a feature that are not present in the GFF but which are present in the 
- *   database will not be altered. Default is 0
+ *   database will not be altered. Default is 1
  * @param $refresh
  *   Set to 1 to update existing features. New features will be added. Attributes 
  *   for a feature that are not present in the GFF but which are present in the 
@@ -374,7 +374,7 @@ function tripal_feature_gff3_load_form_submit($form, &$form_state) {
  * @ingroup gff3_loader
  */
 function tripal_feature_load_gff3($gff_file, $organism_id, $analysis_id,
-  $add_only = 0, $update = 0, $refresh = 0, $remove = 0, $use_transaction = 1,
+  $add_only = 0, $update = 1, $refresh = 0, $remove = 0, $use_transaction = 1,
   $target_organism_id = NULL, $target_type = NULL,  $create_target = 0,
   $start_line = 1, $landmark_type = '', $alt_id_attr = '', $create_organism = FALSE,
   $job = NULL) {

+ 0 - 5
tripal_stock/includes/tripal_stock.admin.inc

@@ -161,11 +161,6 @@ function tripal_stock_admin_validate($form, &$form_state) {
   global $user;  // we need access to the user info
   $job_args = array();
 
-  variable_set('chado_stock_types_cv', $form_state['values']['stock_types_cv']);
-  variable_set('chado_stock_prop_types_cv', $form_state['values']['stock_prop_types_cv']);
-  variable_set('chado_stock_relationship_cv', $form_state['values']['stock_relationship_cv']);
-  variable_set('chado_stock_url_string', $form_state['values']['chado_stock_url_string']);
-
   switch ($form_state['values']['op']) {
     case  t('Set Controlled Vacabularies') :
       break;