CDPP / AMDA_Integration

Commit 2eb530b281c0a42d91a15a6548310dd8241d7c62

Authored by Benjamin Renard
2 parents e8d4f7f5 d9013726
Exists in master and in 24 other branches FER_10400, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_9016_New, MAZ_FIX_9016, SpeasyGet, amdadev, density_maps, develop

Merge amdadev into develop

Showing 2 changed files with 7 additions and 8 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Tools/CommonClass.php
  Diff comments   View file @2eb530b
@@ -108,7 +108,7 @@ class CommonClass @@ -108,7 +108,7 @@ class CommonClass
108 date_default_timezone_set('UTC'); 108 date_default_timezone_set('UTC');
109 $date = DateTime::createFromFormat('YzHisu', $DDTime); 109 $date = DateTime::createFromFormat('YzHisu', $DDTime);
110 110
111 - return strtotime($date->format("Y-m-d\TH:i:s.u")); 111 + return strtotime($date->format("Y-m-d\TH:i:s.v"));
112 } 112 }
113 113
114 /* 114 /*
@@ -118,7 +118,7 @@ class CommonClass @@ -118,7 +118,7 @@ class CommonClass
118 { 118 {
119 $date = DateTime::createFromFormat('YzHisu', $DDTime); 119 $date = DateTime::createFromFormat('YzHisu', $DDTime);
120 120
121 - return $date->format("Y-m-d\TH:i:s.u"); 121 + return $date->format("Y-m-d\TH:i:s.v");
122 } 122 }
123 123
124 /* 124 /*
@@ -129,7 +129,7 @@ class CommonClass @@ -129,7 +129,7 @@ class CommonClass
129 $startStamp = self::DDTimeToTimeStamp($DDStart); 129 $startStamp = self::DDTimeToTimeStamp($DDStart);
130 $intStamp = self::DDTimeToTimeStamp($DDInterval); 130 $intStamp = self::DDTimeToTimeStamp($DDInterval);
131 131
132 - return date("Y-m-d\TH:i:s.u", $startStamp + $intStamp); 132 + return date("Y-m-d\TH:i:s.v", $startStamp + $intStamp);
133 } 133 }
134 134
135 public static function rrmdir($dir) 135 public static function rrmdir($dir)
src/Request/ParamsRequestImpl/ParamsRequestClass.php
  Diff comments   View file @2eb530b
@@ -94,18 +94,17 @@ class ParamsRequestClass extends ProcessRequestClass @@ -94,18 +94,17 @@ class ParamsRequestClass extends ProcessRequestClass
94 } 94 }
95 95
96 //libxml_use_internal_errors(true); 96 //libxml_use_internal_errors(true);
97 - if (!$doc->schemaValidate(KernelConfigClass::getXSDRequestFilePath()))  
98 - { 97 + if (!$doc->schemaValidate(KernelConfigClass::getXSDRequestFilePath())) {
99 //$error_msg = ""; 98 //$error_msg = "";
100 //$errors = libxml_get_errors(); 99 //$errors = libxml_get_errors();
101 //foreach ($errors as $error) { 100 //foreach ($errors as $error) {
102 // if ($error_msg != "") 101 // if ($error_msg != "")
103 // $error_msg .= PHP_EOL; 102 // $error_msg .= PHP_EOL;
104 - // $error_msg .= 'XML error "'.$error->message.'" ['.$error->level.'] (Code '.$error->code.') in '.$error->file.' on line '.$error->line.' column '.$error->column; 103 + // $error_msg .= 'XML error "' . $error->message . '" [' . $error->level . '] (Code ' . $error->code . ') in ' . $error->file . ' on line ' . $error->line . ' column ' . $error->column;
105 //} 104 //}
106 //libxml_clear_errors(); 105 //libxml_clear_errors();
107 -  
108 - $this->requestData->setLastErrorMessage('Params request XML file not valid for request'/*.' ('.$error_msg.')'*/); 106 +
  107 + $this->requestData->setLastErrorMessage('Params request XML file not valid for request' /*. ' (' . $error_msg . ')'*/);
109 return false; 108 return false;
110 } 109 }
111 //libxml_use_internal_errors(false); 110 //libxml_use_internal_errors(false);