--- ray/src/util/wrapBSDF.c	2017/02/14 19:58:37	2.22
+++ ray/src/util/wrapBSDF.c	2020/10/26 21:12:20	2.26
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: wrapBSDF.c,v 2.22 2017/02/14 19:58:37 greg Exp $";
+static const char RCSid[] = "$Id: wrapBSDF.c,v 2.26 2020/10/26 21:12:20 greg Exp $";
 #endif
 /*
  * Wrap BSDF data in valid WINDOW XML file
@@ -27,7 +27,7 @@ const char	legal_units[] = "meter|foot|inch|centimeter
 					/* system materials & geometry */
 const char	*mgf_geometry = NULL;
 					/* comment list */
-#define MAXCOMM		30
+#define MAXCOMM		80
 const char	*commlist[MAXCOMM];
 int		ncomm = 0;
 					/* angle bases */
@@ -69,8 +69,15 @@ const char	*field_assignment[MAXASSIGN];
 int		nfield_assign = 0;
 #define FASEP	';'
 					/* data file(s) & spectra */
-enum { DTtransForward, DTtransBackward, DTreflForward, DTreflBackward };
+enum { DTransFront, DTransBack, DTreflFront, DTreflBack };
 
+static const char	component_name[4][20] = {
+		"Transmission Front",
+		"Transmission Back",
+		"Reflection Front",
+		"Reflection Back"
+};
+
 enum { DSsolar=-1, DSnir=-2, DSxbar31=-3, DSvisible=-4, DSzbar31=-5,
 	DSuprime=-6, DSvprime=-7 };
 
@@ -122,6 +129,24 @@ static char	basis_definition[][256] = {
 	"\t</DataDefinition>\n",
 };
 
+/* Check that the last-added data file is unique */
+static int
+check_new_data_file()
+{
+	int	i = ndataf;
+
+	while (i-- > 0)
+		if ((data_file[i].spectrum == data_file[ndataf].spectrum) &
+				(data_file[i].type == data_file[ndataf].type)) {
+			fprintf(stderr,
+				"%s: warning - ignoring duplicate component %s\n",
+					data_file[ndataf].fname,
+					component_name[data_file[i].type]);
+			return 0;
+		}
+	return 1;
+}
+
 /* Copy data from file descriptor to stdout and close */
 static int
 copy_and_close(int fd)
@@ -485,23 +510,7 @@ writeBSDFblock(const char *caller, struct s_dfile *df)
 	}
 	puts("\t\t<WavelengthDataBlock>");
 	fputs("\t\t\t<WavelengthDataDirection>", stdout);
-	switch (df->type) {
-	case DTtransForward:
-		fputs("Transmission Front", stdout);
-		break;
-	case DTtransBackward:
-		fputs("Transmission Back", stdout);
-		break;
-	case DTreflForward:
-		fputs("Reflection Front", stdout);
-		break;
-	case DTreflBackward:
-		fputs("Reflection Back", stdout);
-		break;
-	default:
-		fprintf(stderr, "%s: internal - bad BSDF type (%d)\n", caller, df->type);
-		return 0;
-	}
+	fputs(component_name[df->type], stdout);
 	puts("</WavelengthDataDirection>");
 	switch (angle_basis) {
 	case ABklemsFull:
@@ -808,7 +817,7 @@ main(int argc, char *argv[])
 						argv[0]);
 				return 1;
 			}
-			if (strchr(argv[++i], '>') != NULL) {
+			if (strstr(argv[++i], "-->") != NULL) {
 				fprintf(stderr, "%s: illegal character in comment\n",
 						argv[0]);
 				return 1;
@@ -824,9 +833,9 @@ main(int argc, char *argv[])
 				return 1;
 			}
 			if (!strcmp(argv[i], "-tf"))
-				data_file[ndataf].type = DTtransForward;
+				data_file[ndataf].type = DTransFront;
 			else if (!strcmp(argv[i], "-tb"))
-				data_file[ndataf].type = DTtransBackward;
+				data_file[ndataf].type = DTransBack;
 			else
 				UsageExit(argv[0]);
 			if (!strcmp(argv[++i], "-")) {
@@ -835,7 +844,7 @@ main(int argc, char *argv[])
 			}
 			data_file[ndataf].fname = argv[i];
 			data_file[ndataf].spectrum = cur_spectrum;
-			ndataf++;
+			ndataf += check_new_data_file();
 			continue;
 		case 'r':		/* reflection */
 			if (i >= argc-1)
@@ -846,9 +855,9 @@ main(int argc, char *argv[])
 				return 1;
 			}
 			if (!strcmp(argv[i], "-rf"))
-				data_file[ndataf].type = DTreflForward;
+				data_file[ndataf].type = DTreflFront;
 			else if (!strcmp(argv[i], "-rb"))
-				data_file[ndataf].type = DTreflBackward;
+				data_file[ndataf].type = DTreflBack;
 			else
 				UsageExit(argv[0]);
 			if (!strcmp(argv[++i], "-")) {
@@ -857,7 +866,7 @@ main(int argc, char *argv[])
 			}
 			data_file[ndataf].fname = argv[i];
 			data_file[ndataf].spectrum = cur_spectrum;
-			ndataf++;
+			ndataf += check_new_data_file();
 			continue;
 		case 's':		/* spectrum name or input file */
 			if (++i >= argc)
@@ -910,7 +919,7 @@ main(int argc, char *argv[])
 		}
 		break;
 	}
-doneOptions:					/* get XML input */
+						/* get XML input */
 	if (i >= argc) {
 		if (xml_input == NULL)
 			xml_input = def_template;