- Echobase-commits - mailman.cloud.codelutin.com

r102 - in trunk/echobase-ui/src/main: java/fr/ifremer/echobase/ui/actions/dbeditor resources/config
by tchemit＠users.forge.codelutin.com Nov. 21, 2011

Nov. 21, 2011

Author: tchemit Date: 2011-11-21 16:40:40 +0100 (Mon, 21 Nov 2011) New Revision: 102 Url: http://forge.codelutin.com/repositories/revision/echobase/102 Log: use selected export file name Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java 2011-11-21 15:26:30 UTC (rev 101) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java 2011-11-21 15:40:40 UTC (rev 102) @@ -49,21 +49,25 @@ protected String tableName; /** Default file name to create. */ - protected String fileName; + protected String exportFileName; - /** WTF ? */ + /** Stream of the file to export. */ protected InputStream inputStream; - /** WTF ? */ + /** Length of the file to export. */ protected long contentLength; - /** WTF ? */ + /** Type of the file to export. */ protected String contentType; public void setTableName(String tableName) { this.tableName = tableName; } + public void setExportFileName(String exportFileName) { + this.exportFileName = exportFileName; + } + public InputStream getInputStream() { return inputStream; } @@ -76,8 +80,8 @@ return contentType; } - public String getFileName() { - return fileName; + public String getExportFileName() { + return exportFileName; } @Override @@ -88,7 +92,6 @@ File file = dbEditorService.exportDatas(tableName); contentType = "text/csv"; - fileName = file.getName(); contentLength = file.length(); inputStream = new FileInputStream(file); Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2011-11-21 15:26:30 UTC (rev 101) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2011-11-21 15:40:40 UTC (rev 102) @@ -32,7 +32,8 @@ <package name="dbeditor" extends="loggued" namespace="/dbeditor"> <result-types> - <result-type name="redirectToDbEditor" class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> + <result-type name="redirectToDbEditor" + class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> <param name="namespace">/dbeditor</param> <param name="actionName">dbeditor</param> <param name="tableName">${tableName}</param> @@ -86,7 +87,7 @@ <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> - <param name="contentDisposition">filename="${fileName}"</param> + <param name="contentDisposition">filename="${exportFileName}"</param> </result> </action>

1 0

r101 - in trunk: echobase-entities/src/main/resources/i18n echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor echobase-ui/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor echobase-ui/src/main/webapp/css
by tchemit＠users.forge.codelutin.com Nov. 21, 2011

Nov. 21, 2011

Author: tchemit Date: 2011-11-21 16:26:30 +0100 (Mon, 21 Nov 2011) New Revision: 101 Url: http://forge.codelutin.com/repositories/revision/echobase/101 Log: improve ui for dbeditor Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp trunk/echobase-ui/src/main/webapp/css/screen.css Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-21 12:00:23 UTC (rev 100) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-21 15:26:30 UTC (rev 101) @@ -6,12 +6,18 @@ echobase.common.admin=Administrateur echobase.common.age= echobase.common.ageClass=ageClass +echobase.common.aggregationHierarchy= +echobase.common.aggregationLevel= +echobase.common.aggregationLevelName= +echobase.common.aggregationLevelObservedWeight= +echobase.common.aggregationLevelSampledWeight= echobase.common.altCallsign= echobase.common.areaOfOperation=areaOfOperation echobase.common.areaOfOperationName= echobase.common.author= echobase.common.authorEmail= echobase.common.axis= +echobase.common.bathymetre= echobase.common.binSizePingAxis= echobase.common.binSizeRangeAxis= echobase.common.binUnitsPingAxis= @@ -39,6 +45,7 @@ echobase.common.classMeaning= echobase.common.codeMemo= echobase.common.comment= +echobase.common.commonName= echobase.common.count= echobase.common.data=data echobase.common.dataAcquisition=dataAcquisition @@ -66,6 +73,13 @@ echobase.common.echoBaseUser=Utilisateur echobase.common.echoBaseUserDTO= echobase.common.echosounderSoundSpeed= +echobase.common.echotype= +echobase.common.echotypeDepthStratum= +echobase.common.echotypeGeniusSpecies= +echobase.common.echotypeLengthCategory= +echobase.common.echotypeMeaning= +echobase.common.echotypeName= +echobase.common.elevationRatio= echobase.common.email=Courriel echobase.common.endDate= echobase.common.endPort= @@ -82,6 +96,17 @@ echobase.common.exportQueryDTO= echobase.common.fillValue= echobase.common.frequency= +echobase.common.gear= +echobase.common.gearMetadata= +echobase.common.gearMetadataName= +echobase.common.gearMetadataValue= +echobase.common.gearName= +echobase.common.gearShootingEndLatitude= +echobase.common.gearShootingEndLongitude= +echobase.common.gearShootingStartLatitude= +echobase.common.gearShootingStartLongitude= +echobase.common.gearType= +echobase.common.gearTypeName= echobase.common.genusSpecies= echobase.common.geospatialLatMax= echobase.common.geospatialLatMin= @@ -95,8 +120,10 @@ echobase.common.id=Identifiant echobase.common.impacte= echobase.common.individu= +echobase.common.individual= echobase.common.individualMeasureParameter= echobase.common.individualMeasureParameterValue= +echobase.common.individualValue= echobase.common.institution= echobase.common.keywords= echobase.common.label= @@ -109,14 +136,25 @@ echobase.common.libelle= echobase.common.licence= echobase.common.linestring= +echobase.common.localisation= +echobase.common.locationMaxLatitude= +echobase.common.locationMaxLongitude= +echobase.common.locationMinLatitude= +echobase.common.locationMinLongitude= echobase.common.loggedDataDatatype= echobase.common.loggedDataFormat= echobase.common.longName= echobase.common.longitudeEndFillageEngin= echobase.common.longitudeStartFillageEngin= +echobase.common.meaning= echobase.common.measureStep= echobase.common.measureType= echobase.common.measureUnit= +echobase.common.measurementBinSize= +echobase.common.measurementMetadata= +echobase.common.measurementMetadataName= +echobase.common.measurementTypeName= +echobase.common.measurementUnit= echobase.common.metadata=metadata echobase.common.metadataClass=metadataClass echobase.common.mission=mission @@ -126,11 +164,20 @@ echobase.common.modificationText=Modification echobase.common.name=Nom echobase.common.notes= +echobase.common.numberAtAge= +echobase.common.numberAtLength= +echobase.common.numberSampled= echobase.common.operation= echobase.common.operationEngineParameterValue= +echobase.common.operationGearMetadataValue= +echobase.common.operationMeasurementMetadataValue= +echobase.common.operationMetadata= +echobase.common.operationMetadataName= +echobase.common.operationMetadataValue= echobase.common.operationParameter= echobase.common.operationParameterValue= echobase.common.operationType= +echobase.common.operationTypeName= echobase.common.operator= echobase.common.organisationLevelAcknowledgements= echobase.common.organisationReferences= @@ -155,10 +202,14 @@ echobase.common.regionName= echobase.common.relatedActivity= echobase.common.sample= +echobase.common.sampleAge= +echobase.common.sampleAggregation= echobase.common.sampleCSJ= echobase.common.sampleLength= +echobase.common.sampleWeight= echobase.common.scaleFactor= echobase.common.scientistName= +echobase.common.seafloorSubstrate= echobase.common.size= echobase.common.soundSpeedCalculations= echobase.common.sounderConstant= @@ -171,6 +222,8 @@ echobase.common.startPort= echobase.common.startTimeFillageEngin= echobase.common.station=station +echobase.common.stationStartLatitude= +echobase.common.stationStartLongitude= echobase.common.surface= echobase.common.timeCoverageEnd= echobase.common.timeCoverageStart= @@ -232,7 +285,9 @@ echobase.common.voyage=Campagne echobase.common.voyageDescription= echobase.common.voyageEndDate= +echobase.common.voyageEndHarbour= echobase.common.voyageName= echobase.common.voyageStartDate= +echobase.common.voyageStartHarbour= echobase.common.weight= echobase.config.data.directory.description=Chemin de l'application Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2011-11-21 12:00:23 UTC (rev 100) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2011-11-21 15:26:30 UTC (rev 101) @@ -35,9 +35,17 @@ private static final long serialVersionUID = 1L; + protected String exportFileName; + + public String getExportFileName() { + return exportFileName; + } + @Override public String input() throws Exception { + load(); + exportFileName = "export-" + tableMeta.getEntityType().getSimpleName() + ".csv"; return INPUT; } Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-21 12:00:23 UTC (rev 100) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-21 15:26:30 UTC (rev 101) @@ -93,9 +93,11 @@ echobase.title.dbEditor=Modification de la base echobase.title.entityModificationLogs=Journal des modifications echobase.title.export=Export +echobase.title.exportTable=Exporter une table echobase.title.import=Imports echobase.title.importProgress=Import en cours echobase.title.importResult=Résultats de l'import +echobase.title.importTable=Importer une table echobase.title.login=Connexion echobase.title.modification.detail=Détail de la modification echobase.title.users=Adminitration des utilisateurs Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-21 12:00:23 UTC (rev 100) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-21 15:26:30 UTC (rev 101) @@ -170,29 +170,44 @@ } </script> -<div class="inline"> - <s:select key="tableName" label='%{getText("echobase.common.tableName")}' +<s:select key="tableName" label='%{getText("echobase.common.tableName")}' list="tableNames" headerKey="" headerValue=""/> - <s:if test="tableSelected"> - <s:form id="importForm" namespace="/dbeditor" method="post" - enctype="multipart/form-data" cssClass="floatLeft"> + - <s:hidden key="tableName" label=''/> - <s:file key="importFile" required="true" - label="%{getText('echobase.common.importFile')}"/> - <s:submit key="echobase.action.importTable" action="doImport" /> - </s:form> +<s:if test="tableSelected"> - <s:form id="exportForm" namespace="/dbeditor" theme="simple" cssClass="floatRight"> + <sj:tabbedpanel id="io" collapsible="true"> + <sj:tab id="tab_importForm" target="importForm" title="ss" + label="%{getText('echobase.title.importTable')}"/> - <s:hidden key="tableName" label=''/> - <s:submit key="echobase.action.exportTable" action="doExport" /> - </s:form> - + <sj:tab id="tab_exportForm" target="exportForm" + label="%{getText('echobase.title.exportTable')}"/> + + <s:form id="importForm" namespace="/dbeditor" method="post" + enctype="multipart/form-data"> + + <s:hidden key="tableName" label=''/> + <s:file key="importFile" required="true" + label="%{getText('echobase.common.importFile')}"/> + + <s:submit key="echobase.action.importTable" action="doImport" + align="right"/> + </s:form> + + <s:form id="exportForm" namespace="/dbeditor" method="post"> + <s:hidden key="tableName" label=''/> + <s:textfield key="exportFileName" required="true" size="100" + label="%{getText('echobase.common.exportFileName')}"/> + + + <s:submit key="echobase.action.exportTable" action="doExport" + align="right"/> + </s:form> + + </sj:tabbedpanel> + </s:if> - -</div> <s:if test="tableSelected"> Modified: trunk/echobase-ui/src/main/webapp/css/screen.css =================================================================== --- trunk/echobase-ui/src/main/webapp/css/screen.css 2011-11-21 12:00:23 UTC (rev 100) +++ trunk/echobase-ui/src/main/webapp/css/screen.css 2011-11-21 15:26:30 UTC (rev 101) @@ -33,11 +33,18 @@ font-size: 11px; } -.ui-tabs-panel pre { +.ui-tabs-panel { font-family: monospace; font-size: 9pt; } +.ui-tabs .ui-tabs-nav li a { + float: left; + padding: .5em .1em; + text-decoration: none; + font-size: 11px; +} + #body { /*min-height: 500px;*/ float: left;

1 0

r100 - trunk/src/doc/model
by tchemit＠users.forge.codelutin.com Nov. 21, 2011

Nov. 21, 2011

Author: tchemit Date: 2011-11-21 13:00:23 +0100 (Mon, 21 Nov 2011) New Revision: 100 Url: http://forge.codelutin.com/repositories/revision/echobase/100 Log: set as bianry models Modified: trunk/src/doc/model/EchoBase_structure_V5.mm Property changes on: trunk/src/doc/model/EchoBase_structure_V5.mm ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r99 - in trunk/src/doc: . model
by tchemit＠users.forge.codelutin.com Nov. 21, 2011

Nov. 21, 2011

