mirror of
https://expo.survex.com/repositories/expoweb/.git/
synced 2024-11-22 07:11:55 +00:00
merged
This commit is contained in:
commit
1de2354505
@ -30,17 +30,24 @@ If a heading is in italics, then there are hidden items.
|
|||||||
|
|
||||||
<p>We are working on a more capable and easier-to-use system (see <a href="x-todo.html">x-todo.html</a>) which will mimic how <a href="https://github.com/CaveSurveying/CUCCexposurveyissues/issues">GitHub Issues</a> do this sort of thing.
|
<p>We are working on a more capable and easier-to-use system (see <a href="x-todo.html">x-todo.html</a>) which will mimic how <a href="https://github.com/CaveSurveying/CUCCexposurveyissues/issues">GitHub Issues</a> do this sort of thing.
|
||||||
|
|
||||||
|
<h3>Cave Updating</h3>
|
||||||
|
<dl>
|
||||||
|
<dt><!--2020-04-12 wookey-->1623/251</dt>
|
||||||
|
<dd>Put in tunnel plan instead of scan of drawn-up notes.</dd>
|
||||||
|
<dd>Draw up elevation (therion)</dd>
|
||||||
|
</dl>
|
||||||
|
|
||||||
<h3>Process Documentation</h3>
|
<h3>Process Documentation</h3>
|
||||||
<dl>
|
<dl>
|
||||||
<dt><!--2020-03-26 psargent-->Wallets and new-cave</dt>
|
<dt><!--2020-03-26 psargent-->Wallets and new-cave</dt>
|
||||||
|
|
||||||
<dd><!--2020-03-26 psargent-->Explain (in the wallets process) how to view the surveys
|
<dd><!--2020-03-26 psargent-->Explain (in the wallets process) how to view the surveys
|
||||||
online so that <br> (1) you can see an example of how to do your new one,
|
online so that <br> (1) you can see an example of how to do your new one,
|
||||||
and <br> (2) so that you can check that you have done it properly when you
|
and <br> (2) so that you can check that you have done it properly when you
|
||||||
have finished.</dd>
|
have finished.</dd>
|
||||||
<dd><!--2020-03-26 psargent-->Explain how to link a new cave into the other caves in
|
<dd><!--2020-03-26 psargent-->Explain how to link a new cave into the other caves in
|
||||||
troggle filesystem</dd>
|
troggle filesystem</dd>
|
||||||
<dd><!--2020-03-26 psargent-->Explain how to add photos with the correct URL format to sub-HTML files attached to New Caves</dd>
|
<dd><!--2020-03-26 psargent-->Explain how to add photos with the correct URL format to sub-HTML files attached to New Caves</dd>
|
||||||
<dt><!--2020-04-13 psargent-->svx check</dt>
|
<dt><!--2020-04-13 psargent-->svx check</dt>
|
||||||
<dd>explain command line to run on newly typed survex file to check for format errors '$cavern xxxx.svx'
|
<dd>explain command line to run on newly typed survex file to check for format errors '$cavern xxxx.svx'
|
||||||
<dd>explain when to use svxtrace.py <a href="troggle/scriptscurrent.html">current scripts</a>
|
<dd>explain when to use svxtrace.py <a href="troggle/scriptscurrent.html">current scripts</a>
|
||||||
@ -252,11 +259,6 @@ the original file from disc. So storing changes done by js will mean working dir
|
|||||||
// TO DO - make the <dt> italic when any of the <dd> following it are hidden.
|
// TO DO - make the <dt> italic when any of the <dd> following it are hidden.
|
||||||
|
|
||||||
// Set up the click handlers:
|
// Set up the click handlers:
|
||||||
var itemlist = document.getElementsByTagName('h2');
|
|
||||||
for (i = 0; i < itemlist.length; i++) {
|
|
||||||
itemlist[i].onclick = h2toggle;
|
|
||||||
}
|
|
||||||
|
|
||||||
var itemlist = document.getElementsByTagName('dd');
|
var itemlist = document.getElementsByTagName('dd');
|
||||||
for (i = 0; i < itemlist.length; i++) {
|
for (i = 0; i < itemlist.length; i++) {
|
||||||
itemlist[i].onclick = hideable;
|
itemlist[i].onclick = hideable;
|
||||||
|
89
scripts/summarizecave.sh
Normal file
89
scripts/summarizecave.sh
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
#get .3d file contents using survex parser
|
||||||
|
>&2 echo "Processing: $1"
|
||||||
|
|
||||||
|
summary=$(cavern "./$1/$1.svx" -o "./$1/$1.3d")
|
||||||
|
contents=`dump3d -d ./$1/$1.3d`
|
||||||
|
|
||||||
|
if [[ "$2" = "--verbose" ]]; then
|
||||||
|
echo "Processing file: ./$1/$1.3d"
|
||||||
|
fi
|
||||||
|
|
||||||
|
#find most recent leg
|
||||||
|
lastdate=$(echo "$contents" | grep ^LINE | rev | cut -f1 -d " " | rev | grep [1234567890.-] | sort | tail -n1)
|
||||||
|
|
||||||
|
if [[ "$2" = "--verbose" ]]; then
|
||||||
|
echo "Cave last visited on: $lastdate"
|
||||||
|
fi
|
||||||
|
|
||||||
|
#find all legs done most recently
|
||||||
|
lastlegs=$(echo "$contents" | grep ^LINE | grep "$lastdate")
|
||||||
|
|
||||||
|
#find last survey full name
|
||||||
|
lastsurvey=$(echo "$lastlegs" | grep -o '\[.*\]' | sort | uniq | tr -d "[" | tr -d "]" | tail -n1)
|
||||||
|
|
||||||
|
#find last survey name
|
||||||
|
lastsurvey=$(echo "$lastsurvey" | rev | cut -f1 -d "." | rev)
|
||||||
|
|
||||||
|
#find deepest point of most revent survey
|
||||||
|
lastdepth=$(echo "$lastlegs" | cut -f4 -d " " | tr -d "m" | sort -n | tail -n1)
|
||||||
|
|
||||||
|
#find file containing last survey
|
||||||
|
lastfile="./"$(grep -ril "begin ****$lastsurvey" "$1" | tail -n1)
|
||||||
|
|
||||||
|
#display results
|
||||||
|
if [[ "$2" = "--verbose" ]]; then
|
||||||
|
echo "Last visit on survey name:"
|
||||||
|
echo "$lastsurvey"
|
||||||
|
echo "Located in the file:"
|
||||||
|
echo "$lastfile"
|
||||||
|
fi
|
||||||
|
|
||||||
|
#find team members of last survey
|
||||||
|
visitors=$(cat "$lastfile" | grep team | cut -f2- -d " " | tr "\n" "\t")
|
||||||
|
|
||||||
|
#find total length from summary
|
||||||
|
leng=$(echo "$summary" | grep "Total length of survey legs" | tr -s " " |cut -f7 -d " ")
|
||||||
|
|
||||||
|
#find vertical span from summary
|
||||||
|
vert=$(echo "$summary" | grep "Vertical range" | cut -f4 -d " ")
|
||||||
|
|
||||||
|
#renaming
|
||||||
|
cavename="$1"
|
||||||
|
cavedepth="$vert"
|
||||||
|
cavelength="$leng"
|
||||||
|
lastdate="$lastdate"
|
||||||
|
lastdepth="$lastdepth"
|
||||||
|
lastpeople="$visitors"
|
||||||
|
lastfile="$lastfile"
|
||||||
|
|
||||||
|
|
||||||
|
#output
|
||||||
|
if [[ "$2" == "--table" ]]; then
|
||||||
|
echo "<tr>"
|
||||||
|
|
||||||
|
echo "<td>$cavename</td>"
|
||||||
|
echo "<td>$cavedepth</td>"
|
||||||
|
echo "<td>$cavelength</td>"
|
||||||
|
echo "<td>$lastdate</td>"
|
||||||
|
echo "<td>$lastpeople</td>"
|
||||||
|
echo "<td>$lastdepth</td>"
|
||||||
|
echo "<td>$lastfile</td>"
|
||||||
|
|
||||||
|
echo "</tr>"
|
||||||
|
|
||||||
|
else
|
||||||
|
echo "Last surveyed leg on:"
|
||||||
|
echo "Date, Survex file, Depth"
|
||||||
|
echo "$lastdate $lastdepth $lastfile"
|
||||||
|
|
||||||
|
echo "Last visited by:"
|
||||||
|
echo "$lastpeople"
|
||||||
|
|
||||||
|
echo "Total length:"
|
||||||
|
echo "$cavelength"
|
||||||
|
|
||||||
|
echo "Total depth:"
|
||||||
|
echo "$cavedepth"
|
||||||
|
echo ""
|
||||||
|
echo ""
|
||||||
|
fi
|
@ -8,7 +8,7 @@
|
|||||||
<body>
|
<body>
|
||||||
<h1>Expo Systems - Data Validation</h1>
|
<h1>Expo Systems - Data Validation</h1>
|
||||||
<h2>SVX files referring to wallets and vice-versa</h2>
|
<h2>SVX files referring to wallets and vice-versa</h2>
|
||||||
<!-- you can edit this by any normal methois, either Edit This Page or using version contron pull/edit/commit/push
|
<!-- you can edit this by any normal methods, either Edit This Page or using version control pull/edit/commit/push
|
||||||
because the actual updated data is pulled in through the iframe -->
|
because the actual updated data is pulled in through the iframe -->
|
||||||
<p>
|
<p>
|
||||||
"json" is the survex filename stated in the <code>2018#03/content.json</code> file in surveyscans/2018/ .
|
"json" is the survex filename stated in the <code>2018#03/content.json</code> file in surveyscans/2018/ .
|
||||||
@ -27,7 +27,7 @@ But doing it outside troggle means that we get feedback on errors before going t
|
|||||||
<iframe name="okiframe" width="90%" height="20%"
|
<iframe name="okiframe" width="90%" height="20%"
|
||||||
src="svx-refs.ok.html" frameborder="1" ></iframe>
|
src="svx-refs.ok.html" frameborder="1" ></iframe>
|
||||||
<hr />
|
<hr />
|
||||||
Go to the <a href="xmlvalid.html">drawings/survex</a> data links validaiton page
|
Go to the <a href="xmlvalid.html">drawings/survex</a> data links validation page
|
||||||
|
|
||||||
<hr />
|
<hr />
|
||||||
</body></html>
|
</body></html>
|
Loading…
Reference in New Issue
Block a user