Changeset 41475 for trunk

Timestamp:

Jan 24, 2021, 3:39:06 PM (5 years ago)

Author:

eugene

Message:

catch unhandled error (no valid image data); allow -h to show help info without valid configuration

Location:

trunk/Ohana/src/addstar

Files:

• include/addstar.h (modified) (1 diff)
• src/ConfigInit.c (modified) (1 diff)
• src/LoadStars.c (modified) (3 diffs)
• src/MatchHeaders.c (modified) (1 diff)
• src/addstar.c (modified) (2 diffs)
• src/args.c (modified) (2 diffs)
• src/args_parallel_client.c (modified) (1 diff)

trunk/Ohana/src/addstar/include/addstar.h

@@ -341 +341 @@
 void resort_catalog_galphot (Catalog *catalog);
 
+void GetConfig (char *config, char *field, char *format, int N, void *ptr);
+
 /** 
     there is an inconsistency to be resolved: fixed structures (like Image)

trunk/Ohana/src/addstar/src/ConfigInit.c

@@ -1 +1 @@
 # include "addstar.h"
-
-void GetConfig (char *config, char *field, char *format, int N, void *ptr);
 
 AddstarClientOptions ConfigInit (int *argc, char **argv) {

trunk/Ohana/src/addstar/src/LoadStars.c

@@ -3 +3 @@
 Catalog *LoadStars (char *filename, Image **images, off_t *Nimages, AddstarClientOptions *options) {
 
-  off_t *extsize;
   int i, Nfile, mode;
 
@@ -38 +37 @@
     off_t NimagesStart = *Nimages;
     Catalog *newcat = NULL;
+    off_t *extsize = NULL;
 
     // load PMM data if specified (these are not stored as FITS-tables)
@@ -47 +47 @@
     // otherwise, we have FITS-table files: parse their headers to determine the contents
     headers = LoadHeaders (f, &mode, &Nheaders);
+    if (Nheaders == 0) {
+      fprintf (stderr, "ERROR: no FITS headers in %s, is it a FITS file?\n", file[i].filename);
+      goto next_file;
+    }
+
     headerSets = MatchHeaders (&extsize, &NheaderSets, mode, headers, Nheaders);
     if (headerSets == NULL) {

trunk/Ohana/src/addstar/src/MatchHeaders.c

@@ -21 +21 @@
   char extname[80], exttype[80], exthead[80], xtension[80];
   HeaderSet *headerSets;
+
+  if (!Nheaders) return NULL;
 
   ALLOCATE (extsize[0], off_t, Nheaders);

trunk/Ohana/src/addstar/src/addstar.c

@@ -1 +1 @@
 # include "addstar.h"
+void help (void);
 
 # define RESETTIME { gettimeofday (&startTimer, (void *) NULL); }
@@ -21 +22 @@
 
   INITTIME;
+
+  /* check for help request */
+  if (get_argument (argc, argv, "-h"    )) help();
+  if (get_argument (argc, argv, "-help" )) help();
+  if (get_argument (argc, argv, "--help")) help();
 
   SetSignals ();

trunk/Ohana/src/addstar/src/args.c

@@ -1 +1 @@
 # include "addstar.h"
-static void help (void);
+void help (void);
 
 AddstarClientOptions args (int argc, char **argv, AddstarClientOptions options) {
@@ -430 +430 @@
 }
 
-static void help () {
+void help (void) {
 
   fprintf (stderr, "USAGE\n");

trunk/Ohana/src/addstar/src/args_parallel_client.c

@@ -106 +106 @@
 }
 
-static void help () {
+static void help (void) {
 
   fprintf (stderr, "USAGE\n");