Author: tchemit Date: 2011-11-21 12:59:18 +0100 (Mon, 21 Nov 2011) New Revision: 99 Url: http://forge.codelutin.com/repositories/revision/echobase/99 Log: create model directory Added: trunk/src/doc/model/ trunk/src/doc/model/EchoBAse_structure_V3.mm trunk/src/doc/model/EchoBase_structure_V5.mm Removed: trunk/src/doc/EchoBAse_structure_V3.mm trunk/src/doc/EchoBase_structure_V5.mm Deleted: trunk/src/doc/EchoBAse_structure_V3.mm =================================================================== (Binary files differ) Deleted: trunk/src/doc/EchoBase_structure_V5.mm =================================================================== --- trunk/src/doc/EchoBase_structure_V5.mm 2011-11-21 11:58:23 UTC (rev 98) +++ trunk/src/doc/EchoBase_structure_V5.mm 2011-11-21 11:59:18 UTC (rev 99) @@ -1,633 +0,0 @@ -<map version="0.9.0"> - -<node CREATED="1320414227374" ID="Freemind_Link_1816719942" MODIFIED="1320672696096" TEXT="EchoBase"> -<node CREATED="1320672662112" ID="Freemind_Link_1000684081" MODIFIED="1320860303674" POSITION="right" TEXT="Mission"> - -<node CREATED="1320745945873" ID="Freemind_Link_1647670071" MODIFIED="1320764161103" TEXT="MissionID"> - -<node CREATED="1320745964653" ID="Freemind_Link_530449074" MODIFIED="1321454473762" TEXT="Many-to-one link"> - -<node CREATED="1320745976558" ID="Freemind_Link_891298930" MODIFIED="1321266920835" TEXT="MissionList"> - -<node CREATED="1320684060854" ID="Freemind_Link_1153370841" MODIFIED="1320684060854" TEXT="MissionID"/> -<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="MissionName"/> -<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="PrincipalInvestigator"/> -<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="References"/> -<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="MissionAbstract"/> -<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Project"/> -<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Platform"/> -<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Institution"/> -<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Keywords"/> -<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="References"/> -<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="DataCentre"/> -<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="DataCentreEmail"/> -<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="AuthorEmail"/> -<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Author"/> -<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="PrincipalInvestigatorEmail"/> -<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="OrganisationReferences"/> -<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="DistributionStatement"/> -<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="OrganisationLevelAcknowledgements"/> -<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Source"/> -</node> -</node> -<node CREATED="1320672768627" ID="Freemind_Link_1234421627" MODIFIED="1320685375595" TEXT="One-to-many link to" VSHIFT="-111"> - -<node CREATED="1320414374515" ID="_" MODIFIED="1321279147118" TEXT="Voyage"> - -<node CREATED="1320762754281" ID="Freemind_Link_876869769" MODIFIED="1320764179800" TEXT="MissionID"> - -</node> -<node CREATED="1320684811880" ID="Freemind_Link_963065985" MODIFIED="1321438096438" TEXT="VoyageID"> - -<node CREATED="1320684816474" FOLDED="true" ID="Freemind_Link_177695531" MODIFIED="1321454482637" TEXT="One-to-many link to"> - -<node CREATED="1320414383327" ID="Freemind_Link_665386905" MODIFIED="1320685411705" TEXT="Transit"> - -<node CREATED="1320762730642" ID="Freemind_Link_1859969644" MODIFIED="1320852106660" TEXT="VoyageID"> - -</node> -<node CREATED="1320684878145" ID="Freemind_Link_490342294" MODIFIED="1321267746739" TEXT="TransitID"> - -<node CREATED="1320747560871" FOLDED="true" ID="Freemind_Link_745070343" MODIFIED="1321454469244" TEXT="One-to-many link"> - -<node CREATED="1320763829630" ID="Freemind_Link_970203878" MODIFIED="1320763931218" TEXT="Vessel"> - -<node CREATED="1320763845242" ID="Freemind_Link_1797338913" MODIFIED="1320764204507" TEXT="TransitID"> - -</node> -<node CREATED="1320763855837" ID="Freemind_Link_136076903" MODIFIED="1320764208783" TEXT="VesselTransitID"> - -<node CREATED="1320763886127" ID="Freemind_Link_1670236489" MODIFIED="1320763937139" TEXT="One-to-many link to"> - -<node CREATED="1320680415734" FOLDED="true" ID="Freemind_Link_1606755930" MODIFIED="1321454465558" TEXT="Transect"> - -<node CREATED="1320685767018" ID="Freemind_Link_1002340991" MODIFIED="1320764225593" TEXT="VesselTransitID"> - -</node> -<node CREATED="1320687033637" ID="Freemind_Link_1677143617" MODIFIED="1321262245668" TEXT="TransectID"> - -<node CREATED="1320680989887" ID="Freemind_Link_435190659" MODIFIED="1320685813293" TEXT="One-to-many link"> - -<node CREATED="1320673346795" ID="Freemind_Link_1110771553" MODIFIED="1321372166692" TEXT="AcousticInstrument"> - -<node CREATED="1320687033637" ID="Freemind_Link_443830258" MODIFIED="1320764239015" TEXT="TransectID"> - -</node> -<node CREATED="1320686503938" ID="Freemind_Link_238706726" MODIFIED="1320764243011" TEXT="AcousticInstrumentID"> - -<node CREATED="1320745727927" FOLDED="true" ID="Freemind_Link_1071765877" MODIFIED="1321279165592" TEXT="Many-to-one link"> - -<node CREATED="1320745784879" ID="Freemind_Link_286667586" MODIFIED="1321262374168" TEXT="AcousticInstrumentsList"> - -<node CREATED="1320745762942" FOLDED="true" ID="Freemind_Link_727094002" MODIFIED="1320765279424" TEXT="AcousticInstrumentID"> - -<node CREATED="1320763409765" FOLDED="true" ID="Freemind_Link_845278257" MODIFIED="1320763442137" TEXT="One-to-many link to"> - -<node CREATED="1320673020781" FOLDED="true" ID="Freemind_Link_611849017" MODIFIED="1320686066337" TEXT="Calibration"> - -<node CREATED="1320763424873" ID="Freemind_Link_69157462" MODIFIED="1320763433075" TEXT="AcousticInstrumentID"/> -<node CREATED="1320747868138" ID="Freemind_Link_55028634" MODIFIED="1320747868138" TEXT="CalibrationDate"/> -<node CREATED="1320747868138" MODIFIED="1320747868138" TEXT="CalibrationAquisitionMethod"/> -<node CREATED="1320747868154" MODIFIED="1320747868154" TEXT="CalibrationProcessingMethod"/> -<node CREATED="1320747868154" ID="Freemind_Link_840605646" MODIFIED="1320747903166" TEXT="CalibrationAccuracyEstimate"/> -<node CREATED="1320747868154" MODIFIED="1320747868154" TEXT="CalibrationReport"/> -</node> -</node> -</node> -<node CREATED="1320686503938" ID="Freemind_Link_394789408" MODIFIED="1320686503938" TEXT="TransceiverModel"/> -<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="Frequency"/> -<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransceiverManufacturer"/> -<node CREATED="1320686503938" ID="Freemind_Link_212611503" MODIFIED="1320686503938" TEXT="TransceiverBeams"/> -<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransceiverAperture"/> -<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransceiverSerial"/> -<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransceiverFirmware"/> -<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerLocation"/> -<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerModel"/> -<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerBeams"/> -<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerSerial"/> -<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerDepth"/> -<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerOrientation"/> -<node CREATED="1320686503938" ID="ID_732575667" MODIFIED="1320686503938" TEXT="TransducerAperture"/> -</node> -</node> -</node> -<node CREATED="1320763307134" ID="Freemind_Link_1299225898" MODIFIED="1321262511515" TEXT="TransectAcousticInstrumentID"> - -<node CREATED="1320672852954" FOLDED="true" ID="Freemind_Link_963421402" MODIFIED="1321454463525" TEXT="One-to-many link to"> - -<node CREATED="1320414424952" ID="Freemind_Link_538841928" MODIFIED="1320857866415" TEXT="DataAcquisition"> - -<node CREATED="1320747986251" ID="Freemind_Link_1357656705" MODIFIED="1320764253280" TEXT="TransectAcousticInstrumentID"> - -</node> -<node CREATED="1320745617789" FOLDED="true" ID="Freemind_Link_1153043747" MODIFIED="1321454461421" TEXT="DataAcquisitionID"> - -<node CREATED="1320677282598" ID="Freemind_Link_1607624977" MODIFIED="1320686837580" TEXT="One-to-many link to"> - -<node CREATED="1320414432296" ID="Freemind_Link_1091633171" MODIFIED="1321262915412" TEXT="DataProcessing"> - -<node CREATED="1320687449739" ID="Freemind_Link_1324961543" MODIFIED="1320764263456" TEXT="DataAcquisitionID"> - -</node> -<node CREATED="1320687449739" ID="Freemind_Link_201776742" MODIFIED="1320764266172" TEXT="DataProcessingID"> - -<node CREATED="1320673208905" ID="Freemind_Link_156379983" MODIFIED="1320688102449" TEXT="One-to-many link to"> - -<node CREATED="1320672573112" FOLDED="true" ID="Freemind_Link_1187226973" MODIFIED="1321454458981" TEXT="Cells"> - -<node CREATED="1320689289481" ID="Freemind_Link_1436627817" MODIFIED="1320764272150" TEXT="DataProcessingID"> - -</node> -<node CREATED="1320689289481" ID="Freemind_Link_1878671348" MODIFIED="1321372174176" TEXT="CellID"> - -<node CREATED="1320674375210" ID="Freemind_Link_1290486014" MODIFIED="1320777516520" TEXT="One-to-many link to"> - -<node CREATED="1320672567894" ID="Freemind_Link_841358874" MODIFIED="1321454210216" TEXT="Data"> - -<node CREATED="1320689340027" ID="Freemind_Link_747297790" MODIFIED="1320764278206" TEXT="CellID"> - -</node> -<node CREATED="1320689419510" ID="Freemind_Link_1643361049" MODIFIED="1320764281124" TEXT="DataID"> - -</node> -<node CREATED="1320689419510" FOLDED="true" ID="Freemind_Link_1668121639" MODIFIED="1321454211774" TEXT="DataMetadataID"> - -<node CREATED="1320672322833" ID="Freemind_Link_130498975" MODIFIED="1320745330331" TEXT="Many-to-one link"> - -<node CREATED="1320748100990" ID="Freemind_Link_734830668" MODIFIED="1321438004407" TEXT="DataMetadata"> - -<node CREATED="1320688066746" ID="Freemind_Link_879034643" MODIFIED="1320765746122" TEXT="DataMetadataID"> - -</node> -<node CREATED="1320688066746" ID="Freemind_Link_1565536956" MODIFIED="1321372522419" TEXT="DataTypeID"> -<node CREATED="1320846301889" ID="Freemind_Link_618319869" MODIFIED="1321372457639" TEXT=""Longitude""/> -<node CREATED="1320846318342" ID="Freemind_Link_505475955" MODIFIED="1321372460573" TEXT=""Latitude""/> -<node CREATED="1320689289481" ID="Freemind_Link_616331607" MODIFIED="1321372463756" TEXT=""Time""/> -<node CREATED="1320846355529" ID="Freemind_Link_115361487" MODIFIED="1321372466565" TEXT=""Depth""/> -<node CREATED="1320846364935" ID="Freemind_Link_131576363" MODIFIED="1321439652788" TEXT=""AcousticDensity""/> -<node CREATED="1320846599122" ID="Freemind_Link_1498920698" MODIFIED="1321372514241" TEXT=""Volume""/> -<node CREATED="1320846605872" ID="Freemind_Link_269579553" MODIFIED="1321372529613" TEXT=""Surface""/> -</node> -<node CREATED="1320688066746" ID="ID_1730944816" MODIFIED="1320688066746" TEXT="LongName"/> -<node CREATED="1320688066746" ID="ID_1166266381" MODIFIED="1320688066746" TEXT="StandardName"/> -<node CREATED="1320688066746" ID="ID_1109097484" MODIFIED="1320688066746" TEXT="Units"/> -<node CREATED="1320688066746" FOLDED="true" ID="Freemind_Link_1821167050" MODIFIED="1321263877674" TEXT="ReferenceDatumID"> - -<node CREATED="1320777097790" ID="Freemind_Link_1914434983" MODIFIED="1320777202914" TEXT="Many-to-one link to"> - -<node CREATED="1320777109523" ID="Freemind_Link_1572421551" MODIFIED="1320847127518" TEXT="ReferenceList "> - -<node CREATED="1320777242439" ID="Freemind_Link_857147024" MODIFIED="1320848340958" TEXT="ReferenceDatumID"> - -</node> -<node CREATED="1320847155862" ID="Freemind_Link_85450540" MODIFIED="1320847161221" TEXT="ReferenceType"/> -<node CREATED="1320847165659" ID="Freemind_Link_1758939672" MODIFIED="1320848117008" TEXT="ReferenceValue"> -<node CREATED="1320848357739" ID="Freemind_Link_1304249748" MODIFIED="1320848407942" TEXT=""WGS84" for positions"/> -<node CREATED="1320848368067" ID="Freemind_Link_328253837" MODIFIED="1320848412785" TEXT=""Sea surface" for depth"/> -<node CREATED="1320848387067" ID="Freemind_Link_633848349" MODIFIED="1320848419348" TEXT=""Nearest haul" for referenceStations"/> -<node CREATED="1320940877382" ID="Freemind_Link_1624269179" MODIFIED="1320940900148" TEXT=""Expert" for BiomassResults"/> -</node> -<node CREATED="1320777242439" ID="Freemind_Link_1421996870" MODIFIED="1320847341642" TEXT="ReferenceMeaning"/> -</node> -</node> -</node> -<node CREATED="1320688066746" ID="ID_539853208" MODIFIED="1320688066746" TEXT="Positive"/> -<node CREATED="1320688066746" ID="ID_1905782671" MODIFIED="1320688066746" TEXT="Calendar"/> -<node CREATED="1320688066746" ID="ID_149809453" MODIFIED="1320688066746" TEXT="Axis"/> -<node CREATED="1320688066746" MODIFIED="1320688066746" TEXT="ValidMin"/> -<node CREATED="1320688066746" ID="ID_1571780866" MODIFIED="1320688066746" TEXT="ValidMax"/> -<node CREATED="1320688066746" ID="ID_241036365" MODIFIED="1320688066746" TEXT="ScaleFactor"/> -<node CREATED="1320688066746" ID="ID_136041003" MODIFIED="1320688066746" TEXT="AddOffset"/> -<node CREATED="1320688066746" MODIFIED="1320688066746" TEXT="FillValue"/> -<node CREATED="1320688066746" ID="Freemind_Link_905151553" MODIFIED="1321263880941" TEXT="CellMethods"> -<node CREATED="1320848237366" ID="Freemind_Link_18211845" MODIFIED="1320848442144" TEXT=""CellStart""/> -<node CREATED="1320848247334" ID="Freemind_Link_1010938529" MODIFIED="1320848466113" TEXT=""CellEnd""/> -<node CREATED="1320848259725" ID="Freemind_Link_237605748" MODIFIED="1320848469066" TEXT=""Barycenter""/> -<node CREATED="1320848282365" ID="Freemind_Link_437521451" MODIFIED="1320848471956" TEXT=""Enveloppe""/> -</node> -</node> -</node> -</node> -<node CREATED="1320689419510" FOLDED="true" ID="Freemind_Link_1289051952" MODIFIED="1320776266407" TEXT="DataQualityFlagValue"> - -<node CREATED="1320767942178" FOLDED="true" ID="Freemind_Link_811450777" MODIFIED="1320767949934" TEXT="Many-to-one link to"> -<node CREATED="1320767953492" FOLDED="true" ID="Freemind_Link_1350464076" MODIFIED="1320768123660" TEXT="DataQuality"> - -<node CREATED="1320768161607" ID="Freemind_Link_73579719" MODIFIED="1320776269548" TEXT="DataQualityFlagValue"> - -</node> -<node CREATED="1320768161607" ID="Freemind_Link_1500985688" MODIFIED="1320776273781" TEXT="DataQualityFlagMeaning"/> -<node CREATED="1320768161607" ID="Freemind_Link_139715883" MODIFIED="1320776275984" TEXT="DataQualityFlagNote"/> -</node> -</node> -</node> -<node CREATED="1320689419510" ID="Freemind_Link_211689814" MODIFIED="1321265369170" TEXT="DataValue"/> -</node> -</node> -<node CREATED="1320674375210" ID="ID_87075867" MODIFIED="1320777516520" TEXT="One-to-many link to"> - -<node CREATED="1320672567894" ID="ID_404160383" MODIFIED="1321454083030" TEXT="Result"> - -<node CREATED="1320689340027" ID="ID_687265912" MODIFIED="1320764278206" TEXT="CellID"> - -</node> -<node CREATED="1320689419510" ID="ID_1363744639" MODIFIED="1321372552709" TEXT="ResultID"> - -</node> -<node CREATED="1320689419510" FOLDED="true" ID="ID_332881231" MODIFIED="1321454205893" TEXT="ResultMetadataID"> - -<node CREATED="1320672322833" ID="ID_1827431494" MODIFIED="1320745330331" TEXT="Many-to-one link"> - -<node CREATED="1320748100990" ID="ID_1688274110" MODIFIED="1321437996231" TEXT="DataMetadata"> - -<node CREATED="1320688066746" ID="ID_1691998080" MODIFIED="1321372618975" TEXT="ResultMetadataID"> - -</node> -<node CREATED="1320688066746" ID="ID_958226778" MODIFIED="1321372634810" TEXT="Name"> -<node CREATED="1320846387638" ID="ID_1462845359" MODIFIED="1321439692071" TEXT=""AcousticDensity""/> -<node CREATED="1320776631802" ID="ID_200285758" MODIFIED="1321372647709" TEXT=""ReferenceStationCatch""> - -</node> -<node CREATED="1320776631802" ID="ID_1849074163" MODIFIED="1321372651504" TEXT=""ReferenceStationBiometry""> - -</node> -<node CREATED="1320937143600" ID="ID_1281205734" MODIFIED="1321372675678" TEXT=""Biomass""/> -<node CREATED="1320937143600" ID="ID_1475278676" MODIFIED="1321372679051" TEXT=""Abundance""/> -<node CREATED="1320937143600" ID="ID_1413988522" MODIFIED="1321372682315" TEXT=""MeanLength""/> -<node CREATED="1320937143600" ID="ID_607264655" MODIFIED="1321372685829" TEXT=""MeanWeight""/> -<node CREATED="1321437859348" ID="ID_516517517" MODIFIED="1321437870087" TEXT=""Formula""/> -<node CREATED="1321437878178" ID="ID_111739595" MODIFIED="1321439726087" TEXT=""MeanAcousticDensity""/> -<node CREATED="1321437909986" ID="ID_1953012934" MODIFIED="1321437920023" TEXT=""MeanXe""/> -</node> -<node CREATED="1320688066746" ID="ID_1444018462" MODIFIED="1320688066746" TEXT="LongName"/> -<node CREATED="1320688066746" ID="ID_1637009848" MODIFIED="1320688066746" TEXT="StandardName"/> -<node CREATED="1320688066746" ID="ID_359933215" MODIFIED="1320688066746" TEXT="Units"/> -<node CREATED="1320688066746" FOLDED="true" ID="ID_18595903" MODIFIED="1321437948730" TEXT="ReferenceDatumID"> - -<node CREATED="1320777097790" ID="ID_872614135" MODIFIED="1320777202914" TEXT="Many-to-one link to"> - -<node CREATED="1320777109523" ID="ID_681011956" MODIFIED="1320847127518" TEXT="ReferenceList "> - -<node CREATED="1320777242439" ID="ID_441866341" MODIFIED="1320848340958" TEXT="ReferenceDatumID"> - -</node> -<node CREATED="1320847155862" ID="ID_496145632" MODIFIED="1320847161221" TEXT="ReferenceType"/> -<node CREATED="1320847165659" ID="ID_1537171235" MODIFIED="1320848117008" TEXT="ReferenceValue"> -<node CREATED="1320848357739" ID="ID_1095308219" MODIFIED="1320848407942" TEXT=""WGS84" for positions"/> -<node CREATED="1320848368067" ID="ID_44481810" MODIFIED="1320848412785" TEXT=""Sea surface" for depth"/> -<node CREATED="1320848387067" ID="ID_1454775809" MODIFIED="1320848419348" TEXT=""Nearest haul" for referenceStations"/> -<node CREATED="1320940877382" ID="ID_1195674514" MODIFIED="1320940900148" TEXT=""Expert" for BiomassResults"/> -</node> -<node CREATED="1320777242439" ID="ID_209769963" MODIFIED="1320847341642" TEXT="ReferenceMeaning"/> -</node> -</node> -</node> -<node CREATED="1320688066746" ID="ID_1490913637" MODIFIED="1320688066746" TEXT="Positive"/> -<node CREATED="1320688066746" ID="ID_628499439" MODIFIED="1320688066746" TEXT="Calendar"/> -<node CREATED="1320688066746" ID="ID_843713911" MODIFIED="1320688066746" TEXT="Axis"/> -<node CREATED="1320688066746" MODIFIED="1320688066746" TEXT="ValidMin"/> -<node CREATED="1320688066746" ID="ID_68829944" MODIFIED="1320688066746" TEXT="ValidMax"/> -<node CREATED="1320688066746" ID="ID_1068324285" MODIFIED="1320688066746" TEXT="ScaleFactor"/> -<node CREATED="1320688066746" ID="ID_517099561" MODIFIED="1320688066746" TEXT="AddOffset"/> -<node CREATED="1320688066746" MODIFIED="1320688066746" TEXT="FillValue"/> -<node CREATED="1320688066746" FOLDED="true" ID="ID_506658960" MODIFIED="1321437977394" TEXT="CellMethods"> -<node CREATED="1320848237366" ID="ID_398778421" MODIFIED="1320848442144" TEXT=""CellStart""/> -<node CREATED="1320848247334" ID="ID_1155436774" MODIFIED="1320848466113" TEXT=""CellEnd""/> -<node CREATED="1320848259725" ID="ID_889027432" MODIFIED="1320848469066" TEXT=""Barycenter""/> -<node CREATED="1320848282365" ID="ID_1070871368" MODIFIED="1320848471956" TEXT=""Enveloppe""/> -</node> -</node> -</node> -</node> -<node CREATED="1320689419510" FOLDED="true" ID="ID_1112452592" MODIFIED="1320776266407" TEXT="DataQualityFlagValue"> - -<node CREATED="1320767942178" FOLDED="true" ID="ID_894953041" MODIFIED="1320767949934" TEXT="Many-to-one link to"> -<node CREATED="1320767953492" FOLDED="true" ID="ID_1606352420" MODIFIED="1320768123660" TEXT="DataQuality"> - -<node CREATED="1320768161607" ID="ID_1725382244" MODIFIED="1320776269548" TEXT="DataQualityFlagValue"> - -</node> -<node CREATED="1320768161607" ID="ID_1557434769" MODIFIED="1320776273781" TEXT="DataQualityFlagMeaning"/> -<node CREATED="1320768161607" ID="ID_1363004316" MODIFIED="1320776275984" TEXT="DataQualityFlagNote"/> -</node> -</node> -</node> -<node CREATED="1320749054832" FOLDED="true" ID="ID_1115402078" MODIFIED="1321454455443" TEXT="CategoryID"> - -<node CREATED="1320764073732" ID="ID_675456842" MODIFIED="1320764106070" TEXT="Many-to-one link to"> - -<node CREATED="1320749083313" FOLDED="true" ID="ID_1920652633" MODIFIED="1321454453622" TEXT="Category"> - -<node CREATED="1320769275292" ID="ID_1870688966" MODIFIED="1321373848640" TEXT="CategoryID"> - -</node> -<node CREATED="1321264508330" ID="ID_688951704" MODIFIED="1321438481175" TEXT="EchotypeID"> - -<node CREATED="1321438484946" ID="ID_762045386" MODIFIED="1321438583307" TEXT="Many-to-one link to"> - -<node CREATED="1321438497818" ID="ID_584758688" MODIFIED="1321438560651" TEXT="Echotypes"> - -<node CREATED="1321438519594" ID="ID_1709555337" MODIFIED="1321440402443" TEXT="VoyageID"> - -</node> -<node CREATED="1321438702338" ID="ID_1831471282" MODIFIED="1321438763851" TEXT="EchotypeID"> - -</node> -<node CREATED="1321438712850" ID="ID_1129097154" MODIFIED="1321438722983" TEXT="EchotypeName"/> -<node CREATED="1321438726138" ID="ID_1542204930" MODIFIED="1321438730599" TEXT="EchotypeMeaning"/> -<node CREATED="1320769275292" FOLDED="true" ID="ID_1817182292" MODIFIED="1321452789396" TEXT="DepthStratumID"> - -<node CREATED="1320775451179" ID="ID_1148965038" MODIFIED="1320775471503" TEXT="Many-to-one link to"> - -<node CREATED="1320775465582" ID="ID_1777897340" MODIFIED="1320775468348" TEXT="DepthStratumID"> - -<node CREATED="1320849580739" ID="ID_1380023185" MODIFIED="1320849635473" TEXT=""CLASD""/> -<node CREATED="1320849661957" ID="ID_1136441105" MODIFIED="1320849669988" TEXT=""CLASF""/> -<node CREATED="1320849588286" ID="ID_300014068" MODIFIED="1320849655004" TEXT=""SURFM""/> -<node CREATED="1320849642551" ID="ID_808801048" MODIFIED="1320849648410" TEXT=""SURFS""/> -</node> -<node CREATED="1320775465582" MODIFIED="1320775465582" TEXT="DepthStratumMeaning"/> -</node> -</node> -<node CREATED="1321438733842" ID="ID_619972384" MODIFIED="1321454376836" TEXT="EchotypeGenusSpecies"/> -<node CREATED="1321454379772" ID="ID_593819229" MODIFIED="1321454388889" TEXT="EchotypeLengthCategory"/> -</node> -</node> -</node> -<node CREATED="1320769275292" ID="ID_1576510066" MODIFIED="1321438648903" TEXT="SpeciesCodeID"> - -<node CREATED="1321438484946" ID="ID_834493610" MODIFIED="1321438627963" TEXT="Many-to-one link to"> - -<node CREATED="1321438497818" ID="ID_1043005033" MODIFIED="1321438663785" TEXT="SpeciesCodes"> - -<node CREATED="1320769475049" ID="ID_782236278" MODIFIED="1321438412380" TEXT="SpeciesCode"> - -</node> -<node CREATED="1320769498201" ID="ID_192591437" MODIFIED="1320769862318" TEXT="GenusSpecies"/> -<node CREATED="1321438418186" FOLDED="true" ID="ID_1736474805" MODIFIED="1321454300932" TEXT="LengthCategory"> -<node CREATED="1321454288844" ID="ID_215719110" MODIFIED="1321454292441" TEXT=""G""/> -<node CREATED="1321454294980" ID="ID_1276715070" MODIFIED="1321454298009" TEXT=""0""/> -</node> -</node> -</node> -</node> -<node CREATED="1320769275292" ID="ID_129874245" MODIFIED="1321452841833" TEXT="LengthID"> - -<node CREATED="1321438484946" ID="ID_948253781" MODIFIED="1321438627963" TEXT="Many-to-one link to"> - -<node CREATED="1321438497818" ID="ID_1767492776" MODIFIED="1321452883204" TEXT="ProcessedLength"> - -<node CREATED="1320769475049" ID="ID_1227399107" MODIFIED="1321452890585" TEXT="LengthID"> - -</node> -<node CREATED="1320769498201" ID="ID_1698253684" MODIFIED="1321452921209" TEXT="LengthValue"/> -<node CREATED="1321438418186" FOLDED="true" ID="ID_1803866578" MODIFIED="1321454279619" TEXT="LengthBreakType"> -<node CREATED="1321453040276" ID="ID_759261198" MODIFIED="1321453298569" TEXT=""Left""/> -<node CREATED="1321453050500" FOLDED="true" ID="ID_961741991" MODIFIED="1321453311815" TEXT=""Mid""> -<node CREATED="1321453301341" ID="ID_931948086" MODIFIED="1321453301341" TEXT=""/> -</node> -<node CREATED="1321453259180" ID="ID_9103520" MODIFIED="1321453318281" TEXT=""Right""/> -</node> -<node CREATED="1321452935316" ID="ID_858058727" MODIFIED="1321452945785" TEXT="LengthBinSize"/> -</node> -</node> -</node> -<node CREATED="1320769455928" ID="ID_518948677" MODIFIED="1321452847817" TEXT="AgeID"> - -<node CREATED="1321438484946" ID="ID_401329189" MODIFIED="1321438627963" TEXT="Many-to-one link to"> - -<node CREATED="1321438497818" ID="ID_59221369" MODIFIED="1321452977445" TEXT="ProcessedAge"> - -<node CREATED="1320769475049" ID="ID_1595910224" MODIFIED="1321452982649" TEXT="AgeID"> - -</node> -<node CREATED="1320769498201" ID="ID_1697043222" MODIFIED="1321452988601" TEXT="AgeValue"/> -<node CREATED="1321438418186" ID="ID_1954945419" MODIFIED="1321453342201" TEXT="AgeBreakType"/> -<node CREATED="1321452935316" ID="ID_1935449826" MODIFIED="1321452998905" TEXT="AgeBinSize"/> -</node> -</node> -</node> -</node> -</node> -</node> -<node CREATED="1320689419510" FOLDED="true" ID="ID_1355231733" MODIFIED="1321454304924" TEXT="ResultValue"> -<node CREATED="1320777277621" ID="ID_1463268905" MODIFIED="1321373176162" TEXT="IF Result.Name="ReferenceStation..." Many-to-one link to"> - -<node CREATED="1320777303851" ID="ID_295960116" MODIFIED="1321265980331" TEXT="NumOpe"> - -</node> -</node> -</node> -</node> -</node> -</node> -<node CREATED="1320689289481" FOLDED="true" ID="Freemind_Link_289726026" MODIFIED="1321372173083" TEXT="DataQualityFlagValue"> - -<node CREATED="1320767942178" ID="Freemind_Link_783504227" MODIFIED="1320833307178" TEXT="Many-to-one link to"> - -<node CREATED="1320767953492" ID="Freemind_Link_1787831084" MODIFIED="1320768123660" TEXT="DataQuality"> - -<node CREATED="1320768161607" ID="Freemind_Link_997399526" MODIFIED="1320776294637" TEXT="DataQualityFlagValue"> - -</node> -<node CREATED="1320768161607" ID="Freemind_Link_316235656" MODIFIED="1320776297637" TEXT="DataQualityFlagMeaning"/> -<node CREATED="1320768161607" ID="Freemind_Link_1126809788" MODIFIED="1320776301386" TEXT="DataQualityFlagNote"/> -</node> -</node> -</node> -<node CREATED="1320771223791" ID="Freemind_Link_244846319" MODIFIED="1321263688839" TEXT="CellName"/> -<node CREATED="1320846260264" ID="Freemind_Link_815026680" MODIFIED="1320847432548" TEXT="ParentCellID"> - -</node> -<node CREATED="1320846244374" ID="Freemind_Link_753743013" MODIFIED="1321263081886" TEXT="CellType"> -<node CREATED="1320846931534" ID="Freemind_Link_139964329" MODIFIED="1320848477409" TEXT=""Region""/> -<node CREATED="1320846931534" ID="Freemind_Link_1317808960" MODIFIED="1320849816877" TEXT=""RegionSURF""/> -<node CREATED="1320846931534" ID="Freemind_Link_263786227" MODIFIED="1320849829626" TEXT=""RegionCLAS""/> -<node CREATED="1320846938534" ID="Freemind_Link_447324327" MODIFIED="1320848480347" TEXT=""Esdu""/> -<node CREATED="1320846944878" ID="Freemind_Link_1221538183" MODIFIED="1320848483456" TEXT=""Elementary""/> -</node> -</node> -</node> -</node> -<node CREATED="1320687449739" ID="Freemind_Link_945928166" MODIFIED="1320687449739" TEXT="ProcessingTemplate"/> -<node CREATED="1320687449739" MODIFIED="1320687449739" TEXT="ProcessingDescription"/> -<node CREATED="1320687449739" MODIFIED="1320687449739" TEXT="SounderConstant"/> -<node CREATED="1320687449739" MODIFIED="1320687449739" TEXT="DigitThreshold"/> -<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="EIThreshold"/> -<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransceiverProcessingGain"/> -<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="ProcessingSoftwareVersion"/> -<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransceiverProcessingSacorrection"/> -<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransceiverProcessingAbsorption"/> -<node CREATED="1320687449754" ID="ID_818807184" MODIFIED="1320687449754" TEXT="TransceiverProcessingAbsorptionDescription"/> -<node CREATED="1320687449754" ID="ID_1634165222" MODIFIED="1320687449754" TEXT="TransducerProcessingPsi"/> -<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransducerProcessingBeamAngleAthwartship"/> -<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransducerProcessingBeamAngleAlongship"/> -<node CREATED="1320687449754" ID="Freemind_Link_245146210" MODIFIED="1320687449754" TEXT="AcousticDensityUnit"/> -<node CREATED="1320686503938" ID="Freemind_Link_153543466" MODIFIED="1320686503938" TEXT="EchosounderSoundSpeed"/> -<node CREATED="1320686503938" ID="Freemind_Link_1032873765" MODIFIED="1320686503938" TEXT="SoundSpeedCalculations"/> -<node CREATED="1320687449754" ID="Freemind_Link_354741307" MODIFIED="1320687449754" TEXT="Notes"/> -</node> -</node> -</node> -<node CREATED="1320686812487" ID="Freemind_Link_1001224269" MODIFIED="1320686812487" TEXT="AcquisitionSoftwareVersion"/> -<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="LoggedDataFormat"/> -<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="LoggedDataDatatype"/> -<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionPulseLength"/> -<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionGain"/> -<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionAbsorption"/> -<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionAbsorptionDescription"/> -<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransducerAcquisitionBeamAngleAthwartship"/> -<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransducerAcquisitionBeamAngleAlongship"/> -<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransducerAcquisitionPsi"/> -<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionPower"/> -<node CREATED="1320686812502" ID="Freemind_Link_274873458" MODIFIED="1320686812502" TEXT="TransceiverAcquisitionSacorrection"/> -<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="EchosounderSoundSpeed"/> -<node CREATED="1320686503938" ID="Freemind_Link_141672915" MODIFIED="1320686503938" TEXT="SoundSpeedCalculations"/> -<node CREATED="1320686503938" ID="Freemind_Link_624713978" MODIFIED="1320686503938" TEXT="PingDutyCycle"/> -</node> -</node> -</node> -</node> -<node CREATED="1320673360076" ID="Freemind_Link_1126773259" MODIFIED="1320685948826" TEXT="FishingInstrument"> - -<node CREATED="1320941913757" ID="Freemind_Link_807070830" MODIFIED="1320941953210" TEXT="Station"/> -</node> -<node CREATED="1320673671949" ID="Freemind_Link_1057008121" MODIFIED="1320685995351" TEXT="EnvironmentalInstrument"> - -<node CREATED="1320941913757" ID="Freemind_Link_1584545104" MODIFIED="1320941958695" TEXT="Station "/> -</node> -<node CREATED="1320678176920" ID="Freemind_Link_341229272" MODIFIED="1320685999756" TEXT="LogInstrument"> - -<node CREATED="1320941913757" ID="Freemind_Link_1992319338" MODIFIED="1320941936710" TEXT="Measure"/> -</node> -</node> -</node> -<node CREATED="1320685767018" ID="Freemind_Link_1647010708" MODIFIED="1320685767018" TEXT="Title"/> -<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Abstract"/> -<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="History"/> -<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Comment"/> -<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Metadata"/> -<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Citation"/> -<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Licence"/> -<node CREATED="1320685767018" ID="Freemind_Link_876006089" MODIFIED="1320685767018" TEXT="DateCreated"/> -<node CREATED="1320685767018" ID="ID_1802673588" MODIFIED="1320685767018" TEXT="GeospatialLonMin"/> -<node CREATED="1320685767018" ID="ID_1677614152" MODIFIED="1320685767018" TEXT="GeospatialLonMax"/> -<node CREATED="1320685767018" ID="ID_1518387517" MODIFIED="1320685767018" TEXT="GeospatialLatMin"/> -<node CREATED="1320685767018" ID="ID_207099221" MODIFIED="1320685767018" TEXT="GeospatialLatMax"/> -<node CREATED="1320685767018" ID="ID_862338299" MODIFIED="1320685767018" TEXT="Datum"/> -<node CREATED="1320685767018" ID="ID_1343683978" MODIFIED="1320685767018" TEXT="Linestring"/> -<node CREATED="1320685767018" ID="ID_957942235" MODIFIED="1320685767018" TEXT="GeospatialVerticalMin"/> -<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="GeospatialVerticalMax"/> -<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="GeospatialVerticalPositive"/> -<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="TimeCoverageStart"/> -<node CREATED="1320685767018" ID="Freemind_Link_1901684066" MODIFIED="1320685767018" TEXT="TimeCoverageEnd"/> -<node CREATED="1320680978387" ID="Freemind_Link_1637211249" MODIFIED="1320680978387" TEXT="BinUnitsPingAxis"/> -<node CREATED="1320680978387" MODIFIED="1320680978387" TEXT="BinSizePingAxis"/> -<node CREATED="1320680978387" ID="Freemind_Link_1519855559" MODIFIED="1320680978387" TEXT="BinSizeRangeAxis"/> -</node> -</node> -</node> -<node CREATED="1320685294002" ID="Freemind_Link_139407579" MODIFIED="1321262716865" TEXT="VesselName"> - -<node CREATED="1320745855362" ID="Freemind_Link_204678916" MODIFIED="1321262717985" TEXT="Many-to-one link"> - -<node CREATED="1320745881986" FOLDED="true" ID="Freemind_Link_1393360106" MODIFIED="1321454467084" TEXT="VesselList"> - -<node CREATED="1320685294002" ID="Freemind_Link_1813667568" MODIFIED="1320764810167" TEXT="VesselName"> - -</node> -<node CREATED="1320685294002" ID="Freemind_Link_793336005" MODIFIED="1320685294002" TEXT="VesselType"/> -<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselCode"/> -<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="Callsign"/> -<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="AltCallsign"/> -<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="IMO"/> -<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="Operator"/> -<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselLength"/> -<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselTonnage"/> -<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselEnginePower"/> -<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselNoiseDesign"/> -<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="Acknowledgement"/> -</node> -</node> -</node> -</node> -</node> -</node> -<node CREATED="1320684878145" ID="Freemind_Link_20593183" MODIFIED="1320747664439" TEXT="TransitDescription"/> -<node CREATED="1320684878145" MODIFIED="1320684878145" TEXT="RelatedActivity"/> -<node CREATED="1320684878145" ID="Freemind_Link_1114663660" MODIFIED="1320747668501" TEXT="TransitStartTime"/> -<node CREATED="1320684878145" ID="Freemind_Link_461738660" MODIFIED="1320747672907" TEXT="TransitEndTime"/> -<node CREATED="1320684878145" MODIFIED="1320684878145" TEXT="TransitStartLocality"/> -<node CREATED="1320684878145" ID="Freemind_Link_690075609" MODIFIED="1320684878145" TEXT="TransitEndLocatlity"/> -</node> -<node CREATED="1321438497818" ID="ID_1813920809" MODIFIED="1321438560651" TEXT="Echotypes"> - -<node CREATED="1321438519594" ID="ID_1762244769" MODIFIED="1321440402443" TEXT="VoyageID"> - -</node> -<node CREATED="1321438702338" ID="ID_1372050043" MODIFIED="1321438763851" TEXT="EchotypeID"> - -</node> -<node CREATED="1321438712850" ID="ID_1813668613" MODIFIED="1321438722983" TEXT="EchotypeName"/> -<node CREATED="1321438726138" ID="ID_581891139" MODIFIED="1321438730599" TEXT="EchotypeMeaning"/> -<node CREATED="1321438733842" ID="ID_886654837" MODIFIED="1321454376836" TEXT="EchotypeGenusSpecies"/> -<node CREATED="1321454379772" ID="ID_199149193" MODIFIED="1321454388889" TEXT="EchotypeLengthCategory"/> -<node CREATED="1320769275292" FOLDED="true" ID="ID_1221865757" MODIFIED="1321438044602" TEXT="DepthStratumID"> - -<node CREATED="1320775451179" ID="ID_1299228109" MODIFIED="1320775471503" TEXT="Many-to-one link to"> - -<node CREATED="1320775465582" ID="ID_1159968596" MODIFIED="1320775468348" TEXT="DepthStratumID"> - -<node CREATED="1320849580739" ID="ID_1675981518" MODIFIED="1320849635473" TEXT=""CLASD""/> -<node CREATED="1320849661957" ID="ID_950217734" MODIFIED="1320849669988" TEXT=""CLASF""/> -<node CREATED="1320849588286" ID="ID_762295781" MODIFIED="1320849655004" TEXT=""SURFM""/> -<node CREATED="1320849642551" ID="ID_352671089" MODIFIED="1320849648410" TEXT=""SURFS""/> -</node> -<node CREATED="1320775465582" MODIFIED="1320775465582" TEXT="DepthStratumMeaning"/> -</node> -</node> -</node> -</node> -</node> -<node CREATED="1320684811880" ID="Freemind_Link_826471017" MODIFIED="1320684811880" TEXT="VoyageName"/> -<node CREATED="1320684811880" ID="ID_1876224208" MODIFIED="1320684811880" TEXT="VoyageStartDate"/> -<node CREATED="1320684811880" MODIFIED="1320684811880" TEXT="VoyageEndDate"/> -<node CREATED="1320684811880" MODIFIED="1320684811880" TEXT="StartPort"/> -<node CREATED="1320684811880" MODIFIED="1320684811880" TEXT="EndPort"/> -<node CREATED="1320684811880" FOLDED="true" ID="Freemind_Link_1587001602" MODIFIED="1321267290817" TEXT="AreaOfOperationID"> - -<node CREATED="1320855036138" ID="Freemind_Link_1980873432" MODIFIED="1320855073012" TEXT="Many-to-one link to"> - -<node CREATED="1320855056341" ID="Freemind_Link_691033092" MODIFIED="1320855070684" TEXT="AreaOfOperationList"> - -<node CREATED="1320855052731" ID="Freemind_Link_1412920840" MODIFIED="1320855077809" TEXT="AreaOfOperationID"> - -</node> -<node CREATED="1320855052731" ID="Freemind_Link_1977871654" MODIFIED="1320855052731" TEXT="AreaOfOperationName"/> -</node> -</node> -</node> -<node CREATED="1320684811880" ID="Freemind_Link_328229853" MODIFIED="1320684811880" TEXT="VoyageDescription"/> -<node CREATED="1320684811880" ID="Freemind_Link_586875122" MODIFIED="1320684811880" TEXT="Datum"/> -</node> -</node> -</node> -</node> -<node CREATED="1320852659278" FOLDED="true" ID="Freemind_Link_356521950" MODIFIED="1320852912978" POSITION="right" TEXT="TSparameters"> - -<node CREATED="1320854749439" ID="Freemind_Link_1220318247" MODIFIED="1320854766595" TEXT="TSparametersID"> - -</node> -<node CREATED="1320854749439" ID="Freemind_Link_1396585474" MODIFIED="1320854754798" TEXT="GenusSpecies"> - -</node> -<node CREATED="1320854749439" ID="Freemind_Link_1791423910" MODIFIED="1320854756845" TEXT="AcousticInstrumentID"> - -</node> -<node CREATED="1320854749439" MODIFIED="1320854749439" TEXT="m"/> -<node CREATED="1320854749439" MODIFIED="1320854749439" TEXT="b"/> -<node CREATED="1320854749439" MODIFIED="1320854749439" TEXT="mz"/> -<node CREATED="1320854749439" ID="Freemind_Link_1917662738" MODIFIED="1320854749439" TEXT="Reference"/> -</node> -</node> -</map> Copied: trunk/src/doc/model/EchoBAse_structure_V3.mm (from rev 97, trunk/src/doc/EchoBAse_structure_V3.mm) =================================================================== (Binary files differ) Property changes on: trunk/src/doc/model/EchoBAse_structure_V3.mm ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/src/doc/model/EchoBase_structure_V5.mm (from rev 98, trunk/src/doc/EchoBase_structure_V5.mm) =================================================================== --- trunk/src/doc/model/EchoBase_structure_V5.mm (rev 0) +++ trunk/src/doc/model/EchoBase_structure_V5.mm 2011-11-21 11:59:18 UTC (rev 99) @@ -0,0 +1,633 @@ +<map version="0.9.0"> + +<node CREATED="1320414227374" ID="Freemind_Link_1816719942" MODIFIED="1320672696096" TEXT="EchoBase"> +<node CREATED="1320672662112" ID="Freemind_Link_1000684081" MODIFIED="1320860303674" POSITION="right" TEXT="Mission"> + +<node CREATED="1320745945873" ID="Freemind_Link_1647670071" MODIFIED="1320764161103" TEXT="MissionID"> + +<node CREATED="1320745964653" ID="Freemind_Link_530449074" MODIFIED="1321454473762" TEXT="Many-to-one link"> + +<node CREATED="1320745976558" ID="Freemind_Link_891298930" MODIFIED="1321266920835" TEXT="MissionList"> + +<node CREATED="1320684060854" ID="Freemind_Link_1153370841" MODIFIED="1320684060854" TEXT="MissionID"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="MissionName"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="PrincipalInvestigator"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="References"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="MissionAbstract"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Project"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Platform"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Institution"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Keywords"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="References"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="DataCentre"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="DataCentreEmail"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="AuthorEmail"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Author"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="PrincipalInvestigatorEmail"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="OrganisationReferences"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="DistributionStatement"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="OrganisationLevelAcknowledgements"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Source"/> +</node> +</node> +<node CREATED="1320672768627" ID="Freemind_Link_1234421627" MODIFIED="1320685375595" TEXT="One-to-many link to" VSHIFT="-111"> + +<node CREATED="1320414374515" ID="_" MODIFIED="1321279147118" TEXT="Voyage"> + +<node CREATED="1320762754281" ID="Freemind_Link_876869769" MODIFIED="1320764179800" TEXT="MissionID"> + +</node> +<node CREATED="1320684811880" ID="Freemind_Link_963065985" MODIFIED="1321438096438" TEXT="VoyageID"> + +<node CREATED="1320684816474" FOLDED="true" ID="Freemind_Link_177695531" MODIFIED="1321454482637" TEXT="One-to-many link to"> + +<node CREATED="1320414383327" ID="Freemind_Link_665386905" MODIFIED="1320685411705" TEXT="Transit"> + +<node CREATED="1320762730642" ID="Freemind_Link_1859969644" MODIFIED="1320852106660" TEXT="VoyageID"> + +</node> +<node CREATED="1320684878145" ID="Freemind_Link_490342294" MODIFIED="1321267746739" TEXT="TransitID"> + +<node CREATED="1320747560871" FOLDED="true" ID="Freemind_Link_745070343" MODIFIED="1321454469244" TEXT="One-to-many link"> + +<node CREATED="1320763829630" ID="Freemind_Link_970203878" MODIFIED="1320763931218" TEXT="Vessel"> + +<node CREATED="1320763845242" ID="Freemind_Link_1797338913" MODIFIED="1320764204507" TEXT="TransitID"> + +</node> +<node CREATED="1320763855837" ID="Freemind_Link_136076903" MODIFIED="1320764208783" TEXT="VesselTransitID"> + +<node CREATED="1320763886127" ID="Freemind_Link_1670236489" MODIFIED="1320763937139" TEXT="One-to-many link to"> + +<node CREATED="1320680415734" FOLDED="true" ID="Freemind_Link_1606755930" MODIFIED="1321454465558" TEXT="Transect"> + +<node CREATED="1320685767018" ID="Freemind_Link_1002340991" MODIFIED="1320764225593" TEXT="VesselTransitID"> + +</node> +<node CREATED="1320687033637" ID="Freemind_Link_1677143617" MODIFIED="1321262245668" TEXT="TransectID"> + +<node CREATED="1320680989887" ID="Freemind_Link_435190659" MODIFIED="1320685813293" TEXT="One-to-many link"> + +<node CREATED="1320673346795" ID="Freemind_Link_1110771553" MODIFIED="1321372166692" TEXT="AcousticInstrument"> + +<node CREATED="1320687033637" ID="Freemind_Link_443830258" MODIFIED="1320764239015" TEXT="TransectID"> + +</node> +<node CREATED="1320686503938" ID="Freemind_Link_238706726" MODIFIED="1320764243011" TEXT="AcousticInstrumentID"> + +<node CREATED="1320745727927" FOLDED="true" ID="Freemind_Link_1071765877" MODIFIED="1321279165592" TEXT="Many-to-one link"> + +<node CREATED="1320745784879" ID="Freemind_Link_286667586" MODIFIED="1321262374168" TEXT="AcousticInstrumentsList"> + +<node CREATED="1320745762942" FOLDED="true" ID="Freemind_Link_727094002" MODIFIED="1320765279424" TEXT="AcousticInstrumentID"> + +<node CREATED="1320763409765" FOLDED="true" ID="Freemind_Link_845278257" MODIFIED="1320763442137" TEXT="One-to-many link to"> + +<node CREATED="1320673020781" FOLDED="true" ID="Freemind_Link_611849017" MODIFIED="1320686066337" TEXT="Calibration"> + +<node CREATED="1320763424873" ID="Freemind_Link_69157462" MODIFIED="1320763433075" TEXT="AcousticInstrumentID"/> +<node CREATED="1320747868138" ID="Freemind_Link_55028634" MODIFIED="1320747868138" TEXT="CalibrationDate"/> +<node CREATED="1320747868138" MODIFIED="1320747868138" TEXT="CalibrationAquisitionMethod"/> +<node CREATED="1320747868154" MODIFIED="1320747868154" TEXT="CalibrationProcessingMethod"/> +<node CREATED="1320747868154" ID="Freemind_Link_840605646" MODIFIED="1320747903166" TEXT="CalibrationAccuracyEstimate"/> +<node CREATED="1320747868154" MODIFIED="1320747868154" TEXT="CalibrationReport"/> +</node> +</node> +</node> +<node CREATED="1320686503938" ID="Freemind_Link_394789408" MODIFIED="1320686503938" TEXT="TransceiverModel"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="Frequency"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransceiverManufacturer"/> +<node CREATED="1320686503938" ID="Freemind_Link_212611503" MODIFIED="1320686503938" TEXT="TransceiverBeams"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransceiverAperture"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransceiverSerial"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransceiverFirmware"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerLocation"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerModel"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerBeams"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerSerial"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerDepth"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerOrientation"/> +<node CREATED="1320686503938" ID="ID_732575667" MODIFIED="1320686503938" TEXT="TransducerAperture"/> +</node> +</node> +</node> +<node CREATED="1320763307134" ID="Freemind_Link_1299225898" MODIFIED="1321262511515" TEXT="TransectAcousticInstrumentID"> + +<node CREATED="1320672852954" FOLDED="true" ID="Freemind_Link_963421402" MODIFIED="1321454463525" TEXT="One-to-many link to"> + +<node CREATED="1320414424952" ID="Freemind_Link_538841928" MODIFIED="1320857866415" TEXT="DataAcquisition"> + +<node CREATED="1320747986251" ID="Freemind_Link_1357656705" MODIFIED="1320764253280" TEXT="TransectAcousticInstrumentID"> + +</node> +<node CREATED="1320745617789" FOLDED="true" ID="Freemind_Link_1153043747" MODIFIED="1321454461421" TEXT="DataAcquisitionID"> + +<node CREATED="1320677282598" ID="Freemind_Link_1607624977" MODIFIED="1320686837580" TEXT="One-to-many link to"> + +<node CREATED="1320414432296" ID="Freemind_Link_1091633171" MODIFIED="1321262915412" TEXT="DataProcessing"> + +<node CREATED="1320687449739" ID="Freemind_Link_1324961543" MODIFIED="1320764263456" TEXT="DataAcquisitionID"> + +</node> +<node CREATED="1320687449739" ID="Freemind_Link_201776742" MODIFIED="1320764266172" TEXT="DataProcessingID"> + +<node CREATED="1320673208905" ID="Freemind_Link_156379983" MODIFIED="1320688102449" TEXT="One-to-many link to"> + +<node CREATED="1320672573112" FOLDED="true" ID="Freemind_Link_1187226973" MODIFIED="1321454458981" TEXT="Cells"> + +<node CREATED="1320689289481" ID="Freemind_Link_1436627817" MODIFIED="1320764272150" TEXT="DataProcessingID"> + +</node> +<node CREATED="1320689289481" ID="Freemind_Link_1878671348" MODIFIED="1321372174176" TEXT="CellID"> + +<node CREATED="1320674375210" ID="Freemind_Link_1290486014" MODIFIED="1320777516520" TEXT="One-to-many link to"> + +<node CREATED="1320672567894" ID="Freemind_Link_841358874" MODIFIED="1321454210216" TEXT="Data"> + +<node CREATED="1320689340027" ID="Freemind_Link_747297790" MODIFIED="1320764278206" TEXT="CellID"> + +</node> +<node CREATED="1320689419510" ID="Freemind_Link_1643361049" MODIFIED="1320764281124" TEXT="DataID"> + +</node> +<node CREATED="1320689419510" FOLDED="true" ID="Freemind_Link_1668121639" MODIFIED="1321454211774" TEXT="DataMetadataID"> + +<node CREATED="1320672322833" ID="Freemind_Link_130498975" MODIFIED="1320745330331" TEXT="Many-to-one link"> + +<node CREATED="1320748100990" ID="Freemind_Link_734830668" MODIFIED="1321438004407" TEXT="DataMetadata"> + +<node CREATED="1320688066746" ID="Freemind_Link_879034643" MODIFIED="1320765746122" TEXT="DataMetadataID"> + +</node> +<node CREATED="1320688066746" ID="Freemind_Link_1565536956" MODIFIED="1321372522419" TEXT="DataTypeID"> +<node CREATED="1320846301889" ID="Freemind_Link_618319869" MODIFIED="1321372457639" TEXT=""Longitude""/> +<node CREATED="1320846318342" ID="Freemind_Link_505475955" MODIFIED="1321372460573" TEXT=""Latitude""/> +<node CREATED="1320689289481" ID="Freemind_Link_616331607" MODIFIED="1321372463756" TEXT=""Time""/> +<node CREATED="1320846355529" ID="Freemind_Link_115361487" MODIFIED="1321372466565" TEXT=""Depth""/> +<node CREATED="1320846364935" ID="Freemind_Link_131576363" MODIFIED="1321439652788" TEXT=""AcousticDensity""/> +<node CREATED="1320846599122" ID="Freemind_Link_1498920698" MODIFIED="1321372514241" TEXT=""Volume""/> +<node CREATED="1320846605872" ID="Freemind_Link_269579553" MODIFIED="1321372529613" TEXT=""Surface""/> +</node> +<node CREATED="1320688066746" ID="ID_1730944816" MODIFIED="1320688066746" TEXT="LongName"/> +<node CREATED="1320688066746" ID="ID_1166266381" MODIFIED="1320688066746" TEXT="StandardName"/> +<node CREATED="1320688066746" ID="ID_1109097484" MODIFIED="1320688066746" TEXT="Units"/> +<node CREATED="1320688066746" FOLDED="true" ID="Freemind_Link_1821167050" MODIFIED="1321263877674" TEXT="ReferenceDatumID"> + +<node CREATED="1320777097790" ID="Freemind_Link_1914434983" MODIFIED="1320777202914" TEXT="Many-to-one link to"> + +<node CREATED="1320777109523" ID="Freemind_Link_1572421551" MODIFIED="1320847127518" TEXT="ReferenceList "> + +<node CREATED="1320777242439" ID="Freemind_Link_857147024" MODIFIED="1320848340958" TEXT="ReferenceDatumID"> + +</node> +<node CREATED="1320847155862" ID="Freemind_Link_85450540" MODIFIED="1320847161221" TEXT="ReferenceType"/> +<node CREATED="1320847165659" ID="Freemind_Link_1758939672" MODIFIED="1320848117008" TEXT="ReferenceValue"> +<node CREATED="1320848357739" ID="Freemind_Link_1304249748" MODIFIED="1320848407942" TEXT=""WGS84" for positions"/> +<node CREATED="1320848368067" ID="Freemind_Link_328253837" MODIFIED="1320848412785" TEXT=""Sea surface" for depth"/> +<node CREATED="1320848387067" ID="Freemind_Link_633848349" MODIFIED="1320848419348" TEXT=""Nearest haul" for referenceStations"/> +<node CREATED="1320940877382" ID="Freemind_Link_1624269179" MODIFIED="1320940900148" TEXT=""Expert" for BiomassResults"/> +</node> +<node CREATED="1320777242439" ID="Freemind_Link_1421996870" MODIFIED="1320847341642" TEXT="ReferenceMeaning"/> +</node> +</node> +</node> +<node CREATED="1320688066746" ID="ID_539853208" MODIFIED="1320688066746" TEXT="Positive"/> +<node CREATED="1320688066746" ID="ID_1905782671" MODIFIED="1320688066746" TEXT="Calendar"/> +<node CREATED="1320688066746" ID="ID_149809453" MODIFIED="1320688066746" TEXT="Axis"/> +<node CREATED="1320688066746" MODIFIED="1320688066746" TEXT="ValidMin"/> +<node CREATED="1320688066746" ID="ID_1571780866" MODIFIED="1320688066746" TEXT="ValidMax"/> +<node CREATED="1320688066746" ID="ID_241036365" MODIFIED="1320688066746" TEXT="ScaleFactor"/> +<node CREATED="1320688066746" ID="ID_136041003" MODIFIED="1320688066746" TEXT="AddOffset"/> +<node CREATED="1320688066746" MODIFIED="1320688066746" TEXT="FillValue"/> +<node CREATED="1320688066746" ID="Freemind_Link_905151553" MODIFIED="1321263880941" TEXT="CellMethods"> +<node CREATED="1320848237366" ID="Freemind_Link_18211845" MODIFIED="1320848442144" TEXT=""CellStart""/> +<node CREATED="1320848247334" ID="Freemind_Link_1010938529" MODIFIED="1320848466113" TEXT=""CellEnd""/> +<node CREATED="1320848259725" ID="Freemind_Link_237605748" MODIFIED="1320848469066" TEXT=""Barycenter""/> +<node CREATED="1320848282365" ID="Freemind_Link_437521451" MODIFIED="1320848471956" TEXT=""Enveloppe""/> +</node> +</node> +</node> +</node> +<node CREATED="1320689419510" FOLDED="true" ID="Freemind_Link_1289051952" MODIFIED="1320776266407" TEXT="DataQualityFlagValue"> + +<node CREATED="1320767942178" FOLDED="true" ID="Freemind_Link_811450777" MODIFIED="1320767949934" TEXT="Many-to-one link to"> +<node CREATED="1320767953492" FOLDED="true" ID="Freemind_Link_1350464076" MODIFIED="1320768123660" TEXT="DataQuality"> + +<node CREATED="1320768161607" ID="Freemind_Link_73579719" MODIFIED="1320776269548" TEXT="DataQualityFlagValue"> + +</node> +<node CREATED="1320768161607" ID="Freemind_Link_1500985688" MODIFIED="1320776273781" TEXT="DataQualityFlagMeaning"/> +<node CREATED="1320768161607" ID="Freemind_Link_139715883" MODIFIED="1320776275984" TEXT="DataQualityFlagNote"/> +</node> +</node> +</node> +<node CREATED="1320689419510" ID="Freemind_Link_211689814" MODIFIED="1321265369170" TEXT="DataValue"/> +</node> +</node> +<node CREATED="1320674375210" ID="ID_87075867" MODIFIED="1320777516520" TEXT="One-to-many link to"> + +<node CREATED="1320672567894" ID="ID_404160383" MODIFIED="1321454083030" TEXT="Result"> + +<node CREATED="1320689340027" ID="ID_687265912" MODIFIED="1320764278206" TEXT="CellID"> + +</node> +<node CREATED="1320689419510" ID="ID_1363744639" MODIFIED="1321372552709" TEXT="ResultID"> + +</node> +<node CREATED="1320689419510" FOLDED="true" ID="ID_332881231" MODIFIED="1321454205893" TEXT="ResultMetadataID"> + +<node CREATED="1320672322833" ID="ID_1827431494" MODIFIED="1320745330331" TEXT="Many-to-one link"> + +<node CREATED="1320748100990" ID="ID_1688274110" MODIFIED="1321437996231" TEXT="DataMetadata"> + +<node CREATED="1320688066746" ID="ID_1691998080" MODIFIED="1321372618975" TEXT="ResultMetadataID"> + +</node> +<node CREATED="1320688066746" ID="ID_958226778" MODIFIED="1321372634810" TEXT="Name"> +<node CREATED="1320846387638" ID="ID_1462845359" MODIFIED="1321439692071" TEXT=""AcousticDensity""/> +<node CREATED="1320776631802" ID="ID_200285758" MODIFIED="1321372647709" TEXT=""ReferenceStationCatch""> + +</node> +<node CREATED="1320776631802" ID="ID_1849074163" MODIFIED="1321372651504" TEXT=""ReferenceStationBiometry""> + +</node> +<node CREATED="1320937143600" ID="ID_1281205734" MODIFIED="1321372675678" TEXT=""Biomass""/> +<node CREATED="1320937143600" ID="ID_1475278676" MODIFIED="1321372679051" TEXT=""Abundance""/> +<node CREATED="1320937143600" ID="ID_1413988522" MODIFIED="1321372682315" TEXT=""MeanLength""/> +<node CREATED="1320937143600" ID="ID_607264655" MODIFIED="1321372685829" TEXT=""MeanWeight""/> +<node CREATED="1321437859348" ID="ID_516517517" MODIFIED="1321437870087" TEXT=""Formula""/> +<node CREATED="1321437878178" ID="ID_111739595" MODIFIED="1321439726087" TEXT=""MeanAcousticDensity""/> +<node CREATED="1321437909986" ID="ID_1953012934" MODIFIED="1321437920023" TEXT=""MeanXe""/> +</node> +<node CREATED="1320688066746" ID="ID_1444018462" MODIFIED="1320688066746" TEXT="LongName"/> +<node CREATED="1320688066746" ID="ID_1637009848" MODIFIED="1320688066746" TEXT="StandardName"/> +<node CREATED="1320688066746" ID="ID_359933215" MODIFIED="1320688066746" TEXT="Units"/> +<node CREATED="1320688066746" FOLDED="true" ID="ID_18595903" MODIFIED="1321437948730" TEXT="ReferenceDatumID"> + +<node CREATED="1320777097790" ID="ID_872614135" MODIFIED="1320777202914" TEXT="Many-to-one link to"> + +<node CREATED="1320777109523" ID="ID_681011956" MODIFIED="1320847127518" TEXT="ReferenceList "> + +<node CREATED="1320777242439" ID="ID_441866341" MODIFIED="1320848340958" TEXT="ReferenceDatumID"> + +</node> +<node CREATED="1320847155862" ID="ID_496145632" MODIFIED="1320847161221" TEXT="ReferenceType"/> +<node CREATED="1320847165659" ID="ID_1537171235" MODIFIED="1320848117008" TEXT="ReferenceValue"> +<node CREATED="1320848357739" ID="ID_1095308219" MODIFIED="1320848407942" TEXT=""WGS84" for positions"/> +<node CREATED="1320848368067" ID="ID_44481810" MODIFIED="1320848412785" TEXT=""Sea surface" for depth"/> +<node CREATED="1320848387067" ID="ID_1454775809" MODIFIED="1320848419348" TEXT=""Nearest haul" for referenceStations"/> +<node CREATED="1320940877382" ID="ID_1195674514" MODIFIED="1320940900148" TEXT=""Expert" for BiomassResults"/> +</node> +<node CREATED="1320777242439" ID="ID_209769963" MODIFIED="1320847341642" TEXT="ReferenceMeaning"/> +</node> +</node> +</node> +<node CREATED="1320688066746" ID="ID_1490913637" MODIFIED="1320688066746" TEXT="Positive"/> +<node CREATED="1320688066746" ID="ID_628499439" MODIFIED="1320688066746" TEXT="Calendar"/> +<node CREATED="1320688066746" ID="ID_843713911" MODIFIED="1320688066746" TEXT="Axis"/> +<node CREATED="1320688066746" MODIFIED="1320688066746" TEXT="ValidMin"/> +<node CREATED="1320688066746" ID="ID_68829944" MODIFIED="1320688066746" TEXT="ValidMax"/> +<node CREATED="1320688066746" ID="ID_1068324285" MODIFIED="1320688066746" TEXT="ScaleFactor"/> +<node CREATED="1320688066746" ID="ID_517099561" MODIFIED="1320688066746" TEXT="AddOffset"/> +<node CREATED="1320688066746" MODIFIED="1320688066746" TEXT="FillValue"/> +<node CREATED="1320688066746" FOLDED="true" ID="ID_506658960" MODIFIED="1321437977394" TEXT="CellMethods"> +<node CREATED="1320848237366" ID="ID_398778421" MODIFIED="1320848442144" TEXT=""CellStart""/> +<node CREATED="1320848247334" ID="ID_1155436774" MODIFIED="1320848466113" TEXT=""CellEnd""/> +<node CREATED="1320848259725" ID="ID_889027432" MODIFIED="1320848469066" TEXT=""Barycenter""/> +<node CREATED="1320848282365" ID="ID_1070871368" MODIFIED="1320848471956" TEXT=""Enveloppe""/> +</node> +</node> +</node> +</node> +<node CREATED="1320689419510" FOLDED="true" ID="ID_1112452592" MODIFIED="1320776266407" TEXT="DataQualityFlagValue"> + +<node CREATED="1320767942178" FOLDED="true" ID="ID_894953041" MODIFIED="1320767949934" TEXT="Many-to-one link to"> +<node CREATED="1320767953492" FOLDED="true" ID="ID_1606352420" MODIFIED="1320768123660" TEXT="DataQuality"> + +<node CREATED="1320768161607" ID="ID_1725382244" MODIFIED="1320776269548" TEXT="DataQualityFlagValue"> + +</node> +<node CREATED="1320768161607" ID="ID_1557434769" MODIFIED="1320776273781" TEXT="DataQualityFlagMeaning"/> +<node CREATED="1320768161607" ID="ID_1363004316" MODIFIED="1320776275984" TEXT="DataQualityFlagNote"/> +</node> +</node> +</node> +<node CREATED="1320749054832" FOLDED="true" ID="ID_1115402078" MODIFIED="1321454455443" TEXT="CategoryID"> + +<node CREATED="1320764073732" ID="ID_675456842" MODIFIED="1320764106070" TEXT="Many-to-one link to"> + +<node CREATED="1320749083313" FOLDED="true" ID="ID_1920652633" MODIFIED="1321454453622" TEXT="Category"> + +<node CREATED="1320769275292" ID="ID_1870688966" MODIFIED="1321373848640" TEXT="CategoryID"> + +</node> +<node CREATED="1321264508330" ID="ID_688951704" MODIFIED="1321438481175" TEXT="EchotypeID"> + +<node CREATED="1321438484946" ID="ID_762045386" MODIFIED="1321438583307" TEXT="Many-to-one link to"> + +<node CREATED="1321438497818" ID="ID_584758688" MODIFIED="1321438560651" TEXT="Echotypes"> + +<node CREATED="1321438519594" ID="ID_1709555337" MODIFIED="1321440402443" TEXT="VoyageID"> + +</node> +<node CREATED="1321438702338" ID="ID_1831471282" MODIFIED="1321438763851" TEXT="EchotypeID"> + +</node> +<node CREATED="1321438712850" ID="ID_1129097154" MODIFIED="1321438722983" TEXT="EchotypeName"/> +<node CREATED="1321438726138" ID="ID_1542204930" MODIFIED="1321438730599" TEXT="EchotypeMeaning"/> +<node CREATED="1320769275292" FOLDED="true" ID="ID_1817182292" MODIFIED="1321452789396" TEXT="DepthStratumID"> + +<node CREATED="1320775451179" ID="ID_1148965038" MODIFIED="1320775471503" TEXT="Many-to-one link to"> + +<node CREATED="1320775465582" ID="ID_1777897340" MODIFIED="1320775468348" TEXT="DepthStratumID"> + +<node CREATED="1320849580739" ID="ID_1380023185" MODIFIED="1320849635473" TEXT=""CLASD""/> +<node CREATED="1320849661957" ID="ID_1136441105" MODIFIED="1320849669988" TEXT=""CLASF""/> +<node CREATED="1320849588286" ID="ID_300014068" MODIFIED="1320849655004" TEXT=""SURFM""/> +<node CREATED="1320849642551" ID="ID_808801048" MODIFIED="1320849648410" TEXT=""SURFS""/> +</node> +<node CREATED="1320775465582" MODIFIED="1320775465582" TEXT="DepthStratumMeaning"/> +</node> +</node> +<node CREATED="1321438733842" ID="ID_619972384" MODIFIED="1321454376836" TEXT="EchotypeGenusSpecies"/> +<node CREATED="1321454379772" ID="ID_593819229" MODIFIED="1321454388889" TEXT="EchotypeLengthCategory"/> +</node> +</node> +</node> +<node CREATED="1320769275292" ID="ID_1576510066" MODIFIED="1321438648903" TEXT="SpeciesCodeID"> + +<node CREATED="1321438484946" ID="ID_834493610" MODIFIED="1321438627963" TEXT="Many-to-one link to"> + +<node CREATED="1321438497818" ID="ID_1043005033" MODIFIED="1321438663785" TEXT="SpeciesCodes"> + +<node CREATED="1320769475049" ID="ID_782236278" MODIFIED="1321438412380" TEXT="SpeciesCode"> + +</node> +<node CREATED="1320769498201" ID="ID_192591437" MODIFIED="1320769862318" TEXT="GenusSpecies"/> +<node CREATED="1321438418186" FOLDED="true" ID="ID_1736474805" MODIFIED="1321454300932" TEXT="LengthCategory"> +<node CREATED="1321454288844" ID="ID_215719110" MODIFIED="1321454292441" TEXT=""G""/> +<node CREATED="1321454294980" ID="ID_1276715070" MODIFIED="1321454298009" TEXT=""0""/> +</node> +</node> +</node> +</node> +<node CREATED="1320769275292" ID="ID_129874245" MODIFIED="1321452841833" TEXT="LengthID"> + +<node CREATED="1321438484946" ID="ID_948253781" MODIFIED="1321438627963" TEXT="Many-to-one link to"> + +<node CREATED="1321438497818" ID="ID_1767492776" MODIFIED="1321452883204" TEXT="ProcessedLength"> + +<node CREATED="1320769475049" ID="ID_1227399107" MODIFIED="1321452890585" TEXT="LengthID"> + +</node> +<node CREATED="1320769498201" ID="ID_1698253684" MODIFIED="1321452921209" TEXT="LengthValue"/> +<node CREATED="1321438418186" FOLDED="true" ID="ID_1803866578" MODIFIED="1321454279619" TEXT="LengthBreakType"> +<node CREATED="1321453040276" ID="ID_759261198" MODIFIED="1321453298569" TEXT=""Left""/> +<node CREATED="1321453050500" FOLDED="true" ID="ID_961741991" MODIFIED="1321453311815" TEXT=""Mid""> +<node CREATED="1321453301341" ID="ID_931948086" MODIFIED="1321453301341" TEXT=""/> +</node> +<node CREATED="1321453259180" ID="ID_9103520" MODIFIED="1321453318281" TEXT=""Right""/> +</node> +<node CREATED="1321452935316" ID="ID_858058727" MODIFIED="1321452945785" TEXT="LengthBinSize"/> +</node> +</node> +</node> +<node CREATED="1320769455928" ID="ID_518948677" MODIFIED="1321452847817" TEXT="AgeID"> + +<node CREATED="1321438484946" ID="ID_401329189" MODIFIED="1321438627963" TEXT="Many-to-one link to"> + +<node CREATED="1321438497818" ID="ID_59221369" MODIFIED="1321452977445" TEXT="ProcessedAge"> + +<node CREATED="1320769475049" ID="ID_1595910224" MODIFIED="1321452982649" TEXT="AgeID"> + +</node> +<node CREATED="1320769498201" ID="ID_1697043222" MODIFIED="1321452988601" TEXT="AgeValue"/> +<node CREATED="1321438418186" ID="ID_1954945419" MODIFIED="1321453342201" TEXT="AgeBreakType"/> +<node CREATED="1321452935316" ID="ID_1935449826" MODIFIED="1321452998905" TEXT="AgeBinSize"/> +</node> +</node> +</node> +</node> +</node> +</node> +<node CREATED="1320689419510" FOLDED="true" ID="ID_1355231733" MODIFIED="1321454304924" TEXT="ResultValue"> +<node CREATED="1320777277621" ID="ID_1463268905" MODIFIED="1321373176162" TEXT="IF Result.Name="ReferenceStation..." Many-to-one link to"> + +<node CREATED="1320777303851" ID="ID_295960116" MODIFIED="1321265980331" TEXT="NumOpe"> + +</node> +</node> +</node> +</node> +</node> +</node> +<node CREATED="1320689289481" FOLDED="true" ID="Freemind_Link_289726026" MODIFIED="1321372173083" TEXT="DataQualityFlagValue"> + +<node CREATED="1320767942178" ID="Freemind_Link_783504227" MODIFIED="1320833307178" TEXT="Many-to-one link to"> + +<node CREATED="1320767953492" ID="Freemind_Link_1787831084" MODIFIED="1320768123660" TEXT="DataQuality"> + +<node CREATED="1320768161607" ID="Freemind_Link_997399526" MODIFIED="1320776294637" TEXT="DataQualityFlagValue"> + +</node> +<node CREATED="1320768161607" ID="Freemind_Link_316235656" MODIFIED="1320776297637" TEXT="DataQualityFlagMeaning"/> +<node CREATED="1320768161607" ID="Freemind_Link_1126809788" MODIFIED="1320776301386" TEXT="DataQualityFlagNote"/> +</node> +</node> +</node> +<node CREATED="1320771223791" ID="Freemind_Link_244846319" MODIFIED="1321263688839" TEXT="CellName"/> +<node CREATED="1320846260264" ID="Freemind_Link_815026680" MODIFIED="1320847432548" TEXT="ParentCellID"> + +</node> +<node CREATED="1320846244374" ID="Freemind_Link_753743013" MODIFIED="1321263081886" TEXT="CellType"> +<node CREATED="1320846931534" ID="Freemind_Link_139964329" MODIFIED="1320848477409" TEXT=""Region""/> +<node CREATED="1320846931534" ID="Freemind_Link_1317808960" MODIFIED="1320849816877" TEXT=""RegionSURF""/> +<node CREATED="1320846931534" ID="Freemind_Link_263786227" MODIFIED="1320849829626" TEXT=""RegionCLAS""/> +<node CREATED="1320846938534" ID="Freemind_Link_447324327" MODIFIED="1320848480347" TEXT=""Esdu""/> +<node CREATED="1320846944878" ID="Freemind_Link_1221538183" MODIFIED="1320848483456" TEXT=""Elementary""/> +</node> +</node> +</node> +</node> +<node CREATED="1320687449739" ID="Freemind_Link_945928166" MODIFIED="1320687449739" TEXT="ProcessingTemplate"/> +<node CREATED="1320687449739" MODIFIED="1320687449739" TEXT="ProcessingDescription"/> +<node CREATED="1320687449739" MODIFIED="1320687449739" TEXT="SounderConstant"/> +<node CREATED="1320687449739" MODIFIED="1320687449739" TEXT="DigitThreshold"/> +<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="EIThreshold"/> +<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransceiverProcessingGain"/> +<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="ProcessingSoftwareVersion"/> +<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransceiverProcessingSacorrection"/> +<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransceiverProcessingAbsorption"/> +<node CREATED="1320687449754" ID="ID_818807184" MODIFIED="1320687449754" TEXT="TransceiverProcessingAbsorptionDescription"/> +<node CREATED="1320687449754" ID="ID_1634165222" MODIFIED="1320687449754" TEXT="TransducerProcessingPsi"/> +<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransducerProcessingBeamAngleAthwartship"/> +<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransducerProcessingBeamAngleAlongship"/> +<node CREATED="1320687449754" ID="Freemind_Link_245146210" MODIFIED="1320687449754" TEXT="AcousticDensityUnit"/> +<node CREATED="1320686503938" ID="Freemind_Link_153543466" MODIFIED="1320686503938" TEXT="EchosounderSoundSpeed"/> +<node CREATED="1320686503938" ID="Freemind_Link_1032873765" MODIFIED="1320686503938" TEXT="SoundSpeedCalculations"/> +<node CREATED="1320687449754" ID="Freemind_Link_354741307" MODIFIED="1320687449754" TEXT="Notes"/> +</node> +</node> +</node> +<node CREATED="1320686812487" ID="Freemind_Link_1001224269" MODIFIED="1320686812487" TEXT="AcquisitionSoftwareVersion"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="LoggedDataFormat"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="LoggedDataDatatype"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionPulseLength"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionGain"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionAbsorption"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionAbsorptionDescription"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransducerAcquisitionBeamAngleAthwartship"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransducerAcquisitionBeamAngleAlongship"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransducerAcquisitionPsi"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionPower"/> +<node CREATED="1320686812502" ID="Freemind_Link_274873458" MODIFIED="1320686812502" TEXT="TransceiverAcquisitionSacorrection"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="EchosounderSoundSpeed"/> +<node CREATED="1320686503938" ID="Freemind_Link_141672915" MODIFIED="1320686503938" TEXT="SoundSpeedCalculations"/> +<node CREATED="1320686503938" ID="Freemind_Link_624713978" MODIFIED="1320686503938" TEXT="PingDutyCycle"/> +</node> +</node> +</node> +</node> +<node CREATED="1320673360076" ID="Freemind_Link_1126773259" MODIFIED="1320685948826" TEXT="FishingInstrument"> + +<node CREATED="1320941913757" ID="Freemind_Link_807070830" MODIFIED="1320941953210" TEXT="Station"/> +</node> +<node CREATED="1320673671949" ID="Freemind_Link_1057008121" MODIFIED="1320685995351" TEXT="EnvironmentalInstrument"> + +<node CREATED="1320941913757" ID="Freemind_Link_1584545104" MODIFIED="1320941958695" TEXT="Station "/> +</node> +<node CREATED="1320678176920" ID="Freemind_Link_341229272" MODIFIED="1320685999756" TEXT="LogInstrument"> + +<node CREATED="1320941913757" ID="Freemind_Link_1992319338" MODIFIED="1320941936710" TEXT="Measure"/> +</node> +</node> +</node> +<node CREATED="1320685767018" ID="Freemind_Link_1647010708" MODIFIED="1320685767018" TEXT="Title"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Abstract"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="History"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Comment"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Metadata"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Citation"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Licence"/> +<node CREATED="1320685767018" ID="Freemind_Link_876006089" MODIFIED="1320685767018" TEXT="DateCreated"/> +<node CREATED="1320685767018" ID="ID_1802673588" MODIFIED="1320685767018" TEXT="GeospatialLonMin"/> +<node CREATED="1320685767018" ID="ID_1677614152" MODIFIED="1320685767018" TEXT="GeospatialLonMax"/> +<node CREATED="1320685767018" ID="ID_1518387517" MODIFIED="1320685767018" TEXT="GeospatialLatMin"/> +<node CREATED="1320685767018" ID="ID_207099221" MODIFIED="1320685767018" TEXT="GeospatialLatMax"/> +<node CREATED="1320685767018" ID="ID_862338299" MODIFIED="1320685767018" TEXT="Datum"/> +<node CREATED="1320685767018" ID="ID_1343683978" MODIFIED="1320685767018" TEXT="Linestring"/> +<node CREATED="1320685767018" ID="ID_957942235" MODIFIED="1320685767018" TEXT="GeospatialVerticalMin"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="GeospatialVerticalMax"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="GeospatialVerticalPositive"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="TimeCoverageStart"/> +<node CREATED="1320685767018" ID="Freemind_Link_1901684066" MODIFIED="1320685767018" TEXT="TimeCoverageEnd"/> +<node CREATED="1320680978387" ID="Freemind_Link_1637211249" MODIFIED="1320680978387" TEXT="BinUnitsPingAxis"/> +<node CREATED="1320680978387" MODIFIED="1320680978387" TEXT="BinSizePingAxis"/> +<node CREATED="1320680978387" ID="Freemind_Link_1519855559" MODIFIED="1320680978387" TEXT="BinSizeRangeAxis"/> +</node> +</node> +</node> +<node CREATED="1320685294002" ID="Freemind_Link_139407579" MODIFIED="1321262716865" TEXT="VesselName"> + +<node CREATED="1320745855362" ID="Freemind_Link_204678916" MODIFIED="1321262717985" TEXT="Many-to-one link"> + +<node CREATED="1320745881986" FOLDED="true" ID="Freemind_Link_1393360106" MODIFIED="1321454467084" TEXT="VesselList"> + +<node CREATED="1320685294002" ID="Freemind_Link_1813667568" MODIFIED="1320764810167" TEXT="VesselName"> + +</node> +<node CREATED="1320685294002" ID="Freemind_Link_793336005" MODIFIED="1320685294002" TEXT="VesselType"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselCode"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="Callsign"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="AltCallsign"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="IMO"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="Operator"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselLength"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselTonnage"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselEnginePower"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselNoiseDesign"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="Acknowledgement"/> +</node> +</node> +</node> +</node> +</node> +</node> +<node CREATED="1320684878145" ID="Freemind_Link_20593183" MODIFIED="1320747664439" TEXT="TransitDescription"/> +<node CREATED="1320684878145" MODIFIED="1320684878145" TEXT="RelatedActivity"/> +<node CREATED="1320684878145" ID="Freemind_Link_1114663660" MODIFIED="1320747668501" TEXT="TransitStartTime"/> +<node CREATED="1320684878145" ID="Freemind_Link_461738660" MODIFIED="1320747672907" TEXT="TransitEndTime"/> +<node CREATED="1320684878145" MODIFIED="1320684878145" TEXT="TransitStartLocality"/> +<node CREATED="1320684878145" ID="Freemind_Link_690075609" MODIFIED="1320684878145" TEXT="TransitEndLocatlity"/> +</node> +<node CREATED="1321438497818" ID="ID_1813920809" MODIFIED="1321438560651" TEXT="Echotypes"> + +<node CREATED="1321438519594" ID="ID_1762244769" MODIFIED="1321440402443" TEXT="VoyageID"> + +</node> +<node CREATED="1321438702338" ID="ID_1372050043" MODIFIED="1321438763851" TEXT="EchotypeID"> + +</node> +<node CREATED="1321438712850" ID="ID_1813668613" MODIFIED="1321438722983" TEXT="EchotypeName"/> +<node CREATED="1321438726138" ID="ID_581891139" MODIFIED="1321438730599" TEXT="EchotypeMeaning"/> +<node CREATED="1321438733842" ID="ID_886654837" MODIFIED="1321454376836" TEXT="EchotypeGenusSpecies"/> +<node CREATED="1321454379772" ID="ID_199149193" MODIFIED="1321454388889" TEXT="EchotypeLengthCategory"/> +<node CREATED="1320769275292" FOLDED="true" ID="ID_1221865757" MODIFIED="1321438044602" TEXT="DepthStratumID"> + +<node CREATED="1320775451179" ID="ID_1299228109" MODIFIED="1320775471503" TEXT="Many-to-one link to"> + +<node CREATED="1320775465582" ID="ID_1159968596" MODIFIED="1320775468348" TEXT="DepthStratumID"> + +<node CREATED="1320849580739" ID="ID_1675981518" MODIFIED="1320849635473" TEXT=""CLASD""/> +<node CREATED="1320849661957" ID="ID_950217734" MODIFIED="1320849669988" TEXT=""CLASF""/> +<node CREATED="1320849588286" ID="ID_762295781" MODIFIED="1320849655004" TEXT=""SURFM""/> +<node CREATED="1320849642551" ID="ID_352671089" MODIFIED="1320849648410" TEXT=""SURFS""/> +</node> +<node CREATED="1320775465582" MODIFIED="1320775465582" TEXT="DepthStratumMeaning"/> +</node> +</node> +</node> +</node> +</node> +<node CREATED="1320684811880" ID="Freemind_Link_826471017" MODIFIED="1320684811880" TEXT="VoyageName"/> +<node CREATED="1320684811880" ID="ID_1876224208" MODIFIED="1320684811880" TEXT="VoyageStartDate"/> +<node CREATED="1320684811880" MODIFIED="1320684811880" TEXT="VoyageEndDate"/> +<node CREATED="1320684811880" MODIFIED="1320684811880" TEXT="StartPort"/> +<node CREATED="1320684811880" MODIFIED="1320684811880" TEXT="EndPort"/> +<node CREATED="1320684811880" FOLDED="true" ID="Freemind_Link_1587001602" MODIFIED="1321267290817" TEXT="AreaOfOperationID"> + +<node CREATED="1320855036138" ID="Freemind_Link_1980873432" MODIFIED="1320855073012" TEXT="Many-to-one link to"> + +<node CREATED="1320855056341" ID="Freemind_Link_691033092" MODIFIED="1320855070684" TEXT="AreaOfOperationList"> + +<node CREATED="1320855052731" ID="Freemind_Link_1412920840" MODIFIED="1320855077809" TEXT="AreaOfOperationID"> + +</node> +<node CREATED="1320855052731" ID="Freemind_Link_1977871654" MODIFIED="1320855052731" TEXT="AreaOfOperationName"/> +</node> +</node> +</node> +<node CREATED="1320684811880" ID="Freemind_Link_328229853" MODIFIED="1320684811880" TEXT="VoyageDescription"/> +<node CREATED="1320684811880" ID="Freemind_Link_586875122" MODIFIED="1320684811880" TEXT="Datum"/> +</node> +</node> +</node> +</node> +<node CREATED="1320852659278" FOLDED="true" ID="Freemind_Link_356521950" MODIFIED="1320852912978" POSITION="right" TEXT="TSparameters"> + +<node CREATED="1320854749439" ID="Freemind_Link_1220318247" MODIFIED="1320854766595" TEXT="TSparametersID"> + +</node> +<node CREATED="1320854749439" ID="Freemind_Link_1396585474" MODIFIED="1320854754798" TEXT="GenusSpecies"> + +</node> +<node CREATED="1320854749439" ID="Freemind_Link_1791423910" MODIFIED="1320854756845" TEXT="AcousticInstrumentID"> + +</node> +<node CREATED="1320854749439" MODIFIED="1320854749439" TEXT="m"/> +<node CREATED="1320854749439" MODIFIED="1320854749439" TEXT="b"/> +<node CREATED="1320854749439" MODIFIED="1320854749439" TEXT="mz"/> +<node CREATED="1320854749439" ID="Freemind_Link_1917662738" MODIFIED="1320854749439" TEXT="Reference"/> +</node> +</node> +</map> Property changes on: trunk/src/doc/model/EchoBase_structure_V5.mm ___________________________________________________________________ Added: svn:eol-style + native

