Project

General

Profile

« Previous | Next » 

Revision 1c637b4f

Added by Andreas Müller over 13 years ago

moved PESI classes to cdmlib-pesi

View differences:

.gitattributes
1192 1192
app-import/src/main/resources/taxonX/palm_tc_98886.xml -text
1193 1193
app-import/src/main/resources/tcs/Cichorium_tcs.xml -text
1194 1194
app-import/src/main/resources/tcs/tcsXmlTest.xml -text
1195
cdmlib-pesi/LICENSE.TXT -text
1196
cdmlib-pesi/README.TXT -text
1197
cdmlib-pesi/pom.xml -text
1198
cdmlib-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/merging/FaunaEuErmsMerging.java -text
1199
cdmlib-pesi/src/test/java/eu/etaxonomy/cdm/io/erms/ermsErrors.txt -text
.gitignore
17 17
app-import/src/main/resources/arecaceae_short.rdf
18 18
app-import/src/main/resources/tmp
19 19
/bin
20
cdmlib-pesi/.classpath
21
cdmlib-pesi/.project
22
cdmlib-pesi/.settings
23
cdmlib-pesi/target
20 24
/eu.etaxonomy.cdm.model.common.DefinedTermBase
21 25
/eu.etaxonomy.cdm.model.common.LanguageString
22 26
/eu.etaxonomy.cdm.model.description.DescriptionBase
cdmlib-pesi/LICENSE.TXT
1
The contents of this file are subject to the Mozilla Public License
2
Version 1.1 (the "License"); you may not use this file except in
3
compliance with the License. You may obtain a copy of the License at
4
http://www.mozilla.org/MPL/
5

  
6
Software distributed under the License is distributed on an "AS IS"
7
basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
8
License for the specific language governing rights and limitations
9
under the License.
cdmlib-pesi/README.TXT
1
The project uses Maven2 and AspectJ.
2

  
3
Please see http://dev.e-taxonomy.eu/trac/wiki/CdmLibrary for details on installation and usage
cdmlib-pesi/pom.xml
1
<?xml version="1.0" encoding="UTF-8"?>
2
<project xmlns="http://maven.apache.org/POM/4.0.0" 
3
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4
  <!-- 
5
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
6
   -->
7
  <parent>
8
    <groupId>eu.etaxonomy</groupId>
9
    <artifactId>cdmlib-parent</artifactId>
10
    <version>2.5</version>
11
	<relativePath>pom.xml</relativePath>
12
  </parent>
13
  
14
  <modelVersion>4.0.0</modelVersion>
15
  <artifactId>cdmlib-pesi</artifactId>
16
  <name>CDM PESI</name>
17
  <description>The PESI package for EDIT's CdmLibrary</description>
18
  <scm>
19
    <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-pesi/</connection>
20
    <developerConnection>scm:svn:https://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-pesi/</developerConnection>
21
    <url>http://dev.e-taxonomy.eu/trac/browser/trunk/cdmlib/cdmlib-pesi/</url>
22
  </scm>
23
  <build>
24
    <plugins>
25
      <plugin>
26
        <groupId>org.apache.maven.plugins</groupId>
27
        <artifactId>maven-jar-plugin</artifactId>
28
        <executions>
29
          <execution>
30
            <goals>
31
              <goal>test-jar</goal>
32
            </goals>
33
          </execution>
34
        </executions>
35
      </plugin>
36
    </plugins>
37
  </build>
38
  <dependencies>   
39
  <dependency>
40
  		<groupId>eu.etaxonomy</groupId>
41
  		<artifactId>cdmlib-persistence</artifactId>
42
  		<type>test-jar</type>
43
  		<scope>test</scope> 
44
  		<version>${parent.version}</version>
45
  	</dependency>
46
   	<dependency>
47
  		<groupId>eu.etaxonomy</groupId>
48
  		<artifactId>cdmlib-io</artifactId>
49
  	</dependency>
50
  	<dependency>
51
        <groupId>org.unitils</groupId>
52
        <artifactId>unitils</artifactId>
53
    </dependency>
54
    <dependency>
55
      <groupId>org.dbunit</groupId>
56
      <artifactId>dbunit</artifactId>
57
    </dependency>
58
    <dependency>
59
      <groupId>xmlunit</groupId>
60
      <artifactId>xmlunit</artifactId>
61
  	</dependency>
62
  </dependencies>
