Commit 77237fff1044928ceeb99bb129217b7979d32eaa
1 parent
4b3bd283
Exists in
master
and in
110 other branches
if ws param was already deleted
Showing
2 changed files
with
34 additions
and
28 deletions
Show diff stats
generic_data/migration/migrationTest.php
| ... | ... | @@ -4,7 +4,7 @@ |
| 4 | 4 | define("USERPATH", "/home/budnik/data/"); |
| 5 | 5 | |
| 6 | 6 | require_once AMDA_IHM."php/classes/UserWsTransfer.php"; |
| 7 | - $user = 'budnik'; | |
| 7 | + $user = 'genot'; | |
| 8 | 8 | |
| 9 | 9 | if (!is_dir(USERPATH)) mkdir(USERPATH); |
| 10 | 10 | if (!is_dir(USERPATH.$user)) mkdir(USERPATH.$user); |
| ... | ... | @@ -17,24 +17,24 @@ |
| 17 | 17 | |
| 18 | 18 | $res = $convert->checkWS(); |
| 19 | 19 | if (!$res['success']) exit($res['error']); |
| 20 | -/* | |
| 20 | + | |
| 21 | 21 | $res = $convert->transferMyData(); |
| 22 | 22 | $msg = $res['msg']; |
| 23 | 23 | |
| 24 | 24 | $res = $convert->transferDerived(); |
| 25 | - $msg .= $res['msg'];*/ | |
| 25 | + $msg .= $res['msg']; | |
| 26 | + | |
| 27 | + $res = $convert->transferTimeTables(); | |
| 28 | + $msg .= $res['msg']; | |
| 26 | 29 | |
| 27 | -// $res = $convert->transferTimeTables(); | |
| 28 | -// $msg .= $res['msg']; | |
| 29 | -// | |
| 30 | 30 | $res = $convert->transferConditions(); |
| 31 | 31 | $msg .= $res['msg']; |
| 32 | 32 | |
| 33 | 33 | // $res = $convert->transferRequests(); |
| 34 | 34 | // $msg .= $res['msg']; |
| 35 | 35 | |
| 36 | -// $res = $convert->transferFilters(); | |
| 37 | -// $msg .= $res['msg']; | |
| 36 | + $res = $convert->transferFilters(); | |
| 37 | + $msg .= $res['msg']; | |
| 38 | 38 | |
| 39 | 39 | |
| 40 | 40 | echo $msg.PHP_EOL; |
| ... | ... |
php/classes/UserWsTransfer.php
| ... | ... | @@ -313,18 +313,21 @@ class UserWsTransfer { |
| 313 | 313 | foreach ($wsParams as $wsParam) { |
| 314 | 314 | $res = $xp->query("//param[@name='".trim($wsParam)."']"); |
| 315 | 315 | if ($res->length == 0) { |
| 316 | - unlink($this->newWsDir.$id.'.xml'); | |
| 317 | - $paramsToRemove[] = $param; | |
| 318 | - $this->ws_deleted[] = $name; | |
| 319 | - $msg .= '<li><i>'.$name.'</i> : uses obsolete / not ready ws param : <br/> '.$expression.'<br/>'; | |
| 316 | + if (file_exists($this->newWsDir.$id.'.xml')) { // Delete only once | |
| 317 | + unlink($this->newWsDir.$id.'.xml'); | |
| 318 | + $paramsToRemove[] = $param; | |
| 319 | + $this->ws_deleted[] = $name; | |
| 320 | + $msg .= '<li><i>'.$name.'</i> : uses obsolete / not ready ws param : <br/> '.$expression.'<br/>'; | |
| 321 | + } | |
| 320 | 322 | } |
| 321 | 323 | } |
| 322 | 324 | } |
| 323 | 325 | } |
| 324 | 326 | |
| 325 | - foreach ($paramsToRemove as $paramToRemove) { | |
| 326 | - $paramToRemove->parentNode->removeChild($paramToRemove); | |
| 327 | - } | |
| 327 | + if (count($paramsToRemove) > 0) | |
| 328 | + foreach ($paramsToRemove as $paramToRemove) { | |
| 329 | + $paramToRemove->parentNode->removeChild($paramToRemove); | |
| 330 | + } | |
| 328 | 331 | |
| 329 | 332 | $this->newWs->save($this->newWsDir.'WsParams.xml'); |
| 330 | 333 | $copied = $newParams->length - count($paramsToRemove); |
| ... | ... | @@ -560,20 +563,23 @@ class UserWsTransfer { |
| 560 | 563 | copy(OLDUSERPATH.TRANSFERUSER.'/DATA/'.$fileName,NEWUSERPATH.TRANSFERUSER.'/DATA/'.$fileName); |
| 561 | 564 | } |
| 562 | 565 | } |
| 563 | - | |
| 564 | - foreach ($deletedVi as $vi) { | |
| 565 | - $node = $FilesXml->getElementById($vi); | |
| 566 | - if ($node) | |
| 567 | - $node->parentNode->removeChild($node); | |
| 568 | - } | |
| 569 | - $msg .= 'Not copied files :<br/>'; | |
| 570 | - foreach ($deletedFiles as $vi) { | |
| 571 | - $node = $FilesXml->getElementById($vi); | |
| 572 | - if ($node) { | |
| 573 | - $msg .= '<li><i>'.$vi.'</i> <br/>'; | |
| 574 | - $node->parentNode->removeChild($node); | |
| 566 | + | |
| 567 | + if (count($deletedFiles) > 0) | |
| 568 | + foreach ($deletedVi as $vi) { | |
| 569 | + $node = $FilesXml->getElementById($vi); | |
| 570 | + if ($node) | |
| 571 | + $node->parentNode->removeChild($node); | |
| 572 | + } | |
| 573 | + $msg .= 'Not copied files :<br/>'; | |
| 574 | + | |
| 575 | + if (count($deletedFiles) > 0) | |
| 576 | + foreach ($deletedFiles as $vi) { | |
| 577 | + $node = $FilesXml->getElementById($vi); | |
| 578 | + if ($node) { | |
| 579 | + $msg .= '<li><i>'.$vi.'</i> <br/>'; | |
| 580 | + $node->parentNode->removeChild($node); | |
| 581 | + } | |
| 575 | 582 | } |
| 576 | - } | |
| 577 | 583 | |
| 578 | 584 | $FilesXml->save($this->newWsDir.'Files.xml'); |
| 579 | 585 | |
| ... | ... |