linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PSI UPDATE

Browse Source 
r2720 | ffr | 2008-10-13 15:40:07 +1100 (Mon, 13 Oct 2008) | 2 lines
This commit is contained in:
Ferdi Franceschini
2008-10-13 15:40:07 +11:00
committed by Douglas Clowes
parent f0973c6196 4baffb9b7a
commit 0adecdcec9
183 changed files with 20455 additions and 3661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
stdscan.c
View File

@@ -610,7 +610,7 @@ int prepareDataFile(pScanData self){
char pBueffel[512];
/* allocate a new data file */
pPtr = ScanMakeFileName(self->pSics,self->pCon);
pPtr = ScanMakeFileName(pServ->pSics,self->pCon);
if(!pPtr)
{
SCWrite(self->pCon,
@@ -637,7 +637,6 @@ int prepareDataFile(pScanData self){
char pMessage[1024];
assert(self);
assert(self->iNP > 0);
assert(self->pCon);
/* check boundaries of scan variables and allocate storage */
@@ -766,8 +765,8 @@ int prepareDataFile(pScanData self){
pVarEntry pVar = NULL;
void *pDings;
int i, iRet, status;
char pStatus[512], pItem[20];
char pHead[512];
char pStatus[2024], pItem[20];
char pHead[2024];
float fVal;
CountEntry sCount;
@@ -821,8 +820,10 @@ int prepareDataFile(pScanData self){
strcat(pStatus,pItem);
/* write progress */
strcat(pHead,"\n");
strcat(pStatus,"\n");
/*
strcat(pHead,"\r\n");
strcat(pStatus,"\r\n");
*/
SCWrite(self->pCon,pHead,eWarning);
SCWrite(self->pCon,pStatus,eWarning);
@@ -1124,6 +1125,10 @@ int StandardScanWrapper(SConnection *pCon, SicsInterp *pSics, void *pData,
return 0;
}
if(self->pCon == NULL){
self->pCon = pCon;
}
if(strcmp(argv[1],"writeheader") == 0){
return WriteHeader(self);
} else if(strcmp(argv[1],"prepare") == 0){