X-Git-Url: http://jaekl.net/gitweb/?p=cfb.git;a=blobdiff_plain;f=prod%2Fnet%2Fjaekl%2Fcfb%2Fstore%2FDbStore.java;h=ed22291387c14c8047593d7b1a11932633df6361;hp=6c2097925f3d78a3c14fb91e6325643d66578be1;hb=e8190c8189a5270ada70aaa478409db6dbf1efae;hpb=769f0f2e9b90516e68246b551a4c68f953018c72

diff --git a/prod/net/jaekl/cfb/store/DbStore.java b/prod/net/jaekl/cfb/store/DbStore.java
index 6c20979..ed22291 100644
--- a/prod/net/jaekl/cfb/store/DbStore.java
+++ b/prod/net/jaekl/cfb/store/DbStore.java
@@ -3,7 +3,9 @@ package net.jaekl.cfb.store;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
+import java.util.Locale;
 
+import net.jaekl.cfb.CfbBundle;
 import net.jaekl.cfb.analyze.Analysis;
 import net.jaekl.cfb.db.CfbSchema;
 import net.jaekl.cfb.db.Column;
@@ -17,6 +19,8 @@ import net.jaekl.cfb.db.driver.DbDriver;
 import net.jaekl.cfb.xml.BugCollection;
 import net.jaekl.cfb.xml.BugInstance;
 import net.jaekl.cfb.xml.LocalVariable;
+import net.jaekl.cfb.xml.messages.BugCategory;
+import net.jaekl.cfb.xml.messages.BugPattern;
 import net.jaekl.cfb.xml.messages.MessageCollection;
 
 public class DbStore {
@@ -42,7 +46,9 @@ public class DbStore {
 		return getAnalysis(priorId);
 	}
 	
-	public boolean put(Analysis analysis) throws SQLException, TypeMismatchException {
+	public boolean put(Analysis analysis) throws SQLException, TypeMismatchException, StoreException {
+		CfbBundle bundle = CfbBundle.getInst(Locale.getDefault());
+		
 		if (null == analysis) {
 			return false;
 		}
@@ -54,6 +60,7 @@ public class DbStore {
 		Object[][] values = { 
 								{
 									Long.valueOf(runId),
+									analysis.getProjectName(),
 									analysis.getBuildNumber(),
 									analysis.getStart(),
 									analysis.getEnd() 
@@ -81,6 +88,13 @@ public class DbStore {
 			Location secondLoc = (locs.size() > 1) ? locs.get(1) : null;
 			Location thirdLoc  = (locs.size() > 2) ? locs.get(2) : null;
 			
+			if (BugPattern.UNKNOWN.getId() == bugId) {
+				throw new StoreException(bundle.get(CfbBundle.BUG_TYPE_UNKNOWN, ""+bug.getType()));
+			}
+			if (BugCategory.UNKNOWN.getId() == categoryId) {
+				throw new StoreException(bundle.get(CfbBundle.BUG_CATEGORY_UNKNOWN, ""+bug.getCategory()));
+			}
+			
 			values[row][0] = foundId;
 			values[row][1] = runId;
 			values[row][2] = bugId;
@@ -287,7 +301,10 @@ public class DbStore {
 	{
 		Column[] columns = { CfbSchema.RUNID };
 		Table[] tables = { CfbSchema.RUNS };
-		Condition[] conditions = { new Condition( CfbSchema.STARTTIME, analysis.getStart(), Operation.LESS_THAN ) };
+		Condition[] conditions = {
+			new Condition( CfbSchema.PROJNAME, analysis.getProjectName(), Operation.EQUAL ),
+			new Condition( CfbSchema.STARTTIME, analysis.getStart(), Operation.LESS_THAN ) 
+		};
 		Sort[] sorts = { new Sort( CfbSchema.STARTTIME, Sort.Direction.DESCENDING ) };
 		int limit = 1;
 		
@@ -300,7 +317,7 @@ public class DbStore {
 	
 	Analysis getAnalysis(Long analysisId) throws SQLException, TypeMismatchException
 	{
-		Column[] columns = { CfbSchema.VERSION, CfbSchema.STARTTIME, CfbSchema.ENDTIME };
+		Column[] columns = { CfbSchema.PROJNAME, CfbSchema.VERSION, CfbSchema.STARTTIME, CfbSchema.ENDTIME };
 		Table[] tables = { CfbSchema.RUNS };
 		Condition[] conditions = { new Condition( CfbSchema.RUNID, analysisId, Operation.EQUAL ) };
 		
@@ -311,11 +328,12 @@ public class DbStore {
 		
 		Row row = rows.get(0);
 		
-		String version = row.getString(0);
-		java.util.Date start= row.getDate(1);
-		java.util.Date end = row.getDate(2);
+		String projName = row.getString(0);
+		String version = row.getString(1);
+		java.util.Date start= row.getDate(2);
+		java.util.Date end = row.getDate(3);
 		
-		Analysis prior = new Analysis(version);
+		Analysis prior = new Analysis(projName, version);
 		prior.setId(analysisId.longValue());
 		prior.setStart(start);
 		prior.setEnd(end);