Author: chatellier Date: 2011-02-08 17:47:13 +0000 (Tue, 08 Feb 2011) New Revision: 722 Log: Fix doc Modified: trunk/src/site/en/rst/user/configuration.rst trunk/src/site/en/rst/user/controls.rst trunk/src/site/en/rst/user/guide_listcontrols.rst Modified: trunk/src/site/en/rst/user/configuration.rst =================================================================== --- trunk/src/site/en/rst/user/configuration.rst 2011-02-08 17:35:53 UTC (rev 721) +++ trunk/src/site/en/rst/user/configuration.rst 2011-02-08 17:47:13 UTC (rev 722) @@ -70,7 +70,7 @@ Fish species type code name. Used by some controls to exclude some species. coser.selection.occurrenceFilter - Default percentage used in mimimum occurrence field filter in selection step. + Default percentage used in minimum occurrence field filter in selection step. coser.selection.densityFilter - Default percentage used in mimimum density field filter in selection step. + Default percentage used in minimum density field filter in selection step. Modified: trunk/src/site/en/rst/user/controls.rst =================================================================== --- trunk/src/site/en/rst/user/controls.rst 2011-02-08 17:35:53 UTC (rev 721) +++ trunk/src/site/en/rst/user/controls.rst 2011-02-08 17:47:13 UTC (rev 722) @@ -26,13 +26,13 @@ Controls ======== -Coser provides a user interface allowing to customise the controls. +Coser provides a user interface allowing to customize the controls. -But this customisation is quite technical and must be performed only by +But this customization is quite technical and must be performed only by advanced users. This interface is made of a tree with the list of the 4 files (catch, length, -hauls, stratas) and for each one of them, the level of error possible. +hauls, strata) and for each one of them, the level of error possible. For each level, a XML file describing the controls can be associated in order to describe them. Modified: trunk/src/site/en/rst/user/guide_listcontrols.rst =================================================================== --- trunk/src/site/en/rst/user/guide_listcontrols.rst 2011-02-08 17:35:53 UTC (rev 721) +++ trunk/src/site/en/rst/user/guide_listcontrols.rst 2011-02-08 17:47:13 UTC (rev 722) @@ -32,32 +32,32 @@ ------- +------------+----------------------------------------------------------------+----------+ -| Field | Check | Level | +| Field | Check | Level | +============+================================================================+==========+ -| Campagne | Mandatory field | Error | +| Survey | Mandatory field | Error | +------------+----------------------------------------------------------------+----------+ -| | Field with 4 mandatory numbers and 2 optional numbers separated by a point (trimester) ex : 2002.25 | | -| Année | | Error | +| | Field with 4 mandatory numbers and 2 optional numbers | | +| Year | separated by a point (trimester) ex : 2002.25 | Error | +------------+----------------------------------------------------------------+----------+ -| Traits | Made up of letters and numbers | Error | +| Haul | Made up of letters and numbers | Error | +------------+----------------------------------------------------------------+----------+ -| Especes | Mandatory field | Error | +| Species | Mandatory field | Error | +------------+----------------------------------------------------------------+----------+ -| Nombre | Number, empty or NA | Error | +| Number | Number, empty or NA | Error | +------------+----------------------------------------------------------------+----------+ -| Poids | Number, empty or NA | Error | +| Weight | Number, empty or NA | Error | +------------+----------------------------------------------------------------+----------+ +-----------------------------------------------------------------------------+----------+ | Other checks | Level | +=============================================================================+==========+ -| If the weight is a number different of 0, then the number also needs to be different from 0 | | -| | Error | +| If the weight is a number different of 0, then the number also needs to be | | +| different from 0 | Error | +-----------------------------------------------------------------------------+----------+ -| Check of duplicate entries with the keys "Campagne", "Annee", "Trait", | | -| "Espece" | Error | +| Check of duplicate entries with the keys "Survey", "Year", "Haul", | | +| "Species" | Error | +-----------------------------------------------------------------------------+----------+ -| Check of the minimal number of observations in the table CAPTURES$Nombre | | +| Check of the minimal number of observations in the table CATCH$Number | | | by species by stratum by year | Warning | +-----------------------------------------------------------------------------+----------+ @@ -67,9 +67,9 @@ +------------+----------------------------------------------------------------+----------+ | Fields | Check | Level | +============+================================================================+==========+ -| Campagne | Mandatory field | Error | +| Survey | Mandatory field | Error | +------------+----------------------------------------------------------------+----------+ -| Strate | Mandatory field | Error | +| Stratum | Mandatory field | Error | +------------+----------------------------------------------------------------+----------+ | Surface | Number, empty or NA | Error | +------------+----------------------------------------------------------------+----------+ @@ -77,33 +77,33 @@ +-----------------------------------------------------------------------------+----------+ | Other Checks | Level | +=============================================================================+==========+ -| Check the duplicate lines on the keys "Campagne", "Strate" | Error | +| Check the duplicate lines on the keys "Survey", "Stratum " | Error | +-----------------------------------------------------------------------------+----------+ Lengths ------- +------------+----------------------------------------------------------------+----------+ -| Fields | Check | Level | +| Fields | Check | Level | +============+================================================================+==========+ -| Campagne | Mandatory field | Error | +| Survey | Mandatory field | Error | +------------+----------------------------------------------------------------+----------+ -| Année | Field with 4 mandatory numbers and 2 optional numbers separated by a point (trimester) ex : 2002.25 | | -| | | Error | +| Year | Field with 4 mandatory numbers and 2 optional numbers | | +| | separated by a point (trimester) ex : 2002.25 | Error | +------------+----------------------------------------------------------------+----------+ -| Traits | Made up of letters and numbers | Error | +| Haul | Made up of letters and numbers | Error | +------------+----------------------------------------------------------------+----------+ -| Espece | Mandatory field | Error | +| Species | Mandatory field | Error | +------------+----------------------------------------------------------------+----------+ -| Sexe | Mandatory field | Error | +| Sex | Mandatory field | Error | +------------+----------------------------------------------------------------+----------+ -| Maturite | Mandatory field | Error | +| Maturity | Mandatory field | Error | +------------+----------------------------------------------------------------+----------+ -| Longueur | Number or empty | Error | +| Length | Number or empty | Error | +------------+----------------------------------------------------------------+----------+ -| Nombre | Number, empty or NA | Error | +| Number | Number, empty or NA | Error | +------------+----------------------------------------------------------------+----------+ -| Poids | Number, empty or NA | Error | +| Weight | Number, empty or NA | Error | +------------+----------------------------------------------------------------+----------+ | Age | Number, empty or NA | Fatal | +------------+----------------------------------------------------------------+----------+ @@ -111,13 +111,13 @@ +-----------------------------------------------------------------------------+----------+ | Other Checks | Level | +=============================================================================+==========+ -| If the Weight is a number different from 0, the Number must be also different from 0 | Error | -| | | +| If the Weight is a number different from 0, the Number must be also | Error | +| different from 0 | | +-----------------------------------------------------------------------------+----------+ -| Check duplicate lines on keys "Campagne", "Annee", "Trait", | Error | -| "Espece", "Sexe", "Maturite", "Longueur" | | +| Check duplicate lines on keys "Survey", "Year", "Haul", | Error | +| "Species", "Sex", "Maturity", "Length" | | +-----------------------------------------------------------------------------+----------+ -| Check the minimal number of observations in the table TAILLES$Nombre by | Error | +| Check the minimal number of observations in the table LENGTH$Number by | Error | | species by stratum by year | | +-----------------------------------------------------------------------------+----------+ @@ -127,26 +127,26 @@ +-----------------+----------------------------------------------------------------+----------+ | Fields | Check | Level | +=================+================================================================+==========+ -| Campagne | Mandatory field | Error | +| Survey | Mandatory field | Error | +-----------------+----------------------------------------------------------------+----------+ -| | Field with 4 mandatory numbers and 2 optional numbers separated by a point (trimester) ex : 2002.25 | | -| Année | | Error | +| | Field with 4 mandatory numbers and 2 optional numbers | | +| Year | separated by a point (trimester) ex : 2002.25 | Error | +-----------------+----------------------------------------------------------------+----------+ -| Traits | Made up of letters and numbers | Error | +| Haul | Made up of letters and numbers | Error | +-----------------+----------------------------------------------------------------+----------+ -| Mois | 2 numbers | Error | +| Month | 2 numbers | Error | +-----------------+----------------------------------------------------------------+----------+ -| Strates | Mandatory field | Error | +| Stratum | Mandatory field | Error | +-----------------+----------------------------------------------------------------+----------+ -| SurfaceBalayee | Mandatory field and number or NA | Error | +| SweptSurface | Mandatory field and number or NA | Error | +-----------------+----------------------------------------------------------------+----------+ | Lat | Number, empty or NA | Error | +-----------------+----------------------------------------------------------------+----------+ | Long | Number, empty or NA | Error | +-----------------+----------------------------------------------------------------+----------+ -| ProfMoy | Number, empty or NA | Error | +| Depth | Number, empty or NA | Error | +-----------------+----------------------------------------------------------------+----------+ -| SurfaceBalayee | With at least 3 decimals | Fatal | +| SweptSurface | With at least 3 decimals | Fatal | +-----------------+----------------------------------------------------------------+----------+ | Lat | With at least 4 decimals | Warning | +-----------------+----------------------------------------------------------------+----------+ @@ -156,11 +156,11 @@ +-----------------------------------------------------------------------------+----------+ | Other Checks | Level | +=============================================================================+==========+ -| If the Weight is a number different from 0, the Number must be also different from 0 | | -| | Error | +| If the Weight is a number different from 0, the Number must be also | | +| different from 0 | Error | +-----------------------------------------------------------------------------+----------+ -| Check duplicate lines on keys "Campagne", "Annee", "Trait", | | -| "Mois" | Error | +| Check duplicate lines on keys "Survey", "Year", "Haul", | | +| "Month" | Error | +-----------------------------------------------------------------------------+----------+ Files cross-checking @@ -171,17 +171,17 @@ +=============================================================================+==========+ | Check the campaign name is the same in the 4 files | Fatal | +-----------------------------------------------------------------------------+----------+ -| The list of years must be the same in the Catches, Lengthes and Hauls files | Fatal | +| The list of years must be the same in the Catchs, Length and Hauls files | Fatal | +-----------------------------------------------------------------------------+----------+ -| For the fishes, the Length field must have a full or half step (for example: 4.0 or 4.5 but not 4.25) | | -| | Warning | +| For the fishes, the Length field must have a full or half step | | +| (for example: 4.0 or 4.5 but not 4.25) | Warning | +-----------------------------------------------------------------------------+----------+ | Check that for each species present in a haul of a year in the length file | Fatal | | (noted Year/Haul/Species) there is a data in the catch files (the opposite | | | is not true) | | +-----------------------------------------------------------------------------+----------+ -| Check qthat for each haul present in a year (noted Year/Haul) in the lengthes files and catches, there is a data in the haul file | | -| | Fatal | +| Check that for each haul present in a year (noted Year/Haul) in the | | +| length files and catches, there is a data in the haul file | Fatal | +-----------------------------------------------------------------------------+----------+ Cross checking with the taxonomic referential @@ -190,9 +190,9 @@ +-----------------------------------------------------------------------------+----------+ | Checks | Level | +=============================================================================+==========+ -| The Field Species of the catches file must corresponf to a species present in the taxonomic referential | | -| | Error | +| The Field Species of the catchs file must correspond to a species | | +| present in the taxonomic referential | Error | +-----------------------------------------------------------------------------+----------+ -| The Field Species of the lengthes file must corresponf to a species present in the taxonomic referential | | -| | Error | +| The Field Species of the length file must correspond to a species | | +| present in the taxonomic referential | Error | +-----------------------------------------------------------------------------+----------+