- Fixed a bug in conman.c which could cause a core dump when terminating
a connection during an active run. - Added an additional output mode for the connection in order to support the batch run editor. - Made clientput send everything with eWarning mode in order to support the batch run editor. - Added a better NetReadTillTerm - Fixed a problem in synchronize.c - Fixed an issue with reading empty line on normal connection sockets. - Added a psi scan mode to mesure.c for TRICS - Made motor print warnings when trying to reposition. - Fixed abug in hkl.c which cause wrong signs. SKIPPED: psi/el734driv.c psi/el734hp.c psi/el737driv.c psi/el737hpdriv.c psi/nextrics.c psi/nxamor.c psi/psi.c psi/slsmagnet.c psi/swmotor2.c psi/tasscan.c psi/tasutil.c
This commit is contained in:
12
scan.c
12
scan.c
@ -34,6 +34,15 @@ extern void SNXFormatTime(char *pBuffer, int iLen);
|
||||
/*
|
||||
from nxdata.c
|
||||
*/
|
||||
/*-----------------------------------------------------------------------*/
|
||||
static char *fixExtension(char *filename)
|
||||
{
|
||||
if(strstr(filename,".hdf") != NULL)
|
||||
{
|
||||
changeExtension(filename,"dat");
|
||||
}
|
||||
return filename;
|
||||
}
|
||||
/*------------------------------------------------------------------------*/
|
||||
char *ScanMakeFileName(SicsInterp *pSics, SConnection *pCon)
|
||||
{
|
||||
@ -54,8 +63,7 @@ extern void SNXFormatTime(char *pBuffer, int iLen);
|
||||
{
|
||||
pRes = strdup("emergency.scn");
|
||||
}
|
||||
|
||||
return pRes;
|
||||
return fixExtension(pRes);
|
||||
}
|
||||
|
||||
/*--------------------- VarEntry Management --------------------------------*/
|
||||
|
Reference in New Issue
Block a user