Merge branch 'naffanya-dev'

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / parser_tariff.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp
index 7be1af9645a0107ff39a0ec839e45780f1817b08..0e001b224a559fdfee6f94411275387e7ec62926 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp
@@ -145,6 +145,8 @@ for (; it != dataList.end(); ++it)
             break;
         }
 
             break;
         }
 

+    answerList->push_back("<Period value=\"" + TARIFF::PeriodToString(it->tariffConf.period) + "\"/>");
+

     answerList->push_back("</tariff>");
     }
 answerList->push_back("</Tariffs>");
     answerList->push_back("</tariff>");
     }
 answerList->push_back("</Tariffs>");


@@ -451,6 +453,12 @@ else
             }
         return 0;
         }
             }
         return 0;
         }

+
+    if (strcasecmp(el, "Period") == 0)
+        {
+        td.tariffConf.period = TARIFF::StringToPeriod(attr[1]);
+        return 0;
+        }

     }
 return -1;
 }
     }
 return -1;
 }