1 0

r98 - in trunk: echobase-entities/src/main/xmi src/doc
by tchemit＠users.forge.codelutin.com Nov. 21, 2011

Nov. 21, 2011

Author: tchemit Date: 2011-11-21 12:58:23 +0100 (Mon, 21 Nov 2011) New Revision: 98 Url: http://forge.codelutin.com/repositories/revision/echobase/98 Log: continue model Added: trunk/src/doc/EchoBase_structure_V5.mm Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ) Added: trunk/src/doc/EchoBase_structure_V5.mm =================================================================== --- trunk/src/doc/EchoBase_structure_V5.mm (rev 0) +++ trunk/src/doc/EchoBase_structure_V5.mm 2011-11-21 11:58:23 UTC (rev 98) @@ -0,0 +1,633 @@ +<map version="0.9.0"> + +<node CREATED="1320414227374" ID="Freemind_Link_1816719942" MODIFIED="1320672696096" TEXT="EchoBase"> +<node CREATED="1320672662112" ID="Freemind_Link_1000684081" MODIFIED="1320860303674" POSITION="right" TEXT="Mission"> + +<node CREATED="1320745945873" ID="Freemind_Link_1647670071" MODIFIED="1320764161103" TEXT="MissionID"> + +<node CREATED="1320745964653" ID="Freemind_Link_530449074" MODIFIED="1321454473762" TEXT="Many-to-one link"> + +<node CREATED="1320745976558" ID="Freemind_Link_891298930" MODIFIED="1321266920835" TEXT="MissionList"> + +<node CREATED="1320684060854" ID="Freemind_Link_1153370841" MODIFIED="1320684060854" TEXT="MissionID"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="MissionName"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="PrincipalInvestigator"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="References"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="MissionAbstract"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Project"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Platform"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Institution"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Keywords"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="References"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="DataCentre"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="DataCentreEmail"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="AuthorEmail"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Author"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="PrincipalInvestigatorEmail"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="OrganisationReferences"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="DistributionStatement"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="OrganisationLevelAcknowledgements"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Source"/> +</node> +</node> +<node CREATED="1320672768627" ID="Freemind_Link_1234421627" MODIFIED="1320685375595" TEXT="One-to-many link to" VSHIFT="-111"> + +<node CREATED="1320414374515" ID="_" MODIFIED="1321279147118" TEXT="Voyage"> + +<node CREATED="1320762754281" ID="Freemind_Link_876869769" MODIFIED="1320764179800" TEXT="MissionID"> + +</node> +<node CREATED="1320684811880" ID="Freemind_Link_963065985" MODIFIED="1321438096438" TEXT="VoyageID"> + +<node CREATED="1320684816474" FOLDED="true" ID="Freemind_Link_177695531" MODIFIED="1321454482637" TEXT="One-to-many link to"> + +<node CREATED="1320414383327" ID="Freemind_Link_665386905" MODIFIED="1320685411705" TEXT="Transit"> + +<node CREATED="1320762730642" ID="Freemind_Link_1859969644" MODIFIED="1320852106660" TEXT="VoyageID"> + +</node> +<node CREATED="1320684878145" ID="Freemind_Link_490342294" MODIFIED="1321267746739" TEXT="TransitID"> + +<node CREATED="1320747560871" FOLDED="true" ID="Freemind_Link_745070343" MODIFIED="1321454469244" TEXT="One-to-many link"> + +<node CREATED="1320763829630" ID="Freemind_Link_970203878" MODIFIED="1320763931218" TEXT="Vessel"> + +<node CREATED="1320763845242" ID="Freemind_Link_1797338913" MODIFIED="1320764204507" TEXT="TransitID"> + +</node> +<node CREATED="1320763855837" ID="Freemind_Link_136076903" MODIFIED="1320764208783" TEXT="VesselTransitID"> + +<node CREATED="1320763886127" ID="Freemind_Link_1670236489" MODIFIED="1320763937139" TEXT="One-to-many link to"> + +<node CREATED="1320680415734" FOLDED="true" ID="Freemind_Link_1606755930" MODIFIED="1321454465558" TEXT="Transect"> + +<node CREATED="1320685767018" ID="Freemind_Link_1002340991" MODIFIED="1320764225593" TEXT="VesselTransitID"> + +</node> +<node CREATED="1320687033637" ID="Freemind_Link_1677143617" MODIFIED="1321262245668" TEXT="TransectID"> + +<node CREATED="1320680989887" ID="Freemind_Link_435190659" MODIFIED="1320685813293" TEXT="One-to-many link"> + +<node CREATED="1320673346795" ID="Freemind_Link_1110771553" MODIFIED="1321372166692" TEXT="AcousticInstrument"> + +<node CREATED="1320687033637" ID="Freemind_Link_443830258" MODIFIED="1320764239015" TEXT="TransectID"> + +</node> +<node CREATED="1320686503938" ID="Freemind_Link_238706726" MODIFIED="1320764243011" TEXT="AcousticInstrumentID"> + +<node CREATED="1320745727927" FOLDED="true" ID="Freemind_Link_1071765877" MODIFIED="1321279165592" TEXT="Many-to-one link"> + +<node CREATED="1320745784879" ID="Freemind_Link_286667586" MODIFIED="1321262374168" TEXT="AcousticInstrumentsList"> + +<node CREATED="1320745762942" FOLDED="true" ID="Freemind_Link_727094002" MODIFIED="1320765279424" TEXT="AcousticInstrumentID"> + +<node CREATED="1320763409765" FOLDED="true" ID="Freemind_Link_845278257" MODIFIED="1320763442137" TEXT="One-to-many link to"> + +<node CREATED="1320673020781" FOLDED="true" ID="Freemind_Link_611849017" MODIFIED="1320686066337" TEXT="Calibration"> + +<node CREATED="1320763424873" ID="Freemind_Link_69157462" MODIFIED="1320763433075" TEXT="AcousticInstrumentID"/> +<node CREATED="1320747868138" ID="Freemind_Link_55028634" MODIFIED="1320747868138" TEXT="CalibrationDate"/> +<node CREATED="1320747868138" MODIFIED="1320747868138" TEXT="CalibrationAquisitionMethod"/> +<node CREATED="1320747868154" MODIFIED="1320747868154" TEXT="CalibrationProcessingMethod"/> +<node CREATED="1320747868154" ID="Freemind_Link_840605646" MODIFIED="1320747903166" TEXT="CalibrationAccuracyEstimate"/> +<node CREATED="1320747868154" MODIFIED="1320747868154" TEXT="CalibrationReport"/> +</node> +</node> +</node> +<node CREATED="1320686503938" ID="Freemind_Link_394789408" MODIFIED="1320686503938" TEXT="TransceiverModel"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="Frequency"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransceiverManufacturer"/> +<node CREATED="1320686503938" ID="Freemind_Link_212611503" MODIFIED="1320686503938" TEXT="TransceiverBeams"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransceiverAperture"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransceiverSerial"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransceiverFirmware"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerLocation"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerModel"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerBeams"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerSerial"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerDepth"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerOrientation"/> +<node CREATED="1320686503938" ID="ID_732575667" MODIFIED="1320686503938" TEXT="TransducerAperture"/> +</node> +</node> +</node> +<node CREATED="1320763307134" ID="Freemind_Link_1299225898" MODIFIED="1321262511515" TEXT="TransectAcousticInstrumentID"> + +<node CREATED="1320672852954" FOLDED="true" ID="Freemind_Link_963421402" MODIFIED="1321454463525" TEXT="One-to-many link to"> + +<node CREATED="1320414424952" ID="Freemind_Link_538841928" MODIFIED="1320857866415" TEXT="DataAcquisition"> + +<node CREATED="1320747986251" ID="Freemind_Link_1357656705" MODIFIED="1320764253280" TEXT="TransectAcousticInstrumentID"> + +</node> +<node CREATED="1320745617789" FOLDED="true" ID="Freemind_Link_1153043747" MODIFIED="1321454461421" TEXT="DataAcquisitionID"> + +<node CREATED="1320677282598" ID="Freemind_Link_1607624977" MODIFIED="1320686837580" TEXT="One-to-many link to"> + +<node CREATED="1320414432296" ID="Freemind_Link_1091633171" MODIFIED="1321262915412" TEXT="DataProcessing"> + +<node CREATED="1320687449739" ID="Freemind_Link_1324961543" MODIFIED="1320764263456" TEXT="DataAcquisitionID"> + +</node> +<node CREATED="1320687449739" ID="Freemind_Link_201776742" MODIFIED="1320764266172" TEXT="DataProcessingID"> + +<node CREATED="1320673208905" ID="Freemind_Link_156379983" MODIFIED="1320688102449" TEXT="One-to-many link to"> + +<node CREATED="1320672573112" FOLDED="true" ID="Freemind_Link_1187226973" MODIFIED="1321454458981" TEXT="Cells"> + +<node CREATED="1320689289481" ID="Freemind_Link_1436627817" MODIFIED="1320764272150" TEXT="DataProcessingID"> + +</node> +<node CREATED="1320689289481" ID="Freemind_Link_1878671348" MODIFIED="1321372174176" TEXT="CellID"> + +<node CREATED="1320674375210" ID="Freemind_Link_1290486014" MODIFIED="1320777516520" TEXT="One-to-many link to"> + +<node CREATED="1320672567894" ID="Freemind_Link_841358874" MODIFIED="1321454210216" TEXT="Data"> + +<node CREATED="1320689340027" ID="Freemind_Link_747297790" MODIFIED="1320764278206" TEXT="CellID"> + +</node> +<node CREATED="1320689419510" ID="Freemind_Link_1643361049" MODIFIED="1320764281124" TEXT="DataID"> + +</node> +<node CREATED="1320689419510" FOLDED="true" ID="Freemind_Link_1668121639" MODIFIED="1321454211774" TEXT="DataMetadataID"> + +<node CREATED="1320672322833" ID="Freemind_Link_130498975" MODIFIED="1320745330331" TEXT="Many-to-one link"> + +<node CREATED="1320748100990" ID="Freemind_Link_734830668" MODIFIED="1321438004407" TEXT="DataMetadata"> + +<node CREATED="1320688066746" ID="Freemind_Link_879034643" MODIFIED="1320765746122" TEXT="DataMetadataID"> + +</node> +<node CREATED="1320688066746" ID="Freemind_Link_1565536956" MODIFIED="1321372522419" TEXT="DataTypeID"> +<node CREATED="1320846301889" ID="Freemind_Link_618319869" MODIFIED="1321372457639" TEXT=""Longitude""/> +<node CREATED="1320846318342" ID="Freemind_Link_505475955" MODIFIED="1321372460573" TEXT=""Latitude""/> +<node CREATED="1320689289481" ID="Freemind_Link_616331607" MODIFIED="1321372463756" TEXT=""Time""/> +<node CREATED="1320846355529" ID="Freemind_Link_115361487" MODIFIED="1321372466565" TEXT=""Depth""/> +<node CREATED="1320846364935" ID="Freemind_Link_131576363" MODIFIED="1321439652788" TEXT=""AcousticDensity""/> +<node CREATED="1320846599122" ID="Freemind_Link_1498920698" MODIFIED="1321372514241" TEXT=""Volume""/> +<node CREATED="1320846605872" ID="Freemind_Link_269579553" MODIFIED="1321372529613" TEXT=""Surface""/> +</node> +<node CREATED="1320688066746" ID="ID_1730944816" MODIFIED="1320688066746" TEXT="LongName"/> +<node CREATED="1320688066746" ID="ID_1166266381" MODIFIED="1320688066746" TEXT="StandardName"/> +<node CREATED="1320688066746" ID="ID_1109097484" MODIFIED="1320688066746" TEXT="Units"/> +<node CREATED="1320688066746" FOLDED="true" ID="Freemind_Link_1821167050" MODIFIED="1321263877674" TEXT="ReferenceDatumID"> + +<node CREATED="1320777097790" ID="Freemind_Link_1914434983" MODIFIED="1320777202914" TEXT="Many-to-one link to"> + +<node CREATED="1320777109523" ID="Freemind_Link_1572421551" MODIFIED="1320847127518" TEXT="ReferenceList "> + +<node CREATED="1320777242439" ID="Freemind_Link_857147024" MODIFIED="1320848340958" TEXT="ReferenceDatumID"> + +</node> +<node CREATED="1320847155862" ID="Freemind_Link_85450540" MODIFIED="1320847161221" TEXT="ReferenceType"/> +<node CREATED="1320847165659" ID="Freemind_Link_1758939672" MODIFIED="1320848117008" TEXT="ReferenceValue"> +<node CREATED="1320848357739" ID="Freemind_Link_1304249748" MODIFIED="1320848407942" TEXT=""WGS84" for positions"/> +<node CREATED="1320848368067" ID="Freemind_Link_328253837" MODIFIED="1320848412785" TEXT=""Sea surface" for depth"/> +<node CREATED="1320848387067" ID="Freemind_Link_633848349" MODIFIED="1320848419348" TEXT=""Nearest haul" for referenceStations"/> +<node CREATED="1320940877382" ID="Freemind_Link_1624269179" MODIFIED="1320940900148" TEXT=""Expert" for BiomassResults"/> +</node> +<node CREATED="1320777242439" ID="Freemind_Link_1421996870" MODIFIED="1320847341642" TEXT="ReferenceMeaning"/> +</node> +</node> +</node> +<node CREATED="1320688066746" ID="ID_539853208" MODIFIED="1320688066746" TEXT="Positive"/> +<node CREATED="1320688066746" ID="ID_1905782671" MODIFIED="1320688066746" TEXT="Calendar"/> +<node CREATED="1320688066746" ID="ID_149809453" MODIFIED="1320688066746" TEXT="Axis"/> +<node CREATED="1320688066746" MODIFIED="1320688066746" TEXT="ValidMin"/> +<node CREATED="1320688066746" ID="ID_1571780866" MODIFIED="1320688066746" TEXT="ValidMax"/> +<node CREATED="1320688066746" ID="ID_241036365" MODIFIED="1320688066746" TEXT="ScaleFactor"/> +<node CREATED="1320688066746" ID="ID_136041003" MODIFIED="1320688066746" TEXT="AddOffset"/> +<node CREATED="1320688066746" MODIFIED="1320688066746" TEXT="FillValue"/> +<node CREATED="1320688066746" ID="Freemind_Link_905151553" MODIFIED="1321263880941" TEXT="CellMethods"> +<node CREATED="1320848237366" ID="Freemind_Link_18211845" MODIFIED="1320848442144" TEXT=""CellStart""/> +<node CREATED="1320848247334" ID="Freemind_Link_1010938529" MODIFIED="1320848466113" TEXT=""CellEnd""/> +<node CREATED="1320848259725" ID="Freemind_Link_237605748" MODIFIED="1320848469066" TEXT=""Barycenter""/> +<node CREATED="1320848282365" ID="Freemind_Link_437521451" MODIFIED="1320848471956" TEXT=""Enveloppe""/> +</node> +</node> +</node> +</node> +<node CREATED="1320689419510" FOLDED="true" ID="Freemind_Link_1289051952" MODIFIED="1320776266407" TEXT="DataQualityFlagValue"> + +<node CREATED="1320767942178" FOLDED="true" ID="Freemind_Link_811450777" MODIFIED="1320767949934" TEXT="Many-to-one link to"> +<node CREATED="1320767953492" FOLDED="true" ID="Freemind_Link_1350464076" MODIFIED="1320768123660" TEXT="DataQuality"> + +<node CREATED="1320768161607" ID="Freemind_Link_73579719" MODIFIED="1320776269548" TEXT="DataQualityFlagValue"> + +</node> +<node CREATED="1320768161607" ID="Freemind_Link_1500985688" MODIFIED="1320776273781" TEXT="DataQualityFlagMeaning"/> +<node CREATED="1320768161607" ID="Freemind_Link_139715883" MODIFIED="1320776275984" TEXT="DataQualityFlagNote"/> +</node> +</node> +</node> +<node CREATED="1320689419510" ID="Freemind_Link_211689814" MODIFIED="1321265369170" TEXT="DataValue"/> +</node> +</node> +<node CREATED="1320674375210" ID="ID_87075867" MODIFIED="1320777516520" TEXT="One-to-many link to"> + +<node CREATED="1320672567894" ID="ID_404160383" MODIFIED="1321454083030" TEXT="Result"> + +<node CREATED="1320689340027" ID="ID_687265912" MODIFIED="1320764278206" TEXT="CellID"> + +</node> +<node CREATED="1320689419510" ID="ID_1363744639" MODIFIED="1321372552709" TEXT="ResultID"> + +</node> +<node CREATED="1320689419510" FOLDED="true" ID="ID_332881231" MODIFIED="1321454205893" TEXT="ResultMetadataID"> + +<node CREATED="1320672322833" ID="ID_1827431494" MODIFIED="1320745330331" TEXT="Many-to-one link"> + +<node CREATED="1320748100990" ID="ID_1688274110" MODIFIED="1321437996231" TEXT="DataMetadata"> + +<node CREATED="1320688066746" ID="ID_1691998080" MODIFIED="1321372618975" TEXT="ResultMetadataID"> + +</node> +<node CREATED="1320688066746" ID="ID_958226778" MODIFIED="1321372634810" TEXT="Name"> +<node CREATED="1320846387638" ID="ID_1462845359" MODIFIED="1321439692071" TEXT=""AcousticDensity""/> +<node CREATED="1320776631802" ID="ID_200285758" MODIFIED="1321372647709" TEXT=""ReferenceStationCatch""> + +</node> +<node CREATED="1320776631802" ID="ID_1849074163" MODIFIED="1321372651504" TEXT=""ReferenceStationBiometry""> + +</node> +<node CREATED="1320937143600" ID="ID_1281205734" MODIFIED="1321372675678" TEXT=""Biomass""/> +<node CREATED="1320937143600" ID="ID_1475278676" MODIFIED="1321372679051" TEXT=""Abundance""/> +<node CREATED="1320937143600" ID="ID_1413988522" MODIFIED="1321372682315" TEXT=""MeanLength""/> +<node CREATED="1320937143600" ID="ID_607264655" MODIFIED="1321372685829" TEXT=""MeanWeight""/> +<node CREATED="1321437859348" ID="ID_516517517" MODIFIED="1321437870087" TEXT=""Formula""/> +<node CREATED="1321437878178" ID="ID_111739595" MODIFIED="1321439726087" TEXT=""MeanAcousticDensity""/> +<node CREATED="1321437909986" ID="ID_1953012934" MODIFIED="1321437920023" TEXT=""MeanXe""/> +</node> +<node CREATED="1320688066746" ID="ID_1444018462" MODIFIED="1320688066746" TEXT="LongName"/> +<node CREATED="1320688066746" ID="ID_1637009848" MODIFIED="1320688066746" TEXT="StandardName"/> +<node CREATED="1320688066746" ID="ID_359933215" MODIFIED="1320688066746" TEXT="Units"/> +<node CREATED="1320688066746" FOLDED="true" ID="ID_18595903" MODIFIED="1321437948730" TEXT="ReferenceDatumID"> + +<node CREATED="1320777097790" ID="ID_872614135" MODIFIED="1320777202914" TEXT="Many-to-one link to"> + +<node CREATED="1320777109523" ID="ID_681011956" MODIFIED="1320847127518" TEXT="ReferenceList "> + +<node CREATED="1320777242439" ID="ID_441866341" MODIFIED="1320848340958" TEXT="ReferenceDatumID"> + +</node> +<node CREATED="1320847155862" ID="ID_496145632" MODIFIED="1320847161221" TEXT="ReferenceType"/> +<node CREATED="1320847165659" ID="ID_1537171235" MODIFIED="1320848117008" TEXT="ReferenceValue"> +<node CREATED="1320848357739" ID="ID_1095308219" MODIFIED="1320848407942" TEXT=""WGS84" for positions"/> +<node CREATED="1320848368067" ID="ID_44481810" MODIFIED="1320848412785" TEXT=""Sea surface" for depth"/> +<node CREATED="1320848387067" ID="ID_1454775809" MODIFIED="1320848419348" TEXT=""Nearest haul" for referenceStations"/> +<node CREATED="1320940877382" ID="ID_1195674514" MODIFIED="1320940900148" TEXT=""Expert" for BiomassResults"/> +</node> +<node CREATED="1320777242439" ID="ID_209769963" MODIFIED="1320847341642" TEXT="ReferenceMeaning"/> +</node> +</node> +</node> +<node CREATED="1320688066746" ID="ID_1490913637" MODIFIED="1320688066746" TEXT="Positive"/> +<node CREATED="1320688066746" ID="ID_628499439" MODIFIED="1320688066746" TEXT="Calendar"/> +<node CREATED="1320688066746" ID="ID_843713911" MODIFIED="1320688066746" TEXT="Axis"/> +<node CREATED="1320688066746" MODIFIED="1320688066746" TEXT="ValidMin"/> +<node CREATED="1320688066746" ID="ID_68829944" MODIFIED="1320688066746" TEXT="ValidMax"/> +<node CREATED="1320688066746" ID="ID_1068324285" MODIFIED="1320688066746" TEXT="ScaleFactor"/> +<node CREATED="1320688066746" ID="ID_517099561" MODIFIED="1320688066746" TEXT="AddOffset"/> +<node CREATED="1320688066746" MODIFIED="1320688066746" TEXT="FillValue"/> +<node CREATED="1320688066746" FOLDED="true" ID="ID_506658960" MODIFIED="1321437977394" TEXT="CellMethods"> +<node CREATED="1320848237366" ID="ID_398778421" MODIFIED="1320848442144" TEXT=""CellStart""/> +<node CREATED="1320848247334" ID="ID_1155436774" MODIFIED="1320848466113" TEXT=""CellEnd""/> +<node CREATED="1320848259725" ID="ID_889027432" MODIFIED="1320848469066" TEXT=""Barycenter""/> +<node CREATED="1320848282365" ID="ID_1070871368" MODIFIED="1320848471956" TEXT=""Enveloppe""/> +</node> +</node> +</node> +</node> +<node CREATED="1320689419510" FOLDED="true" ID="ID_1112452592" MODIFIED="1320776266407" TEXT="DataQualityFlagValue"> + +<node CREATED="1320767942178" FOLDED="true" ID="ID_894953041" MODIFIED="1320767949934" TEXT="Many-to-one link to"> +<node CREATED="1320767953492" FOLDED="true" ID="ID_1606352420" MODIFIED="1320768123660" TEXT="DataQuality"> + +<node CREATED="1320768161607" ID="ID_1725382244" MODIFIED="1320776269548" TEXT="DataQualityFlagValue"> + +</node> +<node CREATED="1320768161607" ID="ID_1557434769" MODIFIED="1320776273781" TEXT="DataQualityFlagMeaning"/> +<node CREATED="1320768161607" ID="ID_1363004316" MODIFIED="1320776275984" TEXT="DataQualityFlagNote"/> +</node> +</node> +</node> +<node CREATED="1320749054832" FOLDED="true" ID="ID_1115402078" MODIFIED="1321454455443" TEXT="CategoryID"> + +<node CREATED="1320764073732" ID="ID_675456842" MODIFIED="1320764106070" TEXT="Many-to-one link to"> + +<node CREATED="1320749083313" FOLDED="true" ID="ID_1920652633" MODIFIED="1321454453622" TEXT="Category"> + +<node CREATED="1320769275292" ID="ID_1870688966" MODIFIED="1321373848640" TEXT="CategoryID"> + +</node> +<node CREATED="1321264508330" ID="ID_688951704" MODIFIED="1321438481175" TEXT="EchotypeID"> + +<node CREATED="1321438484946" ID="ID_762045386" MODIFIED="1321438583307" TEXT="Many-to-one link to"> + +<node CREATED="1321438497818" ID="ID_584758688" MODIFIED="1321438560651" TEXT="Echotypes"> + +<node CREATED="1321438519594" ID="ID_1709555337" MODIFIED="1321440402443" TEXT="VoyageID"> + +</node> +<node CREATED="1321438702338" ID="ID_1831471282" MODIFIED="1321438763851" TEXT="EchotypeID"> + +</node> +<node CREATED="1321438712850" ID="ID_1129097154" MODIFIED="1321438722983" TEXT="EchotypeName"/> +<node CREATED="1321438726138" ID="ID_1542204930" MODIFIED="1321438730599" TEXT="EchotypeMeaning"/> +<node CREATED="1320769275292" FOLDED="true" ID="ID_1817182292" MODIFIED="1321452789396" TEXT="DepthStratumID"> + +<node CREATED="1320775451179" ID="ID_1148965038" MODIFIED="1320775471503" TEXT="Many-to-one link to"> + +<node CREATED="1320775465582" ID="ID_1777897340" MODIFIED="1320775468348" TEXT="DepthStratumID"> + +<node CREATED="1320849580739" ID="ID_1380023185" MODIFIED="1320849635473" TEXT=""CLASD""/> +<node CREATED="1320849661957" ID="ID_1136441105" MODIFIED="1320849669988" TEXT=""CLASF""/> +<node CREATED="1320849588286" ID="ID_300014068" MODIFIED="1320849655004" TEXT=""SURFM""/> +<node CREATED="1320849642551" ID="ID_808801048" MODIFIED="1320849648410" TEXT=""SURFS""/> +</node> +<node CREATED="1320775465582" MODIFIED="1320775465582" TEXT="DepthStratumMeaning"/> +</node> +</node> +<node CREATED="1321438733842" ID="ID_619972384" MODIFIED="1321454376836" TEXT="EchotypeGenusSpecies"/> +<node CREATED="1321454379772" ID="ID_593819229" MODIFIED="1321454388889" TEXT="EchotypeLengthCategory"/> +</node> +</node> +</node> +<node CREATED="1320769275292" ID="ID_1576510066" MODIFIED="1321438648903" TEXT="SpeciesCodeID"> + +<node CREATED="1321438484946" ID="ID_834493610" MODIFIED="1321438627963" TEXT="Many-to-one link to"> + +<node CREATED="1321438497818" ID="ID_1043005033" MODIFIED="1321438663785" TEXT="SpeciesCodes"> + +<node CREATED="1320769475049" ID="ID_782236278" MODIFIED="1321438412380" TEXT="SpeciesCode"> + +</node> +<node CREATED="1320769498201" ID="ID_192591437" MODIFIED="1320769862318" TEXT="GenusSpecies"/> +<node CREATED="1321438418186" FOLDED="true" ID="ID_1736474805" MODIFIED="1321454300932" TEXT="LengthCategory"> +<node CREATED="1321454288844" ID="ID_215719110" MODIFIED="1321454292441" TEXT=""G""/> +<node CREATED="1321454294980" ID="ID_1276715070" MODIFIED="1321454298009" TEXT=""0""/> +</node> +</node> +</node> +</node> +<node CREATED="1320769275292" ID="ID_129874245" MODIFIED="1321452841833" TEXT="LengthID"> + +<node CREATED="1321438484946" ID="ID_948253781" MODIFIED="1321438627963" TEXT="Many-to-one link to"> + +<node CREATED="1321438497818" ID="ID_1767492776" MODIFIED="1321452883204" TEXT="ProcessedLength"> + +<node CREATED="1320769475049" ID="ID_1227399107" MODIFIED="1321452890585" TEXT="LengthID"> + +</node> +<node CREATED="1320769498201" ID="ID_1698253684" MODIFIED="1321452921209" TEXT="LengthValue"/> +<node CREATED="1321438418186" FOLDED="true" ID="ID_1803866578" MODIFIED="1321454279619" TEXT="LengthBreakType"> +<node CREATED="1321453040276" ID="ID_759261198" MODIFIED="1321453298569" TEXT=""Left""/> +<node CREATED="1321453050500" FOLDED="true" ID="ID_961741991" MODIFIED="1321453311815" TEXT=""Mid""> +<node CREATED="1321453301341" ID="ID_931948086" MODIFIED="1321453301341" TEXT=""/> +</node> +<node CREATED="1321453259180" ID="ID_9103520" MODIFIED="1321453318281" TEXT=""Right""/> +</node> +<node CREATED="1321452935316" ID="ID_858058727" MODIFIED="1321452945785" TEXT="LengthBinSize"/> +</node> +</node> +</node> +<node CREATED="1320769455928" ID="ID_518948677" MODIFIED="1321452847817" TEXT="AgeID"> + +<node CREATED="1321438484946" ID="ID_401329189" MODIFIED="1321438627963" TEXT="Many-to-one link to"> + +<node CREATED="1321438497818" ID="ID_59221369" MODIFIED="1321452977445" TEXT="ProcessedAge"> + +<node CREATED="1320769475049" ID="ID_1595910224" MODIFIED="1321452982649" TEXT="AgeID"> + +</node> +<node CREATED="1320769498201" ID="ID_1697043222" MODIFIED="1321452988601" TEXT="AgeValue"/> +<node CREATED="1321438418186" ID="ID_1954945419" MODIFIED="1321453342201" TEXT="AgeBreakType"/> +<node CREATED="1321452935316" ID="ID_1935449826" MODIFIED="1321452998905" TEXT="AgeBinSize"/> +</node> +</node> +</node> +</node> +</node> +</node> +<node CREATED="1320689419510" FOLDED="true" ID="ID_1355231733" MODIFIED="1321454304924" TEXT="ResultValue"> +<node CREATED="1320777277621" ID="ID_1463268905" MODIFIED="1321373176162" TEXT="IF Result.Name="ReferenceStation..." Many-to-one link to"> + +<node CREATED="1320777303851" ID="ID_295960116" MODIFIED="1321265980331" TEXT="NumOpe"> + +</node> +</node> +</node> +</node> +</node> +</node> +<node CREATED="1320689289481" FOLDED="true" ID="Freemind_Link_289726026" MODIFIED="1321372173083" TEXT="DataQualityFlagValue"> + +<node CREATED="1320767942178" ID="Freemind_Link_783504227" MODIFIED="1320833307178" TEXT="Many-to-one link to"> + +<node CREATED="1320767953492" ID="Freemind_Link_1787831084" MODIFIED="1320768123660" TEXT="DataQuality"> + +<node CREATED="1320768161607" ID="Freemind_Link_997399526" MODIFIED="1320776294637" TEXT="DataQualityFlagValue"> + +</node> +<node CREATED="1320768161607" ID="Freemind_Link_316235656" MODIFIED="1320776297637" TEXT="DataQualityFlagMeaning"/> +<node CREATED="1320768161607" ID="Freemind_Link_1126809788" MODIFIED="1320776301386" TEXT="DataQualityFlagNote"/> +</node> +</node> +</node> +<node CREATED="1320771223791" ID="Freemind_Link_244846319" MODIFIED="1321263688839" TEXT="CellName"/> +<node CREATED="1320846260264" ID="Freemind_Link_815026680" MODIFIED="1320847432548" TEXT="ParentCellID"> + +</node> +<node CREATED="1320846244374" ID="Freemind_Link_753743013" MODIFIED="1321263081886" TEXT="CellType"> +<node CREATED="1320846931534" ID="Freemind_Link_139964329" MODIFIED="1320848477409" TEXT=""Region""/> +<node CREATED="1320846931534" ID="Freemind_Link_1317808960" MODIFIED="1320849816877" TEXT=""RegionSURF""/> +<node CREATED="1320846931534" ID="Freemind_Link_263786227" MODIFIED="1320849829626" TEXT=""RegionCLAS""/> +<node CREATED="1320846938534" ID="Freemind_Link_447324327" MODIFIED="1320848480347" TEXT=""Esdu""/> +<node CREATED="1320846944878" ID="Freemind_Link_1221538183" MODIFIED="1320848483456" TEXT=""Elementary""/> +</node> +</node> +</node> +</node> +<node CREATED="1320687449739" ID="Freemind_Link_945928166" MODIFIED="1320687449739" TEXT="ProcessingTemplate"/> +<node CREATED="1320687449739" MODIFIED="1320687449739" TEXT="ProcessingDescription"/> +<node CREATED="1320687449739" MODIFIED="1320687449739" TEXT="SounderConstant"/> +<node CREATED="1320687449739" MODIFIED="1320687449739" TEXT="DigitThreshold"/> +<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="EIThreshold"/> +<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransceiverProcessingGain"/> +<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="ProcessingSoftwareVersion"/> +<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransceiverProcessingSacorrection"/> +<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransceiverProcessingAbsorption"/> +<node CREATED="1320687449754" ID="ID_818807184" MODIFIED="1320687449754" TEXT="TransceiverProcessingAbsorptionDescription"/> +<node CREATED="1320687449754" ID="ID_1634165222" MODIFIED="1320687449754" TEXT="TransducerProcessingPsi"/> +<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransducerProcessingBeamAngleAthwartship"/> +<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransducerProcessingBeamAngleAlongship"/> +<node CREATED="1320687449754" ID="Freemind_Link_245146210" MODIFIED="1320687449754" TEXT="AcousticDensityUnit"/> +<node CREATED="1320686503938" ID="Freemind_Link_153543466" MODIFIED="1320686503938" TEXT="EchosounderSoundSpeed"/> +<node CREATED="1320686503938" ID="Freemind_Link_1032873765" MODIFIED="1320686503938" TEXT="SoundSpeedCalculations"/> +<node CREATED="1320687449754" ID="Freemind_Link_354741307" MODIFIED="1320687449754" TEXT="Notes"/> +</node> +</node> +</node> +<node CREATED="1320686812487" ID="Freemind_Link_1001224269" MODIFIED="1320686812487" TEXT="AcquisitionSoftwareVersion"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="LoggedDataFormat"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="LoggedDataDatatype"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionPulseLength"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionGain"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionAbsorption"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionAbsorptionDescription"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransducerAcquisitionBeamAngleAthwartship"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransducerAcquisitionBeamAngleAlongship"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransducerAcquisitionPsi"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionPower"/> +<node CREATED="1320686812502" ID="Freemind_Link_274873458" MODIFIED="1320686812502" TEXT="TransceiverAcquisitionSacorrection"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="EchosounderSoundSpeed"/> +<node CREATED="1320686503938" ID="Freemind_Link_141672915" MODIFIED="1320686503938" TEXT="SoundSpeedCalculations"/> +<node CREATED="1320686503938" ID="Freemind_Link_624713978" MODIFIED="1320686503938" TEXT="PingDutyCycle"/> +</node> +</node> +</node> +</node> +<node CREATED="1320673360076" ID="Freemind_Link_1126773259" MODIFIED="1320685948826" TEXT="FishingInstrument"> + +<node CREATED="1320941913757" ID="Freemind_Link_807070830" MODIFIED="1320941953210" TEXT="Station"/> +</node> +<node CREATED="1320673671949" ID="Freemind_Link_1057008121" MODIFIED="1320685995351" TEXT="EnvironmentalInstrument"> + +<node CREATED="1320941913757" ID="Freemind_Link_1584545104" MODIFIED="1320941958695" TEXT="Station "/> +</node> +<node CREATED="1320678176920" ID="Freemind_Link_341229272" MODIFIED="1320685999756" TEXT="LogInstrument"> + +<node CREATED="1320941913757" ID="Freemind_Link_1992319338" MODIFIED="1320941936710" TEXT="Measure"/> +</node> +</node> +</node> +<node CREATED="1320685767018" ID="Freemind_Link_1647010708" MODIFIED="1320685767018" TEXT="Title"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Abstract"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="History"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Comment"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Metadata"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Citation"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Licence"/> +<node CREATED="1320685767018" ID="Freemind_Link_876006089" MODIFIED="1320685767018" TEXT="DateCreated"/> +<node CREATED="1320685767018" ID="ID_1802673588" MODIFIED="1320685767018" TEXT="GeospatialLonMin"/> +<node CREATED="1320685767018" ID="ID_1677614152" MODIFIED="1320685767018" TEXT="GeospatialLonMax"/> +<node CREATED="1320685767018" ID="ID_1518387517" MODIFIED="1320685767018" TEXT="GeospatialLatMin"/> +<node CREATED="1320685767018" ID="ID_207099221" MODIFIED="1320685767018" TEXT="GeospatialLatMax"/> +<node CREATED="1320685767018" ID="ID_862338299" MODIFIED="1320685767018" TEXT="Datum"/> +<node CREATED="1320685767018" ID="ID_1343683978" MODIFIED="1320685767018" TEXT="Linestring"/> +<node CREATED="1320685767018" ID="ID_957942235" MODIFIED="1320685767018" TEXT="GeospatialVerticalMin"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="GeospatialVerticalMax"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="GeospatialVerticalPositive"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="TimeCoverageStart"/> +<node CREATED="1320685767018" ID="Freemind_Link_1901684066" MODIFIED="1320685767018" TEXT="TimeCoverageEnd"/> +<node CREATED="1320680978387" ID="Freemind_Link_1637211249" MODIFIED="1320680978387" TEXT="BinUnitsPingAxis"/> +<node CREATED="1320680978387" MODIFIED="1320680978387" TEXT="BinSizePingAxis"/> +<node CREATED="1320680978387" ID="Freemind_Link_1519855559" MODIFIED="1320680978387" TEXT="BinSizeRangeAxis"/> +</node> +</node> +</node> +<node CREATED="1320685294002" ID="Freemind_Link_139407579" MODIFIED="1321262716865" TEXT="VesselName"> + +<node CREATED="1320745855362" ID="Freemind_Link_204678916" MODIFIED="1321262717985" TEXT="Many-to-one link"> + +<node CREATED="1320745881986" FOLDED="true" ID="Freemind_Link_1393360106" MODIFIED="1321454467084" TEXT="VesselList"> + +<node CREATED="1320685294002" ID="Freemind_Link_1813667568" MODIFIED="1320764810167" TEXT="VesselName"> + +</node> +<node CREATED="1320685294002" ID="Freemind_Link_793336005" MODIFIED="1320685294002" TEXT="VesselType"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselCode"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="Callsign"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="AltCallsign"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="IMO"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="Operator"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselLength"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselTonnage"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselEnginePower"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselNoiseDesign"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="Acknowledgement"/> +</node> +</node> +</node> +</node> +</node> +</node> +<node CREATED="1320684878145" ID="Freemind_Link_20593183" MODIFIED="1320747664439" TEXT="TransitDescription"/> +<node CREATED="1320684878145" MODIFIED="1320684878145" TEXT="RelatedActivity"/> +<node CREATED="1320684878145" ID="Freemind_Link_1114663660" MODIFIED="1320747668501" TEXT="TransitStartTime"/> +<node CREATED="1320684878145" ID="Freemind_Link_461738660" MODIFIED="1320747672907" TEXT="TransitEndTime"/> +<node CREATED="1320684878145" MODIFIED="1320684878145" TEXT="TransitStartLocality"/> +<node CREATED="1320684878145" ID="Freemind_Link_690075609" MODIFIED="1320684878145" TEXT="TransitEndLocatlity"/> +</node> +<node CREATED="1321438497818" ID="ID_1813920809" MODIFIED="1321438560651" TEXT="Echotypes"> + +<node CREATED="1321438519594" ID="ID_1762244769" MODIFIED="1321440402443" TEXT="VoyageID"> + +</node> +<node CREATED="1321438702338" ID="ID_1372050043" MODIFIED="1321438763851" TEXT="EchotypeID"> + +</node> +<node CREATED="1321438712850" ID="ID_1813668613" MODIFIED="1321438722983" TEXT="EchotypeName"/> +<node CREATED="1321438726138" ID="ID_581891139" MODIFIED="1321438730599" TEXT="EchotypeMeaning"/> +<node CREATED="1321438733842" ID="ID_886654837" MODIFIED="1321454376836" TEXT="EchotypeGenusSpecies"/> +<node CREATED="1321454379772" ID="ID_199149193" MODIFIED="1321454388889" TEXT="EchotypeLengthCategory"/> +<node CREATED="1320769275292" FOLDED="true" ID="ID_1221865757" MODIFIED="1321438044602" TEXT="DepthStratumID"> + +<node CREATED="1320775451179" ID="ID_1299228109" MODIFIED="1320775471503" TEXT="Many-to-one link to"> + +<node CREATED="1320775465582" ID="ID_1159968596" MODIFIED="1320775468348" TEXT="DepthStratumID"> + +<node CREATED="1320849580739" ID="ID_1675981518" MODIFIED="1320849635473" TEXT=""CLASD""/> +<node CREATED="1320849661957" ID="ID_950217734" MODIFIED="1320849669988" TEXT=""CLASF""/> +<node CREATED="1320849588286" ID="ID_762295781" MODIFIED="1320849655004" TEXT=""SURFM""/> +<node CREATED="1320849642551" ID="ID_352671089" MODIFIED="1320849648410" TEXT=""SURFS""/> +</node> +<node CREATED="1320775465582" MODIFIED="1320775465582" TEXT="DepthStratumMeaning"/> +</node> +</node> +</node> +</node> +</node> +<node CREATED="1320684811880" ID="Freemind_Link_826471017" MODIFIED="1320684811880" TEXT="VoyageName"/> +<node CREATED="1320684811880" ID="ID_1876224208" MODIFIED="1320684811880" TEXT="VoyageStartDate"/> +<node CREATED="1320684811880" MODIFIED="1320684811880" TEXT="VoyageEndDate"/> +<node CREATED="1320684811880" MODIFIED="1320684811880" TEXT="StartPort"/> +<node CREATED="1320684811880" MODIFIED="1320684811880" TEXT="EndPort"/> +<node CREATED="1320684811880" FOLDED="true" ID="Freemind_Link_1587001602" MODIFIED="1321267290817" TEXT="AreaOfOperationID"> + +<node CREATED="1320855036138" ID="Freemind_Link_1980873432" MODIFIED="1320855073012" TEXT="Many-to-one link to"> + +<node CREATED="1320855056341" ID="Freemind_Link_691033092" MODIFIED="1320855070684" TEXT="AreaOfOperationList"> + +<node CREATED="1320855052731" ID="Freemind_Link_1412920840" MODIFIED="1320855077809" TEXT="AreaOfOperationID"> + +</node> +<node CREATED="1320855052731" ID="Freemind_Link_1977871654" MODIFIED="1320855052731" TEXT="AreaOfOperationName"/> +</node> +</node> +</node> +<node CREATED="1320684811880" ID="Freemind_Link_328229853" MODIFIED="1320684811880" TEXT="VoyageDescription"/> +<node CREATED="1320684811880" ID="Freemind_Link_586875122" MODIFIED="1320684811880" TEXT="Datum"/> +</node> +</node> +</node> +</node> +<node CREATED="1320852659278" FOLDED="true" ID="Freemind_Link_356521950" MODIFIED="1320852912978" POSITION="right" TEXT="TSparameters"> + +<node CREATED="1320854749439" ID="Freemind_Link_1220318247" MODIFIED="1320854766595" TEXT="TSparametersID"> + +</node> +<node CREATED="1320854749439" ID="Freemind_Link_1396585474" MODIFIED="1320854754798" TEXT="GenusSpecies"> + +</node> +<node CREATED="1320854749439" ID="Freemind_Link_1791423910" MODIFIED="1320854756845" TEXT="AcousticInstrumentID"> + +</node> +<node CREATED="1320854749439" MODIFIED="1320854749439" TEXT="m"/> +<node CREATED="1320854749439" MODIFIED="1320854749439" TEXT="b"/> +<node CREATED="1320854749439" MODIFIED="1320854749439" TEXT="mz"/> +<node CREATED="1320854749439" ID="Freemind_Link_1917662738" MODIFIED="1320854749439" TEXT="Reference"/> +</node> +</node> +</map> Property changes on: trunk/src/doc/EchoBase_structure_V5.mm ___________________________________________________________________ Added: svn:eol-style + native