63
</project>
64

  
cdmlib-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/merging/FaunaEuErmsMerging.java
1
package eu.etaxonomy.cdm.io.pesi.merging;
2

  
3
public class FaunaEuErmsMerging {
4
	
5
	private String uuidFaunaEu;
6
	private String uuidErms;
7
	
8
	private String idInFaunaEu;
9
	private String idInErms;
10
	
11
	private String nameCacheInFaunaEu;
12
	private String nameCacheInErms;
13
	
14
	private boolean statInFaunaEu;
15
	private boolean statInErms;
16
	
17
	private String authorInFaunaEu;
18
	private String authorInErms;
19
	
20
	private String rankInFaunaEu;
21
	private String rankInErms;
22
	
23
	private String phylumInFaunaEu;
24
	private String phylumInErms;
25
	
26
	private String parentStringInFaunaEu;
27
	private String parentStringInErms;
28
	
29
	private String parentRankStringInFaunaEu;
30
	private String parentRankStringInErms;
31
	
32
	
33
	public String getUuidFaunaEu() {
34
		return uuidFaunaEu;
35
	}
36

  
37
	public void setUuidFaunaEu(String uuidFaunaEu) {
38
		this.uuidFaunaEu = uuidFaunaEu;
39
	}
40
	public String getUuidErms() {
41
		return uuidErms;
42
	}
43

  
44
	public void setUuidErms(String uuidErms) {
45
		this.uuidErms = uuidErms;
46
	}
47
	
48
	public String getParentRankStringInFaunaEu() {
49
		return parentRankStringInFaunaEu;
50
	}
51

  
52
	public void setParentRankStringInFaunaEu(String parentRankStringInFaunaEu) {
53
		this.parentRankStringInFaunaEu = parentRankStringInFaunaEu;
54
	}
55

  
56
	public String getParentRankStringInErms() {
57
		return parentRankStringInErms;
58
	}
59

  
60
	public void setParentRankStringInErms(String parentRankStringInErms) {
61
		this.parentRankStringInErms = parentRankStringInErms;
62
	}
63

  
64
	public String getParentStringInFaunaEu() {
65
		return parentStringInFaunaEu;
66
	}
67

  
68
	public void setParentStringInFaunaEu(String parentStringInFaunaEu) {
69
		this.parentStringInFaunaEu = parentStringInFaunaEu;
70
	}
71

  
72
	public String getParentStringInErms() {
73
		return parentStringInErms;
74
	}
75

  
76
	public void setParentStringInErms(String parentStringInErms) {
77
		this.parentStringInErms = parentStringInErms;
78
	}
79

  
80
	public String getRankInFaunaEu() {
81
		return rankInFaunaEu;
82
	}
83

  
84
	public void setRankInFaunaEu(String rankInFaunaEu) {
85
		this.rankInFaunaEu = rankInFaunaEu;
86
	}
87

  
88
	public String getPhylumInFaunaEu() {
89
		return phylumInFaunaEu;
90
	}
91

  
92
	public void setPhylumInFaunaEu(String phylumInFaunaEu) {
93
		this.phylumInFaunaEu = phylumInFaunaEu;
94
	}
95

  
96
	public String getPhylumInErms() {
97
		return phylumInErms;
98
	}
99

  
100
	public void setPhylumInErms(String phylumInErms) {
101
		this.phylumInErms = phylumInErms;
102
	}
103

  
104
	public String getRankInErms() {
105
		return rankInErms;
106
	}
107

  
108
	public void setRankInErms(String rankInErms) {
109
		this.rankInErms = rankInErms;
110
	}
111
	
112
	
113
	public static FaunaEuErmsMerging newInstance(){
114
		return new FaunaEuErmsMerging();
115
		
116
	}
117
	
118
	public boolean isStatInFaunaEu() {
119
		return statInFaunaEu;
120
	}
121
	public void setStatInFaunaEu(boolean statInFaunaEu) {
122
		this.statInFaunaEu = statInFaunaEu;
123
	}
124
	public boolean isStatInErms() {
125
		return statInErms;
126
	}
127
	public void setStatInErms(boolean statInErms) {
128
		this.statInErms = statInErms;
129
	}
130
	public String getAuthorInFaunaEu() {
131
		return authorInFaunaEu;
132
	}
133
	public void setAuthorInFaunaEu(String authorInFaunaEu) {
134
		this.authorInFaunaEu = authorInFaunaEu;
135
	}
136
	public String getAuthorInErms() {
137
		return authorInErms;
138
	}
139
	public void setAuthorInErms(String authorInErms) {
140
		this.authorInErms = authorInErms;
141
	}
142
	public String getIdInFaunaEu() {
143
		return idInFaunaEu;
144
	}
145
	public void setIdInFaunaEu(String idInFaunaEu) {
146
		this.idInFaunaEu = idInFaunaEu;
147
	}
148
	public String getIdInErms() {
149
		return idInErms;
150
	}
151
	public void setIdInErms(String idInErms) {
152
		this.idInErms = idInErms;
153
	}
154
	public String getNameCacheInFaunaEu() {
155
		return nameCacheInFaunaEu;
156
	}
157
	public void setNameCacheInFaunaEu(String nameCacheInFaunaEu) {
158
		this.nameCacheInFaunaEu = nameCacheInFaunaEu;
159
	}
160
	public String getNameCacheInErms() {
161
		return nameCacheInErms;
162
	}
163
	public void setNameCacheInErms(String nameCacheInErms) {
164
		this.nameCacheInErms = nameCacheInErms;
165
	}
166

  
167
	
168
	
169
}
cdmlib-pesi/src/test/java/eu/etaxonomy/cdm/io/erms/ermsErrors.txt
1
ERRORS in ERMS
2
=====================
3

  
4
- there is one case, where a nomen nudum is the accepted taxon for an other taxon
5

  
6
SELECT     dbo.tu.tu_status, tu_1.tu_acctaxon, tu_1.id, dbo.tu.tu_displayname
7
FROM         dbo.tu INNER JOIN
8
                      dbo.tu AS tu_1 ON dbo.tu.id = tu_1.tu_acctaxon
