Merge branch 'master' into servlets

[proteocache.git] / datadb / compbio / cassandra / JpredParserLocalFile.java

diff --git a/datadb/compbio/cassandra/JpredParserLocalFile.java b/datadb/compbio/cassandra/JpredParserLocalFile.java
index 281a20b..4b254ae 100644 (file)
--- a/datadb/compbio/cassandra/JpredParserLocalFile.java
+++ b/datadb/compbio/cassandra/JpredParserLocalFile.java
@@ -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 += cc.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;
        }
 
 }