Project

General

Profile

« Previous | Next » 

Revision 14109

inputs/.TNRS/schema.sql: MatchedTaxon: nested select: use just taxon_best_match since this no longer performs renamings

View differences:

trunk/inputs/.TNRS/schema.sql
440 440
            WHEN (s."Accepted_name_rank" = 'genus'::text) THEN concat_ws(' '::text, s."Accepted_name", s."Unmatched_terms")
441 441
            ELSE s."Accepted_name_species"
442 442
        END AS accepted_morphospecies_binomial
443
   FROM ( SELECT taxon_best_match.batch,
444
            taxon_best_match.match_num,
445
            taxon_best_match."Name_number",
446
            taxon_best_match."Name_submitted",
447
            taxon_best_match."Overall_score",
448
            taxon_best_match."Name_matched",
449
            taxon_best_match."Name_matched_rank",
450
            taxon_best_match."Name_score",
451
            taxon_best_match."Name_matched_author",
452
            taxon_best_match."Name_matched_url",
453
            taxon_best_match."Author_matched",
454
            taxon_best_match."Author_score",
455
            taxon_best_match."Family_matched",
456
            taxon_best_match."Family_score",
457
            taxon_best_match."Name_matched_accepted_family",
458
            taxon_best_match."Genus_matched",
459
            taxon_best_match."Genus_score",
460
            taxon_best_match."Specific_epithet_matched",
461
            taxon_best_match."Specific_epithet_score",
462
            taxon_best_match."Infraspecific_rank",
463
            taxon_best_match."Infraspecific_epithet_matched",
464
            taxon_best_match."Infraspecific_epithet_score",
465
            taxon_best_match."Infraspecific_rank_2",
466
            taxon_best_match."Infraspecific_epithet_2_matched",
467
            taxon_best_match."Infraspecific_epithet_2_score",
468
            taxon_best_match."Annotations",
469
            taxon_best_match."Unmatched_terms",
470
            taxon_best_match."Taxonomic_status",
471
            taxon_best_match."Accepted_name",
472
            taxon_best_match."Accepted_name_author",
473
            taxon_best_match."Accepted_name_rank",
474
            taxon_best_match."Accepted_name_url",
475
            taxon_best_match."Accepted_name_species",
476
            taxon_best_match."Accepted_name_family",
477
            taxon_best_match."Selected",
478
            taxon_best_match."Source",
479
            taxon_best_match."Warnings",
480
            taxon_best_match."Accepted_name_lsid",
481
            taxon_best_match.is_valid_match,
482
            taxon_best_match.scrubbed_unique_taxon_name
483
           FROM taxon_best_match) s;
443
   FROM taxon_best_match s;
484 444

  
485 445

  
486 446
--
trunk/schemas/vegbien.sql
19552 19552
            WHEN (s."Accepted_name_rank" = 'genus'::text) THEN concat_ws(' '::text, s."Accepted_name", s."Unmatched_terms")
19553 19553
            ELSE s."Accepted_name_species"
19554 19554
        END AS accepted_morphospecies_binomial
19555
   FROM ( SELECT taxon_best_match.batch,
19556
            taxon_best_match.match_num,
19557
            taxon_best_match."Name_number",
19558
            taxon_best_match."Name_submitted",
19559
            taxon_best_match."Overall_score",
19560
            taxon_best_match."Name_matched",
19561
            taxon_best_match."Name_matched_rank",
19562
            taxon_best_match."Name_score",
19563
            taxon_best_match."Name_matched_author",
19564
            taxon_best_match."Name_matched_url",
19565
            taxon_best_match."Author_matched",
19566
            taxon_best_match."Author_score",
19567
            taxon_best_match."Family_matched",
19568
            taxon_best_match."Family_score",
19569
            taxon_best_match."Name_matched_accepted_family",
19570
            taxon_best_match."Genus_matched",
19571
            taxon_best_match."Genus_score",
19572
            taxon_best_match."Specific_epithet_matched",
19573
            taxon_best_match."Specific_epithet_score",
19574
            taxon_best_match."Infraspecific_rank",
19575
            taxon_best_match."Infraspecific_epithet_matched",
19576
            taxon_best_match."Infraspecific_epithet_score",
19577
            taxon_best_match."Infraspecific_rank_2",
19578
            taxon_best_match."Infraspecific_epithet_2_matched",
19579
            taxon_best_match."Infraspecific_epithet_2_score",
19580
            taxon_best_match."Annotations",
19581
            taxon_best_match."Unmatched_terms",
19582
            taxon_best_match."Taxonomic_status",
19583
            taxon_best_match."Accepted_name",
19584
            taxon_best_match."Accepted_name_author",
19585
            taxon_best_match."Accepted_name_rank",
19586
            taxon_best_match."Accepted_name_url",
19587
            taxon_best_match."Accepted_name_species",
19588
            taxon_best_match."Accepted_name_family",
19589
            taxon_best_match."Selected",
19590
            taxon_best_match."Source",
19591
            taxon_best_match."Warnings",
19592
            taxon_best_match."Accepted_name_lsid",
19593
            taxon_best_match.is_valid_match,
19594
            taxon_best_match.scrubbed_unique_taxon_name
19595
           FROM taxon_best_match) s;
19555
   FROM taxon_best_match s;
19596 19556

  
19597 19557

  
19598 19558
--

Also available in: Unified diff