1 0

r97 - in trunk/echobase-ui/src/main: java/fr/ifremer/echobase/ui/actions/dbeditor resources/config resources/fr/ifremer/echobase/ui/actions/dbeditor resources/i18n webapp/WEB-INF/jsp/dbeditor
by tchemit＠users.forge.codelutin.com Nov. 19, 2011

Nov. 19, 2011

Author: tchemit Date: 2011-11-19 15:29:57 +0100 (Sat, 19 Nov 2011) New Revision: 97 Url: http://forge.codelutin.com/repositories/revision/echobase/97 Log: Revue rapide de dbEditor, faut revoir l'import-export c'est pas du tout user friendly :( Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntity.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable-doImport-validation.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/modifImportResult.jsp Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java 2011-11-19 14:29:57 UTC (rev 97) @@ -0,0 +1,95 @@ +/* + * #%L + * EchoBase :: UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * 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.echobase.ui.actions.dbeditor; + +import com.google.common.collect.Maps; +import fr.ifremer.echobase.entities.meta.ColumnMeta; +import fr.ifremer.echobase.entities.meta.DbMeta; +import fr.ifremer.echobase.entities.meta.TableMeta; +import fr.ifremer.echobase.services.DbEditorService; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; +import java.util.Map; + +import static org.nuiton.i18n.I18n.l_; + +/** + * A abstract action which can load the table names and a selected table + * meta datas. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.1 + */ +public abstract class AbstractLoadPage extends EchoBaseActionSupport { + + private static final long serialVersionUID = 1L; + + /** Name of the table to load. */ + protected String tableName; + + /** All tables availables */ + protected Map<String, String> tableNames; + + /** Metas of the table */ + protected TableMeta tableMeta; + + public Map<String, String> getTableNames() { + return tableNames; + } + + public List<ColumnMeta> getColumnMetas() { + return tableMeta.getColumns(); + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public String getTableName() { + return tableName; + } + + public void load() throws Exception { + tableNames = Maps.newTreeMap(); + DbMeta dbMeta = getEchoBaseApplicationContext().getDbMeta(); + for (TableMeta tableMeta : dbMeta) { + String name = tableMeta.getName(); + String i18nKey = tableMeta.getI18nKey(); + tableNames.put(name, l_(getLocale(), i18nKey)); + } + if (StringUtils.isEmpty(tableName)) { + + // no table selected + addActionMessage(_("echobase.info.no.table.selected")); + } else { + + // load table metas + DbEditorService dbEditorService = newService(DbEditorService.class); + tableMeta = dbEditorService.getTableMetas(tableName); + } + } + +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java 2011-11-19 14:10:49 UTC (rev 96) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java 2011-11-19 14:29:57 UTC (rev 97) @@ -2,8 +2,8 @@ * #%L * EchoBase :: UI * - * $Id: GetEntities.java 51 2011-11-13 16:20:45Z tchemit $ - * $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/java… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% @@ -50,8 +50,14 @@ /** Default file name to create. */ protected String fileName; + + /** WTF ? */ protected InputStream inputStream; + + /** WTF ? */ protected long contentLength; + + /** WTF ? */ protected String contentType; public void setTableName(String tableName) { Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntity.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntity.java 2011-11-19 14:10:49 UTC (rev 96) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntity.java 2011-11-19 14:29:57 UTC (rev 97) @@ -23,9 +23,13 @@ */ package fr.ifremer.echobase.ui.actions.dbeditor; +import com.google.common.collect.Maps; +import fr.ifremer.echobase.entities.meta.ColumnMeta; +import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.services.DbEditorService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import java.util.List; import java.util.Map; /** @@ -36,6 +40,8 @@ */ public class GetEntity extends EchoBaseActionSupport { + private static final long serialVersionUID = 1L; + /** Name of the table to load. */ protected String tableName; @@ -45,6 +51,9 @@ /** Datas of the given table. */ protected Map<?, ?> datas; + /** Universe of columns metat datas of the selected entity type. */ + protected Map<String, ColumnMeta> metas; + public void setTableName(String tableName) { this.tableName = tableName; } @@ -57,6 +66,10 @@ return datas; } + public Map<String, ColumnMeta> getMetas() { + return metas; + } + @Override public String execute() throws Exception { @@ -64,6 +77,12 @@ datas = dbEditorService.getData(tableName, id); + TableMeta table = serviceContext.getDbMeta().getTable(tableName); + List<ColumnMeta> columnMetas = table.getColumns(); + metas = Maps.newHashMap(); + for (ColumnMeta columnMeta : columnMetas) { + metas.put(columnMeta.getName(), columnMeta); + } return SUCCESS; } } Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntity.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java 2011-11-19 14:10:49 UTC (rev 96) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java 2011-11-19 14:29:57 UTC (rev 97) @@ -2,8 +2,8 @@ * #%L * EchoBase :: UI * - * $Id: GetEntities.java 51 2011-11-13 16:20:45Z tchemit $ - * $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/java… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% @@ -36,48 +36,54 @@ /** * To import datas from import file. - * + * * FIXME 20111117 sletellier : extends {@link LoadEntities} find a better way to redirect to dbeditor page on validation error * UPDATE 20111118 sletellier : with {@link @InputConfig} probleme is solve ? dbeditor root page is prepared only on validation error... * * @author sletellier <letellier(a)codelutin.com> * @since 0.1 */ -public class ImportTable extends LoadEntities { +public class ImportTable extends AbstractLoadPage { private static final long serialVersionUID = 1L; /** Logger. */ private static final Log log = LogFactory.getLog(ImportTable.class); - protected File modifImport; - protected String modifImportContentType; - protected String modifImportFileName; + /** WTF ? */ + protected File importFile; + /** WTF ? */ + protected String importFileContentType; + + /** WTF ? */ + protected String importFileFileName; + + /** WTF ? */ protected List<PropertyDiff[]> propertyDiffs; - public File getModifImport() { - return modifImport; + public File getImportFile() { + return importFile; } - public void setModifImport(File modifImport) { - this.modifImport = modifImport; + public void setImportFile(File importFile) { + this.importFile = importFile; } - public String getModifImportContentType() { - return modifImportContentType; + public String getImportFileContentType() { + return importFileContentType; } - public void setModifImportContentType(String modifImportContentType) { - this.modifImportContentType = modifImportContentType; + public void setImportFileContentType(String importFileContentType) { + this.importFileContentType = importFileContentType; } - public String getModifImportFileName() { - return modifImportFileName; + public String getImportFileFileName() { + return importFileFileName; } - public void setModifImportFileName(String modifImportFileName) { - this.modifImportFileName = modifImportFileName; + public void setImportFileFileName(String importFileFileName) { + this.importFileFileName = importFileFileName; } public List<PropertyDiff[]> getPropertyDiffs() { @@ -87,19 +93,26 @@ return propertyDiffs; } - public void setPropertyDiffs(List<PropertyDiff[]> propertyDiffs) { - this.propertyDiffs = propertyDiffs; +// public void setPropertyDiffs(List<PropertyDiff[]> propertyDiffs) { +// this.propertyDiffs = propertyDiffs; +// } + + @Override + public String input() throws Exception { + load(); + return INPUT; } @Override - @InputConfig(methodName = "input") // to call inpu method on validation error to initialize dbeditor page + @InputConfig(methodName = "input") + // to call input method on validation error to initialize dbeditor page public String execute() throws Exception { DbEditorService dbEditorService = newService(DbEditorService.class); try { propertyDiffs = dbEditorService.importDatas(tableName, - modifImport, + importFile, getEchoBaseSession().getEchoBaseUser()); } catch (Exception eee) { @@ -110,15 +123,15 @@ return ERROR; } for (PropertyDiff[] diffs : propertyDiffs) { - for (PropertyDiff diff : diffs) { - String msg = _("echobase.message.modified.property", - diff.getSourceProperty(), - diff.getSourceValue(), - diff.getTargetValue()); + for (PropertyDiff diff : diffs) { + String msg = _("echobase.message.modified.property", + diff.getSourceProperty(), + diff.getSourceValue(), + diff.getTargetValue()); - log.info(msg); + log.info(msg); - addActionMessage(msg); + addActionMessage(msg); } } Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2011-11-19 14:10:49 UTC (rev 96) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2011-11-19 14:29:57 UTC (rev 97) @@ -23,89 +23,26 @@ */ package fr.ifremer.echobase.ui.actions.dbeditor; -import com.google.common.collect.Maps; -import com.opensymphony.xwork2.Preparable; import fr.ifremer.echobase.entities.meta.ColumnMeta; -import fr.ifremer.echobase.entities.meta.DbMeta; -import fr.ifremer.echobase.entities.meta.TableMeta; -import fr.ifremer.echobase.services.DbEditorService; -import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; -import org.apache.commons.lang3.StringUtils; -import java.util.List; -import java.util.Map; - -import static org.nuiton.i18n.I18n.l_; - /** * To load the db editor pages. * * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class LoadEntities extends EchoBaseActionSupport { +public class LoadEntities extends AbstractLoadPage { private static final long serialVersionUID = 1L; - /** Name of the table to load. */ - protected String tableName; - - /** All tables availables */ - protected Map<String, String> tableNames; - - /** Metas of the table */ - protected TableMeta tableMeta; - - public Map<String, String> getTableNames() { - return tableNames; - } - - public List<ColumnMeta> getColumnMetas() { - return tableMeta.getColumns(); - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - - public String getTableName() { - return tableName; - } - @Override public String input() throws Exception { - tableNames = Maps.newTreeMap(); - DbMeta dbMeta = getEchoBaseApplicationContext().getDbMeta(); - for (TableMeta tableMeta : dbMeta) { - String name = tableMeta.getName(); - String i18nKey = tableMeta.getI18nKey(); - tableNames.put(name, l_(getLocale(), i18nKey)); - } - if (StringUtils.isEmpty(tableName)) { - - // no table selected - addActionMessage(_("echobase.info.no.table.selected")); - } else { - - // load table metas - DbEditorService dbEditorService = newService(DbEditorService.class); - tableMeta = dbEditorService.getTableMetas(tableName); - } + load(); return INPUT; } - public String getEditType(ColumnMeta meta) { - String editType="text"; - if (meta.isBoolean()) { - editType = "checkbox"; - } else if (meta.isDate()) { - editType = "select"; - } - return editType; - } - public String getFormatter(ColumnMeta meta) { - String editType="'string'"; + String editType = "'string'"; if (meta.isBoolean()) { editType = "'checkbox'"; } else if (meta.isFK()) { Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2011-11-19 14:10:49 UTC (rev 96) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2011-11-19 14:29:57 UTC (rev 97) @@ -65,13 +65,13 @@ <result type="json"/> </action> -  +  <action name="editTableData" class="fr.ifremer.echobase.ui.actions.dbeditor.SaveEntity"> <result name="success" type="redirectToDbEditor"/> </action> -  +  <action name="doImport" class="fr.ifremer.echobase.ui.actions.dbeditor.ImportTable"> <interceptor-ref name="paramsPrepareParamsStackLoggued"/> <result>/WEB-INF/jsp/dbeditor/modifImportResult.jsp</result> @@ -79,7 +79,7 @@ <result name="error">/WEB-INF/jsp/dbeditor/modifImportResult.jsp</result> </action> -  +  <action name="doExport" class="fr.ifremer.echobase.ui.actions.dbeditor.ExportTable"> <interceptor-ref name="paramsPrepareParamsStackLoggued"/> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable-doImport-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable-doImport-validation.xml 2011-11-19 14:10:49 UTC (rev 96) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable-doImport-validation.xml 2011-11-19 14:29:57 UTC (rev 97) @@ -26,10 +26,10 @@ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> <validators> - <field name="modifImport"> + <field name="importFile"> <field-validator type="required"> - <message key="echobase.validation.dbeditor.modifImport.required"/> + <message key="echobase.error.importFile.required"/> </field-validator> </field> Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable-doImport-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-19 14:10:49 UTC (rev 96) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-19 14:29:57 UTC (rev 97) @@ -6,7 +6,9 @@ echobase.action.delete=Suppression echobase.action.deleteSqlQuery=Supprimer la requête echobase.action.exportSqlData=Exporter les données +echobase.action.exportTable=Exporter echobase.action.import=Importer +echobase.action.importTable=Importer echobase.action.locale.english=Anglais echobase.action.locale.french=Français echobase.action.login=Connection @@ -21,6 +23,7 @@ echobase.common.embeddedWarFileName=Nom du war à utiliser echobase.common.exportFileName=Nom du fichier d'export echobase.common.import=Import configuration +echobase.common.importFile=Fichier à importer echobase.common.jdbcLogin=Login de connexion echobase.common.jdbcPassword=Mot de passe echobase.common.jdbcUrl=Url de connexion @@ -36,16 +39,14 @@ echobase.common.voyage=Voyage echobase.common.voyagesToSelect=Voyage à exporter echobase.dbEditor.propertyDiffsResult=Nombres d'entrées modifiés \: %s -echobase.dbeditor.create=Création de '%s' echobase.dbeditor.edit=Edition de '%s' -echobase.dbeditor.export=Exporter -echobase.dbeditor.import=Importer echobase.embeddedApplication.configuration=Configuration de l'application embarquée echobase.error.bad.password=Mot de passe incorrrect echobase.error.email.already.used= echobase.error.fileDontExist= echobase.error.fileNotFound= echobase.error.importArgument= +echobase.error.importFile.required=Fichier d'import obligatoire echobase.error.login.unknown=Utilisateur inconnu echobase.error.required.email=L'email est obligatoire echobase.error.required.password=Le mot de passe est obligatoire @@ -81,6 +82,7 @@ echobase.menu.users=Gérer les utilisateurs echobase.message.askAdministratorPassword=Demander à un administrateur le mot de passe pour l'utilisateur donné echobase.message.modified.property=Propriété '%s', ancienne valeur \: %s, nouvelle valeur \: %s +echobase.message.no.row.selected=Aucune donnée sélectionnée echobase.message.noEntrySelection=Aucune entrée sélectionnée echobase.msg.warnImportInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de l'import. echobase.sqlQuery.configuration=Configuration de la requête Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-19 14:10:49 UTC (rev 96) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-19 14:29:57 UTC (rev 97) @@ -25,10 +25,13 @@ <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> +<script type="text/javascript" + src="<s:url value='/js/gridHelper.js' />"></script> + <s:url id="reloadUrl" action="dbeditor" namespace="/dbeditor"/> <s:url id="getTableData" action="getTableData" namespace="/dbeditor"/> -<s:set name="tableSelected" value="%{tableName == null}"/> +<s:set name="tableSelected" value="%{tableName != null && tableName != ''}"/> <title><s:text name="echobase.title.dbEditor"/></title> @@ -47,82 +50,94 @@ this.name = this.id; }); + // on table name change, let's reload reload this page $('[name="tableName"]').change(function(event) { var url = "${reloadUrl}?" + $.param({tableName:this.value}); window.location = url; }); - }); - $.subscribe('rowselect', function(event) { + // on reset let's just reload the selected row + $('[name="resetAction"]').click(function(event){ + $.publish('datas-rowSelect') + }); - // Display edit label - toggleLabels(true); + // on grid selected clear, let's remove the edit form + $.addClearSelectTopic('datas', function(event) { - // get selected id - var id = event.originalEvent.id; + $('#noRowSelected').show(); + $('#editForm').hide(); + }); - // get table name - var tableName = "${tableName}"; + // on row selection, let's load the edit form + $.addRowSelectTopic('datas', function(event) { + + $('#noRowSelected').hide(); + $('#editForm').show(); - // get entity value from json - jQuery.getJSON("${getTableData}", - { - "tableName":tableName, - "id":id - }, - function (result) { + // get selected id + var id = jQuery.struts2_jquery['datas']['selectedRow']; - // for all json result - // get data as pair : [property, value] - for (var data in Iterator(result.datas)) { - if (data) { + // get table name + var tableName = "${tableName}"; - // get property - var propertyName = data[0]; + // get entity value from json + jQuery.getJSON("${getTableData}", + { "tableName":tableName, "id":id }, function (result) { - // get value - var value = data[1]; + // get metadatas from the response + var metas = result.metas; - // get concerned editor - var editor = document.getElementById(propertyName); + // iterate on result to push in form the value to edit - // if editor found - if (editor) { + $.each(result.datas, function(propertyName, value) { - if ($(editor).hasClass("hasDatepicker")) { + if (propertyName == 'id') { - // Update date - updateDate(value, editor); - } else { + // push the id of row + $("#" + propertyName).val(value); + return; + } - // get type for checkbox - var editorType = editor.type; + var meta = metas[propertyName]; - if (editorType == "checkbox") { - editor.checked = value; - } else { - editor.value = value; - } + if (!meta) { + + // not a meta to treate + return; } - } - } - } + + var type = meta['typeSimpleName']; + if (meta['fK']) { + type = 'FK'; + } + + // get concerned editor + var editor = $("#" + propertyName); + + switch (type) { + case 'boolean': + case 'Boolean': + editor.attr('checked', value); + break; + + case 'Date': + // Update date + updateDate(value, editor); + break; + + case 'FK': + // select value in the select box + $('#' + propertyName + ' option[value="' + value + '"]').attr('selected', true); + break; + + default: + editor.val(value); + } + }); + }); }); }); - function toggleLabels(edit) { - var editDiv = $(document.getElementById("editDiv")); - var createDiv = $(document.getElementById("createDiv")); - - if (edit) { - createDiv.hide(); - editDiv.show(); - } else { - editDiv.hide(); - createDiv.show(); - } - } - function formatEntityLabel(cellvalue, options, rowObject) { var columnName = options.colModel.name + "_lib"; return rowObject[columnName]; @@ -159,46 +174,45 @@ <s:select key="tableName" label='%{getText("echobase.common.tableName")}' list="tableNames" headerKey="" headerValue=""/> - <s:form id="importForm" action="doImport" namespace="/dbeditor" method="post" - enctype="multipart/form-data" theme="simple" cssClass="floatLeft"> + <s:if test="tableSelected"> + <s:form id="importForm" namespace="/dbeditor" method="post" + enctype="multipart/form-data" cssClass="floatLeft"> - <s:hidden key="tableName"/> - <s:file name="modifImport" - required="true" - key="echobase.dbeditor.importFile" - disabled="%{tableSelected}"/> - <s:submit value="%{getText('echobase.dbeditor.import')}" disabled="%{tableSelected}"/> + <s:hidden key="tableName" label=''/> + <s:file key="importFile" required="true" + label="%{getText('echobase.common.importFile')}"/> + <s:submit key="echobase.action.importTable" action="doImport" /> </s:form> - <s:form id="exportForm" action="doExport" namespace="/dbeditor" theme="simple" cssClass="floatRight"> + <s:form id="exportForm" namespace="/dbeditor" theme="simple" cssClass="floatRight"> - <s:hidden key="tableName"/> - <s:submit value="%{getText('echobase.dbeditor.export')}" disabled="%{tableSelected}"/> + <s:hidden key="tableName" label=''/> + <s:submit key="echobase.action.exportTable" action="doExport" /> </s:form> + + </s:if> + </div> -<s:if test="tableName!=null and tableName != ''"> +<s:if test="tableSelected"> <s:url id="loadUrl" action="getTableDatas" namespace="/dbeditor" escapeAmp="false"> <s:param name="tableName" value="%{tableName}"/> </s:url> - <s:url id="editUrl" action="editTableData" namespace="/dbeditor" - escapeAmp="false"> - <s:param name="tableName" value="%{tableName}"/> - </s:url> + <s:set var="tableI18nName" + value="%{getText('echobase.common.tableDatas', tableNames[tableName])}"/> - <s:set var="tableI18nName" value="%{getText('echobase.common.tableDatas', tableNames[tableName])}"/> - <sjg:grid id="datas" dataType="json" href="%{loadUrl}" gridModel="datas" caption="%{tableI18nName}" pager="true" pagerButtons="true" pagerInput="true" navigator="true" autowidth="true" rownumbers="false" viewrecords="true" - navigatorEdit="true" navigatorSearch="true" - navigatorDelete="false" navigatorAdd="false" resizable="true" - editurl="%{editUrl}" rowList="10,15,20, 50" rowNum="10" - onSelectRowTopics="rowselect" + navigatorEdit="false" navigatorSearch="true" + navigatorDelete="false" navigatorAdd="false" + rowList="10,15,20, 50" rowNum="10" + onSelectRowTopics="datas-rowSelect" + onCompleteTopics="datas-clearSelect" navigatorSearchOptions="{multipleGroup:false,showQuery:true,multipleSearch:true,sopt:['eq','ne','cn','nc','bw','bn','ew','en','lt','le','gt','ge','nu','nn','in','ni']}"> <sjg:gridColumn name="id" title="id" hidden="true" editable="true"/> @@ -206,25 +220,14 @@ <s:iterator value="columnMetas" var="meta" status="status"> <s:if test="#meta.fK"> - - <s:set name="urlName">getForeignEntitiesUrl_<s:property value="%{#meta.typeSimpleName}"/></s:set> - <s:url id="urlName" - action="getForeignEntities" - namespace="/dbeditor" - escapeAmp="false"> - <s:param name="entityType" value="%{#meta.typeSimpleName}"/> - </s:url> <sjg:gridColumn name="%{#meta.name}" title="%{getText(#meta.i18nKey)}" - edittype='select' - editoptions="{dataUrl : '%{urlName}'}" formatter='formatEntityLabel' - sortable="true" editable="true"/> + sortable="true"/> </s:if> <s:else> <sjg:gridColumn name="%{#meta.name}" title="%{getText(#meta.i18nKey)}" - edittype='%{getEditType(#meta)}' formatter='%{getFormatter(#meta)}' formatoptions="{newformat : 'd/m/Y'}" sortable="true" editable="true"/> @@ -237,37 +240,39 @@ - <s:form id="editForm" action="editTableData" namespace="/dbeditor"> - <fieldset> - <legend> - <div id="editDiv" style="display: none;"> + <fieldset id="noRowSelected"> + <legend> <s:text name="echobase.dbeditor.edit"> <s:param value="%{tableI18nName}"/> </s:text> - </div> - <div id="createDiv"> - <s:text name="echobase.dbeditor.create"> - <s:param value="%{tableI18nName}"/> - </s:text> - </div> </legend> - <s:hidden key="tableName"/> + <s:text name="echobase.message.no.row.selected"/>. + </fieldset> - <%-- hidden field dont reset --%> - <s:textfield id="id" name="id" cssClass="hidden"/> + <s:form id="editForm" namespace="/dbeditor"> + <fieldset> + <legend> + <s:text name="echobase.dbeditor.edit"> + <s:param value="%{tableI18nName}"/> + </s:text> + </legend> + + <s:hidden key="tableName" label=''/> + + <s:hidden id="id" name="id"/> + <s:iterator value="columnMetas" var="meta" status="status"> - <s:url id="urlName" + <s:if test="#meta.fK"> + <s:url id="urlName" action="getForeignEntities" namespace="/dbeditor" escapeAmp="false"> - <s:param name="entityType" value="%{#meta.typeSimpleName}"/> - </s:url> - <s:if test="#meta.fK"> + <s:param name="entityType" value="%{#meta.typeSimpleName}"/> + </s:url> <sj:select id="%{#meta.name}" label="%{getText(#meta.i18nKey)}" href="%{urlName}" list="entities" - listenTopics="rowselect" emptyOption="true"/> </s:if> <s:else> @@ -284,9 +289,6 @@ label="%{getText(#meta.i18nKey)}" value="%{false}"/> </s:elseif> <s:elseif test='#meta.columnType == "date"'> - <%--<sj:datepicker id="%{#meta.name}"--%> - <%--name="%{#meta.name}"--%> - <%--label="%{getText(#meta.i18nKey)}"/>--%> <sj:datepicker id="%{#meta.name}" name="%{#meta.name}" label="%{getText(#meta.i18nKey)}" @@ -299,8 +301,12 @@ </s:iterator> </fieldset> <ul class="toolbar floatRight"> - <li><s:reset key="echobase.common.reset" onclick="toggleLabels(false)"/></li> - <li><s:submit name="submit" key="echobase.action.save" theme="simple"/></li> + <li><s:submit name='resetAction' key="echobase.common.reset" + theme="simple" onclick="return false;"/> + </li> + <li><s:submit name="submitAction" key="echobase.action.save" + action="editTableData" theme="simple"/> + </li> </ul> </s:form> Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/modifImportResult.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r96 - trunk/echobase-ui/src/main/webapp/js
by tchemit＠users.forge.codelutin.com Nov. 19, 2011

