Context Navigation

test

Timestamp:

Dec 3, 2015, 4:14:24 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20151113

Files:

branches/eam_branches/ipp-20151113
- Property svn:mergeinfo changed
  /trunk (added) merged: 39137-39165,39167-39181,39186,39189,39191-39192,39209-39210,39216-39217

Property svn:ignore

Property svn:ignore

r39061	r39224
561	561
562	562	rm -rf $OUTDIR/FO
	563	rm -rf $OUTDIR/FG
563	564
564	565	ippjython loader.py $options $forcedobjqueuename once -simtest < /dev/null

r39015	r39224
21	21	CREATE TABLE diffRun ( diff_id INT, tess_id CHAR(64), state CHAR(16), diff_mode INT, software_ver CHAR(16) );
22	22	CREATE TABLE diffInputSkyfile ( diff_id INT, warp1 INT, stack2 INT, diff_skyfile_id INT, tess_id CHAR(64), skycell_id CHAR(64) );
23		CREATE TABLE diffSkyfile ( diff_id INT, ~~diff_skyfile_id INT, tess_id CHAR(64),~~ skycell_id CHAR(64), path_base CHAR(255) );
	23	CREATE TABLE diffSkyfile ( diff_id INT, skycell_id CHAR(64), path_base CHAR(255) );
24	24
25	25	CREATE TABLE addRun ( add_id INT, stage CHAR(64), stage_extra1 INT, state CHAR(64), stage_id INT, minidvodb_name CHAR(64) );

r39105	r39224
654	654	dbinsert diffRun (diff_id, tess_id, state, diff_mode, software_ver) values ($difID, $TESS_ID, "full", 2, "38000M")
655	655	dbinsert diffInputSkyfile (diff_id, warp1, stack2, diff_skyfile_id, tess_id, skycell_id) values ($difID, $wrpID, $stkID, $diffSkyfileID, $TESS_ID, $SKYCELL )
656		dbinsert diffSkyfile (diff_id, ~~diff_skyfile_id, tess_id, skycell_id, path_base) values ($difID, $diffSkyfileID, $TESS_~~ID, $SKYCELL, "$filename")
	656	dbinsert diffSkyfile (diff_id, skycell_id, path_base) values ($difID, $SKYCELL, "$filename")
657	657	end
658	658

Note: See TracChangeset for help on using the changeset viewer.