expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-22 07:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

updates to scripts

Browse Source 
surveytable needs tobe moved to new section of repo
tools and scripts should be separated somehow
This commit is contained in:
ExpoOnServer 2011-07-14 03:13:06 +01:00
parent c221e37850
commit 63e907404b
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Makefile
View File

@ -14,7 +14,8 @@ svxtrace_cmd = ./svxtrace.py
########### ###########
everything: autogen_pages folklist 3dfiles tarfiles surveytable qmlists prospecting_guide #everything: autogen_pages folklist 3dfiles tarfiles surveytable qmlists prospecting_guide
everything: autogen_pages folklist 3dfiles tarfiles qmlists prospecting_guide
########### ###########
@ -23,14 +24,18 @@ autogen_pages: indxal.htm
# cavestats should be BUILT AUTOMATICALLY rather than having to be # cavestats should be BUILT AUTOMATICALLY rather than having to be
# built manually in a survex build tree. # built manually in a survex build tree.
indxal.htm: noinfo/CAVETAB2.CSV noinfo/all.pos noinfo/make-indxal4.pl noinfo/areapage_skeletons/*.html noinfo/lengths.dat indxal.htm: noinfo/CAVETAB2.CSV noinfo/all.pos noinfo/make-indxal4.pl noinfo/areapage_skeletons/*.html noinfo/lengths.dat
python noinfo/make-areaindices.py python noinfo/make-areaindices.py noinfo/cavestats
-(cd noinfo && perl ./make-indxal4.pl CAVETAB2.CSV) cd noinfo; perl ./make-indxal4.pl -q CAVETAB2.CSV
noinfo/lengths.dat: noinfo/lengths.dat:
-python noinfo/create_dplong_table.py || echo "Carry on and build other targets anyway" python noinfo/create_dplong_table.py
noinfo/all.pos: noinfo/all.3d noinfo/all.pos: noinfo/all.3d
3dtopos noinfo/all.3d noinfo/all.pos 3dtopos noinfo/all.3d noinfo/all.pos
noinfo/cavestats:
# This needs a built copy of survex sources. See
# noinfo/cavestats.build for details
########### ###########
@ -41,8 +46,9 @@ folk/index.htm: noinfo/folk.csv noinfo/make-folklist.py
########### ###########
surveytable: #This is now part of separate repo and should be built separately
cd $(surveydir_path); perl tablize-csv.pl Surveys.csv; perl tablizebyname-csv.pl Surveys.csv --quiet #surveytable:
# cd $(surveydir_path); perl tablize-csv.pl Surveys.csv; perl tablizebyname-csv.pl Surveys.csv --quiet
@ -86,10 +92,21 @@ noinfo/alltracks.3d: $(shell $(svxtrace_cmd) $(dataset_path)/fixedpts/gps/tracks
########### ###########
prospecting_guide: 3dfiles #this requires ttf-freefont package to be installed
#And dump3d from survex
prospecting_guide: 3dfiles freefont dump3d
cd noinfo/prospecting_guide_scripts && python make-prospectingguide-new.py cd noinfo/prospecting_guide_scripts && python make-prospectingguide-new.py
cd noinfo/prospecting_guide_scripts && python make-prospectingguide-new.py --white cd noinfo/prospecting_guide_scripts && python make-prospectingguide-new.py --white
freefont: /usr/share/fonts/truetype/freefont/FreeSans.ttf
# ttf-freefont needs to be installed (or MS corefonts)
dump3d: noinfo/prospecting_guide_scripts/dump3d
# apt-get source survex && sudo apt-get build-dep survex
# cd survex-* && debuild
# make dump3d && cp dump3d $(pwd)/noinfo/prospecting_guide_scripts/dump3d
########### ###########
tarfiles: noinfo/all.tgz smkridge/204/surveydata.tgz smkridge/234/surveydata.tgz plateau/76/surveydata.tgz tarfiles: noinfo/all.tgz smkridge/204/surveydata.tgz smkridge/234/surveydata.tgz plateau/76/surveydata.tgz
@ -118,7 +135,7 @@ clean:
rm -f smkridge/204/surveydata.tgz smkridge/234/surveydata.tgz plateau/76/surveydata.tgz noinfo/all.tgz rm -f smkridge/204/surveydata.tgz smkridge/234/surveydata.tgz plateau/76/surveydata.tgz noinfo/all.tgz
rm -f $(surveydir_path)/surveytable.html rm -f $(surveydir_path)/surveytable.html
rm -f report.html rm -f report.html
find . -name ".cvsignore" | xargs rm find . -name ".cvsignore" | xargs rm -f
########### ###########

6
noinfo/create_dplong_table.py
View File

@ -87,9 +87,9 @@ def parse_csvfile():
# Main routine: # Main routine:
if (not os.access('CS_BINARY', os.X_OK)): #if (not os.access('CS_BINARY', os.X_OK)):
print "%s not executable - skipping %s" % (CS_BINARY, __file__) # print "CS_BINARY not executable - skipping %s" % __file__
exit(1) # exit(1)
caveslist = parse_csvfile() caveslist = parse_csvfile()

2
noinfo/prospecting_guide_scripts/make-prospectingguide-new.py
View File

@ -315,7 +315,7 @@ surfacecolour = "#808080"
repath = re.compile(r'^(?:182to(?:tc|184)|tctocol|82to97|vd1to161d|161ftod|161etof|161etog|40entlink2|surfnr161|surf161|kansurf)$') repath = re.compile(r'^(?:182to(?:tc|184)|tctocol|82to97|vd1to161d|161ftod|161etof|161etog|40entlink2|surfnr161|surf161|kansurf)$')
for fnm in ("all.3d", "alltracks.3d"): for fnm in ("all.3d", "alltracks.3d"):
for mapcode in draws.keys(): for mapcode in draws.keys():
file3d = os.popen("dump3d ../" + fnm) file3d = os.popen("./dump3d ../" + fnm)
draw = draws[mapcode] draw = draws[mapcode]
lastx, lasty = 0, 0 lastx, lasty = 0, 0
for l in file3d: for l in file3d: