Project

General

Profile

« Previous | Next » 

Revision 14105

fix: inputs/.TNRS/schema.sql: MatchedTaxon: added all columns from taxon_match (some of them apparently hadn't been included in MatchedTaxon)

View differences:

trunk/inputs/.TNRS/schema.sql
396 396
CREATE VIEW "MatchedTaxon" AS
397 397
 SELECT s."*batch",
398 398
    s."concatenatedScientificName",
399
    s.match_num,
400
    s."Name_number",
401
    s."Overall_score",
399 402
    s."matchedTaxonName",
400 403
    s."matchedTaxonRank",
401 404
    s."*Name_score",
......
409 412
    s."matchedGenusConfidence_fraction",
410 413
    s."matchedSpecificEpithet",
411 414
    s."matchedSpeciesConfidence_fraction",
415
    s."Infraspecific_rank",
412 416
    s."matchedInfraspecificEpithet",
413 417
    s."*Infraspecific_epithet_score",
418
    s."Infraspecific_rank_2",
419
    s."Infraspecific_epithet_2_matched",
420
    s."Infraspecific_epithet_2_score",
414 421
    s."identificationQualifier",
415 422
    s."morphospeciesSuffix",
416 423
    s."*taxonomicStatus",
......
434 441
        END AS accepted_morphospecies_binomial
435 442
   FROM ( SELECT taxon_best_match.batch AS "*batch",
436 443
            taxon_best_match."Name_submitted" AS "concatenatedScientificName",
444
            taxon_best_match.match_num,
445
            taxon_best_match."Name_number",
446
            taxon_best_match."Overall_score",
437 447
            taxon_best_match."Name_matched" AS "matchedTaxonName",
438 448
            taxon_best_match."Name_matched_rank" AS "matchedTaxonRank",
439 449
            taxon_best_match."Name_score" AS "*Name_score",
......
447 457
            taxon_best_match."Genus_score" AS "matchedGenusConfidence_fraction",
448 458
            taxon_best_match."Specific_epithet_matched" AS "matchedSpecificEpithet",
449 459
            taxon_best_match."Specific_epithet_score" AS "matchedSpeciesConfidence_fraction",
460
            taxon_best_match."Infraspecific_rank",
450 461
            taxon_best_match."Infraspecific_epithet_matched" AS "matchedInfraspecificEpithet",
451 462
            taxon_best_match."Infraspecific_epithet_score" AS "*Infraspecific_epithet_score",
463
            taxon_best_match."Infraspecific_rank_2",
464
            taxon_best_match."Infraspecific_epithet_2_matched",
465
            taxon_best_match."Infraspecific_epithet_2_score",
452 466
            taxon_best_match."Annotations" AS "identificationQualifier",
453 467
            taxon_best_match."Unmatched_terms" AS "morphospeciesSuffix",
454 468
            taxon_best_match."Taxonomic_status" AS "*taxonomicStatus",
......
486 500
CREATE VIEW "ValidMatchedTaxon" AS
487 501
 SELECT "MatchedTaxon"."*batch",
488 502
    "MatchedTaxon"."concatenatedScientificName",
503
    "MatchedTaxon".match_num,
504
    "MatchedTaxon"."Name_number",
505
    "MatchedTaxon"."Overall_score",
489 506
    "MatchedTaxon"."matchedTaxonName",
490 507
    "MatchedTaxon"."matchedTaxonRank",
491 508
    "MatchedTaxon"."*Name_score",
......
499 516
    "MatchedTaxon"."matchedGenusConfidence_fraction",
500 517
    "MatchedTaxon"."matchedSpecificEpithet",
501 518
    "MatchedTaxon"."matchedSpeciesConfidence_fraction",
519
    "MatchedTaxon"."Infraspecific_rank",
502 520
    "MatchedTaxon"."matchedInfraspecificEpithet",
503 521
    "MatchedTaxon"."*Infraspecific_epithet_score",
522
    "MatchedTaxon"."Infraspecific_rank_2",
523
    "MatchedTaxon"."Infraspecific_epithet_2_matched",
524
    "MatchedTaxon"."Infraspecific_epithet_2_score",
504 525
    "MatchedTaxon"."identificationQualifier",
505 526
    "MatchedTaxon"."morphospeciesSuffix",
506 527
    "MatchedTaxon"."*taxonomicStatus",
......
750 771
 SELECT "ValidMatchedTaxon".scrubbed_unique_taxon_name,
751 772
    "ValidMatchedTaxon"."*batch",
752 773
    "ValidMatchedTaxon"."concatenatedScientificName",
774
    "ValidMatchedTaxon".match_num,
775
    "ValidMatchedTaxon"."Name_number",
776
    "ValidMatchedTaxon"."Overall_score",
753 777
    "ValidMatchedTaxon"."matchedTaxonName",
754 778
    "ValidMatchedTaxon"."matchedTaxonRank",
755 779
    "ValidMatchedTaxon"."*Name_score",
......
763 787
    "ValidMatchedTaxon"."matchedGenusConfidence_fraction",
764 788
    "ValidMatchedTaxon"."matchedSpecificEpithet",
765 789
    "ValidMatchedTaxon"."matchedSpeciesConfidence_fraction",
790
    "ValidMatchedTaxon"."Infraspecific_rank",
766 791
    "ValidMatchedTaxon"."matchedInfraspecificEpithet",
767 792
    "ValidMatchedTaxon"."*Infraspecific_epithet_score",
793
    "ValidMatchedTaxon"."Infraspecific_rank_2",
794
    "ValidMatchedTaxon"."Infraspecific_epithet_2_matched",
795
    "ValidMatchedTaxon"."Infraspecific_epithet_2_score",
768 796
    "ValidMatchedTaxon"."identificationQualifier",
769 797
    "ValidMatchedTaxon"."morphospeciesSuffix",
770 798
    "ValidMatchedTaxon"."*taxonomicStatus",
trunk/schemas/vegbien.sql
19508 19508
CREATE VIEW "MatchedTaxon" AS
19509 19509
 SELECT s."*batch",
19510 19510
    s."concatenatedScientificName",
19511
    s.match_num,
19512
    s."Name_number",
19513
    s."Overall_score",
19511 19514
    s."matchedTaxonName",
19512 19515
    s."matchedTaxonRank",
19513 19516
    s."*Name_score",
......
19521 19524
    s."matchedGenusConfidence_fraction",
19522 19525
    s."matchedSpecificEpithet",
19523 19526
    s."matchedSpeciesConfidence_fraction",
19527
    s."Infraspecific_rank",
19524 19528
    s."matchedInfraspecificEpithet",
19525 19529
    s."*Infraspecific_epithet_score",
19530
    s."Infraspecific_rank_2",
19531
    s."Infraspecific_epithet_2_matched",
19532
    s."Infraspecific_epithet_2_score",
19526 19533
    s."identificationQualifier",
19527 19534
    s."morphospeciesSuffix",
19528 19535
    s."*taxonomicStatus",
......
19546 19553
        END AS accepted_morphospecies_binomial
19547 19554
   FROM ( SELECT taxon_best_match.batch AS "*batch",
19548 19555
            taxon_best_match."Name_submitted" AS "concatenatedScientificName",
19556
            taxon_best_match.match_num,
19557
            taxon_best_match."Name_number",
19558
            taxon_best_match."Overall_score",
19549 19559
            taxon_best_match."Name_matched" AS "matchedTaxonName",
19550 19560
            taxon_best_match."Name_matched_rank" AS "matchedTaxonRank",
19551 19561
            taxon_best_match."Name_score" AS "*Name_score",
......
19559 19569
            taxon_best_match."Genus_score" AS "matchedGenusConfidence_fraction",
19560 19570
            taxon_best_match."Specific_epithet_matched" AS "matchedSpecificEpithet",
19561 19571
            taxon_best_match."Specific_epithet_score" AS "matchedSpeciesConfidence_fraction",
19572
            taxon_best_match."Infraspecific_rank",
19562 19573
            taxon_best_match."Infraspecific_epithet_matched" AS "matchedInfraspecificEpithet",
19563 19574
            taxon_best_match."Infraspecific_epithet_score" AS "*Infraspecific_epithet_score",
19575
            taxon_best_match."Infraspecific_rank_2",
19576
            taxon_best_match."Infraspecific_epithet_2_matched",
19577
            taxon_best_match."Infraspecific_epithet_2_score",
19564 19578
            taxon_best_match."Annotations" AS "identificationQualifier",
19565 19579
            taxon_best_match."Unmatched_terms" AS "morphospeciesSuffix",
19566 19580
            taxon_best_match."Taxonomic_status" AS "*taxonomicStatus",
......
19598 19612
CREATE VIEW "ValidMatchedTaxon" AS
19599 19613
 SELECT "MatchedTaxon"."*batch",
19600 19614
    "MatchedTaxon"."concatenatedScientificName",
19615
    "MatchedTaxon".match_num,
19616
    "MatchedTaxon"."Name_number",
19617
    "MatchedTaxon"."Overall_score",
19601 19618
    "MatchedTaxon"."matchedTaxonName",
19602 19619
    "MatchedTaxon"."matchedTaxonRank",
19603 19620
    "MatchedTaxon"."*Name_score",
......
19611 19628
    "MatchedTaxon"."matchedGenusConfidence_fraction",
19612 19629
    "MatchedTaxon"."matchedSpecificEpithet",
19613 19630
    "MatchedTaxon"."matchedSpeciesConfidence_fraction",
19631
    "MatchedTaxon"."Infraspecific_rank",
19614 19632
    "MatchedTaxon"."matchedInfraspecificEpithet",
19615 19633
    "MatchedTaxon"."*Infraspecific_epithet_score",
19634
    "MatchedTaxon"."Infraspecific_rank_2",
19635
    "MatchedTaxon"."Infraspecific_epithet_2_matched",
19636
    "MatchedTaxon"."Infraspecific_epithet_2_score",
19616 19637
    "MatchedTaxon"."identificationQualifier",
19617 19638
    "MatchedTaxon"."morphospeciesSuffix",
19618 19639
    "MatchedTaxon"."*taxonomicStatus",
......
19862 19883
 SELECT "ValidMatchedTaxon".scrubbed_unique_taxon_name,
19863 19884
    "ValidMatchedTaxon"."*batch",
19864 19885
    "ValidMatchedTaxon"."concatenatedScientificName",
19886
    "ValidMatchedTaxon".match_num,
19887
    "ValidMatchedTaxon"."Name_number",
19888
    "ValidMatchedTaxon"."Overall_score",
19865 19889
    "ValidMatchedTaxon"."matchedTaxonName",
19866 19890
    "ValidMatchedTaxon"."matchedTaxonRank",
19867 19891
    "ValidMatchedTaxon"."*Name_score",
......
19875 19899
    "ValidMatchedTaxon"."matchedGenusConfidence_fraction",
19876 19900
    "ValidMatchedTaxon"."matchedSpecificEpithet",
19877 19901
    "ValidMatchedTaxon"."matchedSpeciesConfidence_fraction",
19902
    "ValidMatchedTaxon"."Infraspecific_rank",
19878 19903
    "ValidMatchedTaxon"."matchedInfraspecificEpithet",
19879 19904
    "ValidMatchedTaxon"."*Infraspecific_epithet_score",
19905
    "ValidMatchedTaxon"."Infraspecific_rank_2",
19906
    "ValidMatchedTaxon"."Infraspecific_epithet_2_matched",
19907
    "ValidMatchedTaxon"."Infraspecific_epithet_2_score",
19880 19908
    "ValidMatchedTaxon"."identificationQualifier",
19881 19909
    "ValidMatchedTaxon"."morphospeciesSuffix",
19882 19910
    "ValidMatchedTaxon"."*taxonomicStatus",

Also available in: Unified diff