Might as well free current_file

[ext/subsurface.git] / parse-xml.c

diff --git a/parse-xml.c b/parse-xml.c
index 49402338746c3d3423b65479583eecc802930210..ab77cb59bff5a77a2badb0a8ea6e41e4b1a6c0db 100644 (file)
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -647,6 +647,7 @@ static int uddf_fill_sample(struct sample *sample, const char *name, int len, ch
        return  MATCH(".divetime", sampletime, &sample->time) ||
                MATCH(".depth", depth, &sample->depth) ||
                MATCH(".temperature", temperature, &sample->temperature) ||
+               MATCH(".tankpressure", pressure, &sample->cylinderpressure) ||
                0;
 }
 
@@ -1099,6 +1100,10 @@ static void try_to_fill_dive(struct dive **divep, const char *name, char *buf)
                return;
        if (MATCH(".location", utf8_string, &dive->location))
                return;
+       if (MATCH(".suit", utf8_string, &dive->suit))
+               return;
+       if (MATCH(".divesuit", utf8_string, &dive->suit))
+               return;
        if (MATCH(".notes", utf8_string, &dive->notes))
                return;
        if (MATCH(".divemaster", utf8_string, &dive->divemaster))
@@ -1415,8 +1420,8 @@ void parse_xml_buffer(const char *url, const char *buffer, int size, GError **er
                }
                return;
        }
-       /* we assume that the last (or only) filename passed as argument is a 
-        * great filename to use as default when saving the dives */ 
+       /* we assume that the last (or only) filename passed as argument is a
+        * great filename to use as default when saving the dives */
        set_filename(url);
        reset_all();
        dive_start();
@@ -1462,7 +1467,11 @@ static xsltStylesheetPtr try_get_stylesheet(const char *path, int len, const cha
 
 static xsltStylesheetPtr get_stylesheet(const char *name)
 {
-       const char *path = xslt_path, *next;
+       const char *path, *next;
+
+       path = getenv("SUBSURFACE_XSLT_PATH");
+       if (!path)
+               path = xslt_path;
 
        do {
                int len;