extra link and doctype additions

This commit is contained in:
Philip Sargent 2020-03-02 17:23:44 +00:00
parent 0dc210d665
commit db1050315d
4 changed files with 42 additions and 34 deletions

View File

@ -1,6 +1,7 @@
<!DOCTYPE html>
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Handbook placeholder page</title> <title>Handbook placeholder page</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" /> <link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head> </head>

View File

@ -1,5 +1,7 @@
<!DOCTYPE html>
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>Handbook placeholder page</title> <title>Handbook placeholder page</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" /> <link rel="stylesheet" type="text/css" href="../../css/main2.css" />
@ -22,34 +24,34 @@ at the bottom as this shows that this file is <code>::expoweb::/cave_data/augstb
&lt;/head&gt; &lt;/head&gt;
&lt;body&gt; &lt;body&gt;
&lt;cave&gt; &lt;cave&gt;
&lt;non_public&gt;True&lt;/non_public&gt; &lt;non_public&gt;True&lt;/non_public&gt;
&lt;caveslug&gt;1623-4&lt;/caveslug&gt; &lt;caveslug&gt;1623-4&lt;/caveslug&gt;
&lt;official_name&gt;Ritscherbachh&ouml;hle&lt;/official_name&gt; &lt;official_name&gt;Ritscherbachh&ouml;hle&lt;/official_name&gt;
&lt;area&gt;1623&lt;/area&gt; &lt;area&gt;1623&lt;/area&gt;
&lt;area&gt;11&lt;/area&gt; &lt;area&gt;11&lt;/area&gt;
&lt;kataster_code&gt;1/T(W) +&lt;/kataster_code&gt; &lt;kataster_code&gt;1/T(W) +&lt;/kataster_code&gt;
&lt;kataster_number&gt;4&lt;/kataster_number&gt; &lt;kataster_number&gt;4&lt;/kataster_number&gt;
&lt;unofficial_number&gt;&lt;/unofficial_number&gt; &lt;unofficial_number&gt;&lt;/unofficial_number&gt;
&lt;entrance&gt; &lt;entrance&gt;
&lt;entranceslug&gt;1623-4&lt;/entranceslug&gt; &lt;entranceslug&gt;1623-4&lt;/entranceslug&gt;
&lt;letter&gt;&lt;/letter&gt; &lt;letter&gt;&lt;/letter&gt;
&lt;/entrance&gt; &lt;/entrance&gt;
&lt;explorers&gt;H&ouml;hlenforschervereinigung Altaussee, 1937&lt;/explorers&gt; &lt;explorers&gt;H&ouml;hlenforschervereinigung Altaussee, 1937&lt;/explorers&gt;
&lt;underground_description&gt;&lt;/underground_description&gt; &lt;underground_description&gt;&lt;/underground_description&gt;
&lt;equipment&gt;&lt;/equipment&gt; &lt;equipment&gt;&lt;/equipment&gt;
&lt;references&gt;&lt;/references&gt; &lt;references&gt;&lt;/references&gt;
&lt;survey&gt;Plan at 1:100 by Alfred Auer, 1968 &lt;/survey&gt; &lt;survey&gt;Plan at 1:100 by Alfred Auer, 1968 &lt;/survey&gt;
&lt;kataster_status&gt;&lt;/kataster_status&gt; &lt;kataster_status&gt;&lt;/kataster_status&gt;
&lt;underground_centre_line&gt;&lt;/underground_centre_line&gt; &lt;underground_centre_line&gt;&lt;/underground_centre_line&gt;
&lt;notes&gt;&lt;/notes&gt; &lt;notes&gt;&lt;/notes&gt;
&lt;length&gt;12.3m&lt;/length&gt; &lt;length&gt;12.3m&lt;/length&gt;
&lt;depth&gt;1.07m&lt;/depth&gt; &lt;depth&gt;1.07m&lt;/depth&gt;
&lt;extent&gt;&lt;/extent&gt; &lt;extent&gt;&lt;/extent&gt;
&lt;survex_file&gt;&lt;/survex_file&gt; &lt;survex_file&gt;&lt;/survex_file&gt;
&lt;description_file&gt;augstb/4.htm&lt;/description_file&gt; &lt;description_file&gt;augstb/4.htm&lt;/description_file&gt;
&lt;url&gt;augstb/4.htm&lt;/url&gt; &lt;url&gt;augstb/4.htm&lt;/url&gt;
&lt;/cave&gt; &lt;/cave&gt;
&lt;/body&gt; &lt;/body&gt;
&lt;/html&gt; &lt;/html&gt;
@ -59,6 +61,10 @@ at the bottom as this shows that this file is <code>::expoweb::/cave_data/augstb
<p>As you can see, this is an XML tag format similar to HTML but with tags defined to hold cave survey data. These files are processed by troggle in real-time to produce an HTML file on the fly which is sent to your browser so that it <p>As you can see, this is an XML tag format similar to HTML but with tags defined to hold cave survey data. These files are processed by troggle in real-time to produce an HTML file on the fly which is sent to your browser so that it
looks <a href="http://expo.survex.com/augstb/4.htm">like this</a> looks <a href="http://expo.survex.com/augstb/4.htm">like this</a>
<p>An explanation of what the field names mean and how they are used is on
the <a href="caveentryfields.html">cave entry fields</a> page. There is not an exact correspondance between
the form and the file format however.
<p>When you fill in the online form you creating a file just like the one above: troggle takes the input data from the form and creates the file. Troggle also stores the cave information in it's live memory when you use the form method. <p>When you fill in the online form you creating a file just like the one above: troggle takes the input data from the form and creates the file. Troggle also stores the cave information in it's live memory when you use the form method.
<p>If instead of using the form you create the file by hand and upload it to the server you will also need find a nerd to run the cave import procedure before troggle "knows" that the cave exists. <p>If instead of using the form you create the file by hand and upload it to the server you will also need find a nerd to run the cave import procedure before troggle "knows" that the cave exists.
<h3>Cave entrances</h3> <h3>Cave entrances</h3>

