diff wsdl_hmdb.pl @ 22:453fbe98925a draft

" master branch Updating with tag :CI_COMMIT_TAG - - Fxx"
author fgiacomoni
date Fri, 20 Nov 2020 17:29:18 +0000
parents 63ba1cb240b7
children 2d8a310e86ce
line wrap: on
line diff
--- a/wsdl_hmdb.pl	Thu Feb 14 08:36:52 2019 -0500
+++ b/wsdl_hmdb.pl	Fri Nov 20 17:29:18 2020 +0000
@@ -144,6 +144,7 @@
 	foreach my $mzs ( @{$submasses} ) {
 #		print Dumper $mzs ;
 		my $result = undef ;
+		my $cleanedResult = undef ;
 		
 		my ( $hmdb_masses, $nb_masses_to_submit ) = $oHmdb->prepare_multi_masses_query($mzs) ;
 		my ($hmdb_adducts, $nb_selected_adducts) = $oHmdb->prepareAdductListFormat($adductType) ;
@@ -157,9 +158,16 @@
 		
 		sleep(1) ;
 		
-		($result) = $oHmdb->parse_hmdb_csv_results($hmdb_pages, $mzs, $max_query) ; ## hash format result
-		## This previous step return results with cutoff on the number of entries returned ! 
-		$results = [ @$results, @$result ] ;
+		## hard modification with $max_query fixed at 1000 !!! Need to be refactoring
+		## Cutof will be done in next method after URI check
+		($result) = $oHmdb->parse_hmdb_csv_results($hmdb_pages, $mzs, 1000) ; ## hash format result
+		
+		## This previous step return results with cutoff on the number of entries returned !
+		
+		## clean/max result by testing each HMDB_ID page in HMDB
+		($cleanedResult) = $oHmdb->checkHmdbUrlEntries($CONF->{'HMDB_METABOCARD_URL'}, $result, $max_query ) ;
+				
+		$results = [ @$results, @$cleanedResult ] ;
 		
 #		sleep(1) ;
 		$cluster ++ ;