diff --git a/generic_data/migration/Deleted.xml b/generic_data/migration/Deleted.xml new file mode 100644 index 0000000..707b8b8 --- /dev/null +++ b/generic_data/migration/Deleted.xml @@ -0,0 +1,19 @@ +<?xml version="1.0"?> +<root> + <deleted xml:id="c1_pp_"/> + <deleted xml:id="c3_pp_"/> + <deleted xml:id="_xyz_pre"/> + <deleted xml:id="ros_rsn_"/> + <deleted xml:id="cass_caps_elssec"/> + <deleted xml:id="cass_caps_snghr"/> + <deleted xml:id="wnd_swe_he"/> + <deleted xml:id="ros_b_ib"/> + <deleted xml:id="ros_b_ob"/> + <deleted xml:id="ros_xyz_fixed"/> + <deleted xml:id="ulys_carr"/> + <deleted xml:id="juno_cruise_xyzhci"/> + <deleted xml:id="juno_cruise_xyzhee"/> + <deleted xml:id="juno_cruise_xyzheeq"/> + <deleted xml:id="juno_cruise_lonhci"/> + <deleted xml:id="juno_cruise_lathci"/> +</root> diff --git a/generic_data/migration/Functions.xml b/generic_data/migration/Functions.xml new file mode 100644 index 0000000..90596a7 --- /dev/null +++ b/generic_data/migration/Functions.xml @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<root> + <deleted xml:id="gsegsm_"/> + <deleted xml:id="gsesm_"/> + <deleted xml:id="shiftN_"/> + <deleted xml:id="median_"/> + <deleted xml:id="rms_"/> + <deleted xml:id="min_"/> + <deleted xml:id="max_"/> + <deleted xml:id="var_"/> + <deleted xml:id="skew_"/> + <deleted xml:id="rms_sm_"/> + <deleted xml:id="min_sm_"/> + <deleted xml:id="max_sm_"/> + <deleted xml:id="var_sm_"/> + <deleted xml:id="skew_sm_"/> + <deleted xml:id="fix"/> +</root> diff --git a/generic_data/migration/Modified.xml b/generic_data/migration/Modified.xml new file mode 100644 index 0000000..4efb7d2 --- /dev/null +++ b/generic_data/migration/Modified.xml @@ -0,0 +1,30 @@ +<?xml version="1.0"?> +<conversion> + <param_convert xml:id="ace_xyz_gse" oldid="ace_xyz"/> + <param_convert xml:id="sw_v_gse" oldid="sw_v"/> + <param_convert xml:id="c1_xyz_gse" oldid="c1_xyz"/> + <param_convert xml:id="c2_xyz_gse" oldid="c2_xyz"/> + <param_convert xml:id="c3_xyz_gse" oldid="c3_xyz"/> + <param_convert xml:id="c4_xyz_gse" oldid="c4_xyz"/> + <param_convert xml:id="c1_b_gse" oldid="c1_b"/> + <param_convert xml:id="c2_b_gse" oldid="c2_b"/> + <param_convert xml:id="c3_b_gse" oldid="c3_b"/> + <param_convert xml:id="c4_b_gse" oldid="c4_b"/> + <param_convert xml:id="mex_xyz_mso" oldid="mex_xyz"/> + <param_convert xml:id="vex_xyz_vso" oldid="vex_xyz"/> + <param_convert xml:id="mav_sun_r" oldid="mav_r_iausun"/> + <param_convert xml:id="mav_mars_r" oldid="mav_r_iaumars"/> + <param_convert xml:id="cass_r_sat" oldid="cass_r_ksm"/> + <param_convert xml:id="mex_mars_r" oldid="sys_mex_r"/> + <param_convert xml:id="ros_cg_r" oldid="ros_r_cso"/> + <param_convert xml:id="vex_venus_r" oldid="sys_vex_r"/> + <param_convert xml:id="it_v_gse" oldid="it_v"/> + <param_convert xml:id="cass_wl" oldid="cass_wl_iau"/> + <!--<param_convert xml:id="mex_mars_r" oldid="pol_mex_pc(0)"/>--> + <param_convert xml:id="lat_mex_iau" oldid="pol_mex_pc(1)"/> + <param_convert xml:id="lon_mex_iau" oldid="pol_mex_pc(2)"/> + <param_convert xml:id="b_t96gsm" oldid="bt96"/> + <param_convert xml:id="mgs_mars_r" oldid="pol_mgs_pc(0)"/> + <param_convert xml:id="lon_mgs_iau" oldid="pol_mgs_pc(1)"/> + <param_convert xml:id="lat_mgs_iau" oldid="pol_mgs_pc(2)"/> +</conversion> \ No newline at end of file diff --git a/generic_data/migration/NotReady.xml b/generic_data/migration/NotReady.xml new file mode 100644 index 0000000..e42396b --- /dev/null +++ b/generic_data/migration/NotReady.xml @@ -0,0 +1,30 @@ +<?xml version="1.0"?> +<root> + <deleted xml:id="footprints"/> + <deleted xml:id="exomars"/> + <deleted xml:id="mms1_"/> + <deleted xml:id="mms2_"/> + <deleted xml:id="mms3_"/> + <deleted xml:id="mms4_"/> + <deleted xml:id="bepi_"/> + <deleted xml:id="mpo_"/> + <deleted xml:id="mmo_"/> + <deleted xml:id="io_jup_"/> + <deleted xml:id="eur_jup_"/> + <deleted xml:id="gan_jup_"/> + <deleted xml:id="cal_jup_"/> + <deleted xml:id="ros_mip_"/> + <deleted xml:id="ros_lap"/> + <deleted xml:id="ros_ica_en"/> + <deleted xml:id="vex_o_flux"/> + <deleted xml:id="vex_h_flux"/> + <deleted xml:id="mex_o_flux"/> + <deleted xml:id="mex_h_flux"/> + <deleted xml:id="vex_o_spec"/> + <deleted xml:id="vex_h_spec"/> + <deleted xml:id="mex_o_spec"/> + <deleted xml:id="mex_h_spec"/> + <deleted xml:id="ba2000"/> + <deleted xml:id="bt96"/> + <deleted xml:id="bcain"/> +</root> diff --git a/generic_data/migration/SpectraModifs.xml b/generic_data/migration/SpectraModifs.xml new file mode 100644 index 0000000..19c41b0 --- /dev/null +++ b/generic_data/migration/SpectraModifs.xml @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<root> + <deleted xml:id="e_mgs_omni"/> + <deleted xml:id="mex_els_spec"/> + <deleted xml:id="vex_els_spec"/> + <deleted xml:id="hia_padflux_c1"/> + <deleted xml:id="hia_padflux_c3"/> + <deleted xml:id="sta_swea_pad"/> + <deleted xml:id="stb_swea_pad"/> + <deleted xml:id="mex_h_spec"/> + <deleted xml:id="mex_h_flux"/> + <deleted xml:id="mex_o_spec"/> + <deleted xml:id="mex_o_flux"/> + <deleted xml:id="vex_h_spec"/> + <deleted xml:id="vex_h_flux"/> + <deleted xml:id="vex_o_spec"/> + <deleted xml:id="vex_o_flux"/> + <deleted xml:id="mav_sta_c0"/> + <deleted xml:id="mav_sta_c6"/> + <deleted xml:id="gtl_lep_espec"/> + <deleted xml:id="gtl_lep_ispec"/> +</root> \ No newline at end of file diff --git a/generic_data/migration/Template.xml b/generic_data/migration/Template.xml new file mode 100644 index 0000000..a1caf27 --- /dev/null +++ b/generic_data/migration/Template.xml @@ -0,0 +1,7 @@ +<?xml version="1.0"?> +<root> + <deleted xml:id="bt96"/> + <deleted xml:id="ba2000"/> + <deleted xml:id="bmorsch_mso"/> + <deleted xml:id="bcain_mso"/> +</root> diff --git a/php/RemoteDataCenter/Bases.xml b/php/RemoteDataCenter/Bases.xml index 5124ec9..43fce67 100644 --- a/php/RemoteDataCenter/Bases.xml +++ b/php/RemoteDataCenter/Bases.xml @@ -1,10 +1,9 @@ <?xml version="1.0"?> <dataRoot xml:id="myRemoteData-treeRootNode"> - <!--<dataCenter name="CLWEB@IRAP" desc="CLWeb_Internal_Data_Base" default="yes" id1="CLWeb" xml:id="CLWeb"/>--> <dataCenter name="LATMOS" desc="Latmos Hybrid Simulation Database" isSimulation='1' default="yes" id1="LATMOS" xml:id="LATMOS"/> <dataCenter name="FMI_HYBRID" desc="FMI Hybrid Simulation Database" isSimulation='1' default="yes" id1="FMI_HYBRID" xml:id="FMI_HYBRID"/> - <dataCenter name="FMI_GUMICS" desc="FMI MHD simulation database" isSimulation='1' default="yes" id1="FMI_GUMICS" xml:id="FMI_GUMICS"/> - <!--<dataCenter name="SINP" desc="Paraboloid model calculates the magnetic fields in the Earth's magnetosphere depending on external conditions in solar wind and on geomagnetic activity level" isSimulation='1' default="yes" id1="SINP" xml:id="SINP"/>--> + <dataCenter name="FMI_GUMICS" desc="FMI MHD simulation database" isSimulation='1' addable="true" default="yes" id1="FMI_GUMICS" xml:id="FMI_GUMICS"/> + <dataCenter name="SINP" desc="Paraboloid model calculates the magnetic fields in the Earth's magnetosphere depending on external conditions in solar wind and on geomagnetic activity level" isSimulation='1' default="yes" id1="SINP" xml:id="SINP"/> <dataCenter name="LESIA" desc="LESIA MASER" default="yes" id1="LESIA" isSimulation='1' xml:id="LESIA"/> <!--<dataCenter name="CDPP" desc="CCMC BATSRUS with RCM v8.01" default="yes" id1="CCMC" isSimulation='1' xml:id="CCMC"/>--> <dataCenter name="IPIM" desc="IPIM @ IRAP" default="yes" id1="IPIM" isSimulation='1' xml:id="IPIM"/> diff --git a/php/classes/UserDeleteObsolete.php b/php/classes/UserDeleteObsolete.php index 17d2bf5..21d5971 100644 --- a/php/classes/UserDeleteObsolete.php +++ b/php/classes/UserDeleteObsolete.php @@ -5,181 +5,170 @@ * */ - class UserDeleteObsolete { +class UserDeleteObsolete { - private $dataset, $vi, $Mgr; - private $ws_deleted; + private $dataset, $vi, $Mgr; + private $ws_deleted; - function __construct() { - - $this->ws_deleted = array(); - } - - public function setVI($vi) { - $this->vi = $vi; - $this->dataset = strtolower($vi); - } - - - public function deleteDerived() { - - $msg = '<b>WS (Derived) Params:</b><br/>'; - // derived parameters - $this->Mgr = new DerivedParamMgr('derivedParam'); - // get params - $wsParams = $this->Mgr->contentDom->getElementsByTagName('param'); + function __construct() { + $this->ws_deleted = array(); + } + + public function setVI($vi) { + $this->vi = $vi; + $this->dataset = strtolower($vi); + } + + public function deleteDerived() { + $msg = '<b>WS (Derived) Params:</b><br/>'; + // derived parameters + $this->Mgr = new DerivedParamMgr('derivedParam'); + // get params + $wsParams = $this->Mgr->contentDom->getElementsByTagName('param'); + + if ($wsParams->length == 0) { + return array('success' => true, 'msg' => 'No parameters'); + } + + foreach ($wsParams as $param) { + $id = $param->getAttribute('xml:id'); + $name = $param->getAttribute('name'); + $expression = $param->getAttribute('buildchain'); + + if (strpos(strtolower($expression), $this->dataset)) { + $msg .= 'deleted name:<b>'.$name.'</b>; expression: '.$expression.'<br/>'; + $obj = new stdClass(); + $obj->leaf = true; + $obj->id = $id; + $this->Mgr->deleteObject($obj); + // error_log( 'For INFO : DELETED '.$expression,1,email); + $this->ws_deleted[] = $name; + } + } + + $msg .= ' ok<br/>'; + return array('success' => true, 'msg' => $msg); + } - if ($wsParams->length == 0) { - return array('success' => true, 'msg' => 'No parameters'); - } - - foreach ($wsParams as $param) { - $id = $param->getAttribute('xml:id'); - $name = $param->getAttribute('name'); - $expression = $param->getAttribute('buildchain'); - - if (strpos(strtolower($expression), $this->dataset)) { - $msg .= 'deleted name:<b>'.$name.'</b>; expression: '.$expression.'<br/>'; - $obj = new stdClass(); - $obj->leaf = true; - $obj->id = $id; - $this->Mgr->deleteObject($obj); - // error_log( 'For INFO : DELETED '.$expression,1,email); - $this->ws_deleted[] = $name; - } - } - $msg .= ' ok<br/>'; - return array('success' => true, 'msg' => $msg); - } - - - - public function deleteConditions() { - - $msg = '<b>Conditions:</b><br/>'; - // conditons - $this->Mgr = new RequestMgr('condition'); - - $conditions = $this->Mgr->contentDom->getElementsByTagName('condition'); - - if ($conditions->length == 0) { - return array('success' => true, 'msg' => 'No conditions'); - } - - foreach ($conditions as $item) { - $id = $item->getAttribute('xml:id'); - $name = $item->getAttribute('name'); - - $expression = strtolower($this->Mgr->getObject($id)->expression); - - if (strpos($expression, $this->dataset)) { - $obj = new stdClass(); - $obj->leaf = true; - $obj->id = $id; - $this->Mgr->deleteObject($obj); - $msg .= 'deleted name:<b>'.$obj->name.'</b>; expression:'.$expression.'<br/>'; - - } - } - - $msg .= ' ok<br/>'; - - return array('success' => true, 'msg' => $msg); - } - - public function deleteRequests() { - - $msg = '<b>Requests:</b><br/>'; - // requests - $this->Mgr = new RequestMgr('request'); - $requests = $this->Mgr->contentDom->getElementsByTagName('request'); - - if (count($requests) == 0) { - return array('success' => true, 'msg' => 'No requests'); - } - - foreach ($requests as $item) { - - $id = $item->getAttribute('xml:id'); - $name = $item->getAttribute('name'); - - $objplot = $this->Mgr->getObject($id); - $obj = new stdClass(); - $obj->leaf = true; - $obj->id = $id; + public function deleteConditions() { + + $msg = '<b>Conditions:</b><br/>'; + // conditons + $this->Mgr = new RequestMgr('condition'); + + $conditions = $this->Mgr->contentDom->getElementsByTagName('condition'); + + if ($conditions->length == 0) { + return array('success' => true, 'msg' => 'No conditions'); + } + + foreach ($conditions as $item) { + $id = $item->getAttribute('xml:id'); + $name = $item->getAttribute('name'); + + $expression = strtolower($this->Mgr->getObject($id)->expression); + + if (strpos($expression, $this->dataset)) { + $obj = new stdClass(); + $obj->leaf = true; + $obj->id = $id; + $this->Mgr->deleteObject($obj); + $msg .= 'deleted name:<b>'.$obj->name.'</b>; expression:'.$expression.'<br/>'; + } + } + + $msg .= ' ok<br/>'; + + return array('success' => true, 'msg' => $msg); + } + + public function deleteRequests() { + + $msg = '<b>Requests:</b><br/>'; + // requests + $this->Mgr = new RequestMgr('request'); + $requests = $this->Mgr->contentDom->getElementsByTagName('request'); + + if (count($requests) == 0) { + return array('success' => true, 'msg' => 'No requests'); + } + + foreach ($requests as $item) { + + $id = $item->getAttribute('xml:id'); + $name = $item->getAttribute('name'); + + $objplot = $this->Mgr->getObject($id); + $obj = new stdClass(); + $obj->leaf = true; + $obj->id = $id; - foreach ($objplot->children as $panel) { - foreach ($panel->children as $param) { - - $parID = strtolower($param->name); - - if ($this->ws_deleted && substr($parId,0,3) == "ws_") { - if (array_search($this->ws_deleted, $parId)) { - - $this->Mgr->deleteObject($obj); - $msg .= 'request deleted '.$name.'<br/>'; - continue 3; - } - } - - if (strpos($parID, $this->dataset)) { - $this->Mgr->deleteObject($obj); - $msg .= 'request deleted '.$name.'<br/>'; - continue 3; - } - } - } - } - $msg .= ' ok<br/>'; - - return array('success' => true, 'msg' => $msg); - } - - public function deleteAliases() { - - $msg = '<b>Aliases:</b><br/>'; - $this->Mgr = new AliasMgr(); - $aliases = $this->Mgr->contentDom->getElementsByTagName('alias'); - - foreach ($aliases as $alias) { - $id = $alias->getAttribute('xml:id'); - $name = $alias->getAttribute('name'); - if (strpos(strtolower($id), $this->dataset)) { - $obj = new stdClass(); - $obj->leaf = true; - $obj->id = $id; - $this->Mgr->deleteObject($obj); - $msg .= 'alias deleted '.$name.'<br/>'; - } - } - return array('success' => true, 'msg' => $msg); - } - - - public function deleteInTree() { - - $msg = '<b>Dataset in RemoteParams:</b><br/>'; - - $this->Mgr = new ParamMgr(); - $xp = new domxpath($this->Mgr->xmlDom); - - $nodeToDelete = $xp->query("//dataset[@name='".$this->vi."']"); - if ($nodeToDelete->length > 0) { - $instrNode = $nodeToDelete->item(0)->parentNode; - $instrNode->removeChild($nodeToDelete->item(0)); - if (!$instrNode->hasChildNodes()) { - $missionNode = $instrNode->parentNode; - $missionNode->removeChild($instrNode); - if (!$missionNode->hasChildNodes()) { - $datacenterNode = $missionNode->parentNode; - $datacenterNode->removeChild($missionNode); - } - } - - $this->Mgr->xmlDom->save($this->Mgr->xmlName); - $msg .= 'dataset deleted '.$this->vi.'<br/>'; - } - return array('success' => true, 'msg' => $msg); - } + foreach ($objplot->children as $panel) { + foreach ($panel->children as $param) { + $parID = strtolower($param->name); + if ($this->ws_deleted && substr($parId,0,3) == "ws_") { + if (array_search($this->ws_deleted, $parId)) { + $this->Mgr->deleteObject($obj); + $msg .= 'request deleted '.$name.'<br/>'; + continue 3; + } + } + + if (strpos($parID, $this->dataset)) { + $this->Mgr->deleteObject($obj); + $msg .= 'request deleted '.$name.'<br/>'; + continue 3; + } + } + } + } + $msg .= ' ok<br/>'; + + return array('success' => true, 'msg' => $msg); + } + + public function deleteAliases() { + $msg = '<b>Aliases:</b><br/>'; + $this->Mgr = new AliasMgr(); + $aliases = $this->Mgr->contentDom->getElementsByTagName('alias'); + + foreach ($aliases as $alias) { + $id = $alias->getAttribute('xml:id'); + $name = $alias->getAttribute('name'); + if (strpos(strtolower($id), $this->dataset)) { + $obj = new stdClass(); + $obj->leaf = true; + $obj->id = $id; + $this->Mgr->deleteObject($obj); + $msg .= 'alias deleted '.$name.'<br/>'; + } + } + return array('success' => true, 'msg' => $msg); + } + + public function deleteInTree() { + $msg = '<b>Dataset in RemoteParams:</b><br/>'; + + $this->Mgr = new ParamMgr(); + $xp = new domxpath($this->Mgr->xmlDom); + + $nodeToDelete = $xp->query("//dataset[@name='".$this->vi."']"); + if ($nodeToDelete->length > 0) { + $instrNode = $nodeToDelete->item(0)->parentNode; + $instrNode->removeChild($nodeToDelete->item(0)); + if (!$instrNode->hasChildNodes()) { + $missionNode = $instrNode->parentNode; + $missionNode->removeChild($instrNode); + if (!$missionNode->hasChildNodes()) { + $datacenterNode = $missionNode->parentNode; + $datacenterNode->removeChild($missionNode); + } + } + + $this->Mgr->xmlDom->save($this->Mgr->xmlName); + $msg .= 'dataset deleted '.$this->vi.'<br/>'; + } + return array('success' => true, 'msg' => $msg); + } } ?> \ No newline at end of file diff --git a/php/classes/UserWsTransfer.php b/php/classes/UserWsTransfer.php index d31d53a..1b2c352 100644 --- a/php/classes/UserWsTransfer.php +++ b/php/classes/UserWsTransfer.php @@ -13,9 +13,9 @@ class UserWsTransfer { { define('OLDUSERPATH', 'http://cdpp1.irap.omp.eu/AMDA-NG/data/'); // define('OLDUSERPATH', 'http://amda-dev.irap.omp.eu/~budnik/AMDA-NG4/trunk/data/'); - define('NEWUSERPATH', '/home/budnik/AMDA/AMDA_IHM/data/'); + define('NEWUSERPATH', USERPATH); define('TRANSFERUSER', $user); - define('CONVERSIONDIR', '/home/budnik/AMDA/AMDA_Migration/conversion/'); + define('CONVERSIONDIR', DATAPATH."migration/"); $this->oldWs = new DomDocument("1.0"); $this->newWs = new DomDocument("1.0"); -- libgit2 0.21.2