Skip to content

Commit

Permalink
Mnor changes elsewhere, but big changes in the tables_chron file, t…
Browse files Browse the repository at this point in the history
…rying to get it to the taxonomy table standards.
  • Loading branch information
SimonGoring committed Apr 12, 2016
1 parent dfcf672 commit 1a52b06
Show file tree
Hide file tree
Showing 19 changed files with 345 additions and 504 deletions.
Binary file modified _build/doctrees/environment.pickle
Binary file not shown.
Binary file modified _build/doctrees/index.doctree
Binary file not shown.
Binary file modified _build/doctrees/sql_quickly.doctree
Binary file not shown.
Binary file modified _build/doctrees/tables_chron.doctree
Binary file not shown.
Binary file modified _build/doctrees/tables_taxa.doctree
Binary file not shown.
1 change: 1 addition & 0 deletions _build/html/_sources/index.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Contents:

.. toctree::
:maxdepth: -1
:hidden:

neotoma_introduction
db_design_concepts
Expand Down
17 changes: 2 additions & 15 deletions _build/html/_sources/sql_quickly.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
SQL Quickly
------------------------------

SQL (Sturctured Query Language) is a standard language for querying and
modifying relational databases. It is an ANSI and ISO standard, although
various vendors have added proprietary extensions. It is beyond the
scope of this document to describe SQL or the differences between
Microsoft Access SQL and ANSI SQL. However, examples of SQL queries are
provided in this document as a tutorial. Most users of Access probably
use the graphical design view for queries, but SQL queries are better
suited for examples. These queries can by typed or copied and pasted
into the Access query SQL view. The query can then be executed or opened
in design view to show the graphical representation. One difference
between Access SQL and other flavors is the wildcard; Access uses \*
rather than %.
SQL (Sturctured Query Language) is a standard language for querying and modifying relational databases. It is an ANSI and ISO standard, although various vendors have added proprietary extensions. It is beyond the scope of this document to describe SQL or the differences between Microsoft Access SQL and ANSI SQL. However, examples of SQL queries are provided in this document as a tutorial. Most users of Access probably use the graphical design view for queries, but SQL queries are better suited for examples. These queries can by typed or copied and pasted into the Access query SQL view. The query can then be executed or opened in design view to show the graphical representation. One difference between Access SQL and other flavors is the wildcard; Access uses \* rather than %.

SQL Example
~~~~~~~~~~~
Expand Down Expand Up @@ -52,9 +41,7 @@ Within tables there are often Keys. A Key may be a **Primary Key** (PK), which
Data Types
~~~~~~~~~~~

In the table descriptions in the following section, the SQL Server data
types are given for field descriptions. The equivalent Access data types
are given in the following table.
In the table descriptions in the following section, the SQL Server data types are given for field descriptions. The equivalent Access data types are given in the following table.

+------------------------------------+------------------------+
| **SQL Server data type** | **Access data type** |
Expand Down
134 changes: 77 additions & 57 deletions _build/html/_sources/tables_chron.txt

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions _build/html/_sources/tables_taxa.txt
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ This table lists all taxa in the database. Most taxa are biological taxa; howeve
**Notes**
Free form notes or comments about the Taxon.

.. _TaxaGroupType:
.. _TaxaGroupTypes:

TaxaGroupTypes
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -662,6 +662,8 @@ Result:
| Bison bison antiquus | human butchering | San Jon |
+------------------------+----------------------------+----------------------------+

.. _VariableContexts:

VariableContexts
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -717,7 +719,7 @@ Lookup table of Variable Elements. Table is referenced by the :ref:`Variables` t
**VariableElement**
The element, part, or organ of the taxon identified. For plants, these include pollen, spores, and various macrofossil organs, such as «seed», «twig», «cone», and «cone bract». Thus, *Betula* pollen and *Betula* seeds are two different Variables. For mammals, Elements include the bone or tooth identified, e.g. «tibia». «tibia, distal, left», «M2, lower, left». Some more unusual elements are *Neotoma* fecal pellets and *Erethizon dorsata* quills. If no element is indicated for mammalian fauna, then the genric element «bone/tooth» is assigned. Elements were not assigned in FAUNMAP, so all Variables ingested from FAUNMAP were assigned the «bone/tooth» element. Physical Variables may also have elements. For example, the Loss-on-ignition Variables have «Loss-on-ignition» as a Taxon, and temperature of analysis as an element, e.g. «500°C», «900°C». Charcoal Variables have the size fragments as elements, e.g. «75-100 µm», «100-125 µm».

.. _VariableModification:
.. _VariableModifications:

VariableModifications
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
205 changes: 0 additions & 205 deletions _build/html/index.html

Large diffs are not rendered by default.

