Coser-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
March 2011
- 2 participants
- 36 discussions
r798 - trunk/coser-web/src/main/resources/fr/ifremer/coser/web
by chatellier@users.labs.libre-entreprise.org 25 Mar '11
by chatellier@users.labs.libre-entreprise.org 25 Mar '11
25 Mar '11
Author: chatellier
Date: 2011-03-25 09:06:41 +0000 (Fri, 25 Mar 2011)
New Revision: 798
Log:
Modification by verena
Modified:
trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties
trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties
Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties
===================================================================
--- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2011-03-24 15:45:33 UTC (rev 797)
+++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2011-03-25 09:06:41 UTC (rev 798)
@@ -31,21 +31,21 @@
message.documents.paragraph2=Grands invert\u00E9br\u00E9s et poissons observ\u00E9s par les campagnes scientifiques. Bilan 2007. 2009. {0}
message.documents.paragraph3=L''\u00E9tat des communaut\u00E9s exploit\u00E9es au large des c\u00F4tes de France. Application d''indicateurs \u00E0 l''\u00E9valuation de l''impact de la p\u00EAche. Bilan 2004 Edition 2009. {0}
message.documents.paragraph4=Poissons et invert\u00E9br\u00E9s au large des c\u00F4tes de France. Indicateurs issus des p\u00EAches scientifiques. Bilan 2004. 2007. {0}
-message.layout.title=Population and community indices derived from Ifremer scientific surveys.
-message.layout.oceanicdatatitle=Gestion des donn\u00E9es des campagnes oc\u00E9anographiques \u00E0 l''Ifremer
+message.layout.title=Population and community indices derived from scientific surveys carried out by Ifremer.
+message.layout.oceanicdatatitle=Survey data management at Ifremer
message.layout.oceanicdata1=le Syst\u00E8me d''informations scientifiques pour la mer de l''Ifremer (SISMER)
-message.layout.oceanicdata2=le Fisheries Information System - Syst\u00E8me d''information halieutique de l''Ifremer (SIH)
+message.layout.oceanicdata2=the Fisheries Information System - Syst\u00E8me d''information halieutique de l''Ifremer (SIH)
message.index.documentstitle=Documents
message.index.documentsmessage=Documents
message.index.title=Home
-message.index.paragraph1=This web site has been created to provide easy access to the raw data and derived estimated from the scientific surveys carried out by Ifremer along the French coast.
+message.index.paragraph1=This web site has been created to provide easy access to the raw data and index estimates derived from the scientific surveys carried out by Ifremer along the French coasts.
message.index.paragraph2=All data made available have passed rigorous quality checks. However, as the reliability of results interpretions depends directly on the data used, users are cordially invited to study carefully the survey and quality check protocols.
-message.index.paragraph3=Each survey is carried out using a specific sampling design. Data analyses and interpretation of each time series must therefore take into the stratified sampling designs. The data are presented by survey series on the web site.
-message.index.paragraph4=In the data tables all species are identified using the taxinomic reference file of the Syst\u00E8me d''informations halieutiques de l''Ifremer ({0}).
-message.index.datatypetitle=Four data types are presented
-message.index.datatypesource=Data by sampling by unit (generally by haul)
+message.index.paragraph3=Each survey is carried out using a specific sampling design. Data analyses and interpretation of each time series must therefore take into account the sampling designs. The data are presented by survey series on the web site.
+message.index.paragraph4=The species codes used in the data tables are those of the taxinomic reference file of the Syst\u00E8me d''informations halieutiques de l''Ifremer ({0}).
+message.index.datatypetitle=Four data products are presented
+message.index.datatypesource=Raw data by sampling unit (generally by haul)
message.index.datatypemap=Species distribution maps by area
-message.index.datatypepop=Biological indices by species by area
+message.index.datatypepop=Population indices by species by area
message.index.datatypecom=Community indices by area.
message.index.quotetitle=How to cite this web site
message.index.quotemessage=Ifremer {0,date,yyyy}. Population and community indices derived from scientific surveys carried out by Ifremer. {1} ({0,date,dd MMMM})
@@ -57,7 +57,7 @@
message.common.selectpop=Select a population
message.common.selectzone=Select an area
message.common.selectsurvey=Select a survey
-message.common.selectfacade=Select a sea
+message.common.selectfacade=Select an area
message.common.selectindicator=Select an indicator
message.common.noresults=No results available
message.common.selectspecies=Select a species
@@ -68,22 +68,22 @@
message.map.citation=Trenkel V.M., O. Berthel\u00E9, P. Lorance, J.A. Bertrand, A. Brind''Amour, M.L. Cochard, F. Coppin, J.P. Leaut\u00E9, J.C. Mah\u00E9, J. Morin, M.J. Rochet, M. Salaun, A. Souplet & Y. V\u00E9rin, 2009. Grands invert\u00E9br\u00E9s et poissons observ\u00E9s par les campagnes scientifiques. Atlas de distribution. Bilan 2008. Ifremer, Nantes. EMH : 09-003. {0}. 100 p.
message.map.downloadaspdf=Download as PDF
message.map.linkarchimer=Access atlas : {0}
-message.map.paragraph1=The objectif of this atlas is to provide a rough indication of the spatial distribution of certain fish and shelfish species as provided by scientific surveys.
-message.map.paragraph2=For each area a systematic grid was defined and the simple average density across years and hauls was calculated in numbers per km2. For mapping purposes, grid cells were coloured using a percentile scale: blue species never observed, light yellow: average density between [0- 25\u00A0%[; dark yellow: [25-50\u00A0%[, orange\u00A0: [50-75\u00A0%[ and red\u00A0: [75-100\u00A0%]. Thus, cells with the highest average density are in red.
+message.map.paragraph1=The objectif of these maps is to provide a rough indication of the spatial distribution of certain fish and shelfish species as provided by scientific surveys.
+message.map.paragraph2=For each area a systematic grid was defined and the simple average density across years and hauls was calculated in numbers per km2. For mapping purposes, grid cells were coloured using a percentile scale: blue: species never observed, light yellow: average density between [0- 25\u00A0%[; dark yellow: [25-50\u00A0%[, orange\u00A0: [50-75\u00A0%[ and red\u00A0: [75-100\u00A0%]. Thus, cells with the highest average density are in red.
message.map.title=Distribution maps
message.map.warning=Warning
-message.map.warningcontent=The maps should not be interpreted as biological distribution maps but as the areas where the species are caught during the scientific surveys. As the different surveys use different samplin gear and are carried out at different times of the year, there can be differences in cathability among surveys and consequently among areas.
+message.map.warningcontent=The maps should not be interpreted as biological distribution maps but as the areas where the species are caught during the scientific surveys. As the different surveys use different samplin gear and are carried out at different times of the year, there can be differences in catchability among surveys and consequently among areas.
message.pop.downloadascsv=Download as CSV
message.pop.moredetailspdf=More details about computed population indices
-message.pop.title=Biological indices
+message.pop.title=Population indices
message.pop.paragraph1=The presented indices have been selected with respect to their capacity to inform on the impact of fishing and for integration into indicator dashboards for exploited ecosystems.
message.pop.paragraph2=The data correspond to the value of each indicator. The information has been validated by an expert group within the framework of a holostic population and community indicator approach. The results are presented by geographic area or by species for all available data series. The user can select the geographique area, the saison (for saisonal surveys), the species and the index. If data is available for a given selection, a figure is produced that shows the time series of the index, plus-minus one standard deviation. It is possible to extract the corresponding table with index values by year, standard deviations and coefficients of variation.
message.source.download=Download
message.source.title=Raw data
message.source.paragraph1=The raw data are presented in four tables which contain the basic information by sampling unit (generally a haul) as well as the relevant information on the sampling design (strata). An additional table provides the latin names for the species codes used in the data files.
message.source.paragraph2=The web site provides access to the raw data corresponding to the population and community indices presented. For any other data please contact the 'administrateur du Syst\u00E8me d''informations halieutiques de l''Ifremer ({0}).
-message.source.paragraph3=The survey data consist of stations distributed in space following a stratified random design (which can be fixed between years). The spatial resolution determines on which spatial scale population and community indices can be calculated.
-message.source.paragraph4=The list of proposed spatial areas includes the original sampling areas, plus post-stratified areas suitable for the European Marine Strategie Framework Directive. Thes areas have been validated by an internal Ifremer working group following sensitivity analyses.
+message.source.paragraph3=The survey data consist of stations distributed in space following a stratified random design (which can be constant between years). The spatial resolution determines on which spatial scale population and community indices can be calculated.
+message.source.paragraph4=The list of proposed spatial areas includes the original sampling areas, plus post-stratified areas suitable for the European Marine Strategie Framework Directive. These areas have been validated by an internal Ifremer working group following sensitivity analyses.
message.survey.maintitle=Scientific surveys carried out by Ifremer
message.survey.paragraph1=The main objectif of the scientific fisheries surveys is to provide information on ressource changes, using a standard sampling protocol. They are always carried out in the same areas, at the same time of year and with the same gear, to allow comparisons among years. They provide information on both commercial and non-commercial species and their changes. Fish and shelfish species are counted, weighted and measured. For certain species other biological information is collected. Thus each survey provided a quantitive picture of the species assemblage in a given area during a certain time period. Additional information such as temperature, salinity, macrofauna, marin mammals, birds, macro waste etc. are collected during certain surveys, but this information is not presented here
message.survey.paragraph2=For the last two decades Ifremer has organised scientific fisheries surveys in the North Sea, the English Channel, the Atlantic and in the Mediterrean Sea for sampling demersal and benthic ressources. The main objective is to produce abundance indices for the principal commercial species. The surveys collect also data for non-commercial species. Hence they contribute to the knowledge necessary for the development of an ecosystem approach to fisheries, in particular in the context of the common fisheries policy (CFP) and more generally the European marine strategy framework directive.
@@ -148,7 +148,7 @@
message.survey.mediterranee.estcorse.medits5=Manuel des protocoles Medits, Version 5 (2007)
message.quality.title=Quality warning
message.quality.paragraph1=Despite careful data control carried out by Ifremer, inconcistencies inherent to the aggregation of the data might occur. For example\u00A0:
-message.quality.paragraph2=It is not recommended to simply combine data from different surveys in an analysis despite the fact that all data from all surveys are presented in the same format. For example, the catchability of the same species can vary with the survey gear used. As a consequence each survey provides a particular but coherent picture of the sampled ecosystems.
+message.quality.paragraph2=It is not recommended to simply combine data from different surveys in an analysis despite the fact that all data from all surveys are presented in the same format. For example, the catchability of the same species can vary with the survey gear used. As a consequence each survey provides a particular but coherent picture of the sampled ecosystem.
message.quality.paragraph3=A common feature of survey time series is the change of taxonomic expertise over time. As a result new species can appear, disappear or similar species be confused thus biasing time trends of certain species.
message.quality.paragraph4=For any given survey time series, any changes in the sampling procedure, gear, period and area covered might influence the catches. Therefore to avoid the risk of any bias in the analysis, the data must be carefully filtered before use.
message.quality.paragraph5=It is strongly recommended to use the data with care. In the case of doubts about the validity of the data, please contact the administrator of the data base ({0}).
Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties
===================================================================
--- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties 2011-03-24 15:45:33 UTC (rev 797)
+++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties 2011-03-25 09:06:41 UTC (rev 798)
@@ -31,21 +31,21 @@
message.documents.paragraph2=Grands invert\u00E9br\u00E9s et poissons observ\u00E9s par les campagnes scientifiques. Bilan 2007. 2009. {0}
message.documents.paragraph3=L''\u00E9tat des communaut\u00E9s exploit\u00E9es au large des c\u00F4tes de France. Application d''indicateurs \u00E0 l''\u00E9valuation de l''impact de la p\u00EAche. Bilan 2004 Edition 2009. {0}
message.documents.paragraph4=Poissons et invert\u00E9br\u00E9s au large des c\u00F4tes de France. Indicateurs issus des p\u00EAches scientifiques. Bilan 2004. 2007. {0}
-message.layout.title=Population and community indices derived from Ifremer scientific surveys.
-message.layout.oceanicdatatitle=Gestion des donn\u00E9es des campagnes oc\u00E9anographiques \u00E0 l''Ifremer
+message.layout.title=Population and community indices derived from scientific surveys carried out by Ifremer.
+message.layout.oceanicdatatitle=Survey data management at Ifremer
message.layout.oceanicdata1=le Syst\u00E8me d''informations scientifiques pour la mer de l''Ifremer (SISMER)
-message.layout.oceanicdata2=le Fisheries Information System - Syst\u00E8me d''information halieutique de l''Ifremer (SIH)
+message.layout.oceanicdata2=the Fisheries Information System - Syst\u00E8me d''information halieutique de l''Ifremer (SIH)
message.index.documentstitle=Documents
message.index.documentsmessage=Documents
message.index.title=Home
-message.index.paragraph1=This web site has been created to provide easy access to the raw data and derived estimated from the scientific surveys carried out by Ifremer along the French coast.
+message.index.paragraph1=This web site has been created to provide easy access to the raw data and index estimates derived from the scientific surveys carried out by Ifremer along the French coasts.
message.index.paragraph2=All data made available have passed rigorous quality checks. However, as the reliability of results interpretions depends directly on the data used, users are cordially invited to study carefully the survey and quality check protocols.
-message.index.paragraph3=Each survey is carried out using a specific sampling design. Data analyses and interpretation of each time series must therefore take into the stratified sampling designs. The data are presented by survey series on the web site.
-message.index.paragraph4=In the data tables all species are identified using the taxinomic reference file of the Syst\u00E8me d''informations halieutiques de l''Ifremer ({0}).
-message.index.datatypetitle=Four data types are presented
-message.index.datatypesource=Data by sampling by unit (generally by haul)
+message.index.paragraph3=Each survey is carried out using a specific sampling design. Data analyses and interpretation of each time series must therefore take into account the sampling designs. The data are presented by survey series on the web site.
+message.index.paragraph4=The species codes used in the data tables are those of the taxinomic reference file of the Syst\u00E8me d''informations halieutiques de l''Ifremer ({0}).
+message.index.datatypetitle=Four data products are presented
+message.index.datatypesource=Raw data by sampling unit (generally by haul)
message.index.datatypemap=Species distribution maps by area
-message.index.datatypepop=Biological indices by species by area
+message.index.datatypepop=Population indices by species by area
message.index.datatypecom=Community indices by area.
message.index.quotetitle=How to cite this web site
message.index.quotemessage=Ifremer {0,date,yyyy}. Population and community indices derived from scientific surveys carried out by Ifremer. {1} ({0,date,dd MMMM})
@@ -57,7 +57,7 @@
message.common.selectpop=Select a population
message.common.selectzone=Select an area
message.common.selectsurvey=Select a survey
-message.common.selectfacade=Select a sea
+message.common.selectfacade=Select an area
message.common.selectindicator=Select an indicator
message.common.noresults=No results available
message.common.selectspecies=Select a species
@@ -68,22 +68,22 @@
message.map.citation=Trenkel V.M., O. Berthel\u00E9, P. Lorance, J.A. Bertrand, A. Brind''Amour, M.L. Cochard, F. Coppin, J.P. Leaut\u00E9, J.C. Mah\u00E9, J. Morin, M.J. Rochet, M. Salaun, A. Souplet & Y. V\u00E9rin, 2009. Grands invert\u00E9br\u00E9s et poissons observ\u00E9s par les campagnes scientifiques. Atlas de distribution. Bilan 2008. Ifremer, Nantes. EMH : 09-003. {0}. 100 p.
message.map.downloadaspdf=Download as PDF
message.map.linkarchimer=Access atlas : {0}
-message.map.paragraph1=The objectif of this atlas is to provide a rough indication of the spatial distribution of certain fish and shelfish species as provided by scientific surveys.
-message.map.paragraph2=For each area a systematic grid was defined and the simple average density across years and hauls was calculated in numbers per km2. For mapping purposes, grid cells were coloured using a percentile scale: blue species never observed, light yellow: average density between [0- 25\u00A0%[; dark yellow: [25-50\u00A0%[, orange\u00A0: [50-75\u00A0%[ and red\u00A0: [75-100\u00A0%]. Thus, cells with the highest average density are in red.
+message.map.paragraph1=The objectif of these maps is to provide a rough indication of the spatial distribution of certain fish and shelfish species as provided by scientific surveys.
+message.map.paragraph2=For each area a systematic grid was defined and the simple average density across years and hauls was calculated in numbers per km2. For mapping purposes, grid cells were coloured using a percentile scale: blue: species never observed, light yellow: average density between [0- 25\u00A0%[; dark yellow: [25-50\u00A0%[, orange\u00A0: [50-75\u00A0%[ and red\u00A0: [75-100\u00A0%]. Thus, cells with the highest average density are in red.
message.map.title=Distribution maps
message.map.warning=Warning
-message.map.warningcontent=The maps should not be interpreted as biological distribution maps but as the areas where the species are caught during the scientific surveys. As the different surveys use different samplin gear and are carried out at different times of the year, there can be differences in cathability among surveys and consequently among areas.
+message.map.warningcontent=The maps should not be interpreted as biological distribution maps but as the areas where the species are caught during the scientific surveys. As the different surveys use different samplin gear and are carried out at different times of the year, there can be differences in catchability among surveys and consequently among areas.
message.pop.downloadascsv=Download as CSV
message.pop.moredetailspdf=More details about computed population indices
-message.pop.title=Biological indices
+message.pop.title=Population indices
message.pop.paragraph1=The presented indices have been selected with respect to their capacity to inform on the impact of fishing and for integration into indicator dashboards for exploited ecosystems.
message.pop.paragraph2=The data correspond to the value of each indicator. The information has been validated by an expert group within the framework of a holostic population and community indicator approach. The results are presented by geographic area or by species for all available data series. The user can select the geographique area, the saison (for saisonal surveys), the species and the index. If data is available for a given selection, a figure is produced that shows the time series of the index, plus-minus one standard deviation. It is possible to extract the corresponding table with index values by year, standard deviations and coefficients of variation.
message.source.download=Download
message.source.title=Raw data
message.source.paragraph1=The raw data are presented in four tables which contain the basic information by sampling unit (generally a haul) as well as the relevant information on the sampling design (strata). An additional table provides the latin names for the species codes used in the data files.
message.source.paragraph2=The web site provides access to the raw data corresponding to the population and community indices presented. For any other data please contact the 'administrateur du Syst\u00E8me d''informations halieutiques de l''Ifremer ({0}).
-message.source.paragraph3=The survey data consist of stations distributed in space following a stratified random design (which can be fixed between years). The spatial resolution determines on which spatial scale population and community indices can be calculated.
-message.source.paragraph4=The list of proposed spatial areas includes the original sampling areas, plus post-stratified areas suitable for the European Marine Strategie Framework Directive. Thes areas have been validated by an internal Ifremer working group following sensitivity analyses.
+message.source.paragraph3=The survey data consist of stations distributed in space following a stratified random design (which can be constant between years). The spatial resolution determines on which spatial scale population and community indices can be calculated.
+message.source.paragraph4=The list of proposed spatial areas includes the original sampling areas, plus post-stratified areas suitable for the European Marine Strategie Framework Directive. These areas have been validated by an internal Ifremer working group following sensitivity analyses.
message.survey.maintitle=Scientific surveys carried out by Ifremer
message.survey.paragraph1=The main objectif of the scientific fisheries surveys is to provide information on ressource changes, using a standard sampling protocol. They are always carried out in the same areas, at the same time of year and with the same gear, to allow comparisons among years. They provide information on both commercial and non-commercial species and their changes. Fish and shelfish species are counted, weighted and measured. For certain species other biological information is collected. Thus each survey provided a quantitive picture of the species assemblage in a given area during a certain time period. Additional information such as temperature, salinity, macrofauna, marin mammals, birds, macro waste etc. are collected during certain surveys, but this information is not presented here
message.survey.paragraph2=For the last two decades Ifremer has organised scientific fisheries surveys in the North Sea, the English Channel, the Atlantic and in the Mediterrean Sea for sampling demersal and benthic ressources. The main objective is to produce abundance indices for the principal commercial species. The surveys collect also data for non-commercial species. Hence they contribute to the knowledge necessary for the development of an ecosystem approach to fisheries, in particular in the context of the common fisheries policy (CFP) and more generally the European marine strategy framework directive.
@@ -148,7 +148,7 @@
message.survey.mediterranee.estcorse.medits5=Manuel des protocoles Medits, Version 5 (2007)
message.quality.title=Quality warning
message.quality.paragraph1=Despite careful data control carried out by Ifremer, inconcistencies inherent to the aggregation of the data might occur. For example\u00A0:
-message.quality.paragraph2=It is not recommended to simply combine data from different surveys in an analysis despite the fact that all data from all surveys are presented in the same format. For example, the catchability of the same species can vary with the survey gear used. As a consequence each survey provides a particular but coherent picture of the sampled ecosystems.
+message.quality.paragraph2=It is not recommended to simply combine data from different surveys in an analysis despite the fact that all data from all surveys are presented in the same format. For example, the catchability of the same species can vary with the survey gear used. As a consequence each survey provides a particular but coherent picture of the sampled ecosystem.
message.quality.paragraph3=A common feature of survey time series is the change of taxonomic expertise over time. As a result new species can appear, disappear or similar species be confused thus biasing time trends of certain species.
message.quality.paragraph4=For any given survey time series, any changes in the sampling procedure, gear, period and area covered might influence the catches. Therefore to avoid the risk of any bias in the analysis, the data must be carefully filtered before use.
message.quality.paragraph5=It is strongly recommended to use the data with care. In the case of doubts about the validity of the data, please contact the administrator of the data base ({0}).
1
0
r797 - in trunk: . coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/test/java/fr/ifremer/coser/services coser-web/src/main/java/fr/ifremer/coser/web/actions/com coser-web/src/main/java/fr/ifremer/coser/web/actions/common coser-web/src/main/java/fr/ifremer/coser/web/actions/map coser-web/src/main/java/fr/ifremer/coser/web/actions/pop coser-web/src/main/java/fr/ifremer/coser/web/actions/source coser-web/src/main/resources/fr/ifremer/coser/web coser-web/src/main/webapp/
by chatellier@users.labs.libre-entreprise.org 24 Mar '11
by chatellier@users.labs.libre-entreprise.org 24 Mar '11
24 Mar '11
Author: chatellier
Date: 2011-03-24 15:45:33 +0000 (Thu, 24 Mar 2011)
New Revision: 797
Log:
Visu des cartes via leurs zones au lieu de leurs nom de campagne.
La modif est crade (boolean), mais ca ira pour l'instant.
Added:
trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/ZoneAction.java
trunk/coser-web/src/main/webapp/WEB-INF/content/map/zone.jsp
Removed:
trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java
trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp
Modified:
trunk/changelog.txt
trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java
trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java
trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphAction.java
trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonIndicator.java
trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonZone.java
trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapAction.java
trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapDataAction.java
trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SpeciesAction.java
trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java
trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SpeciesAction.java
trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceAction.java
trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/ZoneAction.java
trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties
trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties
trunk/coser-web/src/main/webapp/WEB-INF/content/map/facade.jsp
trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp
trunk/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp
Modified: trunk/changelog.txt
===================================================================
--- trunk/changelog.txt 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/changelog.txt 2011-03-24 15:45:33 UTC (rev 797)
@@ -4,6 +4,7 @@
1.0.3
-----
+ * Display map with zone instead of survey name
* Allow _ in strata name
* Fix double with exponent and fixed decimal count check
* Fix selection comment reload
Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java
===================================================================
--- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-03-24 15:45:33 UTC (rev 797)
@@ -1056,10 +1056,11 @@
*
* @param facade facade (le nom de la facade principale)
* @param onlyWithSource retourn zone liste with available source data
+ * @param forMap look in map directory
* @return couple subzoneid/sub
* @throws CoserBusinessException
*/
- public Map<String, String> getZoneForFacade(String facade, boolean onlyWithSource) throws CoserBusinessException {
+ public Map<String, String> getZoneForFacade(String facade, boolean onlyWithSource, boolean forMap) throws CoserBusinessException {
Map<String, String> zonesForFacade = new HashMap<String, String>();
// get subzone for main zone
@@ -1073,8 +1074,16 @@
}
}
+ File projectsDirectory = null;
+ if (forMap) {
+ projectsDirectory = config.getWebMapsProjectsDirectory();
+ }
+ else {
+ projectsDirectory = config.getWebIndicatorsProjectsDirectory();
+ }
+
// get survey names in subZones collection
- File[] projectFiles = config.getWebIndicatorsProjectsDirectory().listFiles();
+ File[] projectFiles = projectsDirectory.listFiles();
// project iteration
if (projectFiles != null) {
@@ -1128,8 +1137,10 @@
*
* @param facade facade (le nom de la facade principale)
* @return couple campagneid/campagnename
- * @throws CoserBusinessException
+ * @throws CoserBusinessException
+ * @deprecated unused since 1.0.3
*/
+ @Deprecated
public Map<String, String> getSurveyForFacade(String facade) throws CoserBusinessException {
Map<String, String> surveyForFacade = new HashMap<String, String>();
@@ -1191,14 +1202,22 @@
*
* @param zone zone id
* @return map species nom info>nom officiel
+ * @param forMap for map directory
* @throws CoserBusinessException
*/
- public Map<String, String> getSpecies(String zone) throws CoserBusinessException {
+ public Map<String, String> getSpecies(String zone, boolean forMap) throws CoserBusinessException {
Map<String, String> result = new TreeMap<String, String>();
+ File projectsDirectory = null;
+ if (forMap) {
+ projectsDirectory = config.getWebMapsProjectsDirectory();
+ }
+ else {
+ projectsDirectory = config.getWebIndicatorsProjectsDirectory();
+ }
+
// parcours des resultats disponibles
- File projectsDirectory = config.getWebIndicatorsProjectsDirectory();
File[] projectFiles = projectsDirectory.listFiles();
if (projectFiles != null) {
for (File projectFile : projectFiles) {
@@ -1249,8 +1268,10 @@
*
* @param survey survey id
* @return map species nom info>nom officiel
- * @throws CoserBusinessException
+ * @throws CoserBusinessException
+ * @deprecated unused since 1.0.3
*/
+ @Deprecated
public Map<String, String> getSpeciesForSurvey(String survey) throws CoserBusinessException {
Map<String, String> result = new TreeMap<String, String>();
@@ -1696,12 +1717,12 @@
* Retourne également la repartition globale sur la zone si le nom de
* l'espece est {@code null}.
*
- * @param survey survey (surveyid)
+ * @param zone zone (zoneid)
* @param species species or (null to get <survey>_Repartition-stations.png map file)
* @return map file
* @throws CoserBusinessException
*/
- public File getMapFile(String survey, String species) throws CoserBusinessException {
+ public File getMapFile(String zone, String species) throws CoserBusinessException {
File result = null;
@@ -1728,37 +1749,20 @@
RSufiResult rsufiResult = projectService.getRSufiResult(resultFile);
// extraction des especes pour le résultat demandé
- if (rsufiResult.getZone() != null && rsufiResult.isMapsResult()) {
+ if (rsufiResult.getZone() != null && rsufiResult.getZone().equals(zone) && rsufiResult.isMapsResult()) {
+ // get survey name (other condition)
+ String surveyName = projectService.getProjectSurveyName(resultFile, rsufiResult);
- // test parmis toutes les zones disponible
- // si le resultat appartient a une zone
- // qui porte sur la campagne demandée
- boolean zoneRSufiResult = false;
- Iterator<String[]> itZone = getZonesMap().iterator(true);
- while (itZone.hasNext()) {
- // "id";"facadeid";"facade";"zone";"periode";"serie";"comment";"map"
- String[] tuple = itZone.next();
-
- if (tuple[5].equals(survey) && rsufiResult.getZone().equals(tuple[0])) {
- zoneRSufiResult = true;
- }
+ String mapName = null;
+ if (species != null) {
+ mapName = surveyName + "_" + species.toUpperCase() + ".png";
}
+ else {
+ mapName = surveyName + "_Repartition-stations.png";
+ }
- if (zoneRSufiResult) {
- // get survey name (other condition)
- String surveyName = projectService.getProjectSurveyName(resultFile, rsufiResult);
-
- String mapName = null;
- if (species != null) {
- mapName = surveyName + "_" + species.toUpperCase() + ".png";
- }
- else {
- mapName = surveyName + "_Repartition-stations.png";
- }
-
- File mapsDirectory = new File(resultFile, CoserConstants.STORAGE_MAPS_DIRECTORY);
- result = new File(mapsDirectory, mapName);
- }
+ File mapsDirectory = new File(resultFile, CoserConstants.STORAGE_MAPS_DIRECTORY);
+ result = new File(mapsDirectory, mapName);
}
}
}
Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java
===================================================================
--- trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-03-24 15:45:33 UTC (rev 797)
@@ -167,7 +167,7 @@
@Test
public void testGetMapFile() throws CoserBusinessException {
registerUploadedResult("/web/upload2.zip");
- File file = webService.getMapFile("Medits", "SPECIES1");
+ File file = webService.getMapFile("ecorse", "SPECIES1");
Assert.assertTrue(file.isFile());
}
@@ -179,7 +179,7 @@
@Test
public void testGetMapFileAsPDF() throws CoserBusinessException {
registerUploadedResult("/web/upload2.zip");
- File file = webService.getMapFileAsPDF("Medits", "SPECIES1");
+ File file = webService.getMapFileAsPDF("ecorse", "SPECIES1");
Assert.assertTrue(file.isFile());
}
Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphAction.java
===================================================================
--- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphAction.java 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/com/GraphAction.java 2011-03-24 15:45:33 UTC (rev 797)
@@ -91,7 +91,7 @@
WebService webService = ServiceFactory.getWebService();
String displayName = null;
try {
- displayName = webService.getZoneForFacade(facade, false).get(zone);
+ displayName = webService.getZoneForFacade(facade, false, false).get(zone);
} catch (CoserBusinessException ex) {
throw new CoserWebException("Can't get zone display name", ex);
}
Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonIndicator.java
===================================================================
--- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonIndicator.java 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonIndicator.java 2011-03-24 15:45:33 UTC (rev 797)
@@ -107,7 +107,7 @@
WebService webService = ServiceFactory.getWebService();
String displayName = null;
try {
- displayName = webService.getZoneForFacade(facade, false).get(zone);
+ displayName = webService.getZoneForFacade(facade, false, false).get(zone);
} catch (CoserBusinessException ex) {
throw new CoserWebException("Can't get zone display name", ex);
}
@@ -118,7 +118,7 @@
WebService webService = ServiceFactory.getWebService();
String displayName = null;
try {
- displayName = webService.getSpecies(zone).get(species);
+ displayName = webService.getSpecies(zone, false).get(species);
} catch (CoserBusinessException ex) {
throw new CoserWebException("Can't get species display name", ex);
}
Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonZone.java
===================================================================
--- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonZone.java 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CommonZone.java 2011-03-24 15:45:33 UTC (rev 797)
@@ -90,7 +90,7 @@
try {
// renvoi la liste des id subzone-survey et leurs label associé
- zones = webService.getZoneForFacade(facade, false);
+ zones = webService.getZoneForFacade(facade, false, false);
zonesPictures = webService.getZonePictures();
zonesMetaInfo = webService.getZoneMetaInfo();
} catch (CoserBusinessException ex) {
Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapAction.java
===================================================================
--- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapAction.java 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapAction.java 2011-03-24 15:45:33 UTC (rev 797)
@@ -44,7 +44,7 @@
protected String facade;
- protected String survey;
+ protected String zone;
protected String species;
@@ -56,12 +56,12 @@
return facade;
}
- public String getSurvey() {
- return survey;
+ public String getZone() {
+ return zone;
}
- public void setSurvey(String survey) {
- this.survey = survey;
+ public void setZone(String zone) {
+ this.zone = zone;
}
public String getSpecies() {
@@ -83,11 +83,22 @@
return displayName;
}
+ public String getZoneDisplayName() {
+ WebService webService = ServiceFactory.getWebService();
+ String displayName = null;
+ try {
+ displayName = webService.getZoneForFacade(facade, false, true).get(zone);
+ } catch (CoserBusinessException ex) {
+ throw new CoserWebException("Can't get zone display name", ex);
+ }
+ return displayName;
+ }
+
public String getSpeciesDisplayName() {
WebService webService = ServiceFactory.getWebService();
String displayName = null;
try {
- displayName = webService.getSpeciesForSurvey(survey).get(species);
+ displayName = webService.getSpecies(zone, true).get(species);
} catch (CoserBusinessException ex) {
throw new CoserWebException("Can't get species display name", ex);
}
Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapDataAction.java
===================================================================
--- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapDataAction.java 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/MapDataAction.java 2011-03-24 15:45:33 UTC (rev 797)
@@ -50,16 +50,16 @@
/** serialVersionUID. */
private static final long serialVersionUID = 1663244944108703571L;
- protected String survey;
+ protected String zone;
protected String species;
- public String getSurvey() {
- return survey;
+ public String getZone() {
+ return zone;
}
- public void setSurvey(String survey) {
- this.survey = survey;
+ public void setZone(String zone) {
+ this.zone = zone;
}
public String getSpecies() {
@@ -81,7 +81,7 @@
InputStream input = null;
try {
// work with null species (get Repartition-stations map)
- File mapImage = webService.getMapFile(survey, species);
+ File mapImage = webService.getMapFile(zone, species);
input = new FileInputStream(mapImage);
} catch (CoserBusinessException ex) {
throw new CoserWebException("Can't get map file", ex);
Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SpeciesAction.java
===================================================================
--- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SpeciesAction.java 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SpeciesAction.java 2011-03-24 15:45:33 UTC (rev 797)
@@ -51,7 +51,7 @@
protected String facade;
- protected String survey;
+ protected String zone;
protected Map<String, String> species;
@@ -63,12 +63,12 @@
return facade;
}
- public String getSurvey() {
- return survey;
+ public String getZone() {
+ return zone;
}
- public void setSurvey(String survey) {
- this.survey = survey;
+ public void setZone(String zone) {
+ this.zone = zone;
}
public Map<String, String> getSpecies() {
@@ -86,17 +86,28 @@
return displayName;
}
+ public String getZoneDisplayName() {
+ WebService webService = ServiceFactory.getWebService();
+ String displayName = null;
+ try {
+ displayName = webService.getZoneForFacade(facade, false, true).get(zone);
+ } catch (CoserBusinessException ex) {
+ throw new CoserWebException("Can't get zone display name", ex);
+ }
+ return displayName;
+ }
+
@Override
public String execute() {
if (log.isInfoEnabled()) {
- log.info("Looking for species for survey " + survey);
+ log.info("Looking for species for zone " + zone);
}
WebService webService = ServiceFactory.getWebService();
try {
- species = webService.getSpeciesForSurvey(survey);
+ species = webService.getSpecies(zone, true);
if (log.isDebugEnabled()) {
log.debug("Species are : " + species);
Deleted: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java
===================================================================
--- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java 2011-03-24 15:45:33 UTC (rev 797)
@@ -1,90 +0,0 @@
-/*
- * #%L
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-
-package fr.ifremer.coser.web.actions.map;
-
-import java.util.Map;
-
-import fr.ifremer.coser.CoserBusinessException;
-import fr.ifremer.coser.services.WebService;
-import fr.ifremer.coser.web.CoserWebException;
-import fr.ifremer.coser.web.ServiceFactory;
-import fr.ifremer.coser.web.actions.common.CoserAction;
-
-/**
- * Affiche la liste des sous zones (zone).
- *
- * @author chatellier
- * @version $Revision$
- *
- * Last update : $Date$
- * By : $Author$
- */
-public class SurveyAction extends CoserAction {
-
- /** serialVersionUID. */
- private static final long serialVersionUID = 3385467755357775199L;
-
- protected String facade;
-
- protected Map<String, String> surveys;
-
- public void setFacade(String facade) {
- this.facade = facade;
- }
-
- public String getFacade() {
- return facade;
- }
-
- public Map<String, String> getSurveys() {
- return surveys;
- }
-
- public String getFacadeDisplayName() {
- WebService webService = ServiceFactory.getWebService();
- String displayName = null;
- try {
- displayName = webService.getFacades().get(facade);
- } catch (CoserBusinessException ex) {
- throw new CoserWebException("Can't get species display name", ex);
- }
- return displayName;
- }
-
- @Override
- public String execute() {
-
- WebService webService = ServiceFactory.getWebService();
- try {
-
- // renvoie la liste des id subzone-survey et leurs label
- // associé
- surveys = webService.getSurveyForFacade(facade);
-
- } catch (CoserBusinessException ex) {
- throw new CoserWebException("Can't get zone map", ex);
- }
-
- return SUCCESS;
- }
-}
Copied: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/ZoneAction.java (from rev 759, trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/SurveyAction.java)
===================================================================
--- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/ZoneAction.java (rev 0)
+++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/map/ZoneAction.java 2011-03-24 15:45:33 UTC (rev 797)
@@ -0,0 +1,61 @@
+/*
+ * #%L
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package fr.ifremer.coser.web.actions.map;
+
+import fr.ifremer.coser.CoserBusinessException;
+import fr.ifremer.coser.services.WebService;
+import fr.ifremer.coser.web.CoserWebException;
+import fr.ifremer.coser.web.ServiceFactory;
+import fr.ifremer.coser.web.actions.common.CommonZone;
+
+/**
+ * Affiche la liste des sous zones (zone).
+ *
+ * @author chatellier
+ * @version $Revision$
+ *
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class ZoneAction extends CommonZone {
+
+ /** serialVersionUID. */
+ private static final long serialVersionUID = 3385467755357775199L;
+
+ @Override
+ public String execute() {
+
+ WebService webService = ServiceFactory.getWebService();
+
+ try {
+ // renvoi la liste des id subzone-survey et leurs label associé
+ zones = webService.getZoneForFacade(facade, false, true);
+ zonesPictures = webService.getZonePictures();
+ zonesMetaInfo = webService.getZoneMetaInfo();
+ } catch (CoserBusinessException ex) {
+ throw new CoserWebException("Can't get zone map", ex);
+ }
+
+ return SUCCESS;
+ }
+}
Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java
===================================================================
--- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/GraphAction.java 2011-03-24 15:45:33 UTC (rev 797)
@@ -101,7 +101,7 @@
WebService webService = ServiceFactory.getWebService();
String displayName = null;
try {
- displayName = webService.getZoneForFacade(facade, false).get(zone);
+ displayName = webService.getZoneForFacade(facade, false, false).get(zone);
} catch (CoserBusinessException ex) {
throw new CoserWebException("Can't get zone display name", ex);
}
@@ -112,7 +112,7 @@
WebService webService = ServiceFactory.getWebService();
String displayName = null;
try {
- displayName = webService.getSpecies(zone).get(species);
+ displayName = webService.getSpecies(zone, false).get(species);
} catch (CoserBusinessException ex) {
throw new CoserWebException("Can't get species display name", ex);
}
Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SpeciesAction.java
===================================================================
--- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SpeciesAction.java 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/pop/SpeciesAction.java 2011-03-24 15:45:33 UTC (rev 797)
@@ -96,7 +96,7 @@
WebService webService = ServiceFactory.getWebService();
String displayName = null;
try {
- displayName = webService.getZoneForFacade(facade, false).get(zone);
+ displayName = webService.getZoneForFacade(facade, false, false).get(zone);
} catch (CoserBusinessException ex) {
throw new CoserWebException("Can't get zone display name", ex);
}
@@ -113,7 +113,7 @@
WebService webService = ServiceFactory.getWebService();
try {
- species = webService.getSpecies(zone);
+ species = webService.getSpecies(zone, false);
zonePicture = webService.getZonePictures().get(zone);
Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceAction.java
===================================================================
--- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceAction.java 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceAction.java 2011-03-24 15:45:33 UTC (rev 797)
@@ -83,7 +83,7 @@
WebService webService = ServiceFactory.getWebService();
String displayName = null;
try {
- displayName = webService.getZoneForFacade(facade, false).get(zone);
+ displayName = webService.getZoneForFacade(facade, false, false).get(zone);
} catch (CoserBusinessException ex) {
throw new CoserWebException("Can't get zone display name", ex);
}
Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/ZoneAction.java
===================================================================
--- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/ZoneAction.java 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/ZoneAction.java 2011-03-24 15:45:33 UTC (rev 797)
@@ -49,7 +49,7 @@
try {
// renvoi la liste des id subzone-survey et leurs label associé
- zones = webService.getZoneForFacade(facade, true);
+ zones = webService.getZoneForFacade(facade, true, false);
zonesPictures = webService.getZonePictures();
zonesMetaInfo = webService.getZoneMetaInfo();
} catch (CoserBusinessException ex) {
Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties
===================================================================
--- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2011-03-24 15:45:33 UTC (rev 797)
@@ -21,136 +21,136 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# #L%
###
-message.com.title=Indices de communaut\u00E9s
-message.com.paragraph1=Des indices de communaut\u00E9 sont calcul\u00E9s pour un ensemble d''esp\u00E8ces dans chaque s\u00E9rie. La liste des esp\u00E8ces incluses pour le calcul de chaque indice varie selon les donn\u00E9es disponibles pour la r\u00E9alisation des calculs.
+message.com.title=Community indices
+message.com.paragraph1=Community indices are calculated for a list of species for each survey time series. The list of species included when calculating each index depends on the available data.
message.com.downloadascsv=Download as CSV
message.com.downloadaszip=Download as ZIP
-message.com.moredetailspdf=More details about communities computed indices
+message.com.moredetailspdf=More information on calculated community indices
message.documents.title=Documents
message.documents.paragraph1=Grands invert\u00E9br\u00E9s et poissons observ\u00E9s par les campagnes scientifiques. Atlas de distribution. Bilan 2008. 2009. {0}
message.documents.paragraph2=Grands invert\u00E9br\u00E9s et poissons observ\u00E9s par les campagnes scientifiques. Bilan 2007. 2009. {0}
message.documents.paragraph3=L''\u00E9tat des communaut\u00E9s exploit\u00E9es au large des c\u00F4tes de France. Application d''indicateurs \u00E0 l''\u00E9valuation de l''impact de la p\u00EAche. Bilan 2004 Edition 2009. {0}
message.documents.paragraph4=Poissons et invert\u00E9br\u00E9s au large des c\u00F4tes de France. Indicateurs issus des p\u00EAches scientifiques. Bilan 2004. 2007. {0}
-message.layout.title=Populations and communities indices, resulting from Ifremer monitoring halieutics survey
+message.layout.title=Population and community indices derived from Ifremer scientific surveys.
message.layout.oceanicdatatitle=Gestion des donn\u00E9es des campagnes oc\u00E9anographiques \u00E0 l''Ifremer
message.layout.oceanicdata1=le Syst\u00E8me d''informations scientifiques pour la mer de l''Ifremer (SISMER)
-message.layout.oceanicdata2=le Syst\u00E8me d''information halieutique de l''Ifremer (SIH)
+message.layout.oceanicdata2=le Fisheries Information System - Syst\u00E8me d''information halieutique de l''Ifremer (SIH)
message.index.documentstitle=Documents
message.index.documentsmessage=Documents
message.index.title=Home
-message.index.paragraph1=Ce site a \u00E9t\u00E9 con\u00E7u pour fournir en libre acc\u00E8s des donn\u00E9es brutes et des donn\u00E9es \u00E9labor\u00E9es relatives aux campagnes scientifiques d''observation halieutique conduites par l''Ifremer le long des c\u00F4tes fran\u00E7aises.
-message.index.paragraph2=Toutes les donn\u00E9es mises \u00E0 disposition ont fait l''objet de qualification selon des protocoles sp\u00E9cifiques. La qualit\u00E9 des interpr\u00E9tations \u00E9tant directement li\u00E9e \u00E0 la nature des donn\u00E9es source, les utilisateurs de donn\u00E9es sont invit\u00E9s \u00E0 consid\u00E9rer avec attention les descriptions des protocoles mis en \u0153uvre ainsi que les niveaux de qualit\u00E9 contr\u00F4l\u00E9s.
-message.index.paragraph3=Chaque s\u00E9rie de campagnes est conduite selon une strat\u00E9gie d''\u00E9chantillonnage sp\u00E9cifique. Sauf cas particuliers, les analyses et interpr\u00E9tations doivent \u00EAtre conduites par s\u00E9rie, en prenant en compte les strat\u00E9gies d''\u00E9chantillonnage propres \u00E0 chacune de ces s\u00E9ries. Sur le site, les donn\u00E9es sont pr\u00E9sent\u00E9es par s\u00E9rie.
-message.index.paragraph4=Dans les tables de donn\u00E9es, toutes les esp\u00E8ces sont identifi\u00E9es selon le r\u00E9f\u00E9rentiel taxinomique du Syst\u00E8me d''informations halieutiques de l''Ifremer ({0}).
-message.index.datatypetitle=Quatre types de donn\u00E9es sont pr\u00E9sent\u00E9es
-message.index.datatypesource=Des donn\u00E9es par op\u00E9ration d''\u00E9chantillonnage (en g\u00E9n\u00E9ral par trait de chalut)
-message.index.datatypemap=Des cartes de distribution par esp\u00E8ce et par zone
-message.index.datatypepop=Des indices biologiques par esp\u00E8ce et par zone
-message.index.datatypecom=Des indices de communaut\u00E9 par zone.
-message.index.quotetitle=Pour citer ce site
-message.index.quotemessage=Ifremer {0,date,yyyy}. Indices de populations et de communautés issus des campagnes de surveillance halieutique de l''Ifremer. {1} ({0,date,dd MMMM})
-message.index.qualitytitle=Avertissement qualit\u00E9
-message.index.qualitymessage=Avertissement qualit\u00E9
-message.index.surveytitle=Description des campagnes
-message.index.surveyparagraph=Des manuels des protocoles d\u00E9crivent les modalit\u00E9s techniques de r\u00E9alisation de chaque s\u00E9rie de campagnes.
+message.index.paragraph1=This web site has been created to provide easy access to the raw data and derived estimated from the scientific surveys carried out by Ifremer along the French coast.
+message.index.paragraph2=All data made available have passed rigorous quality checks. However, as the reliability of results interpretions depends directly on the data used, users are cordially invited to study carefully the survey and quality check protocols.
+message.index.paragraph3=Each survey is carried out using a specific sampling design. Data analyses and interpretation of each time series must therefore take into the stratified sampling designs. The data are presented by survey series on the web site.
+message.index.paragraph4=In the data tables all species are identified using the taxinomic reference file of the Syst\u00E8me d''informations halieutiques de l''Ifremer ({0}).
+message.index.datatypetitle=Four data types are presented
+message.index.datatypesource=Data by sampling by unit (generally by haul)
+message.index.datatypemap=Species distribution maps by area
+message.index.datatypepop=Biological indices by species by area
+message.index.datatypecom=Community indices by area.
+message.index.quotetitle=How to cite this web site
+message.index.quotemessage=Ifremer {0,date,yyyy}. Population and community indices derived from scientific surveys carried out by Ifremer. {1} ({0,date,dd MMMM})
+message.index.qualitytitle=Quality warning
+message.index.qualitymessage=Quality warning
+message.index.surveytitle=Survey description
+message.index.surveyparagraph=Survey protocol handbooks for each survey time series.
message.common.anchortop=Top
message.common.selectpop=Select a population
-message.common.selectzone=Select a zone
+message.common.selectzone=Select an area
message.common.selectsurvey=Select a survey
-message.common.selectfacade=Select a facade
+message.common.selectfacade=Select a sea
message.common.selectindicator=Select an indicator
message.common.noresults=No results available
message.common.selectspecies=Select a species
message.common.jsreadmore=Read more
message.common.validform=Valid
-message.common.facade=Facade
+message.common.facade=Sea
message.map.citationtitle=Citation
message.map.citation=Trenkel V.M., O. Berthel\u00E9, P. Lorance, J.A. Bertrand, A. Brind''Amour, M.L. Cochard, F. Coppin, J.P. Leaut\u00E9, J.C. Mah\u00E9, J. Morin, M.J. Rochet, M. Salaun, A. Souplet & Y. V\u00E9rin, 2009. Grands invert\u00E9br\u00E9s et poissons observ\u00E9s par les campagnes scientifiques. Atlas de distribution. Bilan 2008. Ifremer, Nantes. EMH : 09-003. {0}. 100 p.
message.map.downloadaspdf=Download as PDF
-message.map.linkarchimer=Acc\u00E8s \u00E0 l''atlas : {0}
-message.map.paragraph1=L''objectif de cet atlas est de donner un aper\u00E7u de la distribution spatiale des esp\u00E8ces de poissons et de certains invert\u00E9br\u00E9s marin \u00E0 partir des observations des campagnes de p\u00EAche scientifiques.
-message.map.paragraph2=Pour chaque zone un quadrillage syst\u00E9matique a \u00E9t\u00E9 d\u00E9fini, puis la densit\u00E9 moyenne par km\u00B2 dans chaque cellule a \u00E9t\u00E9 calcul\u00E9e en utilisant les observations de toute la p\u00E9riode. Pour la repr\u00E9sentation cartographique, les cellules avec des densit\u00E9s moyenne correspondant aux quartiles de densit\u00E9 ont re\u00E7u la m\u00EAme couleur\u00A0: bleu\u00A0: esp\u00E8ce jamais observ\u00E9e, jaune clair\u00A0: densit\u00E9 moyenne entre [0 et 25\u00A0%[; jaune fonc\u00E9\u00A0: [25-50\u00A0%[, orange\u00A0: [50-75\u00A0%[ et rouge\u00A0: [75-100\u00A0%]. Donc, les zones o\u00F9 se trouvent les densit\u00E9s les plus \u00E9lev\u00E9es en moyenne sont repr\u00E9sent\u00E9es en rouge.
-message.map.title=Cartes de distribution
+message.map.linkarchimer=Access atlas : {0}
+message.map.paragraph1=The objectif of this atlas is to provide a rough indication of the spatial distribution of certain fish and shelfish species as provided by scientific surveys.
+message.map.paragraph2=For each area a systematic grid was defined and the simple average density across years and hauls was calculated in numbers per km2. For mapping purposes, grid cells were coloured using a percentile scale: blue species never observed, light yellow: average density between [0- 25\u00A0%[; dark yellow: [25-50\u00A0%[, orange\u00A0: [50-75\u00A0%[ and red\u00A0: [75-100\u00A0%]. Thus, cells with the highest average density are in red.
+message.map.title=Distribution maps
message.map.warning=Warning
-message.map.warningcontent=Les cartes pr\u00E9sent\u00E9es ne doivent pas \u00EAtre interpr\u00E9t\u00E9es comme des cartes de distribution des esp\u00E8ces mais comme celle des zones o\u00F9 elles sont captur\u00E9es lors des campagnes scientifiques. Les campagnes \u00E9tant r\u00E9alis\u00E9es avec des chaluts diff\u00E9rents et \u00E0 diff\u00E9rentes saisons, les esp\u00E8ces peuvent avoir des capturabilit\u00E9s tr\u00E8s diff\u00E9rentes entre les s\u00E9ries de campagnes, donc d''une zone \u00E0 l''autre.
+message.map.warningcontent=The maps should not be interpreted as biological distribution maps but as the areas where the species are caught during the scientific surveys. As the different surveys use different samplin gear and are carried out at different times of the year, there can be differences in cathability among surveys and consequently among areas.
message.pop.downloadascsv=Download as CSV
-message.pop.moredetailspdf=More details about populations computed indices
-message.pop.title=Indices biologiques
-message.pop.paragraph1=Les indices pr\u00E9sent\u00E9s ont \u00E9t\u00E9 s\u00E9lectionn\u00E9s en r\u00E9f\u00E9rence \u00E0 leur aptitude \u00E0 renseigner sur l''impact de la p\u00EAche, en vue de leur int\u00E9gration dans des tableaux de bord d\u2019indicateurs d''\u00E9volution d''\u00E9cosyst\u00E8mes exploit\u00E9s par la p\u00EAche.
-message.pop.paragraph2=Les donn\u00E9es disponibles sur le site sont les valeurs de chaque indice. Les informations ont \u00E9t\u00E9 valid\u00E9es par un groupe de travail dans une approche int\u00E9grative d\u2019indicateurs de populations et de communaut\u00E9s. Les r\u00E9sultats sont donn\u00E9s par zone g\u00E9ographique et par esp\u00E8ce pour l''ensemble de la s\u00E9rie de donn\u00E9es disponible. L''utilisateur peut s\u00E9lectionner la zone g\u00E9ographique, la saison (dans le cas de s\u00E9ries saisonni\u00E8res), l''esp\u00E8ce et l''indice. Pour les s\u00E9lections pour lesquelles une information est disponible, le syst\u00E8me produit un graphe pr\u00E9sentant la distribution temporelle de l''indice, avec une repr\u00E9sentation de l''\u00E9cart-type. Il fournit la possibilit\u00E9 d\u2019extraire la table des donn\u00E9es correspondantes, incluant la valeur de l\u2019indice par ann\u00E9e, ainsi que son \u00E9cart-type et son coefficient de variation.
+message.pop.moredetailspdf=More details about computed population indices
+message.pop.title=Biological indices
+message.pop.paragraph1=The presented indices have been selected with respect to their capacity to inform on the impact of fishing and for integration into indicator dashboards for exploited ecosystems.
+message.pop.paragraph2=The data correspond to the value of each indicator. The information has been validated by an expert group within the framework of a holostic population and community indicator approach. The results are presented by geographic area or by species for all available data series. The user can select the geographique area, the saison (for saisonal surveys), the species and the index. If data is available for a given selection, a figure is produced that shows the time series of the index, plus-minus one standard deviation. It is possible to extract the corresponding table with index values by year, standard deviations and coefficients of variation.
message.source.download=Download
-message.source.title=Donn\u00E9es source
-message.source.paragraph1=Les donn\u00E9es Source sont pr\u00E9sent\u00E9es selon quatre tables fournissant des informations de base \u00E9lev\u00E9es \u00E0 l''op\u00E9ration d''\u00E9chantillonnage (en g\u00E9n\u00E9ral un trait de chalut) et organis\u00E9es selon des unit\u00E9s g\u00E9ographiques d\u00E9finies en relation avec le plan d''\u00E9chantillonnage. Une table suppl\u00E9mentaire pr\u00E9sente le r\u00E9f\u00E9rentiel taxinomique associ\u00E9 aux donn\u00E9es.
-message.source.paragraph2=Le site ne contient des donn\u00E9es Source que pour une partie des s\u00E9ries de campagnes pour lesquelles des indices de populations et de communaut\u00E9s sont pr\u00E9sent\u00E9s. Pour un acc\u00E8s aux autres s\u00E9ries de donn\u00E9es de base, il convient de contacter l''administrateur du Syst\u00E8me d''informations halieutiques de l''Ifremer ({0}).
-message.source.paragraph3=Les donn\u00E9es de campagnes halieutiques sont constitu\u00E9es \u00E0 partir de stations d''\u00E9chantillonnage r\u00E9parties dans l''espace selon le principe de tirage stratifi\u00E9. La granularit\u00E9 des donn\u00E9es conditionne la partition g\u00E9ographique selon laquelle les indices de population et de communaut\u00E9 peuvent \u00EAtre \u00E9tablis.
-message.source.paragraph4=Les plans de zonage propos\u00E9s incluent le plan de r\u00E9f\u00E9rence correspondant au plan d''\u00E9chantillonnage, ainsi que des adaptations pour tenir compte des limites des sous-r\u00E9gions d\u00E9finies par la strat\u00E9gie marine europ\u00E9enne. Ils ont \u00E9t\u00E9 valid\u00E9s par un groupe de travail de l''Ifremer, apr\u00E8s exploration de la sensibilit\u00E9 de divers indices aux ajustements propos\u00E9s.
-message.survey.maintitle=Les campagnes de surveillance halieutique de l''Ifremer
-message.survey.paragraph1=Les campagnes de p\u00EAche scientifique standardis\u00E9es ont pour objectif d''observer les ressources halieutiques, en suivant toujours les m\u00EAmes m\u00E9thodes d\u2019\u00E9chantillonnage. Elles sont toujours r\u00E9alis\u00E9es dans la m\u00EAme zone, \u00E0 la m\u00EAme saison, avec des engins de p\u00EAche standardis\u00E9s, afin que les donn\u00E9es soient comparables d''ann\u00E9e en ann\u00E9e. Elles servent \u00E0 d\u00E9crire les esp\u00E8ces, qu''elles soient commerciales ou non, d''une zone et \u00E0 observer les changements s\u2019il y en a. Les poissons, les mollusques et les crustac\u00E9s sont d\u00E9nombr\u00E9s, mesur\u00E9s et pes\u00E9s. Certains d''entre eux font l''objet de pr\u00E9l\u00E8vements biologiques. Chaque campagne fournit ainsi une repr\u00E9sentation quantitative de l''ensemble des esp\u00E8ces de la zone \u00E0 une p\u00E9riode donn\u00E9e. Selon les s\u00E9ries, d'''autres informations sont relev\u00E9es (temp\u00E9rature, salinit\u00E9, macrofaune, observation des mammif\u00E8res marins, oiseaux, macro d\u00E9chets etc., mais ne sont pas pr\u00E9sent\u00E9es dans ce site)
-message.survey.paragraph2=Depuis une vingtaine d''ann\u00E9es, l''Ifremer organise des campagnes de p\u00EAche scientifique en mer du Nord, en Manche, en Atlantique et en M\u00E9diterran\u00E9e concernant les ressources d\u00E9mersales et benthiques. L''objectif prioritaire est de produire des indices d''abondance des principales esp\u00E8ces commerciales. Elles recueillent \u00E9galement des donn\u00E9es sur les esp\u00E8ces captur\u00E9es non commerciales. Elles contribuent ainsi aux connaissances n\u00E9cessaires au d\u00E9veloppement de l''approche \u00E9cosyst\u00E9mique des p\u00EAches, notamment dans le cadre de la politique commune des p\u00EAches et plus largement de la strat\u00E9gie marine de l''Union europ\u00E9enne.
-message.survey.dataengintitle=Diff\u00E9rents engins d''\u00E9chantillonnage sont utilis\u00E9s :
-message.survey.dataenginfond=Un chalut de fond \u00E0 grande ouverture verticale pour l''observation des ressources d\u00E9mersales, sur les plateaux continentaux et le haut des pentes continentales (accores) en mer du Nord, Manche orientale, mer Celtique, golfe de Gascogne, golfe du Lion et Est de la Corse,
-message.survey.dataenginperche=Un chalut \u00E0 perche pour les zones tr\u00E8s c\u00F4ti\u00E8res et les estuaires lors des campagnes visant les juv\u00E9niles de poissons plats : baies de Somme et de Vilaine,
-message.survey.dataengincasier=Un \u00E9chantillonnage au casier pour les campagnes d''\u00E9valuation des grands crustac\u00E9s, en particulier le homard, aux abords du cap de Flamanville.
-message.survey.paragraph3=Les campagnes sont r\u00E9alis\u00E9es selon des plans d''\u00E9chantillonnage standardis\u00E9s. L\u2019engin de p\u00EAche et son gr\u00E9ement, la position des stations, le tri des captures, les pr\u00E9l\u00E8vements biologiques suivent des protocoles fix\u00E9s.
-message.survey.paragraph4=Pour les campagnes coordonn\u00E9es entre navires de recherche des pays riverains en mer du Nord, Manche orientale, mer Celtique, golfe de Gascogne et M\u00E9diterran\u00E9e, les protocoles sont communs \u00E0 l''ensemble des pays partenaires. Les traits de chalut des diff\u00E9rents navires de recherche sont comparables.
-message.survey.paragraph5=Chaque zone \u00E9tudi\u00E9e est d\u00E9coup\u00E9e en strates en fonction de la profondeur, de la latitude ou d''autres crit\u00E8res. L''\u00E9chantillonnage pr\u00E9voit un nombre de traits de chalut ou de mouillages de casiers par strate.
-message.survey.paragraph6=Dans une campagne de chalutage scientifique, les positions des traits de chalut sont choisies selon un plan d''\u00E9chantillonnage statistique. L''objectif n''est pas d''obtenir les meilleures captures possibles comme le recherchent les p\u00EAcheurs, mais de r\u00E9colter des donn\u00E9es comparables d''une ann\u00E9e sur l''autre afin de relever des \u00E9volutions.
-message.survey.detailstitle=Caract\u00E9ristiques des campagnes de surveillance halieutique de l''Ifremer
-message.survey.merdunord=Fa\u00E7ade Mer du Nord
-message.survey.merdunord.sudmerdunord=Sud mer du Nord
-message.survey.merdunord.sudmerdunord.desc=Contribution fran\u00E7aise d''un mois \u00E0 la campagne internationale IBTS (International Bottom Trawl Survey) au premier trimestre, tous les ans depuis 1980, au chalut de fond \u00E0 grande ouverture verticale. En moyenne, le navire fran\u00E7ais fait 58 chalutages par an. Le sud de la mer du Nord est couvert par 4 navires (fran\u00E7ais, belge, danois et allemand) qui r\u00E9alisent en tout environ 200 traits par an. Chaque trait dure une demi-heure et couvre une surface d''environ 0,067 km\u00B2. Cette campagne est repr\u00E9sentative des 678\u00A0000\u00A0km\u00B2 de la zone.
-message.survey.merdunord.sudmerdunord.plus=Pour en savoir plus sur les campagnes IBTS
+message.source.title=Raw data
+message.source.paragraph1=The raw data are presented in four tables which contain the basic information by sampling unit (generally a haul) as well as the relevant information on the sampling design (strata). An additional table provides the latin names for the species codes used in the data files.
+message.source.paragraph2=The web site provides access to the raw data corresponding to the population and community indices presented. For any other data please contact the 'administrateur du Syst\u00E8me d''informations halieutiques de l''Ifremer ({0}).
+message.source.paragraph3=The survey data consist of stations distributed in space following a stratified random design (which can be fixed between years). The spatial resolution determines on which spatial scale population and community indices can be calculated.
+message.source.paragraph4=The list of proposed spatial areas includes the original sampling areas, plus post-stratified areas suitable for the European Marine Strategie Framework Directive. Thes areas have been validated by an internal Ifremer working group following sensitivity analyses.
+message.survey.maintitle=Scientific surveys carried out by Ifremer
+message.survey.paragraph1=The main objectif of the scientific fisheries surveys is to provide information on ressource changes, using a standard sampling protocol. They are always carried out in the same areas, at the same time of year and with the same gear, to allow comparisons among years. They provide information on both commercial and non-commercial species and their changes. Fish and shelfish species are counted, weighted and measured. For certain species other biological information is collected. Thus each survey provided a quantitive picture of the species assemblage in a given area during a certain time period. Additional information such as temperature, salinity, macrofauna, marin mammals, birds, macro waste etc. are collected during certain surveys, but this information is not presented here
+message.survey.paragraph2=For the last two decades Ifremer has organised scientific fisheries surveys in the North Sea, the English Channel, the Atlantic and in the Mediterrean Sea for sampling demersal and benthic ressources. The main objective is to produce abundance indices for the principal commercial species. The surveys collect also data for non-commercial species. Hence they contribute to the knowledge necessary for the development of an ecosystem approach to fisheries, in particular in the context of the common fisheries policy (CFP) and more generally the European marine strategy framework directive.
+message.survey.dataengintitle=Different sampling gears are used:
+message.survey.dataenginfond=Variants of a GOV (grande ouverture verticale) trawl for observing demersal species on the continental shelfs and upper slopes in the North Sea, Eastern English channel, Celtic Sea, Bay of Biscay, Bay of Lions and East Corsica,
+message.survey.dataenginperche=A beam trawl for coastal zones and estuaries during surveys targeting juvenile flatfish: Somme and Vilaine river bays,
+message.survey.dataengincasier=Pots for the assessment of large crustaceans, in particular lobster, around cap Flamanville.
+message.survey.paragraph3=The surveys are carried out using standardised sampling designs. The gear and its rigging, station positions, sample treatment and biological sampling are carried out using fixed protocols.
+message.survey.paragraph4=Common protocols are used by all participants for surveys carried out under international coordination in the North Sea, Eastern English channel, Celtic Sea, Bay of Biscay and the Mediterranean Sea. The data collected by the different research vessels are therefore comparable.
+message.survey.paragraph5=Each survey area is subdivided in strata according to bottom depth, latitude or other criteria. The sampling protocol specifies the number of hauls or pots by stratum.
+message.survey.paragraph6=For each survey the station location is determined following the specified sampling design. The aim is not to obtain the largest catches as fishers might attempt to do, but to collect comparable data for detecting time trends.
+message.survey.detailstitle=Characteristics of the surveys carried out by Ifremer
+message.survey.merdunord=North Sea
+message.survey.merdunord.sudmerdunord=Southern North Sea
+message.survey.merdunord.sudmerdunord.desc=Every years since 1980 France contributes one month of ship time to the IBTS (International Bottom Trawl Survey) in the first quarter using a GOV trawl. On average 58 hauls are carried out. The southern North Sea is sampled by four countries (France, Belgium, Danmark and Germany) who together carry out about 200 hauls per year. Each haul lasts half an hour corresponding to a swept area of about 0.067 km\u00B2. IBTS provides a representative picture of the 678\u00A0000\u00A0km\u00B2 of the area.
+message.survey.merdunord.sudmerdunord.plus=For more information on the IBTS survey
message.survey.merdunord.sudmerdunord.ibts6=Manuel des protocoles IBTS - R\u00E9vision VI (1999)
message.survey.merdunord.sudmerdunord.ibts7=Manuel des protocoles IBTS - R\u00E9vision VII (2004)
-message.survey.mancheorientale=Fa\u00E7ade Manche orientale
-message.survey.mancheorientale.mancheorientale=Manche orientale
-message.survey.mancheorientale.mancheorientale.desc=Campagne fran\u00E7aise CGFS (Channel Ground Fish Survey) d''un mois en octobre, coordonn\u00E9e au plan international avec les campagnes IBTS. La campagne a lieu tous les ans depuis 1988. En moyenne 90 traits d''une demi-heure, au chalut de fond \u00E0 grande ouverture verticale, sont r\u00E9alis\u00E9s. Chaque trait couvre une surface d''environ 0,03 km\u00B2. Cette campagne est repr\u00E9sentative des 70 748 km\u00B2 de la Manche orientale.
-message.survey.mancheorientale.mancheorientale.plus=Pour en savoir plus sur les campagnes CGFS
+message.survey.mancheorientale=Eastern English Channel
+message.survey.mancheorientale.mancheorientale=Eastern English Channel
+message.survey.mancheorientale.mancheorientale.desc=French survey CGFS (Channel Ground Fish Survey) lasting one month and internationally coordonnated together with the IBTS survey. The survey takes place every year since 1988. On average 90 half hour hauls are carried out with a small GOV trawl. Each haul covers about 0.03 km\u00B2. This survey provides a representative picture of the 70 748 km\u00B2 of the Eastern English Channel.
+message.survey.mancheorientale.mancheorientale.plus=For more information on the CGFS survey
message.survey.mancheorientale.mancheorientale.cgfs1=Manuel des protocoles CGFS - Version 1.0 (2002)
-message.survey.mancheorientale.baiedesomme=Baie de Somme
-message.survey.mancheorientale.baiedesomme.desc=Campagne de p\u00EAche sur la nourricerie de la baie de Somme (NourSomme) d''une semaine en septembre-octobre, tous les ans depuis 1995, aux chaluts \u00E0 perche de 2 m\u00E8tres de large dans la partie la plus estuarienne de la baie et 3 m\u00E8tres dans la partie externe, plus marine. En moyenne 50 chalutages sont r\u00E9alis\u00E9s chaque ann\u00E9e. Ils durent en moyenne 7 minutes sur une surface de 0,001 km\u00B2 chacun dans la partie interne de la baie et 15 minutes sur une surface d''environ 0,004 km\u00B2 dans la partie externe. Cette campagne est repr\u00E9sentative des 720 km\u00B2 de la baie.
-message.survey.mancheorientale.baiedesomme.plus=Pour en savoir plus sur les campagnes NourSomme
+message.survey.mancheorientale.baiedesomme=Somme river bay
+message.survey.mancheorientale.baiedesomme.desc=The survey in the nursery area of the Somme rive bay (NourSomme) lasts one week in September-October each year since 1995, using a 2m-beam trawl in the estuary and a 3m-beam trawl in the more open areas. On average 50 hauls are carried out. Haul duration is 7 minutes covering 0.001 km\u00B2 in the estuary part and 15 minutes covering 0.004 km\u00B2 in the more open part. This survey provides a representative picture of the 720 km\u00B2 of the Somme baie.
+message.survey.mancheorientale.baiedesomme.plus=For more information on the NourSomme survey
message.survey.mancheorientale.baiedesomme.noursomme1=Manuel des protocoles Nourriceries Somme - V 1.0 (2002)
-message.survey.mancheoccidentale=Fa\u00E7ade Manche occidentale
-message.survey.mancheoccidentale.flamanville=Abords du cap de Flamanville
-message.survey.mancheoccidentale.flamanville.desc=Deux campagnes de 15 jours aux casiers \u00E0 crustac\u00E9s aux abords du cap de Flamanville (CrustaFlam), en juin et septembre, depuis 1986 : 1200 casiers relev\u00E9s par campagne sur une zone de 26 km\u00B2.
-message.survey.mancheoccidentale.flamanville.plus=Pour en savoir plus sur les campagnes CrustFlam
+message.survey.mancheoccidentale=Eastern English Channel
+message.survey.mancheoccidentale.flamanville=Cap de Flamanville area
+message.survey.mancheoccidentale.flamanville.desc=Two surveys of 15 jours each using pots around cap de Flamanville (CrustaFlam), in June and September, since 1986: 1200 sets per survey in an area covering 26 km\u00B2.
+message.survey.mancheoccidentale.flamanville.plus=For more information on the CrustFlam survey
message.survey.mancheoccidentale.flamanville.crustaflam1=Manuel des protocoles CRUSTAFLAM - Version 1.0 (2003)
-message.survey.atlantique=Fa\u00E7ade Atlantique
-message.survey.atlantique.celtique=Mer Celtique
-message.survey.atlantique.celtique.desc=Campagne Evhoe (Evaluation des ressources halieutiques de l''ouest europ\u00E9en) d''un mois au quatri\u00E8me trimestre, tous les ans depuis 1997. En moyenne 75 traits d''une demi-heure, au chalut de fond \u00E0 grande ouverture verticale, sont r\u00E9alis\u00E9s. Chaque trait couvre une surface d''environ 0,067 km\u00B2. Cette campagne est repr\u00E9sentative des 150 000 km\u00B2 de la mer Celtique.
-message.survey.atlantique.celtique.plus=Pour en savoir plus sur les campagnes Evhoe
+message.survey.atlantique=Northeast Atlantic
+message.survey.atlantique.celtique=Celtic Sea
+message.survey.atlantique.celtique.desc=The Evhoe suvey (Evaluation des ressources halieutiques de l''ouest europ\u00E9en) lasts one month in the fourth quarter every year since 1997. On average 75 half-hour hauls are carried out with a GOV trawl. Each haul covers about 0.067 km\u00B2. This survey provides a representative picture of the 150 000 km\u00B2 of the Celtic Sea.
+message.survey.atlantique.celtique.plus=For more information on the Evhoe surveys
message.survey.atlantique.celtique.evhoe1=Manuel des protocoles EVHOE - Version 1.0 (2005)
-message.survey.atlantique.gascogne=Golfe de Gascogne
-message.survey.atlantique.gascogne.desc=Campagne Evhoe (Evaluation des ressources halieutiques de l''ouest europ\u00E9en) d''un mois au quatri\u00E8me trimestre, tous les ans depuis 1992 (sauf en 1993 et 1996). En moyenne, 70 traits de chalut d''une demi-heure au chalut de fond \u00E0 grande ouverture verticale, sont r\u00E9alis\u00E9s. Chaque trait couvre une surface de 0,067 km\u00B2. Cette campagne est repr\u00E9sentative des 72 500 km\u00B2 du golfe de Gascogne. La campagne Evhoe couvre donc le golfe de Gascogne et la mer Celtique avec le m\u00EAme protocole. De plus elle est coordonn\u00E9e internationalement, dans le cadre des campagnes IBTS, avec une campagne espagnole en mer Cantabrique, une campagne irlandaise et une campagne anglaise en mer Celtique.
-message.survey.atlantique.gascogne.plus=Pour en savoir plus sur les campagnes Evhoe
+message.survey.atlantique.gascogne=Bay of Biscay
+message.survey.atlantique.gascogne.desc=The Evhoe survey (Evaluation des ressources halieutiques de l''ouest europ\u00E9en) lasts one month in the fourth quarter every year since 1992 (except 1993 and 1996). On average 70 half-hour hauls are carried out with a GOV trawl. Each haul covers about 0.067 km\u00B2. This survey provides a representative picture of the 72 500 km\u00B2 of the Bay of Biscay.
+message.survey.atlantique.gascogne.plus=For more information on the Evhoe surveys
message.survey.atlantique.gascogne.evhoe1=Manuel des protocoles EVHOE - Version 1.0 (2005)
-message.survey.atlantique.vilaine=Baie de Vilaine
-message.survey.atlantique.vilaine.desc=Campagne sur la nourricerie de la baie de Vilaine (NourVil), d''une semaine \u00E0 l''automne, tous les ans de 1980 \u00E0 2010, sauf en 1991, 1994, 1995, 1998, 1999, 2006 et 2007, au chalut \u00E0 perche de 3 m\u00E8tres de large. En moyenne, 30 chalutages de 15 minutes sont r\u00E9alis\u00E9s. Chaque trait couvre une surface d''environ 0,0041 km\u00B2. Cette campagne est repr\u00E9sentative des 330 km\u00B2 de la baie.
-message.survey.atlantique.vilaine.plus=Pour en savoir plus sur les campagnes Nourvil
+message.survey.atlantique.vilaine=Vilaine river bay
+message.survey.atlantique.vilaine.desc=Survey in the nursery area of the Vilaine river bay (NourVil) lasted one week every year in autumn from 1980 \u00E0 2010, except 1991, 1994, 1995, 1998, 1999, 2006 and 2007. It used a 3m-beam trawl. On average 30 15-min hauls were carried out covering each about 0.0041 km\u00B2. This survey provides a representative picture of the 330 km\u00B2 of the Vilaine bay.
+message.survey.atlantique.vilaine.plus=For more information on the Nourvil survey
message.survey.atlantique.vilaine.nourvil1=Manuel des protocoles Nourriceries Gascogne - V 1.0 (2002)
-message.survey.mediterranee=Fa\u00E7ade M\u00E9diterran\u00E9e
-message.survey.mediterranee.golfelion=Golfe du Lion
-message.survey.mediterranee.golfelion.desc=Contribution fran\u00E7aise aux campagnes internationales Medits (International bottom Trawl Surveys in the Mediterranean), d''un mois au deuxi\u00E8me trimestre tous les ans depuis 1994 au chalut de fond \u00E0 grande ouverture verticale \u00E0 ailes courtes. En moyenne 69 chalutages sont r\u00E9alis\u00E9s, d''une demi-heure couvrant une surface d''environ 0,05 km\u00B2 chacun pour les profondeurs inf\u00E9rieures \u00E0 200 m\u00E8tres et d''une heure (surface d''environ 0,1\u00A0km\u00B2) pour les profondeurs sup\u00E9rieures \u00E0 200 m\u00E8tres. Medits est repr\u00E9sentative des 13 860 km\u00B2 du golfe de Lion.
-message.survey.mediterranee.golfelion.plus=Pour en savoir plus sur les campagnes Medits
+message.survey.mediterranee=Mediterranean Sea
+message.survey.mediterranee.golfelion=Gulf of Lions
+message.survey.mediterranee.golfelion.desc=French contribution to the internationally coordinated Medits (International bottom Trawl Surveys in the Mediterranean) survey, lasting one month in the second quarter every year since 1994 using a GOV bottom trawl with short wings. On average 69 hauls are carried out; haul duration is half an hour above 200 m depth which corresponds to 0.05 km\u00B2 and one hour for bottom depths greater than 200 m (0.1\u00A0km\u00B2). Medits provides a representative picture of the 13 860 km\u00B2 of the gulf of Lions.
+message.survey.mediterranee.golfelion.plus=For more information on the Medits surveys
message.survey.mediterranee.golfelion.medits1=Manuel des protocoles Medits, Version 1 (1994)
message.survey.mediterranee.golfelion.medits2=Manuel des protocoles Medits, Version 2 (1995)
message.survey.mediterranee.golfelion.medits3=Manuel des protocoles Medits, Version 3 (1999)
message.survey.mediterranee.golfelion.medits4=Manuel des protocoles Medits, Version 4 (2001)
message.survey.mediterranee.golfelion.medits5=Manuel des protocoles Medits, Version 5 (2007)
message.survey.mediterranee.estcorse=Est de la Corse
-message.survey.mediterranee.estcorse.desc=Contribution fran\u00E7aise \u00E0 la campagne internationale Medits (International bottom Trawl Surveys in the Mediterranean), d''une semaine au printemps, tous les ans depuis 1994, sauf en 2002, au chalut de fond \u00E0 grande ouverture verticale \u00E0 ailes courtes. En moyenne 20 chalutages sont r\u00E9alis\u00E9s, d''une demi-heure couvrant une surface d''environ 0,05 km\u00B2 chacun pour les profondeurs inf\u00E9rieures \u00E0 200 m\u00E8tres et d''une heure (surface d''environ 0,1\u00A0km\u00B2) pour les profondeurs sup\u00E9rieures \u00E0 200 m\u00E8tres. La campagne est repr\u00E9sentative des 4 562 km\u00B2 du plateau insulaire de l''est de la Corse.
-message.survey.mediterranee.estcorse.plus=Pour en savoir plus sur les campagnes Medits
+message.survey.mediterranee.estcorse.desc=French contribution to the internationally coordinated Medits (International bottom Trawl Surveys in the Mediterranean) survey, lasting one week in the second quarter every year since 1994 except 2002 using a GOV bottom trawl with short wings. On average 20 hauls are carried out; haul duration is half an hour above 200 m depth which corresponds to 0.05 km\u00B2 and one hour for bottom depths greater than 200 m (0.1\u00A0km\u00B2). Medits provides a representative picture of the 4 562 km\u00B2 of Eastern Corsican island plateau.
+message.survey.mediterranee.estcorse.plus=For more information on the Medits surveys
message.survey.mediterranee.estcorse.medits1=Manuel des protocoles Medits, Version 1 (1994)
message.survey.mediterranee.estcorse.medits2=Manuel des protocoles Medits, Version 2 (1995)
message.survey.mediterranee.estcorse.medits3=Manuel des protocoles Medits, Version 3 (1999)
message.survey.mediterranee.estcorse.medits4=Manuel des protocoles Medits, Version 4 (2001)
message.survey.mediterranee.estcorse.medits5=Manuel des protocoles Medits, Version 5 (2007)
-message.quality.title=Avertissement Qualit\u00E9
-message.quality.paragraph1=Bien que les donn\u00E9es aient \u00E9t\u00E9 pr\u00E9cautionneusement contr\u00F4l\u00E9es par l''Ifremer, des d\u00E9fauts inh\u00E9rents \u00E0 l''agr\u00E9gation des informations peuvent persister. Par exemple\u00A0:
-message.quality.paragraph2=En d\u00E9pit du fait que toutes les donn\u00E9es de toutes les s\u00E9ries de campagnes soient pr\u00E9sent\u00E9es selon le m\u00EAme format, sauf cas particuliers des diff\u00E9rences dans les strat\u00E9gies d''observation emp\u00EAchent la combinaison de donn\u00E9es de diff\u00E9rentes campagnes dans une m\u00EAme analyse. Par exemple, la capturabilit\u00E9 d''une m\u00EAme esp\u00E8ce varie selon le type d''engin d''\u00E9chantillonnage utilis\u00E9. Il en r\u00E9sulte que chaque engin capture un sous-ensemble particulier des bioc\u00E9noses \u00E9chantillonn\u00E9es.
-message.quality.paragraph3=Une propri\u00E9t\u00E9 commune aux s\u00E9ries d''observations \u00E0 la mer est l''\u00E9volution dans le temps de la comp\u00E9tence des \u00E9quipes embarqu\u00E9es pour la d\u00E9termination des esp\u00E8ces. Il peut en r\u00E9sulter des apparitions, des disparitions ou des assignations sous un m\u00EAme nom de taxons proches dans les jeux de donn\u00E9es, non repr\u00E9sentatifs de l''\u00E9volution des populations concern\u00E9es dans l''\u00E9cosyst\u00E8me.
-message.quality.paragraph4=Pour les campagnes d''une m\u00EAme s\u00E9rie, des changements dans les proc\u00E9dures d''\u00E9chantillonnage, dans les caract\u00E9ristiques des engins, dans la p\u00E9riode de r\u00E9alisation de la campagne et la zone couverte peuvent influencer les captures. Pour pr\u00E9venir les risques de biais dans les analyses en raison de ces facteurs, les jeux de donn\u00E9es doivent \u00EAtre pr\u00E9alablement filtr\u00E9s ad\u00E9quatement.
-message.quality.paragraph5=Il est vivement recommand\u00E9 aux utilisateurs de donn\u00E9es de les traiter avec pr\u00E9caution. Si des utilisateurs s''interrogent sur la validit\u00E9 de donn\u00E9es, ils sont invit\u00E9s \u00E0 contacter l''administrateur de la base de donn\u00E9es ({0}).
-message.quality.acceptance=Je reconnais avoir pris connaissance des documents et des restrictions associ\u00E9es et je m'''engage \u00E0 citer la source des donn\u00E9es.
-message.quality.notaccepted=Vous devez valider les conditions Avertissement Qualit\u00E9 !
+message.quality.title=Quality warning
+message.quality.paragraph1=Despite careful data control carried out by Ifremer, inconcistencies inherent to the aggregation of the data might occur. For example\u00A0:
+message.quality.paragraph2=It is not recommended to simply combine data from different surveys in an analysis despite the fact that all data from all surveys are presented in the same format. For example, the catchability of the same species can vary with the survey gear used. As a consequence each survey provides a particular but coherent picture of the sampled ecosystems.
+message.quality.paragraph3=A common feature of survey time series is the change of taxonomic expertise over time. As a result new species can appear, disappear or similar species be confused thus biasing time trends of certain species.
+message.quality.paragraph4=For any given survey time series, any changes in the sampling procedure, gear, period and area covered might influence the catches. Therefore to avoid the risk of any bias in the analysis, the data must be carefully filtered before use.
+message.quality.paragraph5=It is strongly recommended to use the data with care. In the case of doubts about the validity of the data, please contact the administrator of the data base ({0}).
+message.quality.acceptance=I acknowledge having read the documents and restrictions and I accept to cite the data source in all cases.
+message.quality.notaccepted=You must acknowledge having read the quality warning!
Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties
===================================================================
--- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties 2011-03-24 15:45:33 UTC (rev 797)
@@ -21,136 +21,136 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# #L%
###
-message.com.title=Indices de communaut\u00E9s
-message.com.paragraph1=Des indices de communaut\u00E9 sont calcul\u00E9s pour un ensemble d''esp\u00E8ces dans chaque s\u00E9rie. La liste des esp\u00E8ces incluses pour le calcul de chaque indice varie selon les donn\u00E9es disponibles pour la r\u00E9alisation des calculs.
+message.com.title=Community indices
+message.com.paragraph1=Community indices are calculated for a list of species for each survey time series. The list of species included when calculating each index depends on the available data.
message.com.downloadascsv=Download as CSV
message.com.downloadaszip=Download as ZIP
-message.com.moredetailspdf=More details about communities computed indices
+message.com.moredetailspdf=More information on calculated community indices
message.documents.title=Documents
message.documents.paragraph1=Grands invert\u00E9br\u00E9s et poissons observ\u00E9s par les campagnes scientifiques. Atlas de distribution. Bilan 2008. 2009. {0}
message.documents.paragraph2=Grands invert\u00E9br\u00E9s et poissons observ\u00E9s par les campagnes scientifiques. Bilan 2007. 2009. {0}
message.documents.paragraph3=L''\u00E9tat des communaut\u00E9s exploit\u00E9es au large des c\u00F4tes de France. Application d''indicateurs \u00E0 l''\u00E9valuation de l''impact de la p\u00EAche. Bilan 2004 Edition 2009. {0}
message.documents.paragraph4=Poissons et invert\u00E9br\u00E9s au large des c\u00F4tes de France. Indicateurs issus des p\u00EAches scientifiques. Bilan 2004. 2007. {0}
-message.layout.title=Populations and communities indices, resulting from Ifremer monitoring halieutics survey
+message.layout.title=Population and community indices derived from Ifremer scientific surveys.
message.layout.oceanicdatatitle=Gestion des donn\u00E9es des campagnes oc\u00E9anographiques \u00E0 l''Ifremer
message.layout.oceanicdata1=le Syst\u00E8me d''informations scientifiques pour la mer de l''Ifremer (SISMER)
-message.layout.oceanicdata2=le Syst\u00E8me d''information halieutique de l''Ifremer (SIH)
+message.layout.oceanicdata2=le Fisheries Information System - Syst\u00E8me d''information halieutique de l''Ifremer (SIH)
message.index.documentstitle=Documents
message.index.documentsmessage=Documents
message.index.title=Home
-message.index.paragraph1=Ce site a \u00E9t\u00E9 con\u00E7u pour fournir en libre acc\u00E8s des donn\u00E9es brutes et des donn\u00E9es \u00E9labor\u00E9es relatives aux campagnes scientifiques d''observation halieutique conduites par l''Ifremer le long des c\u00F4tes fran\u00E7aises.
-message.index.paragraph2=Toutes les donn\u00E9es mises \u00E0 disposition ont fait l''objet de qualification selon des protocoles sp\u00E9cifiques. La qualit\u00E9 des interpr\u00E9tations \u00E9tant directement li\u00E9e \u00E0 la nature des donn\u00E9es source, les utilisateurs de donn\u00E9es sont invit\u00E9s \u00E0 consid\u00E9rer avec attention les descriptions des protocoles mis en \u0153uvre ainsi que les niveaux de qualit\u00E9 contr\u00F4l\u00E9s.
-message.index.paragraph3=Chaque s\u00E9rie de campagnes est conduite selon une strat\u00E9gie d''\u00E9chantillonnage sp\u00E9cifique. Sauf cas particuliers, les analyses et interpr\u00E9tations doivent \u00EAtre conduites par s\u00E9rie, en prenant en compte les strat\u00E9gies d''\u00E9chantillonnage propres \u00E0 chacune de ces s\u00E9ries. Sur le site, les donn\u00E9es sont pr\u00E9sent\u00E9es par s\u00E9rie.
-message.index.paragraph4=Dans les tables de donn\u00E9es, toutes les esp\u00E8ces sont identifi\u00E9es selon le r\u00E9f\u00E9rentiel taxinomique du Syst\u00E8me d''informations halieutiques de l''Ifremer ({0}).
-message.index.datatypetitle=Quatre types de donn\u00E9es sont pr\u00E9sent\u00E9es
-message.index.datatypesource=Des donn\u00E9es par op\u00E9ration d''\u00E9chantillonnage (en g\u00E9n\u00E9ral par trait de chalut)
-message.index.datatypemap=Des cartes de distribution par esp\u00E8ce et par zone
-message.index.datatypepop=Des indices biologiques par esp\u00E8ce et par zone
-message.index.datatypecom=Des indices de communaut\u00E9 par zone.
-message.index.quotetitle=Pour citer ce site
-message.index.quotemessage=Ifremer {0,date,yyyy}. Indices de populations et de communautés issus des campagnes de surveillance halieutique de l''Ifremer. {1} ({0,date,dd MMMM})
-message.index.qualitytitle=Avertissement qualit\u00E9
-message.index.qualitymessage=Avertissement qualit\u00E9
-message.index.surveytitle=Description des campagnes
-message.index.surveyparagraph=Des manuels des protocoles d\u00E9crivent les modalit\u00E9s techniques de r\u00E9alisation de chaque s\u00E9rie de campagnes.
+message.index.paragraph1=This web site has been created to provide easy access to the raw data and derived estimated from the scientific surveys carried out by Ifremer along the French coast.
+message.index.paragraph2=All data made available have passed rigorous quality checks. However, as the reliability of results interpretions depends directly on the data used, users are cordially invited to study carefully the survey and quality check protocols.
+message.index.paragraph3=Each survey is carried out using a specific sampling design. Data analyses and interpretation of each time series must therefore take into the stratified sampling designs. The data are presented by survey series on the web site.
+message.index.paragraph4=In the data tables all species are identified using the taxinomic reference file of the Syst\u00E8me d''informations halieutiques de l''Ifremer ({0}).
+message.index.datatypetitle=Four data types are presented
+message.index.datatypesource=Data by sampling by unit (generally by haul)
+message.index.datatypemap=Species distribution maps by area
+message.index.datatypepop=Biological indices by species by area
+message.index.datatypecom=Community indices by area.
+message.index.quotetitle=How to cite this web site
+message.index.quotemessage=Ifremer {0,date,yyyy}. Population and community indices derived from scientific surveys carried out by Ifremer. {1} ({0,date,dd MMMM})
+message.index.qualitytitle=Quality warning
+message.index.qualitymessage=Quality warning
+message.index.surveytitle=Survey description
+message.index.surveyparagraph=Survey protocol handbooks for each survey time series.
message.common.anchortop=Top
message.common.selectpop=Select a population
-message.common.selectzone=Select a zone
+message.common.selectzone=Select an area
message.common.selectsurvey=Select a survey
-message.common.selectfacade=Select a facade
+message.common.selectfacade=Select a sea
message.common.selectindicator=Select an indicator
message.common.noresults=No results available
message.common.selectspecies=Select a species
message.common.jsreadmore=Read more
message.common.validform=Valid
-message.common.facade=Facade
+message.common.facade=Sea
message.map.citationtitle=Citation
message.map.citation=Trenkel V.M., O. Berthel\u00E9, P. Lorance, J.A. Bertrand, A. Brind''Amour, M.L. Cochard, F. Coppin, J.P. Leaut\u00E9, J.C. Mah\u00E9, J. Morin, M.J. Rochet, M. Salaun, A. Souplet & Y. V\u00E9rin, 2009. Grands invert\u00E9br\u00E9s et poissons observ\u00E9s par les campagnes scientifiques. Atlas de distribution. Bilan 2008. Ifremer, Nantes. EMH : 09-003. {0}. 100 p.
message.map.downloadaspdf=Download as PDF
-message.map.linkarchimer=Acc\u00E8s \u00E0 l''atlas : {0}
-message.map.paragraph1=L''objectif de cet atlas est de donner un aper\u00E7u de la distribution spatiale des esp\u00E8ces de poissons et de certains invert\u00E9br\u00E9s marin \u00E0 partir des observations des campagnes de p\u00EAche scientifiques.
-message.map.paragraph2=Pour chaque zone un quadrillage syst\u00E9matique a \u00E9t\u00E9 d\u00E9fini, puis la densit\u00E9 moyenne par km\u00B2 dans chaque cellule a \u00E9t\u00E9 calcul\u00E9e en utilisant les observations de toute la p\u00E9riode. Pour la repr\u00E9sentation cartographique, les cellules avec des densit\u00E9s moyenne correspondant aux quartiles de densit\u00E9 ont re\u00E7u la m\u00EAme couleur\u00A0: bleu\u00A0: esp\u00E8ce jamais observ\u00E9e, jaune clair\u00A0: densit\u00E9 moyenne entre [0 et 25\u00A0%[; jaune fonc\u00E9\u00A0: [25-50\u00A0%[, orange\u00A0: [50-75\u00A0%[ et rouge\u00A0: [75-100\u00A0%]. Donc, les zones o\u00F9 se trouvent les densit\u00E9s les plus \u00E9lev\u00E9es en moyenne sont repr\u00E9sent\u00E9es en rouge.
-message.map.title=Cartes de distribution
+message.map.linkarchimer=Access atlas : {0}
+message.map.paragraph1=The objectif of this atlas is to provide a rough indication of the spatial distribution of certain fish and shelfish species as provided by scientific surveys.
+message.map.paragraph2=For each area a systematic grid was defined and the simple average density across years and hauls was calculated in numbers per km2. For mapping purposes, grid cells were coloured using a percentile scale: blue species never observed, light yellow: average density between [0- 25\u00A0%[; dark yellow: [25-50\u00A0%[, orange\u00A0: [50-75\u00A0%[ and red\u00A0: [75-100\u00A0%]. Thus, cells with the highest average density are in red.
+message.map.title=Distribution maps
message.map.warning=Warning
-message.map.warningcontent=Les cartes pr\u00E9sent\u00E9es ne doivent pas \u00EAtre interpr\u00E9t\u00E9es comme des cartes de distribution des esp\u00E8ces mais comme celle des zones o\u00F9 elles sont captur\u00E9es lors des campagnes scientifiques. Les campagnes \u00E9tant r\u00E9alis\u00E9es avec des chaluts diff\u00E9rents et \u00E0 diff\u00E9rentes saisons, les esp\u00E8ces peuvent avoir des capturabilit\u00E9s tr\u00E8s diff\u00E9rentes entre les s\u00E9ries de campagnes, donc d''une zone \u00E0 l''autre.
+message.map.warningcontent=The maps should not be interpreted as biological distribution maps but as the areas where the species are caught during the scientific surveys. As the different surveys use different samplin gear and are carried out at different times of the year, there can be differences in cathability among surveys and consequently among areas.
message.pop.downloadascsv=Download as CSV
-message.pop.moredetailspdf=More details about populations computed indices
-message.pop.title=Indices biologiques
-message.pop.paragraph1=Les indices pr\u00E9sent\u00E9s ont \u00E9t\u00E9 s\u00E9lectionn\u00E9s en r\u00E9f\u00E9rence \u00E0 leur aptitude \u00E0 renseigner sur l''impact de la p\u00EAche, en vue de leur int\u00E9gration dans des tableaux de bord d\u2019indicateurs d''\u00E9volution d''\u00E9cosyst\u00E8mes exploit\u00E9s par la p\u00EAche.
-message.pop.paragraph2=Les donn\u00E9es disponibles sur le site sont les valeurs de chaque indice. Les informations ont \u00E9t\u00E9 valid\u00E9es par un groupe de travail dans une approche int\u00E9grative d\u2019indicateurs de populations et de communaut\u00E9s. Les r\u00E9sultats sont donn\u00E9s par zone g\u00E9ographique et par esp\u00E8ce pour l''ensemble de la s\u00E9rie de donn\u00E9es disponible. L''utilisateur peut s\u00E9lectionner la zone g\u00E9ographique, la saison (dans le cas de s\u00E9ries saisonni\u00E8res), l''esp\u00E8ce et l''indice. Pour les s\u00E9lections pour lesquelles une information est disponible, le syst\u00E8me produit un graphe pr\u00E9sentant la distribution temporelle de l''indice, avec une repr\u00E9sentation de l''\u00E9cart-type. Il fournit la possibilit\u00E9 d\u2019extraire la table des donn\u00E9es correspondantes, incluant la valeur de l\u2019indice par ann\u00E9e, ainsi que son \u00E9cart-type et son coefficient de variation.
+message.pop.moredetailspdf=More details about computed population indices
+message.pop.title=Biological indices
+message.pop.paragraph1=The presented indices have been selected with respect to their capacity to inform on the impact of fishing and for integration into indicator dashboards for exploited ecosystems.
+message.pop.paragraph2=The data correspond to the value of each indicator. The information has been validated by an expert group within the framework of a holostic population and community indicator approach. The results are presented by geographic area or by species for all available data series. The user can select the geographique area, the saison (for saisonal surveys), the species and the index. If data is available for a given selection, a figure is produced that shows the time series of the index, plus-minus one standard deviation. It is possible to extract the corresponding table with index values by year, standard deviations and coefficients of variation.
message.source.download=Download
-message.source.title=Donn\u00E9es source
-message.source.paragraph1=Les donn\u00E9es Source sont pr\u00E9sent\u00E9es selon quatre tables fournissant des informations de base \u00E9lev\u00E9es \u00E0 l''op\u00E9ration d''\u00E9chantillonnage (en g\u00E9n\u00E9ral un trait de chalut) et organis\u00E9es selon des unit\u00E9s g\u00E9ographiques d\u00E9finies en relation avec le plan d''\u00E9chantillonnage. Une table suppl\u00E9mentaire pr\u00E9sente le r\u00E9f\u00E9rentiel taxinomique associ\u00E9 aux donn\u00E9es.
-message.source.paragraph2=Le site ne contient des donn\u00E9es Source que pour une partie des s\u00E9ries de campagnes pour lesquelles des indices de populations et de communaut\u00E9s sont pr\u00E9sent\u00E9s. Pour un acc\u00E8s aux autres s\u00E9ries de donn\u00E9es de base, il convient de contacter l''administrateur du Syst\u00E8me d''informations halieutiques de l''Ifremer ({0}).
-message.source.paragraph3=Les donn\u00E9es de campagnes halieutiques sont constitu\u00E9es \u00E0 partir de stations d''\u00E9chantillonnage r\u00E9parties dans l''espace selon le principe de tirage stratifi\u00E9. La granularit\u00E9 des donn\u00E9es conditionne la partition g\u00E9ographique selon laquelle les indices de population et de communaut\u00E9 peuvent \u00EAtre \u00E9tablis.
-message.source.paragraph4=Les plans de zonage propos\u00E9s incluent le plan de r\u00E9f\u00E9rence correspondant au plan d''\u00E9chantillonnage, ainsi que des adaptations pour tenir compte des limites des sous-r\u00E9gions d\u00E9finies par la strat\u00E9gie marine europ\u00E9enne. Ils ont \u00E9t\u00E9 valid\u00E9s par un groupe de travail de l''Ifremer, apr\u00E8s exploration de la sensibilit\u00E9 de divers indices aux ajustements propos\u00E9s.
-message.survey.maintitle=Les campagnes de surveillance halieutique de l''Ifremer
-message.survey.paragraph1=Les campagnes de p\u00EAche scientifique standardis\u00E9es ont pour objectif d''observer les ressources halieutiques, en suivant toujours les m\u00EAmes m\u00E9thodes d\u2019\u00E9chantillonnage. Elles sont toujours r\u00E9alis\u00E9es dans la m\u00EAme zone, \u00E0 la m\u00EAme saison, avec des engins de p\u00EAche standardis\u00E9s, afin que les donn\u00E9es soient comparables d''ann\u00E9e en ann\u00E9e. Elles servent \u00E0 d\u00E9crire les esp\u00E8ces, qu''elles soient commerciales ou non, d''une zone et \u00E0 observer les changements s\u2019il y en a. Les poissons, les mollusques et les crustac\u00E9s sont d\u00E9nombr\u00E9s, mesur\u00E9s et pes\u00E9s. Certains d''entre eux font l''objet de pr\u00E9l\u00E8vements biologiques. Chaque campagne fournit ainsi une repr\u00E9sentation quantitative de l''ensemble des esp\u00E8ces de la zone \u00E0 une p\u00E9riode donn\u00E9e. Selon les s\u00E9ries, d'''autres informations sont relev\u00E9es (temp\u00E9rature, salinit\u00E9, macrofaune, observation des mammif\u00E8res marins, oiseaux, macro d\u00E9chets etc., mais ne sont pas pr\u00E9sent\u00E9es dans ce site)
-message.survey.paragraph2=Depuis une vingtaine d''ann\u00E9es, l''Ifremer organise des campagnes de p\u00EAche scientifique en mer du Nord, en Manche, en Atlantique et en M\u00E9diterran\u00E9e concernant les ressources d\u00E9mersales et benthiques. L''objectif prioritaire est de produire des indices d''abondance des principales esp\u00E8ces commerciales. Elles recueillent \u00E9galement des donn\u00E9es sur les esp\u00E8ces captur\u00E9es non commerciales. Elles contribuent ainsi aux connaissances n\u00E9cessaires au d\u00E9veloppement de l''approche \u00E9cosyst\u00E9mique des p\u00EAches, notamment dans le cadre de la politique commune des p\u00EAches et plus largement de la strat\u00E9gie marine de l''Union europ\u00E9enne.
-message.survey.dataengintitle=Diff\u00E9rents engins d''\u00E9chantillonnage sont utilis\u00E9s :
-message.survey.dataenginfond=Un chalut de fond \u00E0 grande ouverture verticale pour l''observation des ressources d\u00E9mersales, sur les plateaux continentaux et le haut des pentes continentales (accores) en mer du Nord, Manche orientale, mer Celtique, golfe de Gascogne, golfe du Lion et Est de la Corse,
-message.survey.dataenginperche=Un chalut \u00E0 perche pour les zones tr\u00E8s c\u00F4ti\u00E8res et les estuaires lors des campagnes visant les juv\u00E9niles de poissons plats : baies de Somme et de Vilaine,
-message.survey.dataengincasier=Un \u00E9chantillonnage au casier pour les campagnes d''\u00E9valuation des grands crustac\u00E9s, en particulier le homard, aux abords du cap de Flamanville.
-message.survey.paragraph3=Les campagnes sont r\u00E9alis\u00E9es selon des plans d''\u00E9chantillonnage standardis\u00E9s. L\u2019engin de p\u00EAche et son gr\u00E9ement, la position des stations, le tri des captures, les pr\u00E9l\u00E8vements biologiques suivent des protocoles fix\u00E9s.
-message.survey.paragraph4=Pour les campagnes coordonn\u00E9es entre navires de recherche des pays riverains en mer du Nord, Manche orientale, mer Celtique, golfe de Gascogne et M\u00E9diterran\u00E9e, les protocoles sont communs \u00E0 l''ensemble des pays partenaires. Les traits de chalut des diff\u00E9rents navires de recherche sont comparables.
-message.survey.paragraph5=Chaque zone \u00E9tudi\u00E9e est d\u00E9coup\u00E9e en strates en fonction de la profondeur, de la latitude ou d''autres crit\u00E8res. L''\u00E9chantillonnage pr\u00E9voit un nombre de traits de chalut ou de mouillages de casiers par strate.
-message.survey.paragraph6=Dans une campagne de chalutage scientifique, les positions des traits de chalut sont choisies selon un plan d''\u00E9chantillonnage statistique. L''objectif n''est pas d''obtenir les meilleures captures possibles comme le recherchent les p\u00EAcheurs, mais de r\u00E9colter des donn\u00E9es comparables d''une ann\u00E9e sur l''autre afin de relever des \u00E9volutions.
-message.survey.detailstitle=Caract\u00E9ristiques des campagnes de surveillance halieutique de l''Ifremer
-message.survey.merdunord=Fa\u00E7ade Mer du Nord
-message.survey.merdunord.sudmerdunord=Sud mer du Nord
-message.survey.merdunord.sudmerdunord.desc=Contribution fran\u00E7aise d''un mois \u00E0 la campagne internationale IBTS (International Bottom Trawl Survey) au premier trimestre, tous les ans depuis 1980, au chalut de fond \u00E0 grande ouverture verticale. En moyenne, le navire fran\u00E7ais fait 58 chalutages par an. Le sud de la mer du Nord est couvert par 4 navires (fran\u00E7ais, belge, danois et allemand) qui r\u00E9alisent en tout environ 200 traits par an. Chaque trait dure une demi-heure et couvre une surface d''environ 0,067 km\u00B2. Cette campagne est repr\u00E9sentative des 678\u00A0000\u00A0km\u00B2 de la zone.
-message.survey.merdunord.sudmerdunord.plus=Pour en savoir plus sur les campagnes IBTS
+message.source.title=Raw data
+message.source.paragraph1=The raw data are presented in four tables which contain the basic information by sampling unit (generally a haul) as well as the relevant information on the sampling design (strata). An additional table provides the latin names for the species codes used in the data files.
+message.source.paragraph2=The web site provides access to the raw data corresponding to the population and community indices presented. For any other data please contact the 'administrateur du Syst\u00E8me d''informations halieutiques de l''Ifremer ({0}).
+message.source.paragraph3=The survey data consist of stations distributed in space following a stratified random design (which can be fixed between years). The spatial resolution determines on which spatial scale population and community indices can be calculated.
+message.source.paragraph4=The list of proposed spatial areas includes the original sampling areas, plus post-stratified areas suitable for the European Marine Strategie Framework Directive. Thes areas have been validated by an internal Ifremer working group following sensitivity analyses.
+message.survey.maintitle=Scientific surveys carried out by Ifremer
+message.survey.paragraph1=The main objectif of the scientific fisheries surveys is to provide information on ressource changes, using a standard sampling protocol. They are always carried out in the same areas, at the same time of year and with the same gear, to allow comparisons among years. They provide information on both commercial and non-commercial species and their changes. Fish and shelfish species are counted, weighted and measured. For certain species other biological information is collected. Thus each survey provided a quantitive picture of the species assemblage in a given area during a certain time period. Additional information such as temperature, salinity, macrofauna, marin mammals, birds, macro waste etc. are collected during certain surveys, but this information is not presented here
+message.survey.paragraph2=For the last two decades Ifremer has organised scientific fisheries surveys in the North Sea, the English Channel, the Atlantic and in the Mediterrean Sea for sampling demersal and benthic ressources. The main objective is to produce abundance indices for the principal commercial species. The surveys collect also data for non-commercial species. Hence they contribute to the knowledge necessary for the development of an ecosystem approach to fisheries, in particular in the context of the common fisheries policy (CFP) and more generally the European marine strategy framework directive.
+message.survey.dataengintitle=Different sampling gears are used:
+message.survey.dataenginfond=Variants of a GOV (grande ouverture verticale) trawl for observing demersal species on the continental shelfs and upper slopes in the North Sea, Eastern English channel, Celtic Sea, Bay of Biscay, Bay of Lions and East Corsica,
+message.survey.dataenginperche=A beam trawl for coastal zones and estuaries during surveys targeting juvenile flatfish: Somme and Vilaine river bays,
+message.survey.dataengincasier=Pots for the assessment of large crustaceans, in particular lobster, around cap Flamanville.
+message.survey.paragraph3=The surveys are carried out using standardised sampling designs. The gear and its rigging, station positions, sample treatment and biological sampling are carried out using fixed protocols.
+message.survey.paragraph4=Common protocols are used by all participants for surveys carried out under international coordination in the North Sea, Eastern English channel, Celtic Sea, Bay of Biscay and the Mediterranean Sea. The data collected by the different research vessels are therefore comparable.
+message.survey.paragraph5=Each survey area is subdivided in strata according to bottom depth, latitude or other criteria. The sampling protocol specifies the number of hauls or pots by stratum.
+message.survey.paragraph6=For each survey the station location is determined following the specified sampling design. The aim is not to obtain the largest catches as fishers might attempt to do, but to collect comparable data for detecting time trends.
+message.survey.detailstitle=Characteristics of the surveys carried out by Ifremer
+message.survey.merdunord=North Sea
+message.survey.merdunord.sudmerdunord=Southern North Sea
+message.survey.merdunord.sudmerdunord.desc=Every years since 1980 France contributes one month of ship time to the IBTS (International Bottom Trawl Survey) in the first quarter using a GOV trawl. On average 58 hauls are carried out. The southern North Sea is sampled by four countries (France, Belgium, Danmark and Germany) who together carry out about 200 hauls per year. Each haul lasts half an hour corresponding to a swept area of about 0.067 km\u00B2. IBTS provides a representative picture of the 678\u00A0000\u00A0km\u00B2 of the area.
+message.survey.merdunord.sudmerdunord.plus=For more information on the IBTS survey
message.survey.merdunord.sudmerdunord.ibts6=Manuel des protocoles IBTS - R\u00E9vision VI (1999)
message.survey.merdunord.sudmerdunord.ibts7=Manuel des protocoles IBTS - R\u00E9vision VII (2004)
-message.survey.mancheorientale=Fa\u00E7ade Manche orientale
-message.survey.mancheorientale.mancheorientale=Manche orientale
-message.survey.mancheorientale.mancheorientale.desc=Campagne fran\u00E7aise CGFS (Channel Ground Fish Survey) d''un mois en octobre, coordonn\u00E9e au plan international avec les campagnes IBTS. La campagne a lieu tous les ans depuis 1988. En moyenne 90 traits d''une demi-heure, au chalut de fond \u00E0 grande ouverture verticale, sont r\u00E9alis\u00E9s. Chaque trait couvre une surface d''environ 0,03 km\u00B2. Cette campagne est repr\u00E9sentative des 70 748 km\u00B2 de la Manche orientale.
-message.survey.mancheorientale.mancheorientale.plus=Pour en savoir plus sur les campagnes CGFS
+message.survey.mancheorientale=Eastern English Channel
+message.survey.mancheorientale.mancheorientale=Eastern English Channel
+message.survey.mancheorientale.mancheorientale.desc=French survey CGFS (Channel Ground Fish Survey) lasting one month and internationally coordonnated together with the IBTS survey. The survey takes place every year since 1988. On average 90 half hour hauls are carried out with a small GOV trawl. Each haul covers about 0.03 km\u00B2. This survey provides a representative picture of the 70 748 km\u00B2 of the Eastern English Channel.
+message.survey.mancheorientale.mancheorientale.plus=For more information on the CGFS survey
message.survey.mancheorientale.mancheorientale.cgfs1=Manuel des protocoles CGFS - Version 1.0 (2002)
-message.survey.mancheorientale.baiedesomme=Baie de Somme
-message.survey.mancheorientale.baiedesomme.desc=Campagne de p\u00EAche sur la nourricerie de la baie de Somme (NourSomme) d''une semaine en septembre-octobre, tous les ans depuis 1995, aux chaluts \u00E0 perche de 2 m\u00E8tres de large dans la partie la plus estuarienne de la baie et 3 m\u00E8tres dans la partie externe, plus marine. En moyenne 50 chalutages sont r\u00E9alis\u00E9s chaque ann\u00E9e. Ils durent en moyenne 7 minutes sur une surface de 0,001 km\u00B2 chacun dans la partie interne de la baie et 15 minutes sur une surface d''environ 0,004 km\u00B2 dans la partie externe. Cette campagne est repr\u00E9sentative des 720 km\u00B2 de la baie.
-message.survey.mancheorientale.baiedesomme.plus=Pour en savoir plus sur les campagnes NourSomme
+message.survey.mancheorientale.baiedesomme=Somme river bay
+message.survey.mancheorientale.baiedesomme.desc=The survey in the nursery area of the Somme rive bay (NourSomme) lasts one week in September-October each year since 1995, using a 2m-beam trawl in the estuary and a 3m-beam trawl in the more open areas. On average 50 hauls are carried out. Haul duration is 7 minutes covering 0.001 km\u00B2 in the estuary part and 15 minutes covering 0.004 km\u00B2 in the more open part. This survey provides a representative picture of the 720 km\u00B2 of the Somme baie.
+message.survey.mancheorientale.baiedesomme.plus=For more information on the NourSomme survey
message.survey.mancheorientale.baiedesomme.noursomme1=Manuel des protocoles Nourriceries Somme - V 1.0 (2002)
-message.survey.mancheoccidentale=Fa\u00E7ade Manche occidentale
-message.survey.mancheoccidentale.flamanville=Abords du cap de Flamanville
-message.survey.mancheoccidentale.flamanville.desc=Deux campagnes de 15 jours aux casiers \u00E0 crustac\u00E9s aux abords du cap de Flamanville (CrustaFlam), en juin et septembre, depuis 1986 : 1200 casiers relev\u00E9s par campagne sur une zone de 26 km\u00B2.
-message.survey.mancheoccidentale.flamanville.plus=Pour en savoir plus sur les campagnes CrustFlam
+message.survey.mancheoccidentale=Eastern English Channel
+message.survey.mancheoccidentale.flamanville=Cap de Flamanville area
+message.survey.mancheoccidentale.flamanville.desc=Two surveys of 15 jours each using pots around cap de Flamanville (CrustaFlam), in June and September, since 1986: 1200 sets per survey in an area covering 26 km\u00B2.
+message.survey.mancheoccidentale.flamanville.plus=For more information on the CrustFlam survey
message.survey.mancheoccidentale.flamanville.crustaflam1=Manuel des protocoles CRUSTAFLAM - Version 1.0 (2003)
-message.survey.atlantique=Fa\u00E7ade Atlantique
-message.survey.atlantique.celtique=Mer Celtique
-message.survey.atlantique.celtique.desc=Campagne Evhoe (Evaluation des ressources halieutiques de l''ouest europ\u00E9en) d''un mois au quatri\u00E8me trimestre, tous les ans depuis 1997. En moyenne 75 traits d''une demi-heure, au chalut de fond \u00E0 grande ouverture verticale, sont r\u00E9alis\u00E9s. Chaque trait couvre une surface d''environ 0,067 km\u00B2. Cette campagne est repr\u00E9sentative des 150 000 km\u00B2 de la mer Celtique.
-message.survey.atlantique.celtique.plus=Pour en savoir plus sur les campagnes Evhoe
+message.survey.atlantique=Northeast Atlantic
+message.survey.atlantique.celtique=Celtic Sea
+message.survey.atlantique.celtique.desc=The Evhoe suvey (Evaluation des ressources halieutiques de l''ouest europ\u00E9en) lasts one month in the fourth quarter every year since 1997. On average 75 half-hour hauls are carried out with a GOV trawl. Each haul covers about 0.067 km\u00B2. This survey provides a representative picture of the 150 000 km\u00B2 of the Celtic Sea.
+message.survey.atlantique.celtique.plus=For more information on the Evhoe surveys
message.survey.atlantique.celtique.evhoe1=Manuel des protocoles EVHOE - Version 1.0 (2005)
-message.survey.atlantique.gascogne=Golfe de Gascogne
-message.survey.atlantique.gascogne.desc=Campagne Evhoe (Evaluation des ressources halieutiques de l''ouest europ\u00E9en) d''un mois au quatri\u00E8me trimestre, tous les ans depuis 1992 (sauf en 1993 et 1996). En moyenne, 70 traits de chalut d''une demi-heure au chalut de fond \u00E0 grande ouverture verticale, sont r\u00E9alis\u00E9s. Chaque trait couvre une surface de 0,067 km\u00B2. Cette campagne est repr\u00E9sentative des 72 500 km\u00B2 du golfe de Gascogne. La campagne Evhoe couvre donc le golfe de Gascogne et la mer Celtique avec le m\u00EAme protocole. De plus elle est coordonn\u00E9e internationalement, dans le cadre des campagnes IBTS, avec une campagne espagnole en mer Cantabrique, une campagne irlandaise et une campagne anglaise en mer Celtique.
-message.survey.atlantique.gascogne.plus=Pour en savoir plus sur les campagnes Evhoe
+message.survey.atlantique.gascogne=Bay of Biscay
+message.survey.atlantique.gascogne.desc=The Evhoe survey (Evaluation des ressources halieutiques de l''ouest europ\u00E9en) lasts one month in the fourth quarter every year since 1992 (except 1993 and 1996). On average 70 half-hour hauls are carried out with a GOV trawl. Each haul covers about 0.067 km\u00B2. This survey provides a representative picture of the 72 500 km\u00B2 of the Bay of Biscay.
+message.survey.atlantique.gascogne.plus=For more information on the Evhoe surveys
message.survey.atlantique.gascogne.evhoe1=Manuel des protocoles EVHOE - Version 1.0 (2005)
-message.survey.atlantique.vilaine=Baie de Vilaine
-message.survey.atlantique.vilaine.desc=Campagne sur la nourricerie de la baie de Vilaine (NourVil), d''une semaine \u00E0 l''automne, tous les ans de 1980 \u00E0 2010, sauf en 1991, 1994, 1995, 1998, 1999, 2006 et 2007, au chalut \u00E0 perche de 3 m\u00E8tres de large. En moyenne, 30 chalutages de 15 minutes sont r\u00E9alis\u00E9s. Chaque trait couvre une surface d''environ 0,0041 km\u00B2. Cette campagne est repr\u00E9sentative des 330 km\u00B2 de la baie.
-message.survey.atlantique.vilaine.plus=Pour en savoir plus sur les campagnes Nourvil
+message.survey.atlantique.vilaine=Vilaine river bay
+message.survey.atlantique.vilaine.desc=Survey in the nursery area of the Vilaine river bay (NourVil) lasted one week every year in autumn from 1980 \u00E0 2010, except 1991, 1994, 1995, 1998, 1999, 2006 and 2007. It used a 3m-beam trawl. On average 30 15-min hauls were carried out covering each about 0.0041 km\u00B2. This survey provides a representative picture of the 330 km\u00B2 of the Vilaine bay.
+message.survey.atlantique.vilaine.plus=For more information on the Nourvil survey
message.survey.atlantique.vilaine.nourvil1=Manuel des protocoles Nourriceries Gascogne - V 1.0 (2002)
-message.survey.mediterranee=Fa\u00E7ade M\u00E9diterran\u00E9e
-message.survey.mediterranee.golfelion=Golfe du Lion
-message.survey.mediterranee.golfelion.desc=Contribution fran\u00E7aise aux campagnes internationales Medits (International bottom Trawl Surveys in the Mediterranean), d''un mois au deuxi\u00E8me trimestre tous les ans depuis 1994 au chalut de fond \u00E0 grande ouverture verticale \u00E0 ailes courtes. En moyenne 69 chalutages sont r\u00E9alis\u00E9s, d''une demi-heure couvrant une surface d''environ 0,05 km\u00B2 chacun pour les profondeurs inf\u00E9rieures \u00E0 200 m\u00E8tres et d''une heure (surface d''environ 0,1\u00A0km\u00B2) pour les profondeurs sup\u00E9rieures \u00E0 200 m\u00E8tres. Medits est repr\u00E9sentative des 13 860 km\u00B2 du golfe de Lion.
-message.survey.mediterranee.golfelion.plus=Pour en savoir plus sur les campagnes Medits
+message.survey.mediterranee=Mediterranean Sea
+message.survey.mediterranee.golfelion=Gulf of Lions
+message.survey.mediterranee.golfelion.desc=French contribution to the internationally coordinated Medits (International bottom Trawl Surveys in the Mediterranean) survey, lasting one month in the second quarter every year since 1994 using a GOV bottom trawl with short wings. On average 69 hauls are carried out; haul duration is half an hour above 200 m depth which corresponds to 0.05 km\u00B2 and one hour for bottom depths greater than 200 m (0.1\u00A0km\u00B2). Medits provides a representative picture of the 13 860 km\u00B2 of the gulf of Lions.
+message.survey.mediterranee.golfelion.plus=For more information on the Medits surveys
message.survey.mediterranee.golfelion.medits1=Manuel des protocoles Medits, Version 1 (1994)
message.survey.mediterranee.golfelion.medits2=Manuel des protocoles Medits, Version 2 (1995)
message.survey.mediterranee.golfelion.medits3=Manuel des protocoles Medits, Version 3 (1999)
message.survey.mediterranee.golfelion.medits4=Manuel des protocoles Medits, Version 4 (2001)
message.survey.mediterranee.golfelion.medits5=Manuel des protocoles Medits, Version 5 (2007)
message.survey.mediterranee.estcorse=Est de la Corse
-message.survey.mediterranee.estcorse.desc=Contribution fran\u00E7aise \u00E0 la campagne internationale Medits (International bottom Trawl Surveys in the Mediterranean), d''une semaine au printemps, tous les ans depuis 1994, sauf en 2002, au chalut de fond \u00E0 grande ouverture verticale \u00E0 ailes courtes. En moyenne 20 chalutages sont r\u00E9alis\u00E9s, d''une demi-heure couvrant une surface d''environ 0,05 km\u00B2 chacun pour les profondeurs inf\u00E9rieures \u00E0 200 m\u00E8tres et d''une heure (surface d''environ 0,1\u00A0km\u00B2) pour les profondeurs sup\u00E9rieures \u00E0 200 m\u00E8tres. La campagne est repr\u00E9sentative des 4 562 km\u00B2 du plateau insulaire de l''est de la Corse.
-message.survey.mediterranee.estcorse.plus=Pour en savoir plus sur les campagnes Medits
+message.survey.mediterranee.estcorse.desc=French contribution to the internationally coordinated Medits (International bottom Trawl Surveys in the Mediterranean) survey, lasting one week in the second quarter every year since 1994 except 2002 using a GOV bottom trawl with short wings. On average 20 hauls are carried out; haul duration is half an hour above 200 m depth which corresponds to 0.05 km\u00B2 and one hour for bottom depths greater than 200 m (0.1\u00A0km\u00B2). Medits provides a representative picture of the 4 562 km\u00B2 of Eastern Corsican island plateau.
+message.survey.mediterranee.estcorse.plus=For more information on the Medits surveys
message.survey.mediterranee.estcorse.medits1=Manuel des protocoles Medits, Version 1 (1994)
message.survey.mediterranee.estcorse.medits2=Manuel des protocoles Medits, Version 2 (1995)
message.survey.mediterranee.estcorse.medits3=Manuel des protocoles Medits, Version 3 (1999)
message.survey.mediterranee.estcorse.medits4=Manuel des protocoles Medits, Version 4 (2001)
message.survey.mediterranee.estcorse.medits5=Manuel des protocoles Medits, Version 5 (2007)
-message.quality.title=Avertissement Qualit\u00E9
-message.quality.paragraph1=Bien que les donn\u00E9es aient \u00E9t\u00E9 pr\u00E9cautionneusement contr\u00F4l\u00E9es par l''Ifremer, des d\u00E9fauts inh\u00E9rents \u00E0 l''agr\u00E9gation des informations peuvent persister. Par exemple\u00A0:
-message.quality.paragraph2=En d\u00E9pit du fait que toutes les donn\u00E9es de toutes les s\u00E9ries de campagnes soient pr\u00E9sent\u00E9es selon le m\u00EAme format, sauf cas particuliers des diff\u00E9rences dans les strat\u00E9gies d''observation emp\u00EAchent la combinaison de donn\u00E9es de diff\u00E9rentes campagnes dans une m\u00EAme analyse. Par exemple, la capturabilit\u00E9 d''une m\u00EAme esp\u00E8ce varie selon le type d''engin d''\u00E9chantillonnage utilis\u00E9. Il en r\u00E9sulte que chaque engin capture un sous-ensemble particulier des bioc\u00E9noses \u00E9chantillonn\u00E9es.
-message.quality.paragraph3=Une propri\u00E9t\u00E9 commune aux s\u00E9ries d''observations \u00E0 la mer est l''\u00E9volution dans le temps de la comp\u00E9tence des \u00E9quipes embarqu\u00E9es pour la d\u00E9termination des esp\u00E8ces. Il peut en r\u00E9sulter des apparitions, des disparitions ou des assignations sous un m\u00EAme nom de taxons proches dans les jeux de donn\u00E9es, non repr\u00E9sentatifs de l''\u00E9volution des populations concern\u00E9es dans l''\u00E9cosyst\u00E8me.
-message.quality.paragraph4=Pour les campagnes d''une m\u00EAme s\u00E9rie, des changements dans les proc\u00E9dures d''\u00E9chantillonnage, dans les caract\u00E9ristiques des engins, dans la p\u00E9riode de r\u00E9alisation de la campagne et la zone couverte peuvent influencer les captures. Pour pr\u00E9venir les risques de biais dans les analyses en raison de ces facteurs, les jeux de donn\u00E9es doivent \u00EAtre pr\u00E9alablement filtr\u00E9s ad\u00E9quatement.
-message.quality.paragraph5=Il est vivement recommand\u00E9 aux utilisateurs de donn\u00E9es de les traiter avec pr\u00E9caution. Si des utilisateurs s''interrogent sur la validit\u00E9 de donn\u00E9es, ils sont invit\u00E9s \u00E0 contacter l''administrateur de la base de donn\u00E9es ({0}).
-message.quality.acceptance=Je reconnais avoir pris connaissance des documents et des restrictions associ\u00E9es et je m'''engage \u00E0 citer la source des donn\u00E9es.
-message.quality.notaccepted=Vous devez valider les conditions Avertissement Qualit\u00E9 !
+message.quality.title=Quality warning
+message.quality.paragraph1=Despite careful data control carried out by Ifremer, inconcistencies inherent to the aggregation of the data might occur. For example\u00A0:
+message.quality.paragraph2=It is not recommended to simply combine data from different surveys in an analysis despite the fact that all data from all surveys are presented in the same format. For example, the catchability of the same species can vary with the survey gear used. As a consequence each survey provides a particular but coherent picture of the sampled ecosystems.
+message.quality.paragraph3=A common feature of survey time series is the change of taxonomic expertise over time. As a result new species can appear, disappear or similar species be confused thus biasing time trends of certain species.
+message.quality.paragraph4=For any given survey time series, any changes in the sampling procedure, gear, period and area covered might influence the catches. Therefore to avoid the risk of any bias in the analysis, the data must be carefully filtered before use.
+message.quality.paragraph5=It is strongly recommended to use the data with care. In the case of doubts about the validity of the data, please contact the administrator of the data base ({0}).
+message.quality.acceptance=I acknowledge having read the documents and restrictions and I accept to cite the data source in all cases.
+message.quality.notaccepted=You must acknowledge having read the quality warning!
Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/map/facade.jsp
===================================================================
--- trunk/coser-web/src/main/webapp/WEB-INF/content/map/facade.jsp 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/facade.jsp 2011-03-24 15:45:33 UTC (rev 797)
@@ -42,7 +42,7 @@
<img src="<s:url value='/images/facadesmap.png' />" style="float:right;margin-left:10px;width:318px; heigth:318px;" />
- <s:form action="survey" method="get">
+ <s:form action="zone" method="get">
<s:select name="facade" list="facades" label="%{getText('message.common.selectfacade')}" />
<s:submit value="%{getText('message.common.validform')}" />
</s:form>
Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp
===================================================================
--- trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp 2011-03-24 15:45:33 UTC (rev 797)
@@ -35,7 +35,7 @@
<ul>
<li><s:a action="facade" namespace='/map'><s:text name="message.common.facade" /></s:a> ></li>
<li>
- <s:a action="survey" namespace='/map'>
+ <s:a action="zone" namespace='/map'>
<s:param name="facade" value="facade" />
<s:property value='facadeDisplayName' />
</s:a> >
@@ -43,14 +43,14 @@
<li>
<s:a action="species" namespace='/map'>
<s:param name="facade" value="facade" />
- <s:param name="survey" value="survey" />
- <s:property value='survey' />
+ <s:param name="zone" value="zone" />
+ <s:property value='zoneDisplayName' />
</s:a> >
</li>
<li>
<s:a action="map" namespace='/map'>
<s:param name="facade" value="facade" />
- <s:param name="survey" value="survey" />
+ <s:param name="zone" value="zone" />
<s:param name="species" value="species" />
<s:property value='speciesDisplayName' />
</s:a>
@@ -62,11 +62,11 @@
<h2><s:text name="message.map.title" /></h2>
<img src="<s:url action='map-data'>
- <s:param name="survey" value="%{survey}" />
+ <s:param name="zone" value="%{zone}" />
<s:param name="species" value="%{species}" />
</s:url>" style="float:right;margin-left:10px;" />
- <h3><s:property value='facadeDisplayName' /> - <s:property value='survey' /> - <s:property value='speciesDisplayName' /></h3>
+ <h3><s:property value='facadeDisplayName' /> - <s:property value='zoneDisplayName' /> - <s:property value='speciesDisplayName' /></h3>
<p><s:text name="message.map.paragraph2" /></p>
Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp
===================================================================
--- trunk/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp 2011-03-24 15:45:33 UTC (rev 797)
@@ -35,7 +35,7 @@
<ul>
<li><s:a action="facade" namespace='/map'><s:text name="message.common.facade" /></s:a> ></li>
<li>
- <s:a action="survey" namespace='/map'>
+ <s:a action="zone" namespace='/map'>
<s:param name="facade" value="facade" />
<s:property value='facadeDisplayName' />
</s:a> >
@@ -43,8 +43,8 @@
<li>
<s:a action="species" namespace='/map'>
<s:param name="facade" value="facade" />
- <s:param name="survey" value="survey" />
- <s:property value='survey' />
+ <s:param name="zone" value="zone" />
+ <s:property value='zoneDisplayName' />
</s:a>
</li>
</ul>
@@ -54,7 +54,7 @@
<h2><s:text name="message.map.title" /></h2>
<img src="<s:url action='map-data'>
- <s:param name="survey" value="%{survey}" />
+ <s:param name="zone" value="%{zone}" />
</s:url>" style="float:right;margin-left:10px;" />
<s:if test="%{species.isEmpty()}">
@@ -64,7 +64,7 @@
<s:form action="map" method="get">
<s:select name="species" list="species" label="%{getText('message.common.selectspecies')}" />
<s:hidden name="facade" property="facade"/>
- <s:hidden name="survey" property="survey"/>
+ <s:hidden name="zone" property="zone"/>
<s:submit value="%{getText('message.common.validform')}"/>
</s:form>
</s:else>
Deleted: trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp
===================================================================
--- trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp 2011-03-24 13:50:26 UTC (rev 796)
+++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp 2011-03-24 15:45:33 UTC (rev 797)
@@ -1,62 +0,0 @@
-<!--
- #%L
- Coser :: Web
-
- $Id$
- $HeadURL$
- %%
- Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric
- %%
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- #L%
- -->
-<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<%@taglib uri="/struts-tags" prefix="s" %>
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title><s:text name="message.map.title" /></title>
- </head>
- <body>
-
- <!-- breadcrumb -->
- <div class="breadcrumb">
- <ul>
- <li><s:a action="facade" namespace='/map'><s:text name="message.common.facade" /></s:a> ></li>
- <li>
- <s:a action="survey" namespace='/map'>
- <s:param name="facade" value="facade"/>
- <s:property value='facadeDisplayName' />
- </s:a>
- </li>
- </ul>
- </div>
- <!-- end breadcrumb -->
-
- <h2><s:text name="message.map.title" /></h2>
-
- <img src="<s:url value='/images/facadesmap.png' />" style="float:right;margin-left:10px;width:318px; heigth:318px;" />
-
- <s:if test="%{zones.isEmpty()}">
- <s:text name="message.common.noresults"></s:text>
- </s:if>
- <s:else>
- <s:form action="species" method="get">
- <s:select name="survey" list="surveys" label="%{getText('message.common.selectsurvey')}" />
- <s:hidden name="facade" property="facade"/>
- <s:submit value="%{getText('message.common.validform')}"/>
- </s:form>
- </s:else>
- </body>
-</html>
\ No newline at end of file
Copied: trunk/coser-web/src/main/webapp/WEB-INF/content/map/zone.jsp (from rev 759, trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp)
===================================================================
--- trunk/coser-web/src/main/webapp/WEB-INF/content/map/zone.jsp (rev 0)
+++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/zone.jsp 2011-03-24 15:45:33 UTC (rev 797)
@@ -0,0 +1,62 @@
+<!--
+ #%L
+ Coser :: Web
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<%@taglib uri="/struts-tags" prefix="s" %>
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title><s:text name="message.map.title" /></title>
+ </head>
+ <body>
+
+ <!-- breadcrumb -->
+ <div class="breadcrumb">
+ <ul>
+ <li><s:a action="facade" namespace='/map'><s:text name="message.common.facade" /></s:a> ></li>
+ <li>
+ <s:a action="survey" namespace='/map'>
+ <s:param name="facade" value="facade"/>
+ <s:property value='facadeDisplayName' />
+ </s:a>
+ </li>
+ </ul>
+ </div>
+ <!-- end breadcrumb -->
+
+ <h2><s:text name="message.map.title" /></h2>
+
+ <img src="<s:url value='/images/facadesmap.png' />" style="float:right;margin-left:10px;width:318px; heigth:318px;" />
+
+ <s:if test="%{zones.isEmpty()}">
+ <s:text name="message.common.noresults"></s:text>
+ </s:if>
+ <s:else>
+ <s:form action="species" method="get">
+ <s:select name="zone" list="zones" label="%{getText('message.common.selectsurvey')}" />
+ <s:hidden name="facade" property="facade"/>
+ <s:submit value="%{getText('message.common.validform')}"/>
+ </s:form>
+ </s:else>
+ </body>
+</html>
\ No newline at end of file
1
0
Author: chatellier
Date: 2011-03-24 13:50:26 +0000 (Thu, 24 Mar 2011)
New Revision: 796
Log:
Update changelog
Modified:
trunk/changelog.txt
Modified: trunk/changelog.txt
===================================================================
--- trunk/changelog.txt 2011-03-24 13:48:13 UTC (rev 795)
+++ trunk/changelog.txt 2011-03-24 13:50:26 UTC (rev 796)
@@ -4,6 +4,7 @@
1.0.3
-----
+ * Allow _ in strata name
* Fix double with exponent and fixed decimal count check
* Fix selection comment reload
* Remove replay selection menu
1
0
r795 - trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data
by chatellier@users.labs.libre-entreprise.org 24 Mar '11
by chatellier@users.labs.libre-entreprise.org 24 Mar '11
24 Mar '11
Author: chatellier
Date: 2011-03-24 13:48:13 +0000 (Thu, 24 Mar 2011)
New Revision: 795
Log:
_ autoris?\195?\169 dans le nom des strates
Modified:
trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Catch-error-validation.xml
trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-error-validation.xml
trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Length-error-validation.xml
Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Catch-error-validation.xml
===================================================================
--- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Catch-error-validation.xml 2011-03-24 13:41:55 UTC (rev 794)
+++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Catch-error-validation.xml 2011-03-24 13:48:13 UTC (rev 795)
@@ -40,7 +40,7 @@
</field>
<field name="haul">
<field-validator type="regex">
- <param name="expression">[0-9a-z]+</param>
+ <param name="expression">[0-9a-z_]+</param>
<param name="caseSensitive">false</param>
<message>haul name is not valid</message>
</field-validator>
Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-error-validation.xml
===================================================================
--- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-error-validation.xml 2011-03-24 13:41:55 UTC (rev 794)
+++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-error-validation.xml 2011-03-24 13:48:13 UTC (rev 795)
@@ -39,7 +39,7 @@
</field>
<field name="haul">
<field-validator type="regex">
- <param name="expression">[0-9a-z]+</param>
+ <param name="expression">[0-9a-z_]+</param>
<param name="caseSensitive">false</param>
<message>haul name is not valid</message>
</field-validator>
Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Length-error-validation.xml
===================================================================
--- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Length-error-validation.xml 2011-03-24 13:41:55 UTC (rev 794)
+++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Length-error-validation.xml 2011-03-24 13:48:13 UTC (rev 795)
@@ -40,7 +40,7 @@
</field>
<field name="haul">
<field-validator type="regex">
- <param name="expression">[0-9a-z]+</param>
+ <param name="expression">[0-9a-z_]+</param>
<param name="caseSensitive">false</param>
<message>haul name is not valid</message>
</field-validator>
1
0
r794 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control
by chatellier@users.labs.libre-entreprise.org 24 Mar '11
by chatellier@users.labs.libre-entreprise.org 24 Mar '11
24 Mar '11
Author: chatellier
Date: 2011-03-24 13:41:55 +0000 (Thu, 24 Mar 2011)
New Revision: 794
Log:
Clear selection when checkdata.
Modified:
trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java
Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java
===================================================================
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2011-03-24 13:41:16 UTC (rev 793)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2011-03-24 13:41:55 UTC (rev 794)
@@ -373,8 +373,7 @@
public void checkData(final ControlView view) {
// clear selection and error message when check data start
- JTable controlDataTable = getControlDataTable(view);
- controlDataTable.clearSelection();
+ clearAllSelection(view);
final ControlService validationService = view.getContextValue(ControlService.class);
final Project project = view.getContextValue(Project.class);
1
0
r793 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control
by chatellier@users.labs.libre-entreprise.org 24 Mar '11
by chatellier@users.labs.libre-entreprise.org 24 Mar '11
24 Mar '11
Author: chatellier
Date: 2011-03-24 13:41:16 +0000 (Thu, 24 Mar 2011)
New Revision: 793
Log:
Clear selection when checkdata.
Modified:
trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java
Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java
===================================================================
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2011-03-23 14:40:25 UTC (rev 792)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2011-03-24 13:41:16 UTC (rev 793)
@@ -371,6 +371,11 @@
* @param view view
*/
public void checkData(final ControlView view) {
+
+ // clear selection and error message when check data start
+ JTable controlDataTable = getControlDataTable(view);
+ controlDataTable.clearSelection();
+
final ControlService validationService = view.getContextValue(ControlService.class);
final Project project = view.getContextValue(Project.class);
//final Category category = (Category)view.getCategoryComboBox().getSelectedItem();
1
0
23 Mar '11
Author: chatellier
Date: 2011-03-23 14:40:25 +0000 (Wed, 23 Mar 2011)
New Revision: 792
Log:
Fix title
Modified:
trunk/src/site/en/rst/user/controls.rst
Modified: trunk/src/site/en/rst/user/controls.rst
===================================================================
--- trunk/src/site/en/rst/user/controls.rst 2011-03-23 14:37:52 UTC (rev 791)
+++ trunk/src/site/en/rst/user/controls.rst 2011-03-23 14:40:25 UTC (rev 792)
@@ -22,7 +22,6 @@
.. * <http://www.gnu.org/licenses/lgpl-3.0.html>.
.. * #L%
.. -
-
Controls
========
1
0
23 Mar '11
Author: chatellier
Date: 2011-03-23 14:37:52 +0000 (Wed, 23 Mar 2011)
New Revision: 791
Log:
Fix tab
Modified:
trunk/src/site/en/rst/user/guide_listcontrols.rst
Modified: trunk/src/site/en/rst/user/guide_listcontrols.rst
===================================================================
--- trunk/src/site/en/rst/user/guide_listcontrols.rst 2011-03-23 14:28:09 UTC (rev 790)
+++ trunk/src/site/en/rst/user/guide_listcontrols.rst 2011-03-23 14:37:52 UTC (rev 791)
@@ -50,13 +50,13 @@
+-----------------------------------------------------------------------------+----------+
| Other checks | Level |
+=============================================================================+==========+
-| If Weight has a value different from 0, then Number also needs to be | |
+| If Weight has a value different from 0, then Number also needs to be | |
| different from 0 | Error |
+-----------------------------------------------------------------------------+----------+
| Check for duplicate entries with the keys "Survey", "Year", "Haul", | |
| "Species" | Error |
+-----------------------------------------------------------------------------+----------+
-| Check of the minimum number of observations (minobs) in the table | |
+| Check of the minimum number of observations (minobs) in the table | |
| CATCH$Number by species by stratum by year | Warning |
+-----------------------------------------------------------------------------+----------+
@@ -183,11 +183,11 @@
+-----------------------------------------------------------------------------+----------+
| Check that the difference between total numbers in the catch file and | Warning |
| the corresonding numbers in the length file is below the percentage | |
-| defined in configuration file. | |
+| defined in configuration file. | |
+-----------------------------------------------------------------------------+----------+
| Check that all strata in the haul file are also present in strata file. | Fatal |
+-----------------------------------------------------------------------------+----------+
-| Check that all strata present in strata file are also in the haul file. | Warning |
+| Check that all strata present in strata file are also in the haul file. | Warning |
+-----------------------------------------------------------------------------+----------+
| Check that each haul present in the catch file is also in the haul file. | Fatal |
+-----------------------------------------------------------------------------+----------+
1
0
23 Mar '11
Author: chatellier
Date: 2011-03-23 14:28:09 +0000 (Wed, 23 Mar 2011)
New Revision: 790
Log:
Add verena corrections
Modified:
trunk/src/site/en/rst/user/configuration.rst
trunk/src/site/en/rst/user/controls.rst
trunk/src/site/en/rst/user/dataformat.rst
trunk/src/site/en/rst/user/faq.rst
trunk/src/site/en/rst/user/guide_control.rst
trunk/src/site/en/rst/user/guide_listcontrols.rst
trunk/src/site/en/rst/user/guide_project.rst
trunk/src/site/en/rst/user/guide_results.rst
trunk/src/site/en/rst/user/guide_selection.rst
Modified: trunk/src/site/en/rst/user/configuration.rst
===================================================================
--- trunk/src/site/en/rst/user/configuration.rst 2011-03-21 10:22:19 UTC (rev 789)
+++ trunk/src/site/en/rst/user/configuration.rst 2011-03-23 14:28:09 UTC (rev 790)
@@ -25,8 +25,7 @@
Configuration
=============
-Before using Coser, it need to be configured, especially about files not
-provided with it.
+Before using Coser, the software needs to be configured, especially for the files that have to be supplied by the user.
A wizard is available with the menu *Options/Configuration*
@@ -41,7 +40,7 @@
Coser projects directory location.
coser.validator.directory
- Coser controls directory localtion. Used to store user custom validators.
+ Coser controls directory location. Used to store user defined control rules.
coser.reference.species
Taxonomy reference file location.
@@ -50,30 +49,30 @@
Species types code file location.
coser.web.frontend
- SIH indice campagne website address (used by administrator to publish results).
+ SIH indice campagne website address (used by Ifremer administrator to publish results).
coser.web.zones.file
- Application zone file location (used to affect zone to rsufi results).
+ Application zone file location (used to store Rsufi results).
Control step configuration
--------------------------
.. image:: ../../images/en/91-configurationvalues.png
-In this view, you can define configuration values used during control step :
+In this view, you can define configuration values used for data controls :
coser.control.nobsmin
- Minimum individual observation count.
+ Minimum number of individuals per species per stratum per year for data to be useable.
coser.control.diffcatchlength
- Percentage of acceptable difference between the total numbers of individual
- captured in the capture file and the same amount in length file.
+ Maximum absolute acceptable difference (percentage) between total numbers in the catch data file and corresponding
+ total numbers in the length data file.
coser.control.typeFish
- Fish species type code name. Used by some controls to exclude some species.
+ Species type code (fish, crustacean,...). Used by some controls to exclude certain types.
coser.selection.occurrenceFilter
- Default percentage used in minimum occurrence field filter in selection step.
+ Default percentage value used in minimum occurrence field filter in selection step.
coser.selection.densityFilter
- Default percentage used in minimum density field filter in selection step.
+ Default percentage value used in minimum density (No per km2) field filter in selection step.
Modified: trunk/src/site/en/rst/user/controls.rst
===================================================================
--- trunk/src/site/en/rst/user/controls.rst 2011-03-21 10:22:19 UTC (rev 789)
+++ trunk/src/site/en/rst/user/controls.rst 2011-03-23 14:28:09 UTC (rev 790)
@@ -26,41 +26,39 @@
Controls
========
-Coser provides a user interface allowing to customize the controls.
+Coser has a user interface for customizing the data controls.
-But this customization is quite technical and must be performed only by
-advanced users.
+Warning: this customization is quite technical and must only be performed by
+advanced users!
-This interface is made of a tree with the list of the 4 files (catch, length,
-hauls, strata) and for each one of them, the level of error possible.
+This interface consists of a tree with the four main data file branches (catch, length,
+hauls, strata). For each main branch the controls to be carried out are specified as well
+as their error level (fatal, error, warning).
-For each level, a XML file describing the controls can be associated in order
-to describe them.
+For each branch, a XML file describing the controls can be associated.
Documentation
-------------
-The XML files are based on a syntax used by the Java framework XWork.
+The XML files are based on the syntax used by the Java framework XWork.
-The documentation of this syntax can be found at this address :
+The documentation of this syntax can be found at the address:
http://struts.apache.org/2.x/docs/validation.html
Fields
------
-For each file, the fields are reachable by their english name (``survey``,
+For each file, the fields are accessible using the english name (``survey``,
``stratum``…) in their relative type (for example,``number`` is a Java double).
-For each field, there is also an other field corresponding to its data under a
-String form. For example, the field ``survey`` is also reachable using the name
-``surveyAsString``.
-The field ``number`` (of type double) is also reachable under the name
-``numberAsString`` (of string type).
+All fields, including numeric fields, are also accesible in String format. For example, the field ``survey``
+is also accessible using the name ``surveyAsString``.
+The field ``number`` (of type double) is also accessible under the name ``numberAsString`` (of string type).
Example
-------
-Example of the strata validation file (error level) ::
+Example of a strata control file (error level) ::
<validators>
<field name="survey">
@@ -78,7 +76,7 @@
<field name="surfaceAsString">
<field-validator type="checkDouble">
<param name="notAvailable">NA</param>
- <message>surface attribute is not a valid double</message>
+ <message>Surface attribute is not a valid double</message>
</field-validator>
</field>
</validators>
@@ -86,4 +84,5 @@
In this example:
* the field ``survey`` is mandatory (requiredstring)
- * the field ``surface`` must be a valid number (the value NA is valid).
\ No newline at end of file
+ * the field ``surface`` must be a valid double number (the value NA is valid).
+
\ No newline at end of file
Modified: trunk/src/site/en/rst/user/dataformat.rst
===================================================================
--- trunk/src/site/en/rst/user/dataformat.rst 2011-03-21 10:22:19 UTC (rev 789)
+++ trunk/src/site/en/rst/user/dataformat.rst 2011-03-23 14:28:09 UTC (rev 790)
@@ -25,22 +25,22 @@
Tables file format
==================
-Coser needs 4 tables by project :
+Coser needs four data tables for each project :
- * catchs
- * stratas
- * lengths
+ * catches
+ * strata
+ * length
* hauls
-Each table must be formatted using CSV file format with ';' (semicolon)
-separator and begin with predefined CSV headers (english or french)
-**respecting header order**.
+Each data table must be formatted using the CSV file format with ';' (semicolon)
+separator and begin with predefined CSV headers (in English or French)
+**respecting the colomn order**.
Tables details
--------------
-catchs
-~~~~~~
+catches
+~~~~~~~
French headers::
@@ -50,7 +50,7 @@
Survey;Year;Haul;Species;Number;Weight
-Sample (catchs.csv)::
+Example (catches.csv)::
Survey;Year;Haul;Species;Number;Weight
EVHOE_TOT;1997;B1008;ALLO;160.00;0.47
@@ -69,7 +69,7 @@
Survey;Stratum;Surface
-Sample (strata.csv)::
+Example (strata.csv)::
Survey;Stratum;Surface
EVHOE_TOT;Gn1;8201.69199214
@@ -88,7 +88,7 @@
Survey;Year;Haul;Species;Sex;Maturity;Length;Number;Weight;Age
-Sample (length.csv)::
+Example (length.csv)::
Survey;Year;Haul;Species;Sex;Maturity;Length;Number;Weight;Age
EVHOE_TOT;1997;B1008;ARNOLAT;i;NA;11.00;1.00;;NA
@@ -107,7 +107,7 @@
Survey;Year;Haul;Month;Stratum;SweptSurface;Lat;Long;Depth
-Sample (hauls.csv)::
+Example (hauls.csv)::
Survey;Year;Haul;Month;Stratum;SweptSurface;Lat;Long;Depth
EVHOE_TOT;1997;B1008;10;Gs2;0.06;43.75;-1.50;45.50
Modified: trunk/src/site/en/rst/user/faq.rst
===================================================================
--- trunk/src/site/en/rst/user/faq.rst 2011-03-21 10:22:19 UTC (rev 789)
+++ trunk/src/site/en/rst/user/faq.rst 2011-03-23 14:28:09 UTC (rev 790)
@@ -22,13 +22,13 @@
.. * <http://www.gnu.org/licenses/lgpl-3.0.html>.
.. * #L%
.. -
-Requently Asked Questions
-=========================
+Frequently Asked Questions
+==========================
.. contents::
When I launch the JavaWebStart application, I got the message "Cannot launch the application"
---------------------------------------------------------------------------------------------
-If the detail of this error talks about certificates, try to update Java and
+If the details of this error message talks about certificates, try to update Java and
then start again.
Modified: trunk/src/site/en/rst/user/guide_control.rst
===================================================================
--- trunk/src/site/en/rst/user/guide_control.rst 2011-03-21 10:22:19 UTC (rev 789)
+++ trunk/src/site/en/rst/user/guide_control.rst 2011-03-23 14:28:09 UTC (rev 790)
@@ -22,10 +22,10 @@
.. * <http://www.gnu.org/licenses/lgpl-3.0.html>.
.. * #L%
.. -
-Control step
-============
+Data control step
+=================
-The control step goal is to detect errors on the 4 data tables
+The aim of the data control step is to detect errors in the four data tables
and possibly correct them if possible.
.. image:: ../../images/en/10-controlmain.png
@@ -34,42 +34,40 @@
----------
During this step, the first action to do is launching global check, by clicking
-on ``Check data`` button.
+on the ``Check data`` button.
Coser will check:
- * line by line errors on 4 tables
+ * line by line for errors in each of the 4 tables
* verification by cross-checking files
- * verification by cross-checking with the taxonomic referential
+ * verification by cross-checking with the taxonomic reference file
-After the 10 verifications steps, a tree with all the errors is displayed with
-all the errors detected.
+After the 10 verifications steps, a tree with all the detected errors is displayed.
For more information on the errors : `controls list`_.
.. _controls list: guide_listcontrols.html
-Fixing data
------------
+Correcting data (fixing errors)
+-------------------------------
-When selecting an error, Coser displays the line of the error allowing you to
-fix it.
-The lines in red corresponds to the fields with errors. The right part details
+When selecting an error, Coser displays the corresponding line of the data allowing you to
+correct it.
+The lines in red corresponds to the fields with detected errors. The right part details
the error messages.
-In the previous example, the year is missing, the user can add it by hand and
-then validate the modification.
+If for example the year is missing, the user can add it by hand and then validate the modification.
-Bulk fixing
------------
+Bulk data correction
+--------------------
In the case of the same error on several lines :
- * either the error is caused by an export error of the 4 tables and it is
- better to do the export again, fixing being impossible in coser.
- * either the error can be fixed.
+ * either the error is caused by an export error of the 4 tables from the original data base and it is
+ better to do the export again, bulk correction being impossible in coser.
+ * or the errors can be corrected line by line.
-The table that displays the data got a contextual menu allowing to :
+The table that displays the data has a contextual menu allowing to :
* delete several selected lines.
* find a pattern and replace it by another one
@@ -77,61 +75,59 @@
.. image:: ../../images/en/11-controlmenu1.png
-For example, if all the numbers got a comma (,) instead of a point (.) for
-decimal separation, it is possible to replace all the commas by points in one
-operation.
+For example, if all numbers have a decimal comma (,) instead of a decimal point (.),
+it is possible to replace all commas by points in a single operation.
Charts
------
-Coser can also generate charts to ease the decision taking (specifically
-regarding warning errors).
+Coser generates figures to facilitate decision making (specifically for warnings).
-The button ``Comparison Catch/Length`` displays an interface where a chart
-is generated for each species. The data corresponds to the sum of the
-``Number``s in the catch and length per year files. A difference can show an
-error in the original data.
+The button ``Comparison Catch/Length`` displays an interface where a figure
+is generated for each species. The data correspond to total ``Number``s per year in the
+catch and length files. A difference between the two values indicates an error in the original data, most
+likely caused during the raising procedure from the sub-sample to the haul level.
.. image:: ../../images/en/13-controlgraphdiff.png
-The button``Length structures`` displays an interface that can generate
-charts on a subset of data.
+The button``Length structures`` displays an interface for generating
+figures for a data subset.
It is for example possible to display the length structure but only for a
-stratum, or a species, or get the sum…
+stratum, or a species, or cumulated…
.. image:: ../../images/en/14-controlgraphlength.png
Reports
-------
-In the control step, it is possible to generate 2 reports.
+In the control step, it is possible to generate two reports.
Modifications report
~~~~~~~~~~~~~~~~~~~~
-The modifications report, reachable through the ``Modifications report``
-button, is generated in HTML and should open in a web browser. You can visualize
+The modifications report, accessible through the ``Modifications report``
+button, is generated in HTML format and should be opened in a web browser. You can visualize
and print the report in/from the browser.
Controls report
~~~~~~~~~~~~~~~
-This report is reachable by right clic on the errors tree after verifying the
+This report is accessible by a right clic on the errors tree after verifying the
errors in the data.
.. image:: ../../images/en/12-controlmenu2.png
-This report contains the same errors that the one displayed in the tree and the
-Catch/length comparison charts.
+This report contains the same errors that are displayed in the tree and the
+Catch/length comparison figures.
Save and validation
-------------------
-You can save whenever you want the state of the data while fixing data.
+You can save the current state of the corrected data at any time.
-After the data verification, and if this one ended with **no errors** the
-``Valid control`` button become active and allows you to validate.
+After the data verification ended with **no errors** the
+``Valid control`` button becomes active to validate the (corrected) data.
-The validation of the control step is necessary to go the `selection step`_.
+Validation of the control step is necessary to be able to move on to the `selection step`_.
.. _selection step: guide_selection.html
Modified: trunk/src/site/en/rst/user/guide_listcontrols.rst
===================================================================
--- trunk/src/site/en/rst/user/guide_listcontrols.rst 2011-03-21 10:22:19 UTC (rev 789)
+++ trunk/src/site/en/rst/user/guide_listcontrols.rst 2011-03-23 14:28:09 UTC (rev 790)
@@ -25,8 +25,7 @@
Controls list
=============
-This page details the list of the controls made by Coser when verifying the
-data.
+This page lists the controls made by Coser when verifying the data.
Catches
-------
@@ -51,14 +50,14 @@
+-----------------------------------------------------------------------------+----------+
| Other checks | Level |
+=============================================================================+==========+
-| If the weight is a number different of 0, then the number also needs to be | |
+| If Weight has a value different from 0, then Number also needs to be | |
| different from 0 | Error |
+-----------------------------------------------------------------------------+----------+
-| Check of duplicate entries with the keys "Survey", "Year", "Haul", | |
+| Check for duplicate entries with the keys "Survey", "Year", "Haul", | |
| "Species" | Error |
+-----------------------------------------------------------------------------+----------+
-| Check of the minimal number of observations in the table CATCH$Number | |
-| by species by stratum by year | Warning |
+| Check of the minimum number of observations (minobs) in the table | |
+| CATCH$Number by species by stratum by year | Warning |
+-----------------------------------------------------------------------------+----------+
Stratas
@@ -77,7 +76,7 @@
+-----------------------------------------------------------------------------+----------+
| Other Checks | Level |
+=============================================================================+==========+
-| Check the duplicate lines on the keys "Survey", "Stratum" | Error |
+| Check for duplicated lines using the key "Survey", "Stratum" | Error |
+-----------------------------------------------------------------------------+----------+
Lengths
@@ -111,16 +110,16 @@
+-----------------------------------------------------------------------------+----------+
| Other Checks | Level |
+=============================================================================+==========+
-| If the Weight is a number different from 0, the Number must be also | Error |
-| different from 0 | |
+| If Weight has a value different from 0, the corresponding Number must aslo | Error |
+| be different from 0 | |
+-----------------------------------------------------------------------------+----------+
-| Check duplicate lines on keys "Survey", "Year", "Haul", | Error |
+| Check for duplicated lines using the key "Survey", "Year", "Haul", | Error |
| "Species", "Sex", "Maturity", "Length" | |
+-----------------------------------------------------------------------------+----------+
-| Check the minimal number of observations in the table LENGTH$Number by | Error |
-| species by stratum by year | |
+| Check the minumum number of observations is >=minobs in the table | Error |
+| LENGTH$Number by species by stratum by year | |
+-----------------------------------------------------------------------------+----------+
-| For the fishes, the Length field must have a full or half step | Warning |
+| For the fishes, the Length field must be integer cm or half cm | Warning |
| (for example: 4.0 or 4.5 but not 4.25) | |
+-----------------------------------------------------------------------------+----------+
@@ -149,17 +148,17 @@
+-----------------+----------------------------------------------------------------+----------+
| Depth | Number, empty or NA | Error |
+-----------------+----------------------------------------------------------------+----------+
-| SweptSurface | With at least 3 decimals | Fatal |
+| SweptSurface | In km2 with at least 3 decimal values | Fatal |
+-----------------+----------------------------------------------------------------+----------+
-| Lat | With at least 4 decimals | Warning |
+| Lat | Decimal degrees with at least 4 decimal values (ex. 50.4443) | Warning |
+-----------------+----------------------------------------------------------------+----------+
-| Long | With at least 4 decimals | Warning |
+| Long | Decimal degress with at least 4 decimal values (ex. -7.5554) | Warning |
+-----------------+----------------------------------------------------------------+----------+
+-----------------------------------------------------------------------------+----------+
| Other Checks | Level |
+=============================================================================+==========+
-| Check duplicate lines on keys "Survey", "Year", "Haul", "Month" | Error |
+| Check for duplicated lines using key "Survey", "Year", "Haul", "Month" | Error |
+-----------------------------------------------------------------------------+----------+
Files cross-checking
@@ -168,50 +167,51 @@
+-----------------------------------------------------------------------------+----------+
| Checks | Level |
+=============================================================================+==========+
-| Check the campaign name is the same in the 4 files | Fatal |
+| Check the survey name is the same in the 4 files | Fatal |
+-----------------------------------------------------------------------------+----------+
| The list of years must be the same in the Catchs, Length and Hauls files | Fatal |
+-----------------------------------------------------------------------------+----------+
| 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 | |
+| (noted Year/Haul/Species) there is an entry in the catch file (the opposite | |
| is not true) | |
+-----------------------------------------------------------------------------+----------+
| Check that for each haul present in a year (noted Year/Haul) in the | Fatal |
-| length files and catches, there is a data in the haul file | |
+| length and catch files, there is an entry in the haul file | |
+-----------------------------------------------------------------------------+----------+
-| Check if, for a year, there is catch in catch file, there is catch in | Warning |
-| length file too. | |
+| Check if, for a given year, there is an entry in catch file, there is a | Warning |
+| corresponding one in the length file too. | |
+-----------------------------------------------------------------------------+----------+
-| Check that the difference between catch in catch file and catch in length | Warning |
-| file in belong percentage defined in configuration for a year. | |
+| Check that the difference between total numbers in the catch file and | Warning |
+| the corresonding numbers in the length file is below the percentage | |
+| defined in configuration file. | |
+-----------------------------------------------------------------------------+----------+
-| Check that each strata present in haul file is also present in strata file | Fatal |
+| Check that all strata in the haul file are also present in strata file. | Fatal |
+-----------------------------------------------------------------------------+----------+
-| Check that each strata present in strata file is also present in haul file | Warning |
+| Check that all strata present in strata file are also in the haul file. | Warning |
+-----------------------------------------------------------------------------+----------+
-| Check that each haul present in catch file is also present in haul file | Fatal |
+| Check that each haul present in the catch file is also in the haul file. | Fatal |
+-----------------------------------------------------------------------------+----------+
-| Check that each haul present in haul file is also present in catch file | Warning |
+| Check that each haul present in the haul file is also in the catch file. | Warning |
+-----------------------------------------------------------------------------+----------+
-| Check that each haul present in length file is also present in catch file | Fatal |
+| Check that each haul present in the length file is also in the catch file. | Fatal |
+-----------------------------------------------------------------------------+----------+
-| Check that each haul present in catch file is also present in length file | Warning |
+| Check that each haul present in the catch file is also in the length file. | Warning |
+-----------------------------------------------------------------------------+----------+
-| Check that each species present in length file is also present in catch file| Fatal |
+| Check that each species present in the length file is also in the catch file| Fatal |
+-----------------------------------------------------------------------------+----------+
-| Check that each species present in catch file is also present in length file| Warning |
+| Check that each species present in the catch file is also in the length file| Warning |
+-----------------------------------------------------------------------------+----------+
-Cross checking with the taxonomic referential
+Cross checking with the taxonomic reference file
---------------------------------------------
+-----------------------------------------------------------------------------+----------+
| Checks | Level |
+=============================================================================+==========+
-| The Field Species of the catchs file must correspond to a species | Error |
-| present in the taxonomic referential | |
+| The Species field in the catch file must correspond to a species | Error |
+| present in the taxonomic reference file | |
+-----------------------------------------------------------------------------+----------+
-| The Field Species of the length file must correspond to a species | Error |
-| present in the taxonomic referential | |
+| The Species filed in the length file must correspond to a species | Error |
+| present in the taxonomic reference file | |
+-----------------------------------------------------------------------------+----------+
Modified: trunk/src/site/en/rst/user/guide_project.rst
===================================================================
--- trunk/src/site/en/rst/user/guide_project.rst 2011-03-21 10:22:19 UTC (rev 789)
+++ trunk/src/site/en/rst/user/guide_project.rst 2011-03-23 14:28:09 UTC (rev 790)
@@ -25,8 +25,7 @@
Project
=======
-The first thing to do to treat the 4 data tables is to create a project by
-filling its parameters (and the 4 tables).
+The first step is to create a project by providing file paths and parameters.
Configuration
-------------
@@ -39,23 +38,22 @@
This interface must contains:
* the project name (only alphanumerical characters are allowed).
- * the name of the author (mandatory)
- * The csv files correspond to the 4 tables (mandatory)
+ * the name of the author (mandatory!)
+ * The csv files correspond to the 4 data tables (mandatory!)
* the maps in shapes format (*.shp) used in the selection step to display the
- application zone on the world map.
- * a comment
+ application zone on the world map (optional).
+ * a comment (optional)
-It is also possible to use, only for this project, an other taxonomic
-referential file than the one present in the default configuration of the
-software. It will be used only for this project.
+It is also possible to use, only for this project, a specific taxonomic
+reference file instead of the default file which is part of Coser.
Validation
----------
-After having clicked on the ``Create project``, the 4 tables and the
-taxonomic referential are loaded into memory.
-The software checks then than the files are in the correct format (CSV,
-separator, headers names) then create the project and displays the project
+After having clicked on ``Create project``, the 4 data tables and the
+taxonomic reference file are loaded into memory.
+The software then checks that the files are in the correct format (CSV,
+separator, headers names) then creates the project and displays the project
summary interface :
.. image:: ../../images/en/04-projectsummary.png
Modified: trunk/src/site/en/rst/user/guide_results.rst
===================================================================
--- trunk/src/site/en/rst/user/guide_results.rst 2011-03-21 10:22:19 UTC (rev 789)
+++ trunk/src/site/en/rst/user/guide_results.rst 2011-03-23 14:28:09 UTC (rev 790)
@@ -25,41 +25,41 @@
RSufi Results
=============
-Once your selection data have been used in RSufi, it gives you the result that
-is possible to add in the result list of a selection.
+Once your selected data have been used in RSufi, the results can be
+added to the results list of the project selection.
-To do so, reopen the concerned selection using the
-*Data/Selection/<selectionname>* menu and Select the thirs tab ``RSufi``.
+To do so, reopen the corresponding selection using the
+*Data/Selection/<selectionname>* menu and Select the third tab ``RSufi``.
.. image:: ../../images/en/25-selectionresults.png
-This time, this is the second part on the interface that interest us. It
-summarize the list of results stored in Coser.
+Now, the second part of the interface is of interest. It
+lists the results stored in Coser.
To add a new result, click on the button ``Add a result``.
.. image:: ../../images/en/26-selectionaddresult.png
-A result is compounded of :
+A Rsufi result is composed of :
- * a name unique amongst the selection results (mandatory and compounded only
+ * a unique name amongst the selection results (mandatory and composed only
of alphanumerical characters)
* the RSufi version with which the result have been obtained (mandatory)
- * the result addition date (mandatory)
- * the ``estcomind`` data file (mandatory)
- * the ``estpopind`` data file (mandatory)
+ * the date of the results addition (mandatory)
+ * the ``estcomind`` (commnity indicators) Rsufi results file (mandatory)
+ * the ``estpopind`` (population indicators) Rsufi results file (mandatory)
-You got also optional informations :
+You can add optionally information on:
- * the application zone (used when publishing result in the internet website
- to place the results in a defined zone)
- * the maps directory (used by the website to display the distribution maps)
- * publishable (used by admins to differenciate publishable results from
+ * the study area (used when publishing results on the internet website
+ to place the results in the appropriate geographic zone)
+ * the maps directory (used by the website to display the species distribution maps)
+ * publishable flag (used by administrator to differenciate publishable results from
others)
- * other file (other file that needs to be stored by Coser)
+ * other files (other files that need to be stored by Coser)
-Once the result is parmaterized with no error, click on ``Add the result`` to
-validate the action. This result will be then available to the Coser admins so
-that they can publish it on the internet website :
+Once the results are parmaterized with no error, click on ``Add the result`` to
+validate the action. This result will be then available to the Coser administrator so
+that they can publish it on the Ifremer internet website :
http://www.ifremer.fr/SIH-indices-campagnes/
Modified: trunk/src/site/en/rst/user/guide_selection.rst
===================================================================
--- trunk/src/site/en/rst/user/guide_selection.rst 2011-03-21 10:22:19 UTC (rev 789)
+++ trunk/src/site/en/rst/user/guide_selection.rst 2011-03-23 14:28:09 UTC (rev 790)
@@ -24,58 +24,58 @@
.. -
Selection
=========
+The objective of the selection phase is to create coherent and consistent data tables
+for use in the Rsufi package.
-The selection step consist in selecting the following lists as RSufi
-parameters :
+During the selection the following lists are created:
* L1 : List of the selected species
- * L2 : List of species from L1 respecting an occurence/density filter
- * L3 : List of species form L2 with lengthes for all the years
- * L4 : List of species from L3 with maturity
+ * L2 : List of species as subset from L1 respecting an occurence & density filter
+ * L3 : List of species as subset from L2 with length measurements for all years
+ * L4 : List of species as subset from L3 with maturity information
Selection creation
------------------
-The first step consist in defining the selection parameters for Coser.
+The first step consists in defining the selection parameters for Coser.
To do so, use the menu ``Selection/New selection``
.. image:: ../../images/en/27-selectionmenu0.png
-**Note**: This menu is available only if the control step have been validated.
+**Note**: This menu is available only if the control step has been validated.
.. image:: ../../images/en/20-selectiondetail.png
-This name is mandatory and can contain only alphanumerical characters.
+Providing a name is mandatory; the name can only contain alphanumerical characters.
-You have then to select the years of the selection data. The 4 tables data will
+In the second step, the years are selected (gaps are possible). The 4 tables data will
be restricted to those years.
.. image:: ../../images/en/21-selectionyears.png
-You then need to select the stratas for which you want to select species.
+In the third step the strata are selected.
.. image:: ../../images/en/22-selectionstrata.png
-In this step, it is also possible to display sampling effort data by clicking on
-the table-shape icon.
+To aid the selection of strata it is also possible to display the sampling effort table by clicking on
+the table-shaped icon.
-Then comes the species selection step to include in the L1 list. This step
-summarize the list of all the species available after the choice of years and
-stratas.
+In the fourth step the species to be included in species list L1 are selected. At this point only
+species present in the previously selected years and strata can be selected.
.. image:: ../../images/en/23-selectionspecies.png
-The list ``Filtered species`` correspond to the list of all the species. This
+The list L1 ``Filtered species`` correspond to the list of all the species. This
list is filterable by the ``Filter by type`` list types.
-To adjust a species in the L1 list, you have to select it and click on the
+To add a species in the L1 list, you have to select it and click on the
``right arrow`` button.
-The two lists of this step got contextual menus allowing to :
+The two lists of this step have a contextual menu allowing to :
- * merge species
- * generate catch/length comparison charts
+ * merge species, e.g. merge two species at the genus level
+ * generate catch/length comparison figures
* etc…
.. image:: ../../images/en/28-selectionmenu1.png
@@ -84,59 +84,59 @@
Report
------
-It is possible to generate a report that got all the selection information by
+It is possible to generate a report that contains all selection information by
clicking on the ``Selection report`` button. This report is in html format and
-should open in your browser to be visualised and printed.
+should be opened in your browser to be visualised and printed.
Species list
------------
-Once the L1 list have been defined, you need to save the selection so that
-the ``Species list`` tab become active.
+Once the L1 list has been defined, it needs to be saved so that the ``Species list``
+tab becomes active.
.. image:: ../../images/en/24-selectionlists.png
-In this screen :
+On this screen :
- * The L1 list correspond to the list defined in the previous step
- * The L2 list correspond to the list of filtered species using the minimum
- occurence percentage and the minimum number of individuals per square
- kilometers
- * The L3 list summarize the species selected in L2 list that got lengthes for
- every year
- * The L4 list summarize, amongst the L3 species, the ones that got maturities.
+ * The L1 list corresponds to the species list defined in the previous step
+ * The L2 list correspond to the species list of filtered species using the average
+ occurence percentage and the average number of individuals per square
+ kilometers as selection criteria
+ * The L3 list summarize the species selected in L2 list that have length
+ measurements for every year
+ * The L4 list summarize, amongst the L3 species, those with maturity information.
To be noted :
* Only the **selected** species (highlighted) are taken into account
- * If you modify the default selection, you will have to justify your choice by
- filling in a comment bellow the concerned list
+ * If the default selection is modified, the choice needs to be justified by
+ filling in a comment box below the corresponding list
-Once the 4 species list defined, you can finalize the selection by validating
+Once the 4 species lists have been defined, final selection is validated
it clicking on the `` Validate selection`` button.
-Export the data for RSufi
--------------------------
+Export data for RSufi
+---------------------
-Once the 4 lists are defined and the selection validated, the third tab "RSufi"
-become active.
+Once the 4 lists have been defined and the selection validated, the third menu tab "RSufi"
+becomes active.
.. image: ../../images/en/25-selectionresults.png
-In this screen, you can export the necessary files for RSufi's execution. Take
-care, Coser does not pilot RSufi, it only generates the files needed for its
-execution.
+On this screen, the necessary data files for RSufi can be exported. The consist of
+the controlled and selected data from previous steps. Attention, Coser does not
+run RSufi, it only generates the files needed for its execution.
-The generated file contains :
+The generated files contain:
- * the 4 data tables (with only the years selected)
+ * the 4 data tables (with only the selected years, strata and species)
* a file detailing the 4 species lists (L1, L2, L3 and L4)
* a project information file
-Result
-------
+Results
+-------
-Once RSufi have been executed with your selection, you can go to the
+Once RSufi has been executed with the selected data, move to
`results storing`_ step.
.. _results storing: guide_results.html
1
0
Author: chatellier
Date: 2011-03-21 10:22:19 +0000 (Mon, 21 Mar 2011)
New Revision: 789
Log:
Update to HttpComponent 4.1.1
Modified:
trunk/changelog.txt
trunk/pom.xml
Modified: trunk/changelog.txt
===================================================================
--- trunk/changelog.txt 2011-03-18 11:26:06 UTC (rev 788)
+++ trunk/changelog.txt 2011-03-21 10:22:19 UTC (rev 789)
@@ -13,6 +13,7 @@
* Fix some translation
* Update to jQuery 1.5.1
* Update to rSyntaxTextArea 1.5.0
+ * Update to HttpComponent 4.1.1
1.0.2
-----
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-03-18 11:26:06 UTC (rev 788)
+++ trunk/pom.xml 2011-03-21 10:22:19 UTC (rev 789)
@@ -96,14 +96,14 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.1</version>
+ <version>4.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
- <version>4.1</version>
+ <version>4.1.1</version>
<scope>compile</scope>
</dependency>
1
0