diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2015-06-27 23:38:11 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-06-27 14:43:04 -0700 |
| commit | 4867363ec573f15326110f9affea1e7c046efed7 (patch) | |
| tree | b2a78a8f78e2ad94cda1ac377f1c0f73682702c2 | |
| parent | f04b3bc166fe714f810a90dcd606db60dc7bc900 (diff) | |
| download | subsurface-4867363ec573f15326110f9affea1e7c046efed7.tar.gz | |
Move model tagging to xslt
Instead of replacing all the empty model tags after a csv to xml
transform with some text, just produce that text in the csv to xml
transform instead.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | file.c | 5 | ||||
| -rw-r--r-- | xslt/csv2xml.xslt | 13 |
2 files changed, 7 insertions, 11 deletions
@@ -927,11 +927,6 @@ int parse_csv_file(const char *filename, int timef, int depthf, int tempf, int p previous = dive_table.nr; ret = parse_xml_buffer(filename, mem.buffer, mem.size, &dive_table, (const char **)params); - // mark imported dives as imported from CSV - for (int i = previous; i < dive_table.nr; i++) - if (same_string(get_dive(i)->dc.model, "")) - get_dive(i)->dc.model = copy_string("Imported from CSV"); - free(mem.buffer); return ret; } diff --git a/xslt/csv2xml.xslt b/xslt/csv2xml.xslt index 29ebbce24..b3dbc7a8d 100644 --- a/xslt/csv2xml.xslt +++ b/xslt/csv2xml.xslt @@ -42,12 +42,13 @@ <xsl:attribute name="time"> <xsl:value-of select="concat(substring($time, 2, 2), ':', substring($time, 4, 2))"/> </xsl:attribute> - <divecomputerid deviceid="ffffffff" model="csv" /> - <xsl:call-template name="printLine"> - <xsl:with-param name="line" select="substring-before(//csv, $lf)"/> - <xsl:with-param name="lineno" select="'1'"/> - <xsl:with-param name="remaining" select="substring-after(//csv, $lf)"/> - </xsl:call-template> + <divecomputer model="Imported from CSV" deviceid="ffffffff"> + <xsl:call-template name="printLine"> + <xsl:with-param name="line" select="substring-before(//csv, $lf)"/> + <xsl:with-param name="lineno" select="'1'"/> + <xsl:with-param name="remaining" select="substring-after(//csv, $lf)"/> + </xsl:call-template> + </divecomputer> </dive> </dives> </divelog> |