Changeset 32630 for branches/eam_branches/ipp-20110906/ippToPsps/jython/scratchdb.py

Timestamp:

Nov 8, 2011, 2:44:12 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110906

Files:

• . (modified) (1 prop)
• ippToPsps/jython/scratchdb.py (modified) (2 diffs)

branches/eam_branches/ipp-20110906/ippToPsps/jython/scratchdb.py

@@ -40 +40 @@
         self.logger.debug("ScratchDb destructor")
 
-
     '''
     Creates a stored procedure for psfLikelihood. This uses an implementation of the complimentary error function taken from Numerical Recipes in C.
     '''
     def createPsfLikelihoodFunction(self):
-        sql = "DELIMITER $$ \
-               DROP FUNCTION IF EXISTS `psfLikelihood` $$ \
-               CREATE FUNCTION `psfLikelihood`(x REAL) RETURNS REAL \
+
+        sql = "DROP FUNCTION IF EXISTS `psfLikelihood`"
+        try:
+            self.execute(sql)
+        except:
+            self.logger.errorPair("Could not drop stored procedure", "psfLikelihood")
+            return False
+
+        sql = "CREATE FUNCTION `psfLikelihood`(x REAL) RETURNS REAL \
                DETERMINISTIC \
                COMMENT 'Returns the psfLikelihood using the complimentary error function with fractional error everywhere less than 1.2 x 10-7. From Numerical Recipes in C' \
@@ -62 +67 @@
                END IF; \
                RETURN ans; \
-               END $$ \
-               DELIMITER ;"
+               END"
 
         try: