Skip to content

Commit 2f16f6b

Browse files
committed
Fix NCBI taxonomy parsing
This commit fixes the parsing of the NCBI taxonomy web whose structure has been slightly changed recently.
1 parent 5ebfffd commit 2f16f6b

7 files changed

Lines changed: 9 additions & 12 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>org.sing_group</groupId>
77
<artifactId>seda-all</artifactId>
8-
<version>0.4.0</version>
8+
<version>0.4.1</version>
99
<packaging>pom</packaging>
1010

1111
<name>SEquence DAtaset builder</name>

seda-docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
# built documents.
5555
#
5656
# The short X.Y version.
57-
version = u'0.4.0'
57+
version = u'0.4.1'
5858
# The full version, including alpha/beta/rc tags.
5959
release = u'0.4'
6060

seda-plugin-blast/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.sing_group</groupId>
88
<artifactId>seda-all</artifactId>
9-
<version>0.4.0</version>
9+
<version>0.4.1</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

seda-plugin-clustalomega/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.sing_group</groupId>
88
<artifactId>seda-all</artifactId>
9-
<version>0.4.0</version>
9+
<version>0.4.1</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

seda/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.sing_group</groupId>
88
<artifactId>seda-all</artifactId>
9-
<version>0.4.0</version>
9+
<version>0.4.1</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

seda/src/main/java/org/sing_group/seda/core/ncbi/NcbiTaxonomyResolver.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,8 @@ private Optional<Element> findLineageDl(Document doc) {
6565
if (dtChild.childNodeSize() > 0) {
6666
if (dtChild.child(0).tagName().equals("a")) {
6767
Element link = dtChild.child(0);
68-
if (link.childNodeSize() == 1 && link.child(0).tagName().equals("em")) {
69-
if (link.child(0).text().equals("Lineage")) {
70-
return Optional.of(dlElement);
71-
}
68+
if (link.childNodeSize() == 1 && link.childNode(0).outerHtml().equals("Lineage")) {
69+
return Optional.of(dlElement);
7270
}
7371
}
7472
}
@@ -90,7 +88,6 @@ private Optional<NcbiTaxonomyInfo> extractNcbiTaxonomyInfo(Element lineageDl) {
9088
}
9189
}
9290
}
93-
9491
}
9592
return Optional.of(new NcbiTaxonomyInfo(values));
9693
}

seda/src/main/java/org/sing_group/seda/gui/concatenate/ConcatenateSequencesConfigurationPanel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
* it under the terms of the GNU General Public License as
99
* published by the Free Software Foundation, either version 3 of the
1010
* License, or (at your option) any later version.
11-
*
11+
*
1212
* This program is distributed in the hope that it will be useful,
1313
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1414
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1515
* GNU General Public License for more details.
16-
*
16+
*
1717
* You should have received a copy of the GNU General Public
1818
* License along with this program. If not, see
1919
* <http://www.gnu.org/licenses/gpl-3.0.html>.

0 commit comments

Comments
 (0)