From: hadaq <hadaq>
Date: Fri, 16 Apr 2010 12:46:53 +0000 (+0000)
Subject: runinfo2ora + ebnum. Sergey.
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=0392dbcbfbc48e0ff4fc3cef62c32a2c5a3a06bc;p=daqdata.git

runinfo2ora + ebnum. Sergey.
---

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index 4cbea2d..722686f 100644
--- a/hadaq/evtbuild.c
+++ b/hadaq/evtbuild.c
@@ -1,8 +1,8 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.101 2010-04-15 17:33:01 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.102 2010-04-16 12:46:53 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #define SYSLOG_NAMES
-#undef RFIO
+#define RFIO
 
 #include <unistd.h>
 #include <getopt.h>
@@ -111,6 +111,7 @@ typedef struct TheArgsS {
 	char shmname[PARAM_MAX_VALUE_LEN];
 	unsigned int ebnum;
 	char runinfo2ora[PARAM_MAX_VALUE_LEN];
+	char daq_setup[PARAM_MAX_VALUE_LEN];
 } TheArgs;
 
 typedef struct TheStatsS {
@@ -304,6 +305,8 @@ static void argsDefault(TheArgs *my)
 	my->ebnum = 1;
 	my->ignore = 0;
 
+	strcpy(my->daq_setup, getenv("DAQ_SETUP"));
+
 	/* read path from DAQ_SETUP and define full file name */
 	sprintf(my->runinfo2ora, "%s_runinfo2ora.txt", getenv("DAQ_SETUP"));
 }
@@ -442,9 +445,10 @@ static int argsFromCL(TheArgs *my, int argc, char *argv[])
 			break;
 		case 'B':
 			my->ebnum = strtoul(optarg, NULL, 0);
+			sprintf(my->runinfo2ora, "%s_runinfo2ora_%d.txt", getenv("DAQ_SETUP"), my->ebnum);
 			break;
 		case 'O':
-			sprintf(my->runinfo2ora, "%s_runinfo2ora.txt", optarg);
+			sprintf(my->runinfo2ora, "%s_runinfo2ora.txt", getenv("DAQ_SETUP"));
 			break;
 		case 'H':
 			usage(argv[0]);