Changeset 39224 for branches/eam_branches/ipp-20151113/ippToPsps/jython/ipptopspsdb.py

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:

• . (modified) (1 prop)
• ippToPsps (modified) (1 prop)
• ippToPsps/jython/ipptopspsdb.py (modified) (8 diffs)

branches/eam_branches/ipp-20151113/ippToPsps

@@ -14 +14 @@
 install-sh
 Doxyfile
+compile

@@ -14 +14 @@
 install-sh
 Doxyfile
+compile

branches/eam_branches/ipp-20151113/ippToPsps/jython/ipptopspsdb.py

@@ -324 +324 @@
                AND processed = 1 \
                AND loaded_to_datastore = 1 \
-               AND timestamp BETWEEN now() - INTERVAL " + interval + " AND now()"
+               AND timestamp >= now() - INTERVAL " + interval + " AND timestamp < now()"
 
         total = -1
@@ -421 +421 @@
                AND timestamp > '" + self.skychunk.epoch + "' \
                AND dvo_db = '" + self.skychunk.dvoLabel + "' \
-               AND timestamp BETWEEN now() - INTERVAL " + interval + " AND now()"
+               AND timestamp >= now() - INTERVAL " + interval + " AND timestamp < now()"
 
         try:
@@ -545 +545 @@
                AND dvo_db = '" + self.skychunk.dvoLabel + "' \
                AND batch_type != 'IN' \
-               AND timestamp BETWEEN now() - INTERVAL 12 HOUR AND now()"
+               AND timestamp >= now() - INTERVAL 12 HOUR AND timestamp < now()"
 
         try:
@@ -1158 +1158 @@
 
         self.skychunk.boxSize = rs.getDouble(10)
-        # self.skychunk.halfBox = self.skychunk.boxSize/2.0
-        # self.skychunk.boxSizeWithBorder = self.skychunk.boxSize + (self.skychunk.BORDER * 2)
 
         self.skychunk.basePath = rs.getString(11)
@@ -1240 +1238 @@
         sql = "SELECT id FROM box \
                WHERE skychunk  = '" + self.skychunk.name + "' \
-               AND ra_center BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
-               AND dec_center BETWEEN " + str(minDEC) + " AND " + str(maxDEC)
+               AND ra_center >= " + str(minRA) + " AND ra_center < " + str(maxRA) + " \
+               AND dec_center >= " + str(minDEC) + " AND dec_center < " + str(maxDEC)
 
                # AND box_side = " + str(self.skychunk.boxSize)
@@ -1424 +1422 @@
                FROM box \
                JOIN pending ON (id = box_id) \
-               WHERE ra_center BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
+               WHERE ra_center >= " + str(minRA) + " AND ra_center < " + str(maxRA) + " \
                AND batch_type = '" + batchType + "' \
                AND skychunk = '" + self.skychunk.name + "' \
@@ -1503 +1501 @@
                FROM box \
                JOIN pending ON (id = box_id) \
-               WHERE ra_center BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
+               WHERE ra_center >= " + str(minRA) + " AND ra_center < " + str(maxRA) + " \
                AND skychunk = '" + self.skychunk.name + "' \
                ORDER BY dec_center DESC"
@@ -1712 +1710 @@
         sql = "SELECT DISTINCT stage_id \
                FROM all_pending \
-               WHERE ra_bore BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
-               AND dec_bore BETWEEN " + str(minDEC) + " AND " + str(maxDEC)
+               WHERE ra_bore >= " + str(minRA) + " AND ra_bore < " + str(maxRA) + " \
+               AND dec_bore >= " + str(minDEC) + " AND dec_bore < " + str(maxDEC)
 
         try:

@@ -14 +14 @@
 install-sh
 Doxyfile
+compile