[Pkg-running-devel] [openambit] 05/23: Fixed character encoding of activity names, unfortunately it wont fix already synced moves. Fixes #49

[Christian Perrier]

This is an automated email from the git hooks/post-receive script.

bubulle pushed a commit to branch master
in repository openambit.

commit dbfbf3082d118cfe5ec7304691eb27d945551bc1
Author: Emil Ljungdahl <emil at kratern.se>
Date:   Mon Sep 8 23:38:42 2014 +0200

    Fixed character encoding of activity names, unfortunately it wont fix already synced moves.
    Fixes #49
---
 src/libambit/libambit.h                    | 2 +-
 src/openambit/logentry.cpp                 | 2 +-
 src/openambit/logstore.cpp                 | 4 ++--
 src/openambit/movescount/movescountxml.cpp | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libambit/libambit.h b/src/libambit/libambit.h
index 28d7ef2..02f1ed3 100644
--- a/src/libambit/libambit.h
+++ b/src/libambit/libambit.h
@@ -310,7 +310,7 @@ typedef struct ambit_log_header_s {
     uint32_t heartrate_min_time;    /* ms */
     uint8_t  peak_training_effect;  /* effect scale 0.1 */
     uint8_t  activity_type;
-    char     activity_name[16+1];
+    char     activity_name[16+1];   /* name of activity in ISO 8859-1 */
     int16_t  temperature_max;       /* degree celsius scale 0.1 */
     int16_t  temperature_min;       /* degree celsius scale 0.1 */
     uint32_t temperature_max_time;  /* ms */
diff --git a/src/openambit/logentry.cpp b/src/openambit/logentry.cpp
index 351585f..2190516 100644
--- a/src/openambit/logentry.cpp
+++ b/src/openambit/logentry.cpp
@@ -147,7 +147,7 @@ bool LogEntry::isUploaded(){
 QString LogEntry::toHtml(){
     QString log_html;
 
-    log_html += "<h1>" + QString(this->logEntry->header.activity_name) + "</h1>";
+    log_html += "<h1>" + QString::fromLatin1(this->logEntry->header.activity_name) + "</h1>";
     if (this->isUploaded()){
         log_html += "<a href='http://www.movescount.com/moves/move" + this->movescountId + "'>see on movescount.com</a>";
     }
diff --git a/src/openambit/logstore.cpp b/src/openambit/logstore.cpp
index 7b10e34..a0998ba 100644
--- a/src/openambit/logstore.cpp
+++ b/src/openambit/logstore.cpp
@@ -627,7 +627,7 @@ void LogStore::XMLReader::readLogHeader()
             logEntry->logEntry->header.activity_type = xml.readElementText().toUInt();
         }
         else if (xml.name() == "Activity") {
-            QByteArray ba = xml.readElementText().toLocal8Bit();
+            QByteArray ba = xml.readElementText().toLatin1();
             const char *c_str = ba.data();
             strncpy(logEntry->logEntry->header.activity_name, c_str, 16);
             logEntry->logEntry->header.activity_name[16] = 0;
@@ -1372,7 +1372,7 @@ bool LogStore::XMLWriter::writeLogEntry()
     xml.writeEndElement();
     xml.writeTextElement("PeakTrainingEffect", QString("%1").arg(logEntry->header.peak_training_effect));
     xml.writeTextElement("ActivityType", QString("%1").arg(logEntry->header.activity_type));
-    xml.writeTextElement("Activity", QString(logEntry->header.activity_name));
+    xml.writeTextElement("Activity", QString::fromLatin1(logEntry->header.activity_name));
     xml.writeStartElement("Temperature");
     xml.writeTextElement("Max", QString("%1").arg(logEntry->header.temperature_max));
     xml.writeTextElement("Min", QString("%1").arg(logEntry->header.temperature_min));
diff --git a/src/openambit/movescount/movescountxml.cpp b/src/openambit/movescount/movescountxml.cpp
index bdcecce..6d1ea33 100644
--- a/src/openambit/movescount/movescountxml.cpp
+++ b/src/openambit/movescount/movescountxml.cpp
@@ -241,7 +241,7 @@ bool MovesCountXML::XMLWriter::writeLogEntry()
         xml.writeTextElement("PeakTrainingEffect", QString::number((double)logEntry->logEntry->header.peak_training_effect/10.0, 'g', 16));
     }
     xml.writeTextElement("ActivityType", QString("%1").arg(logEntry->logEntry->header.activity_type));
-    xml.writeTextElement("Activity", QString(logEntry->logEntry->header.activity_name));
+    xml.writeTextElement("Activity", QString::fromLatin1(logEntry->logEntry->header.activity_name));
     xml.writeStartElement("Temperature");
     xml.writeTextElement("Max", QString::number((double)logEntry->logEntry->header.temperature_max/10.0 + 273.15, 'g', 16));
     xml.writeTextElement("Min", QString::number((double)logEntry->logEntry->header.temperature_min/10.0 + 273.15, 'g', 16));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-running/openambit.git