Nov. 19, 2011

Author: tchemit Date: 2011-11-19 15:10:49 +0100 (Sat, 19 Nov 2011) New Revision: 96 Url: http://forge.codelutin.com/repositories/revision/echobase/96 Log: can reuse the select row topic without any event + fix topic name Modified: trunk/echobase-ui/src/main/webapp/js/gridHelper.js Modified: trunk/echobase-ui/src/main/webapp/js/gridHelper.js =================================================================== --- trunk/echobase-ui/src/main/webapp/js/gridHelper.js 2011-11-18 20:57:14 UTC (rev 95) +++ trunk/echobase-ui/src/main/webapp/js/gridHelper.js 2011-11-19 14:10:49 UTC (rev 96) @@ -27,11 +27,14 @@ { addRowSelectTopic: function(gridId, callback) { $.subscribe(gridId + '-rowSelect', function(event) { - var gridId = event.data.id; - var opts = jQuery.struts2_jquery[gridId] = {}; - var id = event.originalEvent.id; - if (id) { - opts['selectedRow'] = id; + if (event.originalEvent) { + var gridId = event.data.id; + var opts = jQuery.struts2_jquery[gridId] = {}; + + var id = event.originalEvent.id; + if (id) { + opts['selectedRow'] = id; + } } var callback = event.data.callback; if (callback) { @@ -41,7 +44,7 @@ }, addClearSelectTopic: function (gridId, callback) { - $.subscribe(gridId + '-cleanSelect', function(event) { + $.subscribe(gridId + '-clearSelect', function(event) { var gridId = event.data.id; jQuery.struts2_jquery[gridId] = {}; var callback = event.data.callback;

