senaite /
senaite.core
| @@ 243-268 (lines=26) @@ | ||
| 240 | ||
| 241 | for i in range(len(splitted)): |
|
| 242 | token = splitted[i] |
|
| 243 | if i < len(self._quantitationresultsheader): |
|
| 244 | colname = self._quantitationresultsheader[i] |
|
| 245 | if colname in self.QUANTITATIONRESULTS_NUMERICHEADERS: |
|
| 246 | try: |
|
| 247 | quantitation[colname] = float(token) |
|
| 248 | except ValueError: |
|
| 249 | self.warn( |
|
| 250 | "No valid number ${token} in column " |
|
| 251 | "${index} (${column_name})", |
|
| 252 | mapping={"token": token, |
|
| 253 | "index": str(i + 1), |
|
| 254 | "column_name": colname}, |
|
| 255 | numline=self._numline, line=line) |
|
| 256 | quantitation[colname] = token |
|
| 257 | else: |
|
| 258 | quantitation[colname] = token |
|
| 259 | ||
| 260 | # val = re.sub(r"\W", "", splitted[1]) |
|
| 261 | # self._addRawResult(quantitation['AR'], |
|
| 262 | # values={val:quantitation}, |
|
| 263 | # override=False) |
|
| 264 | elif token: |
|
| 265 | self.err("Orphan value in column ${index} (${token})", |
|
| 266 | mapping={"index": str(i+1), |
|
| 267 | "token": token}, |
|
| 268 | numline=self._numline, line=line) |
|
| 269 | ||
| 270 | result = quantitation[quantitation['DefaultResult']] |
|
| 271 | column_name = quantitation['DefaultResult'] |
|
| @@ 327-348 (lines=22) @@ | ||
| 324 | ||
| 325 | for i in range(len(splitted)): |
|
| 326 | token = splitted[i] |
|
| 327 | if i < len(self._quantitationresultsheader): |
|
| 328 | colname = self._quantitationresultsheader[i] |
|
| 329 | if colname in self.QUANTITATIONRESULTS_NUMERICHEADERS: |
|
| 330 | try: |
|
| 331 | quantitation[colname] = float(token) |
|
| 332 | except ValueError: |
|
| 333 | self.warn( |
|
| 334 | "No valid number ${token} in column " |
|
| 335 | "${index} (${column_name})", |
|
| 336 | mapping={"token": token, |
|
| 337 | "index": str(i + 1), |
|
| 338 | "column_name": colname}, |
|
| 339 | numline=self._numline, line=line) |
|
| 340 | quantitation[colname] = token |
|
| 341 | else: |
|
| 342 | quantitation[colname] = token |
|
| 343 | ||
| 344 | elif token: |
|
| 345 | self.err("Orphan value in column ${index} (${token})", |
|
| 346 | mapping={"index": str(i+1), |
|
| 347 | "token": token}, |
|
| 348 | numline=self._numline, line=line) |
|
| 349 | ||
| 350 | result = quantitation[quantitation['DefaultResult']] |
|
| 351 | column_name = quantitation['DefaultResult'] |
|
| @@ 425-444 (lines=20) @@ | ||
| 422 | ||
| 423 | for i in range(len(splitted)): |
|
| 424 | token = splitted[i] |
|
| 425 | if i < len(self._quantitationresultsheader): |
|
| 426 | colname = self._quantitationresultsheader[i] |
|
| 427 | if token and colname in self.QUANTITATIONRESULTS_NUMERICHEADERS: |
|
| 428 | try: |
|
| 429 | quantitation[colname] = float(token) |
|
| 430 | except ValueError: |
|
| 431 | self.warn( |
|
| 432 | "No valid number ${token} in column ${index} (${column_name})", |
|
| 433 | mapping={"token": token, |
|
| 434 | "index": str(i + 1), |
|
| 435 | "column_name": colname}, |
|
| 436 | numline=self._numline, line=line) |
|
| 437 | quantitation[colname] = token |
|
| 438 | else: |
|
| 439 | quantitation[colname] = token |
|
| 440 | elif token: |
|
| 441 | self.err("Orphan value in column ${index} (${token})", |
|
| 442 | mapping={"index": str(i+1), |
|
| 443 | "token": token}, |
|
| 444 | numline=self._numline, line=line) |
|
| 445 | ||
| 446 | if self.QUANTITATIONRESULTS_COMPOUNDCOLUMN in quantitation: |
|
| 447 | compound = quantitation[self.QUANTITATIONRESULTS_COMPOUNDCOLUMN] |
|