View File

@ -1,5 +1,7 @@
<!DOCTYPE html>
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>CUCC Expo Surveying Handbook: Drawing Up</title> <title>CUCC Expo Surveying Handbook: Drawing Up</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" /> <link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head> </head>

View File

@ -43,16 +43,15 @@ def print_caveline(number, l, d, w, cave):
def parse_csvfile(): def parse_csvfile():
caveslist = [] caveslist = []
print "Calculating SMK-system extent... ", print ("Calculating SMK-system extent... "),
os.popen("cavern -v7 ../loser/smk-system.svx -o noinfo/smk-system.3d") os.popen("cavern -v7 ../loser/smk-system.svx -o noinfo/smk-system.3d")
l,d,w = map(float, chomp(os.popen(CS_BINARY + " noinfo/smk-system -c ").read()).split("\t")) l,d,w = map(float, chomp(os.popen(CS_BINARY + " noinfo/smk-system -c ").read()).split("\t"))
caveslist.append(["", l,d,w, {"Name" : "<i>Schwarzmooskogelh&ouml;hlensystem</i>", "Autogen file" : ""}]) caveslist.append(["", l,d,w, {"Name" : "<i>Schwarzmooskogelh&ouml;hlensystem</i>", "Autogen file" : ""}])
print "done\nParsing Cave list" print ("done\nParsing Cave list")
for cavefile in os.listdir("noinfo/cave_data"): for cavefile in os.listdir("noinfo/cave_data"):
cavetabfiles = dir("noinfo/cave_data/")
cavetabfiles = dir("noinfo/cave_data/") fieldnames=chomp(cavetabfile.next()).replace('"','').split(",")
fieldnames=chomp(cavetabfile.next()).replace('"','').split(",") cavetab = csv.DictReader(cavetabfile, fieldnames)
cavetab = csv.DictReader(cavetabfile, fieldnames)
# Gratuitiously complicated progress bar widget. # Gratuitiously complicated progress bar widget.
k = 0 k = 0