1 0

r95 - in trunk/echobase-entities/src/main: resources/i18n xmi
by tchemit＠users.forge.codelutin.com Nov. 18, 2011

Nov. 18, 2011

Author: tchemit Date: 2011-11-18 21:57:14 +0100 (Fri, 18 Nov 2011) New Revision: 95 Url: http://forge.codelutin.com/repositories/revision/echobase/95 Log: fix model Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-entities/src/main/xmi/echobase.zargo Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-18 11:29:38 UTC (rev 94) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-18 20:57:14 UTC (rev 95) @@ -4,6 +4,7 @@ echobase.common.acquisitionSoftwareVersion= echobase.common.addOffset= echobase.common.admin=Administrateur +echobase.common.age= echobase.common.ageClass=ageClass echobase.common.altCallsign= echobase.common.areaOfOperation=areaOfOperation @@ -36,7 +37,9 @@ echobase.common.classCode= echobase.common.classGroupId= echobase.common.classMeaning= +echobase.common.codeMemo= echobase.common.comment= +echobase.common.count= echobase.common.data=data echobase.common.dataAcquisition=dataAcquisition echobase.common.dataCentre= @@ -64,7 +67,13 @@ echobase.common.echoBaseUserDTO= echobase.common.echosounderSoundSpeed= echobase.common.email=Courriel +echobase.common.endDate= echobase.common.endPort= +echobase.common.endTimeFillageEngin= +echobase.common.engine= +echobase.common.engineCaracteristic= +echobase.common.engineParameter= +echobase.common.engineType= echobase.common.entityId=Identifiant de l'entité echobase.common.entityModificationLog=Journal des modifications echobase.common.entityModificationLogDTO= @@ -84,17 +93,30 @@ echobase.common.history= echobase.common.iMO= echobase.common.id=Identifiant +echobase.common.impacte= +echobase.common.individu= +echobase.common.individualMeasureParameter= +echobase.common.individualMeasureParameterValue= echobase.common.institution= echobase.common.keywords= echobase.common.label= echobase.common.lastModifiedDate=Date de dernière modification echobase.common.lastModifiedUser=Utilisateur de dernière modification +echobase.common.latitudeEndFillageEngin= +echobase.common.latitudeStartFillageEngin= +echobase.common.length= echobase.common.lengthClass=lengthClass +echobase.common.libelle= echobase.common.licence= echobase.common.linestring= echobase.common.loggedDataDatatype= echobase.common.loggedDataFormat= echobase.common.longName= +echobase.common.longitudeEndFillageEngin= +echobase.common.longitudeStartFillageEngin= +echobase.common.measureStep= +echobase.common.measureType= +echobase.common.measureUnit= echobase.common.metadata=metadata echobase.common.metadataClass=metadataClass echobase.common.mission=mission @@ -104,6 +126,11 @@ echobase.common.modificationText=Modification echobase.common.name=Nom echobase.common.notes= +echobase.common.operation= +echobase.common.operationEngineParameterValue= +echobase.common.operationParameter= +echobase.common.operationParameterValue= +echobase.common.operationType= echobase.common.operator= echobase.common.organisationLevelAcknowledgements= echobase.common.organisationReferences= @@ -127,14 +154,22 @@ echobase.common.region=region echobase.common.regionName= echobase.common.relatedActivity= +echobase.common.sample= +echobase.common.sampleCSJ= +echobase.common.sampleLength= echobase.common.scaleFactor= +echobase.common.scientistName= +echobase.common.size= echobase.common.soundSpeedCalculations= echobase.common.sounderConstant= echobase.common.source= +echobase.common.species= echobase.common.speciesClass=speciesClass echobase.common.sqlQuery=Requête SQL echobase.common.standardName= +echobase.common.startDate= echobase.common.startPort= +echobase.common.startTimeFillageEngin= echobase.common.station=station echobase.common.surface= echobase.common.timeCoverageEnd= @@ -183,6 +218,8 @@ echobase.common.user=Utilisateur echobase.common.validMax= echobase.common.validMin= +echobase.common.value= +echobase.common.vernacullaireName= echobase.common.vessel=Navire echobase.common.vesselCode= echobase.common.vesselEnginePower= @@ -197,4 +234,5 @@ echobase.common.voyageEndDate= echobase.common.voyageName= echobase.common.voyageStartDate= +echobase.common.weight= echobase.config.data.directory.description=Chemin de l'application Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ)

