Changeset 42761

Timestamp:

Dec 6, 2024, 4:56:27 PM (20 months ago)

Author:

eugene

Message:

fix three build errors

Location:

branches/eam_branches/ipp-20230313

Files:

• Ohana/src/libdvo/src/mosaic_astrom.c (modified) (1 diff)
• Ohana/src/relphot/src/bcatalog.c (modified) (3 diffs)
• psLib/src/db/psDB.c (modified) (1 diff)

branches/eam_branches/ipp-20230313/Ohana/src/libdvo/src/mosaic_astrom.c

@@ -60 +60 @@
     j = getDISentry (images[i].tzero, images[i].tzero + (int) images[i].exptime, DIStzero, DISentry, Ndis);
     if (j == -1) {
-      if (NfailMatch < 100) fprintf (stderr, "WARNING: can't find matching mosaic: ID %d, name: %s, Dateobs %s,  \n", images[i].name);
-      // char *ohana_sec_to_date (time_t second) {
+      char *mydate = ohana_sec_to_date (images[i].tzero);
+      if (NfailMatch < 100) fprintf (stderr, "WARNING: can't find matching mosaic: ID %d, name: %s, Dateobs %s,  \n", images[i].imageID, images[i].name, mydate);
+      free (mydate);
       NfailMatch ++;
       continue;

branches/eam_branches/ipp-20230313/Ohana/src/relphot/src/bcatalog.c

@@ -199 +199 @@
     if (nEXT >= nPSF) {
       Nmeasure -= Nm;
-      BAD_COUNT(Ngalaxy);
+      badCount.Ngalaxy++;
       continue; 
     }
@@ -209 +209 @@
     if (Nm <= STAR_TOOFEW) { /* enough measurements total? */
       Nmeasure -= Nm;
-      BAD_COUNT(Nfew);
+      badCount.Nfew++;
       continue; 
     }
@@ -219 +219 @@
     if (!anySecfiltGood) {
       Nmeasure -= Nm;
-      BAD_COUNT(Nfew);
+      badCount.Nfew++;
       continue; 
     }

branches/eam_branches/ipp-20230313/psLib/src/db/psDB.c

@@ -55 +55 @@
 
 /* my_bool was removed from mysql at version 8.0.1, but not from mariadb */
-# if (MYSQL_VERSION_ID >= 80100) && !defined MARIADB_VERSION_ID 
+# if (MYSQL_VERSION_ID >= 80001) && !defined MARIADB_VERSION_ID 
   # define MYSQL_BOOL bool
 # else