Binary file modified _build/html/objects.inv
Binary file not shown.
2 changes: 1 addition & 1 deletion _build/html/searchindex.js

Large diffs are not rendered by default.

24 changes: 2 additions & 22 deletions _build/html/sql_quickly.html
Original file line number Diff line number Diff line change
Expand Up @@ -93,18 +93,11 @@
<li class="toctree-l1"><a class="reference internal" href="neotoma_tables.html">Neotoma Tables</a></li>
<li class="toctree-l1"><a class="reference internal" href="tables_chron.html">Chronology &amp; Age Related Tables</a></li>
<li class="toctree-l1"><a class="reference internal" href="tables_dataset.html">Dataset &amp; Collection Related Tables</a></li>
<li class="toctree-l1"><a class="reference internal" href="tables_dataset.html#datasetpublications">DatasetPublications</a></li>
<li class="toctree-l1"><a class="reference internal" href="tables_dataset.html#datasetsubmissions">DatasetSubmissions</a></li>
<li class="toctree-l1"><a class="reference internal" href="tables_samples.html">Sample Related Tables</a></li>
<li class="toctree-l1"><a class="reference internal" href="tables_site.html">Site Related Tables</a></li>
<li class="toctree-l1"><a class="reference internal" href="tables_taxa.html">Taxonomy Related Tables</a></li>
<li class="toctree-l1"><a class="reference internal" href="tables_taxa.html#table-taxa">Table: Taxa</a></li>
<li class="toctree-l1"><a class="reference internal" href="table_contacts.html">Contact and Individual Related Tables</a></li>
<li class="toctree-l1"><a class="reference internal" href="table_publications.html">Publication Related Tables</a></li>
<li class="toctree-l1"><a class="reference internal" href="table_publications.html#table-publicationauthors">Table: PublicationAuthors</a></li>
<li class="toctree-l1"><a class="reference internal" href="table_publications.html#table-publicationeditors">Table: PublicationEditors</a></li>
<li class="toctree-l1"><a class="reference internal" href="table_publications.html#table-publications">Table: Publications</a></li>
<li class="toctree-l1"><a class="reference internal" href="table_publications.html#table-publicationtypes">Table: PublicationTypes</a></li>
<li class="toctree-l1"><a class="reference internal" href="references_cited.html">References Cited</a></li>
</ul>

Expand Down Expand Up @@ -152,18 +145,7 @@

<div class="section" id="sql-quickly">
<h1>SQL Quickly<a class="headerlink" href="#sql-quickly" title="Permalink to this headline"></a></h1>
<p>SQL (Sturctured Query Language) is a standard language for querying and
modifying relational databases. It is an ANSI and ISO standard, although
various vendors have added proprietary extensions. It is beyond the
scope of this document to describe SQL or the differences between
Microsoft Access SQL and ANSI SQL. However, examples of SQL queries are
provided in this document as a tutorial. Most users of Access probably
use the graphical design view for queries, but SQL queries are better
suited for examples. These queries can by typed or copied and pasted
into the Access query SQL view. The query can then be executed or opened
in design view to show the graphical representation. One difference
between Access SQL and other flavors is the wildcard; Access uses *
rather than %.</p>
<p>SQL (Sturctured Query Language) is a standard language for querying and modifying relational databases. It is an ANSI and ISO standard, although various vendors have added proprietary extensions. It is beyond the scope of this document to describe SQL or the differences between Microsoft Access SQL and ANSI SQL. However, examples of SQL queries are provided in this document as a tutorial. Most users of Access probably use the graphical design view for queries, but SQL queries are better suited for examples. These queries can by typed or copied and pasted into the Access query SQL view. The query can then be executed or opened in design view to show the graphical representation. One difference between Access SQL and other flavors is the wildcard; Access uses * rather than %.</p>
<div class="section" id="sql-example">
<h2>SQL Example<a class="headerlink" href="#sql-example" title="Permalink to this headline"></a></h2>
<p>The following SQL example lists the number of sites by GeoPoliticalID (the name of the country) for and GeoPoliticalID that is defined as a country.</p>
Expand Down Expand Up @@ -215,9 +197,7 @@ <h2>Table Keys<a class="headerlink" href="#table-keys" title="Permalink to this
</div>
<div class="section" id="data-types">
<h2>Data Types<a class="headerlink" href="#data-types" title="Permalink to this headline"></a></h2>
<p>In the table descriptions in the following section, the SQL Server data
types are given for field descriptions. The equivalent Access data types
are given in the following table.</p>
<p>In the table descriptions in the following section, the SQL Server data types are given for field descriptions. The equivalent Access data types are given in the following table.</p>
<table border="1" class="docutils">
<colgroup>
<col width="60%" />
Expand Down

0 comments on commit 1a52b06

Please sign in to comment.