地面二維軌跡分析服務網站搬遷至公司內網暨功能提升

16,19c16,20
< PY=/Users/Data/cwb/e-service/btraj_WRFnests/ftuv10_5dN.py #using fcst wrfout_d1,2,3
< CJ=/opt/anaconda3/bin/csv_to_geojson
< VI=/Users/kuang/bin/addVI.py
< GT=/usr/local/bin/git
---
> WEB=/var/www/html
> PY=/nas1/backup/data/cwb/e-service/btraj_WRFnests/ftuv10_5dN.py #using fcst wrfout_d1,2,3
> CJ=/opt/miniconda3/envs/py37/bin/csv_to_geojson
> VI=$WEB/trj_results/addVI.py
> GT=/bin/git
27c28
< cd /Library/WebServer/Documents/trj_results
---
> cd $WEB/trj_results
34c35
< cd /Library/WebServer/Documents
---
> cd $WEB
60,61c63,64
< cd /Users/kuang/GitHub/sinotec2.github.io/traj/trj_results
< for i in 00 m1 m2 p1 p2;do cp -r /Library/WebServer/Documents/trj_results/$i .;done
---
> cd /home/kuang/GitHubRepos/sinotec2.github.io/traj/trj_results
> for i in 00 m1 m2 p1 p2;do cp -r $WEB/trj_results/$i .;done

63c66,70
< cd /Users/kuang/GitHub/sinotec2.github.io
---
> exit
> exit
>
>
> cd /home/kuang/GitHubRepos/sinotec2.github.io
65c72
< GT=/usr/local/bin/git
---
> GT=/bin/git
69c76
< TOKEN=$(cat /Users/kuang/bin/git.token)
---
> TOKEN=$(cat /home/kuang/bin/git.token)

$ diff surf_trajLL2.py /var/www/cgi-bin/traj/surf_trajLL2.py
10,17c10,18
< JSON='/Users/Data/cwb/e-service/surf_trj/sta_list.json'
< TRJs={'forc':'/Users/Data/cwb/e-service/btraj_WRFnests/ftuv10.py','obsv':'/Users/Data/cwb/e-service/surf_trj/traj2kml.py'}
< WEB='/Library/WebServer/Documents/'
< CGI='/Library/WebServer/CGI-Executables/'
< INI='/opt/local/bin/conda_ini'
< NCL='/opt/anaconda3/envs/ncl_stable/bin/ncl '
< MBLs={'obsv':'/Library/WebServer/Documents/taiwan/taiMarbleScale.ncl',\
<       'forc':'/Library/WebServer/Documents/taiwan/chnMarble.ncl'}
---
> root='/nas1/backup/data'
> JSON=root+'/cwb/e-service/surf_trj/sta_list.json'
> TRJs={'forc':root+'/cwb/e-service/btraj_WRFnests/ftuv10.py','obsv':root+'/cwb/e-service/surf_trj/traj2kml.py'}
> WEB='/var/www/html/'
> CGI='/var/www/cgi-bin/'
> INI='/var/www/html/trj_results/conda_ini3'
> NCL='/opt/miniconda3/envs/ncl_stable/bin/ncl '
> MBLs={'obsv':WEB+'taiwan/taiMarbleScale.ncl',\
>       'forc':WEB+'taiwan/chnMarble.ncl'}

21a23,24
> print 'Content-Type: text/html\n\n'
> print open(CGI+'header.txt','r')
42,43d59
< print 'Content-Type: text/html\n\n'
< print open(CGI+'header.txt','r')

25,28c28,38
< try:
<   ist=int(nam)
< except:
<   AQ=nam
30,32c40,50
<   fn = open(JSON)
<   d_nstnam = json.load(fn)
<   AQ=d_nstnam[nam]
---

62c78
<   cmd+= TRJ+' -t '+AQ+' -d '+dat+num+' -b '+TF+OUT+';'
---
>   cmd+= TRJ+' -t '+AQll+' -d '+dat+num+' -b '+TF+OUT+';'

67c83
<   cmd+='cp topo.png '+fn+'.png;'
---
>   cmd+='mv -f topo.png '+fn+'.png;'

...
nam = form.getvalue('AQSname')
ll = form.getvalue('latlon')
if len(ll)==0:
  try:
    ist=int(nam)
  except:
    AQ=nam
  else:
    fn = open(JSON)
    d_nstnam = json.load(fn)
    AQ=d_nstnam[nam]
  AQll=AQ
else:
  lls=ll.split()
  if len(lls)<2:
    for delt in ',;':
      if delt in ll:
        if ll.count(delt)>1:sys.exit('number of delimiters must be one')
        ll=ll.replace(' ','')
        lls=ll.split(delt)
  lls=[i.replace(',','').replace(';','') for i in lls]
  llo=[str(round(float(i),1)) for i in lls]
  AQ='user-defined'+'_'+llo[0]+'_'+llo[1]+'_'
  AQll=lls[0]+','+lls[1]
os.system('echo '+AQ+OUT)
...