1 0

r94 - in trunk: . echobase-services/src/main/java/fr/ifremer/echobase/services echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor
by sletellier＠users.forge.codelutin.com Nov. 18, 2011

Nov. 18, 2011

Author: sletellier Date: 2011-11-18 12:29:38 +0100 (Fri, 18 Nov 2011) New Revision: 94 Url: http://forge.codelutin.com/repositories/revision/echobase/94 Log: - Use ToCsv method of StringUtil : http://nuiton.org/issues/1811 Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp trunk/pom.xml Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-18 09:32:42 UTC (rev 93) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-18 11:29:38 UTC (rev 94) @@ -45,6 +45,7 @@ import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.util.EntityOperator; +import org.nuiton.util.StringUtil; import org.nuiton.util.beans.BeanMonitor; import org.nuiton.util.beans.PropertyDiff; @@ -73,6 +74,7 @@ public static final String SCV_EXT = ".csv"; public static final String EXPORT_FILE_FORMAT_DATE = "yyyyMMddHHmmss"; public static final String BASE_EDITOR_FORMAT_DATE = "dd/MM/yyyy HH:mm:ss"; + public static final String CSV_SEPARATOR = ";"; protected DecoratorService decoratorService; protected SimpleDateFormat dateFormat; @@ -124,6 +126,7 @@ return getDatas(tableName, pager, sidx, ascendantOrder, true); } + public Map<?, ?>[] getDatas(String tableName, Pager pager, String sidx, @@ -392,14 +395,14 @@ try { bf = new BufferedReader(new FileReader(importFile)); String csvHeader = bf.readLine(); - String[] properties = csvHeader.split(";"); + String[] properties = csvHeader.split(CSV_SEPARATOR); String line = bf.readLine(); while (line != null) { Map<String, String> valuesMap = Maps.newLinkedHashMap(); - String[] values = line.split(";"); + String[] values = line.split(CSV_SEPARATOR); String id = values[0]; for (int i=1;i<values.length;i++) { @@ -439,15 +442,21 @@ // Build csv boolean headerCompleted = false; + + // To escape value if csv special char is found + StringUtil.ToString csvConvertor = new StringUtil.ToCSV(CSV_SEPARATOR); for (Map<?, ?> data : datas) { + + // Write header if (!headerCompleted) { - String keys = StringUtils.join(data.keySet(), ";"); + String keys = StringUtil.join(data.keySet(), csvConvertor, CSV_SEPARATOR, false); csvContent.append(keys); csvContent.append("\n"); headerCompleted = true; } - String values = StringUtils.join(data.values(), ";"); + // Write content + String values = StringUtil.join(data.values(), csvConvertor, CSV_SEPARATOR, false); csvContent.append(values); csvContent.append("\n"); } Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-18 09:32:42 UTC (rev 93) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-18 11:29:38 UTC (rev 94) @@ -41,6 +41,7 @@ combos.each(function(obj) { this.name = this.id; }); + var pickers = $('input.hasDatepicker'); pickers.each(function(obj) { this.name = this.id; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-18 09:32:42 UTC (rev 93) +++ trunk/pom.xml 2011-11-18 11:29:38 UTC (rev 94) @@ -109,7 +109,7 @@ <eugenePluginVersion>2.4.1</eugenePluginVersion> <topiaVersion>2.6.4</topiaVersion> - <nuitonUtilsVersion>2.3.1</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.6</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion>

