diff --git a/src/save.c b/src/save.c index 93bb3ebb..d16c22dc 100644 --- a/src/save.c +++ b/src/save.c @@ -1041,9 +1041,10 @@ int extra_rawfile(int what, const char *file, const char *type, double sweep1, d xctx->extra_raw_n++; } /* **************** table_read ************* */ - if(what == 1 && xctx->extra_raw_n < MAX_RAW_N && file && !strcmp(type, "tablefile")) { + if(what == 1 && xctx->extra_raw_n < MAX_RAW_N && file && !strcmp(type, "table")) { tclvareval("subst {", file, "}", NULL); my_strncpy(f, tclresult(), S(f)); + dbg(1, "extra_rawfile: table_read: f=%s\n", f); for(i = 0; i < xctx->extra_raw_n; i++) { if( !strcmp(xctx->extra_raw_arr[i]->rawfile, f)) break; } @@ -1266,7 +1267,6 @@ int table_read(const char *f) char *line = NULL, *line_ptr, *line_save; const char *line_tok; Raw *raw; - if(xctx->raw) { dbg(0, "table_read(): must clear current data file before loading new\n"); return 0; diff --git a/src/scheduler.c b/src/scheduler.c index c5c55fc6..be7d9bdc 100644 --- a/src/scheduler.c +++ b/src/scheduler.c @@ -3525,7 +3525,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg Tcl_ResetResult(interp); if(!xctx) {Tcl_SetResult(interp, not_avail, TCL_STATIC); return TCL_ERROR;} if(argc > 3 && !strcmp(argv[2], "table_read")) { - ret = extra_rawfile(1, argv[3], "tablefile", sweep1, sweep2); + ret = extra_rawfile(1, argv[3], "table", sweep1, sweep2); Tcl_SetResult(interp, my_itoa(ret), TCL_VOLATILE); } else if(argc > 3 && !strcmp(argv[2], "read")) { if(argc > 6) {