Clean-up of tripal_stock module

tripal_stock/tripal_stock-db_references.inc

@@ -129,7 +129,7 @@ function tripal_stock_add_ONE_dbreference_form_submit($form, &$form_state) {
     tripal_db_set_active($previous_db);
 
     //create stock_dbxref
-    $dbxref = tripal_db_get_dbxref_by_accession(form_state['values']['accession'], $form_state['values']['database']);
+    $dbxref = tripal_db_get_dbxref_by_accession($form_state['values']['accession'], $form_state['values']['database']);
 		if (!empty($dbxref->dbxref_id)) {
 			$previous_db = tripal_db_set_active('chado');
     	db_query(

tripal_stock/tripal_stock.api.inc

@@ -122,8 +122,7 @@ function tripal_stock_get_stocks($criteria, $match_type, $organism_id = NULL, $e
 			if ($v['regex']) { $operator = '~'; }
 			else { $operator = '='; }
 			
-			$synonym_cvterm = tripal_cv_get_cvterm_by_name('synonym'),
-																								'cv_id' => array('type'=>'INT', 'value'=> variable_get('chado_stock_prop_types_cv', 'null')) ));
+			$synonym_cvterm = tripal_cv_get_cvterm_by_name('synonym', variable_get('chado_stock_prop_types_cv', 'null'));
 			$where[] = '(stockprop.type_id='.$synonym_cvterm->cvterm_id.' AND stockprop.value'.$operator."'".$v['value']."')";
 			$joins[] = 'LEFT JOIN stockprop stockprop ON stockprop.stock_id=stock.stock_id';
 	

tripal_stock/tripal_stock.info

@@ -1,7 +1,7 @@
 ; $Id$
 package = Tripal
-name = Tripal Chado Stock
-version = 3.0a
+name = Tripal Stock
+version = 0.3a
 description = A module for interfacing the GMOD chado database with Drupal, providing viewing, inserting and editing of stocks (including stock relationships and properties).
 core = 6.x