X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=datadb%2Fcompbio%2Fcassandra%2FJpredParserLocalFile.java;h=a379d4eea0367f84ba6c908b29b5d2ec5b3cbae6;hb=d4eea7f5a8fea637ab742ce69c84a0f835266567;hp=281a20bdb604ef99e07fc6974bbed47b821235f5;hpb=7fafa396b8b56bb5cc7249dc7c12fd37edf5724b;p=proteocache.git

diff --git a/datadb/compbio/cassandra/JpredParserLocalFile.java b/datadb/compbio/cassandra/JpredParserLocalFile.java
index 281a20b..a379d4e 100644
--- a/datadb/compbio/cassandra/JpredParserLocalFile.java
+++ b/datadb/compbio/cassandra/JpredParserLocalFile.java
@@ -16,18 +16,18 @@ import java.util.Date;
 import java.util.List;
 
 public class JpredParserLocalFile implements JpredParser {
-	private CassandraNativeConnector cc = new CassandraNativeConnector();
+	private CassandraWriter cw = new CassandraWriter();
 	private String dirprefix;
 
 	public void setSource(String newsourceprefix) {
 		this.dirprefix = newsourceprefix;
 	}
 
-	JpredParserLocalFile() {
+	public JpredParserLocalFile() {
 		this.dirprefix = "/home/asherstnev/Projects/Java.projects/proteocache/data_stress_test/data.dat";
 	}
 
-	JpredParserLocalFile(String sourceurl) {
+	public JpredParserLocalFile(String sourceurl) {
 		this.dirprefix = sourceurl;
 	}
 
@@ -58,7 +58,7 @@ public class JpredParserLocalFile implements JpredParser {
 		System.out.println("Execution Time = " + execTime + " ms");
 	}
 
-	private int ParsingForDate(List<String> input, String date) {
+	private void ParsingForDate(List<String> input, String date) {
 		int totalcount = 0;
 		int countNoData = 0;
 		int countUnclearFASTAid = 0;
@@ -66,11 +66,10 @@ public class JpredParserLocalFile implements JpredParser {
 		int countinserted = 0;
 		int counAlignments = 0;
 		int countStrange = 0;
-		int njobs = 0;
 
 		System.out.println("Inserting jobs for " + date);
 		for (String in : input) {
-			if (in.matches(date + "(.*)jp_[^\\s]+")) {
+			if (in.matches(date + ":(.*)jp_[^\\s]+")) {
 				String[] table = in.split("\\s+");
 				String starttime = table[0];
 				String finishtime = table[1];
@@ -104,9 +103,7 @@ public class JpredParserLocalFile implements JpredParser {
 							} catch (ParseException e) {
 								e.printStackTrace();
 							}
-							cc.InsertData(insertdate, starttime, finishtime, ip, id, "OK", "OK", newprotein, seqs);
-							++countinsertions;
-							++njobs;
+							countinsertions += cw.FormQueryTables(insertdate, starttime, finishtime, ip, id, "OK", "OK", newprotein, seqs);
 						}
 						fr.close();
 					} catch (IOException e) {
@@ -132,7 +129,6 @@ public class JpredParserLocalFile implements JpredParser {
 			System.out.println("   " + countUnclearFASTAid + " jobs with unclear FASTA protein id in *.concise.fasta");
 			System.out.println("   " + countinsertions + " new job insertions\n");
 		}
-		return njobs;
 	}
 
 }