Project

General

Profile

« Previous | Next » 

Revision 13588

schemas/vegbien.sql: tnrs_input_name: don't scrub accepted names, as using multiple matches per name no longer provides a single accepted name to scrub. instead, the Accepted_* fields can be whitespace-split to generate the same columns that would have been generated by the scrubbing (and without the overhead of the extra TNRS call).

View differences:

trunk/schemas/public_.sql
8837 8837
--
8838 8838

  
8839 8839
CREATE VIEW tnrs_input_name AS
8840
         SELECT DISTINCT "MatchedTaxon".scrubbed_unique_taxon_name AS taxonomicname
8841
           FROM ("TNRS"."MatchedTaxon"
8842
      LEFT JOIN "TNRS"."taxon_scrub.scrubbed_unique_taxon_name.*" ON (("taxon_scrub.scrubbed_unique_taxon_name.*".scrubbed_unique_taxon_name = "MatchedTaxon".scrubbed_unique_taxon_name)))
8843
     WHERE (("MatchedTaxon".scrubbed_unique_taxon_name IS NOT NULL) AND ("taxon_scrub.scrubbed_unique_taxon_name.*".scrubbed_unique_taxon_name IS NULL))
8844
UNION 
8845
         SELECT DISTINCT taxonlabel.taxonomicname
8846
           FROM (taxonlabel
8847
      LEFT JOIN "TNRS"."MatchedTaxon" ON (("MatchedTaxon"."concatenatedScientificName" = taxonlabel.taxonomicname)))
8848
     WHERE ((taxonlabel.taxonomicname IS NOT NULL) AND ("MatchedTaxon"."concatenatedScientificName" IS NULL));
8840
 SELECT DISTINCT taxonlabel.taxonomicname
8841
   FROM (taxonlabel
8842
   LEFT JOIN "TNRS"."MatchedTaxon" ON (("MatchedTaxon"."concatenatedScientificName" = taxonlabel.taxonomicname)))
8843
  WHERE ((taxonlabel.taxonomicname IS NOT NULL) AND ("MatchedTaxon"."concatenatedScientificName" IS NULL));
8849 8844

  
8850 8845

  
8851 8846
--
trunk/schemas/vegbien.sql
8837 8837
--
8838 8838

  
8839 8839
CREATE VIEW tnrs_input_name AS
8840
         SELECT DISTINCT "MatchedTaxon".scrubbed_unique_taxon_name AS taxonomicname
8841
           FROM ("TNRS"."MatchedTaxon"
8842
      LEFT JOIN "TNRS"."taxon_scrub.scrubbed_unique_taxon_name.*" ON (("taxon_scrub.scrubbed_unique_taxon_name.*".scrubbed_unique_taxon_name = "MatchedTaxon".scrubbed_unique_taxon_name)))
8843
     WHERE (("MatchedTaxon".scrubbed_unique_taxon_name IS NOT NULL) AND ("taxon_scrub.scrubbed_unique_taxon_name.*".scrubbed_unique_taxon_name IS NULL))
8844
UNION 
8845
         SELECT DISTINCT taxonlabel.taxonomicname
8846
           FROM (taxonlabel
8847
      LEFT JOIN "TNRS"."MatchedTaxon" ON (("MatchedTaxon"."concatenatedScientificName" = taxonlabel.taxonomicname)))
8848
     WHERE ((taxonlabel.taxonomicname IS NOT NULL) AND ("MatchedTaxon"."concatenatedScientificName" IS NULL));
8840
 SELECT DISTINCT taxonlabel.taxonomicname
8841
   FROM (taxonlabel
8842
   LEFT JOIN "TNRS"."MatchedTaxon" ON (("MatchedTaxon"."concatenatedScientificName" = taxonlabel.taxonomicname)))
8843
  WHERE ((taxonlabel.taxonomicname IS NOT NULL) AND ("MatchedTaxon"."concatenatedScientificName" IS NULL));
8849 8844

  
8850 8845

  
8851 8846
--

Also available in: Unified diff