Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/MGRAST/tools/BulkLoader/BulkLoader.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ TABLE=''
INFILE=''
OUTDIR=''
JAVA=`which java`
JARS="/root/cassandra/lib /root/opencsv"
JARS="/root/cassandra/lib/*"

while getopts hk:t:i:o: option; do
case "${option}"
Expand Down Expand Up @@ -46,10 +46,7 @@ if [ -z "$CASSANDRA_CONFIG" ]; then
fi

# set classpath
CLASSPATH=".:$CASSANDRA_CONFIG"
for path in $JARS; do
CLASSPATH="$CLASSPATH:$path/*"
done
CLASSPATH=".:$CASSANDRA_CONFIG:$JARS"

# Compile
echo "compile: javac -cp $CLASSPATH BulkLoader.java"
Expand Down
Binary file added src/MGRAST/tools/BulkLoader/opencsv-3.4.jar
Binary file not shown.
8 changes: 4 additions & 4 deletions src/MGRAST/tools/dump_annotation_for_cass.pl
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@

print STDERR "Dumping protein data ...\n";
foreach my $md5 (@$pmd5s) {
my $data = $dbh->selectall_arrayref("SELECT DISTINCT m._id, s.source, a.id, f.name, o.name FROM md5_protein a INNER JOIN md5s m ON a.md5 = m.md5 LEFT OUTER JOIN functions f ON a.function = f._id LEFT OUTER JOIN organisms_ncbi o ON a.organism = o._id LEFT OUTER JOIN sources s ON a.source = s._id where a.md5='$md5'");
my $data = $dbh->selectall_arrayref("SELECT DISTINCT m._id, s.name, a.id, f.name, o.name FROM md5_protein a INNER JOIN md5s m ON a.md5 = m.md5 LEFT OUTER JOIN functions f ON a.function = f._id LEFT OUTER JOIN organisms_ncbi o ON a.organism = o._id LEFT OUTER JOIN sources s ON a.source = s._id where a.md5='$md5'");
next unless ($data && @$data);
my $mid = $data->[0][0];
my $srcs = {};
Expand Down Expand Up @@ -167,7 +167,7 @@

print STDERR "Dumping rna data ...\n";
foreach my $md5 (@$rmd5s) {
my $data = $dbh->selectall_arrayref("SELECT DISTINCT m._id, s.source, a.id, f.name, o.name FROM md5_rna a INNER JOIN md5s m ON a.md5 = m.md5 LEFT OUTER JOIN functions f ON a.function = f._id LEFT OUTER JOIN organisms_ncbi o ON a.organism = o._id LEFT OUTER JOIN sources s ON a.source = s._id where a.md5='$md5'");
my $data = $dbh->selectall_arrayref("SELECT DISTINCT m._id, s.name, a.id, f.name, o.name FROM md5_rna a INNER JOIN md5s m ON a.md5 = m.md5 LEFT OUTER JOIN functions f ON a.function = f._id LEFT OUTER JOIN organisms_ncbi o ON a.organism = o._id LEFT OUTER JOIN sources s ON a.source = s._id where a.md5='$md5'");
next unless ($data && @$data);
my $mid = $data->[0][0];
my $srcs = {};
Expand Down Expand Up @@ -208,7 +208,7 @@

print STDERR "Dumping ontology data ...\n";
foreach my $md5 (@$omd5s) {
my $data = $dbh->selectall_arrayref("SELECT DISTINCT m._id, s.source, a.id, f.name FROM md5_ontology a INNER JOIN md5s m ON a.md5 = m.md5 LEFT OUTER JOIN functions f ON a.function = f._id LEFT OUTER JOIN sources s ON a.source = s._id where a.md5='$md5'");
my $data = $dbh->selectall_arrayref("SELECT DISTINCT m._id, s.name, a.id, f.name FROM md5_ontology a INNER JOIN md5s m ON a.md5 = m.md5 LEFT OUTER JOIN functions f ON a.function = f._id LEFT OUTER JOIN sources s ON a.source = s._id where a.md5='$md5'");
next unless ($data && @$data);
my $mid = $data->[0][0];
my $srcs = {};
Expand All @@ -228,7 +228,7 @@
$acc =~ s/\"/\\"/g;
$fun =~ s/\"/\\"/g;
print IDUMP join(",", map { '"'.$_.'"' } ($mid, $src, $md5, "true", "", "[]", $acc, $fun, ""))."\n";
print MDUMP join(",", map { '"'.$_.'"' } ($md5, $src, "true", "", "[]", $acc, $fun. ""))."\n";
print MDUMP join(",", map { '"'.$_.'"' } ($md5, $src, "true", "", "[]", $acc, $fun, ""))."\n";
}
}

Expand Down