9
WHERE     (dbo.tu.tu_status = 3) OR
10
                      (tu_1.id = 111846) OR
11
                      (tu_1.id = 111850)
12
					  
13
- there are 448 cases where the tu_acctaxon has not a status "accepted"
14

  
15
SELECT     dbo.tu.tu_status AS acceptedStatus, dbo.tu.tu_displayname AS acceptedName, unaccepted.tu_status AS unacceptedStatus, 
16
                      unaccepted.tu_displayname AS unacceptedName
17
FROM         dbo.tu INNER JOIN
18
                      dbo.tu AS unaccepted ON dbo.tu.id = unaccepted.tu_acctaxon
19
WHERE     (dbo.tu.tu_status <> 1)
20
ORDER BY acceptedStatus, unacceptedStatus 
21

  
22
- 289 cases where parent taxon is not accepted (is this allowed ?)
23

  
24
- there are 46 taxa with a status not accepted, a parent not accepted and an parent.tu_acctaxon not accepted 
25

  
26
SELECT     TOP (100) PERCENT tu_1.id, tu_1.tu_status, accTaxon.tu_status AS accStatus, parent.tu_status AS parentStatus, 
27
                      accParent.tu_status AS accParentStatus, tu_1.tu_displayname AS displayname, parent.tu_displayname AS parentdisplayname, tu_1.tu_acctaxon, 
28
                      dbo.status.status_name, dbo.status.status_id AS myStatus, parent.id AS parentId, tu_1.tu_sp
29
FROM         dbo.status RIGHT OUTER JOIN
30
                      dbo.tu AS accTaxon RIGHT OUTER JOIN
31
                      dbo.tu AS tu_1 ON accTaxon.id = tu_1.tu_acctaxon LEFT OUTER JOIN
32
                      dbo.tu AS parent ON tu_1.tu_parent = parent.id ON dbo.status.status_id = tu_1.tu_status LEFT OUTER JOIN
33
                      dbo.tu AS accParent ON parent.tu_acctaxon = accParent.id
34
WHERE     (tu_1.tu_status <> 1) AND (parent.tu_status <> 1) AND (accParent.tu_status <> 1)
35
ORDER BY accParentStatus, parentStatus
36

  
37
- there are 27 taxa with a status not accepted, a parent not accepted and an parent.tu_acctaxon not accepted and an tu_acctaxon not accepted
38

  
39
SELECT     TOP (100) PERCENT tu_1.id, tu_1.tu_status, accTaxon.tu_status AS accStatus, parent.tu_status AS parentStatus, 
40
                      accParent.tu_status AS accParentStatus, tu_1.tu_displayname AS displayname, parent.tu_displayname AS parentdisplayname, tu_1.tu_acctaxon, 
41
                      dbo.status.status_name, dbo.status.status_id AS myStatus, parent.id AS parentId, tu_1.tu_sp
42
FROM         dbo.status RIGHT OUTER JOIN
43
                      dbo.tu AS accTaxon RIGHT OUTER JOIN
44
                      dbo.tu AS tu_1 ON accTaxon.id = tu_1.tu_acctaxon LEFT OUTER JOIN
45
                      dbo.tu AS parent ON tu_1.tu_parent = parent.id ON dbo.status.status_id = tu_1.tu_status LEFT OUTER JOIN
46
                      dbo.tu AS accParent ON parent.tu_acctaxon = accParent.id
47
WHERE     (tu_1.tu_status <> 1) AND (parent.tu_status <> 1) AND (accParent.tu_status <> 1) AND (accTaxon.tu_status <> 1)
48
ORDER BY accParentStatus, parentStatus

Also available in: Unified diff