Skip to content
Snippets Groups Projects

Improvement on f_getYear and f_getMonth functions

Merged Miguel Angel Reina Ortega requested to merge Release1 into master
+ 10
10
Compare changes
  • Side-by-side
  • Inline
Files
@@ -3459,7 +3459,7 @@ module OneM2M_Functions {
@@ -3459,7 +3459,7 @@ module OneM2M_Functions {
* @param p_timestamp Given timestamp
* @param p_timestamp Given timestamp
* @return Year
* @return Year
*/
*/
function f_getYear(charstring p_timestamp) runs on Tester return charstring {
function f_getYear(charstring p_timestamp) runs on Tester return integer {
var charstring v_year := "";
var charstring v_year := "";
var integer i;
var integer i;
@@ -3467,7 +3467,7 @@ module OneM2M_Functions {
@@ -3467,7 +3467,7 @@ module OneM2M_Functions {
for(i := 0; i <= 3; i := i+1){
for(i := 0; i <= 3; i := i+1){
v_year := v_year & p_timestamp[i];
v_year := v_year & p_timestamp[i];
}
}
return v_year;
return str2int(v_year);
} // end f_getYear
} // end f_getYear
@@ -3476,7 +3476,7 @@ module OneM2M_Functions {
@@ -3476,7 +3476,7 @@ module OneM2M_Functions {
* @param p_timestamp Given timestamp
* @param p_timestamp Given timestamp
* @return Year
* @return Year
*/
*/
function f_getMonth(charstring p_timestamp) runs on Tester return charstring {
function f_getMonth(charstring p_timestamp) runs on Tester return integer {
var charstring v_month := "";
var charstring v_month := "";
var integer i;
var integer i;
@@ -3486,7 +3486,7 @@ module OneM2M_Functions {
@@ -3486,7 +3486,7 @@ module OneM2M_Functions {
v_month := v_month & p_timestamp[i];
v_month := v_month & p_timestamp[i];
}
}
}
}
return v_month;
return str2int(v_month);
} // end f_getYear
} // end f_getYear
Loading