Project

General

Profile

« Previous | Next » 

Revision 9493

inputs/.TNRS/schema.sql, data.sql: updated for new TNRS CSV columns (see bug at https://pods.iplantcollaborative.org/jira/browse/TNRS-183). note that these columns may eventually change back (comment by Naim at https://pods.iplantcollaborative.org/jira/browse/TNRS-183#comment-34444).

View differences:

schema.sql
22 22
  "Author_score" text,
23 23
  "Family_matched" text,
24 24
  "Family_score" text,
25
  "Name_matched_accepted_family" text,
26 25
  "Genus_matched" text,
27 26
  "Genus_score" text,
28 27
  "Specific_epithet_matched" text,
......
40 39
  "Accepted_name_author" text,
41 40
  "Accepted_name_rank" text,
42 41
  "Accepted_name_url" text,
43
  "Accepted_name_species" text,
44
  "Accepted_name_family" text,
42
  "Accepted_species" text,
43
  "Accepted_family" text,
45 44
  "Selected" text,
46 45
  "Source" text,
47 46
  "Warnings" text,
......
65 64
$BODY$
66 65
BEGIN
67 66
    new."Accepted_scientific_name" = NULLIF(concat_ws(' '
68
        , NULLIF(NULLIF(new."Accepted_name_family", 'Unknown'), new."Accepted_name")
67
        , NULLIF(NULLIF(new."Accepted_family", 'Unknown'), new."Accepted_name")
69 68
        , new."Accepted_name"
70 69
        , new."Accepted_name_author"
71 70
    ), '');
......
100 99
, "Name_matched_url" AS "matchedScientificNameID"
101 100
, "Author_score" AS "*Name_matched.Author_score"
102 101
, "Family_score" AS "matchedFamilyConfidence_fraction"
103
, "Name_matched_accepted_family" AS "matchedFamily"
104 102
, "Genus_matched" AS "matchedGenus"
105 103
, "Genus_score" AS "matchedGenusConfidence_fraction"
106 104
, "Specific_epithet_matched" AS "matchedSpecificEpithet"
......
114 112
, "Accepted_name_author" AS "acceptedScientificNameAuthorship"
115 113
, "Accepted_name_rank" AS "acceptedTaxonRank"
116 114
, "Accepted_name_url" AS "acceptedScientificNameID"
117
, "Accepted_name_species" AS "*Name_matched.Accepted_name_species"
118
, "Accepted_name_family" AS "acceptedFamily"
115
, "Accepted_species" AS "*Name_matched.Accepted_species"
116
, "Accepted_family" AS "acceptedFamily"
119 117
, "Selected" AS "*Name_matched.Selected"
120 118
, "Source" AS "*Name_matched.Source"
121 119
, "Warnings" AS "*Name_matched.Warnings"

Also available in: Unified diff