From: hadaq <hadaq>
Date: Tue, 20 Apr 2010 16:29:34 +0000 (+0000)
Subject: File name added for runinfo2ora. Sergey
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=b51801747e184f46c9a864cb7712668112b51ce4;p=daqdata.git

File name added for runinfo2ora. Sergey
---

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index 994ad16..fef2b0d 100644
--- a/hadaq/evtbuild.c
+++ b/hadaq/evtbuild.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.104 2010-04-19 14:03:18 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.105 2010-04-20 16:29:34 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #define SYSLOG_NAMES
@@ -111,6 +111,8 @@ typedef struct TheArgsS {
 	char shmname[PARAM_MAX_VALUE_LEN];
 	unsigned int ebnum;
 	char runinfo2ora[PARAM_MAX_VALUE_LEN];
+
+	char fileName[PARAM_MAX_VALUE_LEN];
 } TheArgs;
 
 typedef struct TheStatsS {
@@ -874,7 +876,7 @@ static void storeRunInfoStart(time_t t, TheArgs *myArgs)
 	strftime(ltime, 20, "%Y-%m-%d %H:%M:%S", localtime(&t));
 
 	fp = fopen(myArgs->runinfo2ora, "a+");
-	fprintf(fp, "start %d %d %s %s\n", myArgs->runNr, myArgs->ebnum, myArgs->outPath, ltime);
+	fprintf(fp, "start %d %d %s %s\n", myArgs->runNr, myArgs->ebnum, myArgs->fileName, ltime);
 	fclose(fp);
 }
 
@@ -890,7 +892,7 @@ static void storeRunInfoStop(time_t t, TheArgs *myArgs, TheStats *myStats)
 	strftime(ltime, 20, "%Y-%m-%d %H:%M:%S", localtime(&t));
 
 	fp = fopen(myArgs->runinfo2ora, "a+");
-	fprintf(fp, "stop %d %d %s %s %s ", myArgs->runNr, myArgs->ebnum, myArgs->outPath, ltime, unit(*myStats->evtsComplete));
+	fprintf(fp, "stop %d %d %s %s %s ", myArgs->runNr, myArgs->ebnum, myArgs->fileName, ltime, unit(*myStats->evtsComplete));
 	fprintf(fp, "%s\n", unit(*myStats->bytesWritten));
 	fclose(fp);
 }
@@ -1150,6 +1152,18 @@ static int openFile(TheArgs *theArgs)
 	else
 		sprintf(fileName, "%s.hld", fileName);
 
+	/* Copy file name to theArgs */
+/* 	if( strcmp(theArgs->outDev, "file") == 0 || */
+/* #ifdef RFIO */
+/* 	    fRemote != NULL || */
+/* #endif */
+/* 	    strcmp(theArgs->lustrePath, "") != 0 ){ */
+
+	strcpy(theArgs->fileName, fileName);
+
+/* 	} */
+
+
 	outTape = NULL;
 	outFile = NULL;
 	outSecondFile = NULL;