Commit 11fc7368 authored by claes's avatar claes

Env variables allowed in filename

parent 0207aeed
/* /*
* Proview $Id: rs_nmps_bck.c,v 1.5 2006-01-12 05:57:42 claes Exp $ * Proview $Id: rs_nmps_bck.c,v 1.6 2007-05-28 11:38:10 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -275,7 +275,7 @@ int nmpsbck_get_filename( ...@@ -275,7 +275,7 @@ int nmpsbck_get_filename(
char *s; char *s;
char *s2; char *s2;
strcpy( outname, inname); dcli_translate_filename( outname, inname);
/* Look for extention in filename */ /* Look for extention in filename */
if ( ext != NULL) if ( ext != NULL)
...@@ -1104,7 +1104,7 @@ static pwr_tStatus nmpsbck_open_file( bck_ctx bckctx) ...@@ -1104,7 +1104,7 @@ static pwr_tStatus nmpsbck_open_file( bck_ctx bckctx)
{ {
nmpsbck_t_fileheader fileheader; nmpsbck_t_fileheader fileheader;
pwr_tUInt32 csts; pwr_tUInt32 csts;
char filename[200]; pwr_tFileName filename;
float reopen_time = 10; float reopen_time = 10;
int first_time; int first_time;
int wait_some_time; int wait_some_time;
...@@ -1567,7 +1567,7 @@ static pwr_tStatus nmpsbck_read( bck_ctx bckctx) ...@@ -1567,7 +1567,7 @@ static pwr_tStatus nmpsbck_read( bck_ctx bckctx)
nmpsbck_t_data_list *data_ptr; nmpsbck_t_data_list *data_ptr;
nmpsbck_t_data_list *next_ptr; nmpsbck_t_data_list *next_ptr;
char *objectp; char *objectp;
char filename[200]; pwr_tFileName filename;
int file_num = 1; int file_num = 1;
int record_count; int record_count;
pwr_tUInt32 cellarea_start[NMPSBCK_MAX_RECORDS]; pwr_tUInt32 cellarea_start[NMPSBCK_MAX_RECORDS];
......
/* /*
* Proview $Id: rs_remote_logg.c,v 1.1 2006-01-12 06:39:33 claes Exp $ * Proview $Id: rs_remote_logg.c,v 1.2 2007-05-28 11:37:33 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
#include "pwr_baseclasses.h" #include "pwr_baseclasses.h"
#include "pwr_remoteclasses.h" #include "pwr_remoteclasses.h"
#include "co_time.h" #include "co_time.h"
#include "co_dcli.h"
#include "rt_gdh.h" #include "rt_gdh.h"
#include "rt_errh.h" #include "rt_errh.h"
#include "rt_gdh_msg.h" #include "rt_gdh_msg.h"
...@@ -293,13 +294,13 @@ static int logg_get_filename( ...@@ -293,13 +294,13 @@ static int logg_get_filename(
{ {
char *s; char *s;
char *s2; char *s2;
char timestr[80]; pwr_tFileName timestr;
char comp_timestr[80]; char comp_timestr[80];
pwr_tTime time; pwr_tTime time;
strcpy( outname, inname); dcli_translate_filename( outname, inname);
/* Look for extention in filename */ /* Look for extension in filename */
if ( ext != NULL) if ( ext != NULL)
{ {
s = strrchr( outname, ':'); s = strrchr( outname, ':');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment