Fixes for the Windows installer

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

diff --git a/parse-xml.c b/parse-xml.c
index bc4d4c54661aeb1db4d2462e49625ce8b5997174..4d8568997d835205e8624dd9becef1f6c8f04362 100644 (file)
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -4,6 +4,8 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
+#include <fcntl.h>
+#include <sys/stat.h>
 #define __USE_XOPEN
 #include <time.h>
 #include <libxml/parser.h>
@@ -110,7 +112,6 @@ static int cylinder_index;
 static enum import_source {
        UNKNOWN,
        LIBDIVECOMPUTER,
-       SUUNTO,
        UEMIS,
        DIVINGLOG,
        UDDF,
@@ -644,26 +645,6 @@ static void try_to_fill_sample(struct sample *sample, const char *name, char *bu
        nonmatch("sample", name, buf);
 }
 
-/*
- * Crazy suunto xml. Look at how those o2/he things match up.
- */
-static int suunto_dive_match(struct dive **divep, const char *name, int len, char *buf)
-{
-       struct dive *dive = *divep;
-
-       return  MATCH(".o2pct", percent, &dive->cylinder[0].gasmix.o2) ||
-               MATCH(".hepct_0", percent, &dive->cylinder[0].gasmix.he) ||
-               MATCH(".o2pct_2", percent, &dive->cylinder[1].gasmix.o2) ||
-               MATCH(".hepct_1", percent, &dive->cylinder[1].gasmix.he) ||
-               MATCH(".o2pct_3", percent, &dive->cylinder[2].gasmix.o2) ||
-               MATCH(".hepct_2", percent, &dive->cylinder[2].gasmix.he) ||
-               MATCH(".o2pct_4", percent, &dive->cylinder[3].gasmix.o2) ||
-               MATCH(".hepct_3", percent, &dive->cylinder[3].gasmix.he) ||
-               MATCH(".cylindersize", cylindersize, &dive->cylinder[0].type.size) ||
-               MATCH(".cylinderworkpressure", pressure, &dive->cylinder[0].type.workingpressure) ||
-               0;
-}
-
 static const char *country, *city;
 
 static void divinglog_place(char *place, void *_location)
@@ -978,11 +959,6 @@ static void try_to_fill_dive(struct dive **divep, const char *name, char *buf)
        start_match("dive", name, buf);
 
        switch (import_source) {
-       case SUUNTO:
-               if (suunto_dive_match(divep, name, len, buf))
-                       return;
-               break;
-
        case UEMIS:
                if (uemis_dive_match(divep, name, len, buf))
                        return;
@@ -1050,7 +1026,8 @@ static void try_to_fill_dive(struct dive **divep, const char *name, char *buf)
                return;
        if (MATCH(".buddy", utf8_string, &dive->buddy))
                return;
-
+       if (MATCH(".rating", get_index, &dive->rating))
+               return;
        if (MATCH(".cylinder.size", cylindersize, &dive->cylinder[cylinder_index].type.size))
                return;
        if (MATCH(".cylinder.workpressure", pressure, &dive->cylinder[cylinder_index].type.workingpressure))
@@ -1180,7 +1157,7 @@ static void sanitize_cylinder_type(cylinder_type_t *type)
        if (!type->size.mliter)
                return;
 
-       if (input_units.volume == CUFT || import_source == SUUNTO) {
+       if (input_units.volume == CUFT) {
                /* confusing - we don't really start from ml but millicuft !*/
                volume_of_air = cuft_to_l(type->size.mliter);
                atm = to_ATM(type->workingpressure);            /* working pressure in atm */
@@ -1348,12 +1325,6 @@ static void visit(xmlNode *n)
        traverse(n->children);
 }
 
-static void suunto_importer(void)
-{
-       import_source = SUUNTO;
-       input_units = SI_units;
-}
-
 static void uemis_importer(void)
 {
        import_source = UEMIS;
@@ -1405,7 +1376,6 @@ static struct nesting {
        { "P", sample_start, sample_end },
 
        /* Import type recognition */
-       { "SUUNTO", suunto_importer },
        { "Divinglog", DivingLog_importer },
        { "pre_dive", uemis_importer },
        { "dives", uemis_importer },
@@ -1449,11 +1419,70 @@ static void reset_all(void)
        import_source = UNKNOWN;
 }
 
+struct memblock {
+       void *buffer;
+       size_t size;
+};
+
+static int readfile(const char *filename, struct memblock *mem)
+{
+       int ret, fd = open(filename, O_RDONLY);
+       struct stat st;
+
+       mem->buffer = NULL;
+       mem->size = 0;
+
+       fd = open(filename, O_RDONLY);
+       if (fd < 0)
+               return fd;
+       ret = fstat(fd, &st);
+       if (ret < 0)
+               goto out;
+       ret = -EINVAL;
+       if (!S_ISREG(st.st_mode))
+               goto out;
+       ret = 0;
+       if (!st.st_size)
+               goto out;
+       mem->buffer = malloc(st.st_size);
+       ret = -1;
+       errno = ENOMEM;
+       if (!mem->buffer)
+               goto out;
+       mem->size = st.st_size;
+       ret = read(fd, mem->buffer, mem->size);
+       if (ret < 0)
+               goto free;
+       if (ret == mem->size)
+               goto out;
+       errno = EIO;
+       ret = -1;
+free:
+       free(mem->buffer);
+       mem->buffer = NULL;
+       mem->size = 0;
+out:
+       close(fd);
+       return ret;
+}
+
 void parse_xml_file(const char *filename, GError **error)
 {
        xmlDoc *doc;
+       struct memblock mem;
 
-       doc = xmlReadFile(filename, NULL, 0);
+       if (readfile(filename, &mem) < 0) {
+               fprintf(stderr, "Failed to read '%s'.\n", filename);
+               if (error) {
+                       *error = g_error_new(g_quark_from_string("subsurface"),
+                                            DIVE_ERROR_PARSE,
+                                            "Failed to read '%s'",
+                                            filename);
+               }
+               return;
+       }
+
+       doc = xmlReadMemory(mem.buffer, mem.size, filename, NULL, 0);
        if (!doc) {
                fprintf(stderr, "Failed to parse '%s'.\n", filename);
                if (error != NULL)
@@ -1532,14 +1561,29 @@ static xsltStylesheetPtr get_stylesheet(const char *name)
        return NULL;
 }
 
+static struct xslt_files {
+       const char *root;
+       const char *file;
+} xslt_files[] = {
+       { "SUUNTO", "SuuntoSDM.xslt" },
+       { "JDiveLog", "jdivelog2subsurface.xslt" },
+       { NULL, }
+};
+
 xmlDoc *test_xslt_transforms(xmlDoc *doc)
 {
+       struct xslt_files *info = xslt_files;
        xmlDoc *transformed;
        xsltStylesheetPtr xslt = NULL;
        xmlNode *root_element = xmlDocGetRootElement(doc);
-       if (strcasecmp(root_element->name, "JDiveLog") == 0) {
+
+       while ((info->root) && (strcasecmp(root_element->name, info->root) != 0)) {
+               info++;
+       }
+
+       if (info->root) {
                xmlSubstituteEntitiesDefault(1);
-               xslt = get_stylesheet("jdivelog2subsurface.xslt");
+               xslt = get_stylesheet(info->file);
                if (xslt == NULL)
                        return doc;
                transformed = xsltApplyStylesheet(xslt, doc, NULL);