remove entries from analysis_description using logic name instead of display label

misc-scripts/density_feature/gene_density_calc.pl

@@ -98,15 +98,15 @@ if( ! $seq_region_count ) {
 
 
 print "Deleting old knownGeneDensity and geneDensity features\n";
-$sth = $db->dbc->prepare("DELETE df, dt, a FROM density_feature df, density_type dt, analysis a WHERE a.analysis_id=dt.analysis_id AND dt.density_type_id=df.density_type_id AND a.logic_name IN ('knownGeneDensity', 'geneDensity')");
+$sth = $db->dbc->prepare("DELETE df, dt, a, ad FROM density_feature df, density_type dt, analysis a, analysis_description ad WHERE ad.analysis_id = a.analysis_id AND a.analysis_id=dt.analysis_id AND dt.density_type_id=df.density_type_id AND a.logic_name IN ('knownGeneDensity', 'geneDensity')");
 $sth->execute();
 
-$sth = $db->dbc()->prepare(
-  qq(
-  DELETE ad
-  FROM analysis_description ad
-  WHERE ad.display_label IN ('knownGeneDensity', 'geneDensity')) );
-$sth->execute();
+# $sth = $db->dbc()->prepare(
+#   qq(
+#   DELETE ad
+#   FROM analysis_description ad
+#   WHERE ad.display_label IN ('knownGeneDensity', 'geneDensity')) );
+# $sth->execute();
 
 my $dfa = $db->get_DensityFeatureAdaptor();
 my $dta = $db->get_DensityTypeAdaptor();

misc-scripts/density_feature/percent_gc_calc.pl

@@ -55,19 +55,20 @@ if( ! $dna_count ) {
 print "Deleting old PercentGC features\n";
 $sth = $db->dbc->prepare(
   qq(
-DELETE df, dt, a
-FROM density_feature df, density_type dt, analysis a
+DELETE df, dt, a, ad
+FROM density_feature df, density_type dt, analysis a, analysis_description ad
 WHERE a.analysis_id=dt.analysis_id
+AND ad.analysis_id = a.analysis_id
 AND dt.density_type_id=df.density_type_id
 AND a.logic_name='PercentGC') );
 $sth->execute();
 
-$sth = $db->dbc()->prepare(
-  qq(
-  DELETE ad
-  FROM analysis_description ad
-  WHERE ad.display_label = 'PercentGC') );
-$sth->execute();
+# $sth = $db->dbc()->prepare(
+#   qq(
+#   DELETE ad
+#   FROM analysis_description ad
+#   WHERE ad.display_label = 'PercentGC') );
+# $sth->execute();
 
 #
 # Get the adaptors needed;

misc-scripts/density_feature/repeat_coverage_calc.pl

@@ -64,15 +64,15 @@ if( ! $repeat_count ) {
 #
 
 print "Deleting old PercentageRepeat features\n";
-$sth = $db->dbc->prepare("DELETE df, dt, a FROM density_feature df, density_type dt, analysis a WHERE a.analysis_id=dt.analysis_id AND dt.density_type_id=df.density_type_id AND a.logic_name='PercentageRepeat'");
+$sth = $db->dbc->prepare("DELETE df, dt, a, ad FROM analysis_description ad, density_feature df, density_type dt, analysis a WHERE ad.analysis_id = a.analysis_id AND a.analysis_id=dt.analysis_id AND dt.density_type_id=df.density_type_id AND a.logic_name='PercentageRepeat'");
 $sth->execute();
 
-$sth = $db->dbc()->prepare(
-  qq(
-  DELETE ad
-  FROM analysis_description ad
-  WHERE ad.display_label = 'PercentageRepeat') );
-$sth->execute();
+# $sth = $db->dbc()->prepare(
+#   qq(
+#   DELETE ad
+#   FROM analysis_description ad
+#   WHERE ad.display_label = 'PercentageRepeat') );
+# $sth->execute();
 
 my $slice_adaptor = $db->get_SliceAdaptor();
 my $dfa = $db->get_DensityFeatureAdaptor();

misc-scripts/density_feature/variation_density.pl

@@ -50,15 +50,15 @@ if( ! variation_attach( $db )) {
 # Clean up old features first. Also remove analysis and density type entry as these are recreated.
 #
 
-my $sth = $db->dbc->prepare("DELETE df, dt, a FROM density_feature df, density_type dt, analysis a WHERE a.analysis_id=dt.analysis_id AND dt.density_type_id=df.density_type_id AND a.logic_name='snpDensity'");
+my $sth = $db->dbc->prepare("DELETE df, dt, a, ad FROM analysis_description ad, density_feature df, density_type dt, analysis a WHERE ad.analysis_id = a.analysis_id AND a.analysis_id=dt.analysis_id AND dt.density_type_id=df.density_type_id AND a.logic_name='snpDensity'");
 $sth->execute();
 
-$sth = $db->dbc()->prepare(
-  qq(
-  DELETE ad
-  FROM analysis_description ad
-  WHERE ad.display_label = 'snpDensity') );
-$sth->execute();
+# $sth = $db->dbc()->prepare(
+#   qq(
+#   DELETE ad
+#   FROM analysis_description ad
+#   WHERE ad.display_label = 'snpDensity') );
+# $sth->execute();
 
 #
 # Get the adaptors needed;