From a646dc320498c99899b50a70cb68a4a7d2d50e37 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Wed, 14 Apr 2021 01:47:41 +0100 Subject: [PATCH] corecting mistakes in New Cave pages --- cave_data/1623-101.html | 5 ++-- cave_data/1623-291.html | 41 ++++++++++++++------------------ handbook/survey/newcavefile.html | 19 ++++++++------- templates/cave_data.html | 5 +++- templates/entrance_data.html | 3 +++ 5 files changed, 39 insertions(+), 34 deletions(-) diff --git a/cave_data/1623-101.html b/cave_data/1623-101.html index b77e2f79b..0207be507 100644 --- a/cave_data/1623-101.html +++ b/cave_data/1623-101.html @@ -1,6 +1,7 @@ + - + @@ -37,7 +38,7 @@ ~12m - +caves-1623/101/101.svx 1623/101/101.html 1623/101/101.html diff --git a/cave_data/1623-291.html b/cave_data/1623-291.html index c296a2a87..a9bfcf238 100644 --- a/cave_data/1623-291.html +++ b/cave_data/1623-291.html @@ -1,45 +1,40 @@ - - - + + + + - - - + + False 1623-291 -Glückliche Schmetterlingshöhle +Glückliche Schmetterlingshöhle 1623 291 2017_cucc_24 - - 1623-291 - + 1623-291 + - -

CUCC 2017 on

 - + +

CUCC 2017 on

 +

-

-

 +

+

- + -caves-1623/291/291.svx - -1623/291/291.html - +caves-1623/2017-cucc-24/2017-cucc-24.svx + +1623/291/291 - - - diff --git a/handbook/survey/newcavefile.html b/handbook/survey/newcavefile.html index 571695665..deec8aea1 100644 --- a/handbook/survey/newcavefile.html +++ b/handbook/survey/newcavefile.html @@ -12,8 +12,10 @@

Cave data file

These files live in :expoweb:/cave_data/

The example full format below is of a very simple cave with hardly any fields filled in. The most vital field is -<url>augstb/4.htm</url> -at the bottom as this shows that this file is :expoweb:/cave_data/augstb/4.htm +<url>1623/4</url> +at the bottom as this shows that the cave descripition data is in :expoweb:/cave_data/1623-2.html + +There will only be an additional description file for large and complex caves. 

<!-- Only put one cave in this file -->
@@ -50,8 +52,8 @@ at the bottom as this shows that this file is :expoweb:/cave_data/augstb/4
 	<depth>1.07m</depth>
 	<extent></extent>
 	<survex_file></survex_file>
-	<description_file>augstb/4.htm</description_file>
-	<url>augstb/4.htm</url>
+	<description_file></description_file>
+	<url>1623/4</url>
 </cave>
 </body>
 </html>
@@ -59,7 +61,7 @@ at the bottom as this shows that this file is :expoweb:/cave_data/augstb/4
 
 
 
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 like this 
+looks like this 
 
 
An explanation of what the field names mean and how they are used is on 
 the cave entry fields page. There is not an exact correspondance between
@@ -81,11 +83,11 @@ the form and the file format however.
   
 
File layout

   
The caves in our site are stored as XML files in the directory :expoweb:/cave_data and in
-    files named :expoweb:/cave_data/{area}-{cavenumber}. Entrances are correspondingly
+    files named :expoweb:/cave_data/{area}-{cavenumber}.html. Entrances are correspondingly
     in :expoweb:/entrance_data files, with the same naming convention, except that if
 	there is more than one entrance they have a,b,c suffixes, e.g.  :expoweb:/entrance_data/{area}-{cavenumber}b 
 	
Any associated files, usually photos and surveys, are
-	stored under the area names :expoweb:/1623/{cavenumber} or :expoweb:/1626/{cavenumber} 
+	stored under the area names :expoweb:/1623/{cavenumber}/ent_photo1.jpg or :expoweb:/1626/{cavenumber}/ 
 	Note that this is a different naming convention: caves and entrances have the {area} as 
 		part of the file name
 	
@@ -93,7 +95,8 @@ the form and the file format however.
 	
An
     understanding of this file layout is very important when filling in the forms or writing the tags so that images
     appear on the final published website. The URLs in the XML file should be relative URLs to the cave page, which appears
-    as cave/{area}/{cavenumber} on the website even though internally they are cave_data/{area}-{cavenumber} 

+    as cave/{area}/{cavenumber} on the website even though internally the data 
+    is coming from cave_data/{area}-{cavenumber}.html and entrance_data/{area}-{cavenumber}.html 

 

 
Back to the form-filling method 
 	the form-filling method guide
diff --git a/templates/cave_data.html b/templates/cave_data.html
index a4320494d..365ff165d 100644
--- a/templates/cave_data.html
+++ b/templates/cave_data.html
@@ -1,6 +1,9 @@
 
 
 
+
 
 
 
@@ -52,7 +55,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
  
  
 
- 
+ 
 
 
 
diff --git a/templates/entrance_data.html b/templates/entrance_data.html
index aecd70bd7..c14efe244 100644
--- a/templates/entrance_data.html
+++ b/templates/entrance_data.html
@@ -1,6 +1,9 @@
 
 
 
+