Changeset 1915

Timestamp:

04/04/08 02:23:31 (9 months ago)

Author:

gary

Message:

parse_table.cpp - bugfix - no error when table lines "filename" did not open file, now stops with error message
cdgetlinelist.cpp - tidy up comments

Location:

trunk/source

Files:

• cdgetlinelist.cpp (modified) (3 diffs)
• parse_table.cpp (modified) (1 diff)

trunk/source/cdgetlinelist.cpp

@@ -2 +2 @@
  * others.  For conditions of distribution and use see copyright notice in license.txt */
 /*cdGetLineList routine to read in master list of emission line wavelengths and ids, for
- * generating loc grids,
- * someday add cdGetNLRLineList */
+ * generating loc grids */
 #include "cddefines.h"
 #include "cddrive.h"
@@ -38 +37 @@
         chFilename = ( strlen(chFile) == 0 ) ? "LineList_BLR.dat" : chFile;
 
-        /* >>chng 04 nov 06, had searched only on path, now search locally 
-         * and then on path if not found */
         /* we will check local space first, then on path if not present */
         ioData = open_data( chFilename, "r", AS_LOCAL_DATA_TRY );
 
         if( ioData == NULL )
+        {
+                /* did not find file, return -1 */
                 return -1;
+        }
 
         /* count how many lines are in the file, ignoring all lines
@@ -69 +69 @@
 
         /* create 1-d array of string labels */
-        /* create first dim of space for labels */
         *chLabels = (char**)MALLOC((size_t)(nLines+1)*sizeof(char *) );
 

trunk/source/parse_table.cpp

@@ -878 +878 @@
 
                 lgLines_Malloc = true;
-                /* this flag says we did not find a continuum source - nearly all table XXX
+                /* this flag says this is not find a continuum source - nearly all table XXX
                  * commands deal with continuum sources */
                 ncont = -10;
 
                 /* actually get the lines, and malloc the space in the arrays */
-                nLINE_TABLE = cdGetLineList( chLINE_LIST , &chLabel , &wl);
+                if( (nLINE_TABLE = cdGetLineList( chLINE_LIST , &chLabel , &wl) )<0 )
+                {
+                        /* did not find file, abort */
+                        fprintf(ioQQQ,"\n DISASTER PROBLEM ParseTable could not find "
+                                "line list file %s\n", chLINE_LIST );
+                        fprintf(ioQQQ," Please check the spelling of the file name and that it "
+                                "is in either the local or data directory.\n\n");
+                        cdEXIT(EXIT_FAILURE);
+                }
         }