From 01aa35f5d92fae0fe2fc58e4c143c27abd3ae8b9 Mon Sep 17 00:00:00 2001
From: Magali Ruffier <mr6@ebi.ac.uk>
Date: Tue, 7 Jun 2016 16:36:09 +0100
Subject: [PATCH] same object_xref can have several masters, distinguish in
query
---
misc-scripts/xref_mapping/XrefMapper/DisplayXrefs.pm | 3 ++-
misc-scripts/xref_mapping/XrefMapper/eukaryota.pm | 6 ++++--
misc-scripts/xref_mapping/XrefMapper/gallus_gallus.pm | 3 ++-
.../xref_mapping/XrefMapper/ornithorhynchus_anatinus.pm | 3 ++-
.../xref_mapping/XrefMapper/tetraodon_nigroviridis.pm | 3 ++-
misc-scripts/xref_mapping/XrefMapper/xenopus_tropicalis.pm | 3 ++-
6 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/misc-scripts/xref_mapping/XrefMapper/DisplayXrefs.pm b/misc-scripts/xref_mapping/XrefMapper/DisplayXrefs.pm
index e3afa4c134..17a0f547c6 100644
--- a/misc-scripts/xref_mapping/XrefMapper/DisplayXrefs.pm
+++ b/misc-scripts/xref_mapping/XrefMapper/DisplayXrefs.pm
@@ -105,7 +105,8 @@ SELECT DISTINCT ox.object_xref_id
xdep.source_id = sdep.source_id AND
smas.name like "Refseq%predicted" AND
sdep.name like "EntrezGene" AND
- ox.ox_status = "DUMP_OUT"
+ ox.ox_status = "DUMP_OUT" AND
+ ox.master_xref_id = dx.master_xref_id
IEG
#don't use labels starting with LOC
diff --git a/misc-scripts/xref_mapping/XrefMapper/eukaryota.pm b/misc-scripts/xref_mapping/XrefMapper/eukaryota.pm
index 3a00f73bd0..f37d61cf2e 100644
--- a/misc-scripts/xref_mapping/XrefMapper/eukaryota.pm
+++ b/misc-scripts/xref_mapping/XrefMapper/eukaryota.pm
@@ -95,7 +95,8 @@ SELECT DISTINCT ox.object_xref_id
xdep.source_id = sdep.source_id AND
smas.name like "Refseq%predicted" AND
sdep.name like "EntrezGene" AND
- ox.ox_status = "DUMP_OUT"
+ ox.ox_status = "DUMP_OUT" AND
+ ox.master_xref_id = dx.master_xref_id
IEG
#don't use labels starting with LOC
@@ -159,7 +160,8 @@ SELECT DISTINCT ox.object_xref_id
xdep.source_id = sdep.source_id AND
smas.name like "Refseq%predicted" AND
sdep.name like "EntrezGene" AND
- ox.ox_status = "DUMP_OUT"
+ ox.ox_status = "DUMP_OUT" AND
+ ox.master_xref_id = dx.master_xref_id
IEG
#don't use labels starting with LOC
diff --git a/misc-scripts/xref_mapping/XrefMapper/gallus_gallus.pm b/misc-scripts/xref_mapping/XrefMapper/gallus_gallus.pm
index e5502fefdd..8964dc8994 100644
--- a/misc-scripts/xref_mapping/XrefMapper/gallus_gallus.pm
+++ b/misc-scripts/xref_mapping/XrefMapper/gallus_gallus.pm
@@ -33,7 +33,8 @@ SELECT DISTINCT ox.object_xref_id
xdep.source_id = sdep.source_id AND
smas.name like "Refseq%predicted" AND
sdep.name like "EntrezGene" AND
- ox.ox_status = "DUMP_OUT"
+ ox.ox_status = "DUMP_OUT" AND
+ ox.master_xref_id = dx.master_xref_id
IEG
#don't use labels starting with LOC
diff --git a/misc-scripts/xref_mapping/XrefMapper/ornithorhynchus_anatinus.pm b/misc-scripts/xref_mapping/XrefMapper/ornithorhynchus_anatinus.pm
index b5db7d132e..5242cd1e8b 100644
--- a/misc-scripts/xref_mapping/XrefMapper/ornithorhynchus_anatinus.pm
+++ b/misc-scripts/xref_mapping/XrefMapper/ornithorhynchus_anatinus.pm
@@ -52,7 +52,8 @@ SELECT DISTINCT ox.object_xref_id
xdep.source_id = sdep.source_id AND
smas.name like "Refseq%predicted" AND
sdep.name like "EntrezGene" AND
- ox.ox_status = "DUMP_OUT"
+ ox.ox_status = "DUMP_OUT" AND
+ ox.master_xref_id = dx.master_xref_id
IEG
diff --git a/misc-scripts/xref_mapping/XrefMapper/tetraodon_nigroviridis.pm b/misc-scripts/xref_mapping/XrefMapper/tetraodon_nigroviridis.pm
index 98338972f4..4f107641ef 100644
--- a/misc-scripts/xref_mapping/XrefMapper/tetraodon_nigroviridis.pm
+++ b/misc-scripts/xref_mapping/XrefMapper/tetraodon_nigroviridis.pm
@@ -52,7 +52,8 @@ SELECT DISTINCT ox.object_xref_id
xdep.source_id = sdep.source_id AND
smas.name like "Refseq%predicted" AND
sdep.name like "EntrezGene" AND
- ox.ox_status = "DUMP_OUT"
+ ox.ox_status = "DUMP_OUT" AND
+ ox.master_xref_id = dx.master_xref_id
IEG
#don't use labels starting with LOC
diff --git a/misc-scripts/xref_mapping/XrefMapper/xenopus_tropicalis.pm b/misc-scripts/xref_mapping/XrefMapper/xenopus_tropicalis.pm
index 8de724669e..f54d7b715d 100644
--- a/misc-scripts/xref_mapping/XrefMapper/xenopus_tropicalis.pm
+++ b/misc-scripts/xref_mapping/XrefMapper/xenopus_tropicalis.pm
@@ -71,7 +71,8 @@ SELECT DISTINCT ox.object_xref_id
xdep.source_id = sdep.source_id AND
smas.name like "Refseq%predicted" AND
sdep.name like "EntrezGene" AND
- ox.ox_status = "DUMP_OUT"
+ ox.ox_status = "DUMP_OUT" AND
+ ox.master_xref_id = dx.master_xref_id
IEG
#don't use labels starting with LOC
--
GitLab