1 0

r93 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor echobase-ui/src/main/resources/config echobase-ui/src/main/webapp/WEB-INF/includes
by sletellier＠users.forge.codelutin.com Nov. 18, 2011

Nov. 18, 2011

Author: sletellier Date: 2011-11-18 10:32:42 +0100 (Fri, 18 Nov 2011) New Revision: 93 Url: http://forge.codelutin.com/repositories/revision/echobase/93 Log: - Replace "failled" to "failed" - Fix footer copyright - Improve import error message - Using @InputConfig to call input method on validation error Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-17 16:53:37 UTC (rev 92) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-18 09:32:42 UTC (rev 93) @@ -373,7 +373,7 @@ property = topiaId; } - // Convert date to timestamp + // Format date if (columnMeta.isDate() && property != null) { Date date = (Date) property; property = getDateFormat().format(date); @@ -416,14 +416,14 @@ // Commit getTransaction().commitTransaction(); } catch (Exception eee) { - log.error("Failled to read import file " + importFile.getName(), eee); + log.error("Failed to read import file " + importFile.getName(), eee); throw new EchoBaseTechnicalException(eee); } finally { if (bf != null) { try { bf.close(); } catch (IOException eee) { - log.error("Failled to close import file " + importFile.getName(), eee); + log.error("Failed to close import file " + importFile.getName(), eee); throw new EchoBaseTechnicalException(eee); } } @@ -466,14 +466,14 @@ writer = new FileWriter(file, true); writer.write(csvContent.toString()); } catch (IOException eee) { - log.error("Failled to write modif export file", eee); + log.error("Failed to write modif export file", eee); throw new EchoBaseTechnicalException(eee); } finally { if (writer != null) { try { writer.close(); } catch (IOException eee) { - log.error("Failled to close modif export file", eee); + log.error("Failed to close modif export file", eee); throw new EchoBaseTechnicalException(eee); } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java 2011-11-17 16:53:37 UTC (rev 92) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java 2011-11-18 09:32:42 UTC (rev 93) @@ -23,7 +23,9 @@ */ package fr.ifremer.echobase.ui.actions.dbeditor; +import com.google.common.base.Throwables; import com.google.common.collect.Lists; +import com.opensymphony.xwork2.interceptor.annotations.InputConfig; import fr.ifremer.echobase.services.DbEditorService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -36,6 +38,7 @@ * To import datas from import file. * * FIXME 20111117 sletellier : extends {@link LoadEntities} find a better way to redirect to dbeditor page on validation error + * UPDATE 20111118 sletellier : with {@link @InputConfig} probleme is solve ? dbeditor root page is prepared only on validation error... * * @author sletellier <letellier(a)codelutin.com> * @since 0.1 @@ -88,14 +91,24 @@ this.propertyDiffs = propertyDiffs; } - public String doImportModif() throws Exception { + @Override + @InputConfig(methodName = "input") // to call inpu method on validation error to initialize dbeditor page + public String execute() throws Exception { DbEditorService dbEditorService = newService(DbEditorService.class); - propertyDiffs = dbEditorService.importDatas(tableName, - modifImport, - getEchoBaseSession().getEchoBaseUser()); + try { + propertyDiffs = dbEditorService.importDatas(tableName, + modifImport, + getEchoBaseSession().getEchoBaseUser()); + } catch (Exception eee) { + String message = "Failed to import datas : "; + log.error(message, eee); + addActionError(message + Throwables.getRootCause(eee).getMessage()); + + return ERROR; + } for (PropertyDiff[] diffs : propertyDiffs) { for (PropertyDiff diff : diffs) { String msg = _("echobase.message.modified.property", Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2011-11-17 16:53:37 UTC (rev 92) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2011-11-18 09:32:42 UTC (rev 93) @@ -43,7 +43,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class LoadEntities extends EchoBaseActionSupport implements Preparable { +public class LoadEntities extends EchoBaseActionSupport { private static final long serialVersionUID = 1L; @@ -73,7 +73,7 @@ } @Override - public void prepare() throws Exception { + public String input() throws Exception { tableNames = Maps.newTreeMap(); DbMeta dbMeta = getEchoBaseApplicationContext().getDbMeta(); for (TableMeta tableMeta : dbMeta) { @@ -91,6 +91,7 @@ DbEditorService dbEditorService = newService(DbEditorService.class); tableMeta = dbEditorService.getTableMetas(tableName); } + return INPUT; } public String getEditType(ColumnMeta meta) { Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2011-11-17 16:53:37 UTC (rev 92) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2011-11-18 09:32:42 UTC (rev 93) @@ -41,10 +41,10 @@ </result-types>  - <action name="dbeditor" + <action name="dbeditor" method="input" class="fr.ifremer.echobase.ui.actions.dbeditor.LoadEntities"> <interceptor-ref name="paramsPrepareParamsStackLoggued"/> - <result>/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> + <result name="input">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> </action>  @@ -72,7 +72,7 @@ </action>  - <action name="doImport" method="doImportModif" class="fr.ifremer.echobase.ui.actions.dbeditor.ImportTable"> + <action name="doImport" class="fr.ifremer.echobase.ui.actions.dbeditor.ImportTable"> <interceptor-ref name="paramsPrepareParamsStackLoggued"/> <result>/WEB-INF/jsp/dbeditor/modifImportResult.jsp</result> <result name="input">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp 2011-11-17 16:53:37 UTC (rev 92) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp 2011-11-18 09:32:42 UTC (rev 93) @@ -53,7 +53,7 @@ </li> <li> Copyright 2011 - <a href="http://www.ifremer.fr">Echobase</a> + <a href="http://www.ifremer.fr">Ifremer</a> <a href="http://www.codelutin.com" title="Code Lutin" target="_blank">Code Lutin</a> </li>

1 0