luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

if loading a new schematic (currsch==0) reset current_dirname

This commit is contained in:
Stefan Frederik 2022-11-15 02:10:18 +01:00
parent 6cd9d76f90
commit b2f159706c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/save.c
View File

@ -2168,7 +2168,7 @@ void load_schematic(int load_symbols, const char *fname, int reset_undo) /* 2015
my_snprintf(msg, S(msg), "regsub {/\\.$} [get_directory {%s}] {}", filename);
my_strncpy(xctx->current_dirname, tcleval(msg), S(xctx->current_dirname));
dbg(1, "load_schematic(): filename=%s\n", filename);
} else if((strstr(xctx->current_dirname, "http://") == xctx->current_dirname ||
} else if(xctx->currsch > 0 && (strstr(xctx->current_dirname, "http://") == xctx->current_dirname ||
strstr(xctx->current_dirname, "https://") == xctx->current_dirname)) {
} else {
my_snprintf(msg, S(msg), "regsub {/\\.$} [get_directory {%s}] {}", filename);

6
src/xschem.tcl
View File

@ -4436,17 +4436,17 @@ proc get_directory {f} {
proc download_url {url} {
global XSCHEM_TMP_DIR download_url_helper
set r [catch {exec sh -c "cd $XSCHEM_TMP_DIR; $download_url_helper $url"} res]
puts "download_url: url=$url, exit code=$r, res=$res"
# puts "download_url: url=$url, exit code=$r, res=$res"
return $r
}
proc try_download_url {dirname sch_or_sym} {
set url $dirname/$sch_or_sym
puts "try_download_url: dirname=$dirname, sch_or_sym=$sch_or_sym"
# puts "try_download_url: dirname=$dirname, sch_or_sym=$sch_or_sym"
set r [download_url $url]
if { $r!=0} {
set nitems [regexp -all {/+} $sch_or_sym]
puts "try_download_url: dirname=$dirname, sch_or_sym=$sch_or_sym, nitems=$nitems"
# puts "try_download_url: dirname=$dirname, sch_or_sym=$sch_or_sym, nitems=$nitems"
while { $nitems > 0} {
set dirname [get_directory $dirname]
incr nitems -1