--- ray/src/util/eplus_idf.h	2014/02/01 01:28:43	2.1
+++ ray/src/util/eplus_idf.h	2014/02/09 22:19:30	2.5
@@ -1,4 +1,4 @@
-/* RCSid $Id: eplus_idf.h,v 2.1 2014/02/01 01:28:43 greg Exp $ */
+/* RCSid $Id: eplus_idf.h,v 2.5 2014/02/09 22:19:30 greg Exp $ */
 /*
  *  eplus_idf.h
  *
@@ -17,7 +17,7 @@ extern "C" {
 #endif
 
 #define	IDF_MAXLINE	512			/* maximum line length */
-#define IDF_MAXARGL	128			/* maximum argument length */
+#define IDF_MAXARGL	104			/* maximum argument length */
 
 /* Input Data File parameter argument list */
 typedef struct s_idf_field {
@@ -31,6 +31,7 @@ typedef struct s_idf_parameter {
 	const char		*pname;		/* parameter name (type) */
 	struct s_idf_parameter	*pnext;		/* next parameter same type */
 	struct s_idf_parameter	*dnext;		/* next parameter in IDF */
+	int			nfield;		/* field count */
 	IDF_FIELD		*flist;		/* field list */
 	char			rem[1];		/* comment (extends struct) */
 } IDF_PARAMETER;
@@ -40,21 +41,27 @@ typedef struct {
 	char			*hrem;		/* header remarks */
 	IDF_PARAMETER		*pfirst;	/* first parameter in file */
 	IDF_PARAMETER		*plast;		/* last parameter loaded */
-	LUTAB			ptab;		/* parameter table */
+	LUTAB			ptab;		/* parameter hash table */
 } IDF_LOADED;
 
-/* Create a new parameter with empty field list (comment optional) */
+/* Create a new parameter with empty field list (comment & prev optional) */
 extern IDF_PARAMETER	*idf_newparam(IDF_LOADED *idf, const char *pname,
-							const char *comm,
-						IDF_PARAMETER *prev);
+					const char *comm, IDF_PARAMETER *prev);
 
 /* Add a field to the given parameter and follow with the given text */
 extern int		idf_addfield(IDF_PARAMETER *param, const char *fval,
 							const char *comm);
 
-/* Delete the specified parameter from our IDF */
+/* Retrieve the indexed field from parameter (first field index is 1) */
+extern IDF_FIELD	*idf_getfield(IDF_PARAMETER *param, int fn);
+
+/* Delete the specified parameter from the IDF */
 extern int		idf_delparam(IDF_LOADED *idf, IDF_PARAMETER *param);
 
+/* Move the specified parameter to the given position in the IDF */
+extern int		idf_movparam(IDF_LOADED *idf, IDF_PARAMETER *param,
+						IDF_PARAMETER *prev);
+
 /* Get a named parameter list */
 extern IDF_PARAMETER	*idf_getparam(IDF_LOADED *idf, const char *pname);
 
@@ -64,14 +71,19 @@ extern IDF_PARAMETER	*idf_readparam(IDF_LOADED *idf, F
 /* Initialize an IDF struct */
 extern IDF_LOADED	*idf_create(const char *hdrcomm);
 
+/* Add comment(s) to header */
+extern int		idf_add2hdr(IDF_LOADED *idf, const char *hdrcomm);
+
 /* Load an Input Data File */
 extern IDF_LOADED	*idf_load(const char *fname);
 
 /* Write a parameter and fields to an open file */
-int			idf_writeparam(IDF_PARAMETER *param, FILE *fp);
+int			idf_writeparam(IDF_PARAMETER *param, FILE *fp,
+					int incl_comm);
 
 /* Write out an Input Data File */
-extern int		idf_write(IDF_LOADED *idf, const char *fname);
+extern int		idf_write(IDF_LOADED *idf, const char *fname,
+					int incl_comm);
 
 /* Free a loaded IDF */
 extern void		idf_free(IDF_LOADED *idf);