Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 2056 → Rev 2057

/trunk/scripts/modules/migrationmotscles/Migrationmotscles.php
85,7 → 85,7
$this->afficherAvancement(' mots clés insérés ', $nb_mots_cles);
}
}
echo " Insertion des mots clés ".$this->mode." terminée \n";
echo "\n Insertion des mots clés ".$this->mode." terminée \n";
$infos_nouveaux_mots_cles = $this->dao->obtenirInfosNouveauxMotsCles();
$correspondances = $this->formaterCorrespondanceCheminId($infos_nouveaux_mots_cles);
145,7 → 145,7
$mots_cles_hierarchiques[$cle] = array(
'id_utilisateur' => $mot['id_utilisateur'],
'chemin' => $chemin,
'tag' => $mot['mot_cle']
'mot_cle' => $mot['mot_cle']
);
$chemin_traites[self::harmoniserPourDoublon($chemin).'-'.$mot['id_utilisateur']] = 1;
} else {
155,6 → 155,8
$pbs['vides'][] = $mot;
}
}
//echo '<pre>'.print_r($mots_cles_hierarchiques,true).'</pre>';exit;
return $mots_cles_hierarchiques;
}
/trunk/scripts/modules/migrationmotscles/bibliotheque/Dao.php
12,13 → 12,11
$this->mode = $mode;
if($mode == 'obs') {
$this->table_liaison = 'cel_obs_tags_path_liaison';
$this->table_mots_cles = 'cel_obs_tags_path';
$this->champ_id_element_lie = 'id_obs';
$this->table_liaison = 'cel_mots_cles_obs_liaison';
$this->table_mots_cles = 'cel_arbre_mots_cles_obs';
} else {
$this->table_liaison = 'cel_images_tags_path_liaison';
$this->table_mots_cles = 'cel_images_tags_path';
$this->champ_id_element_lie = 'id_image';
$this->table_liaison = 'cel_mots_cles_images_liaison';
$this->table_mots_cles = 'cel_arbre_mots_cles_images';
}
}
36,10 → 34,10
if($this->mode == 'obs') {
$requete_arbre = "SELECT id_mot_cle_obs as id_mot_cle, ce_mot_cle_obs_parent as parent, id_utilisateur, mot_cle ".
"FROM cel_mots_cles_obs ORDER BY id_utilisateur, niveau";
"FROM cel_mots_cles_obs WHERE niveau != 0 ORDER BY id_utilisateur, niveau";
} else {
$requete_arbre = "SELECT id_mot_cle_image as id_mot_cle, ce_mot_cle_image_parent as parent, id_utilisateur, mot_cle ".
"FROM cel_mots_cles_images ORDER BY id_utilisateur, niveau";
"FROM cel_mots_cles_images WHERE niveau != 0 ORDER BY id_utilisateur, niveau";
}
 
$mots_cles = $this->recupererTous($requete_arbre);
49,12 → 47,12
public function obtenirLiaisonsMotsClesOriginaux() {
if($this->mode == 'obs') {
$requete_liaisons = "SELECT comc.id_observation as id_element_lie, comc.id_mot_cle_obs as id_mot_cle, id_utilisateur as id_utilisateur ".
"FROM cel_obs_mots_cles_srv comc ".
"FROM cel_obs_mots_cles comc ".
"INNER JOIN cel_obs o ON o.id_observation = comc.id_observation ";
} else {
$requete_liaisons = "SELECT comc.id_image as id_element_lie, comc.id_mot_cle_image as id_mot_cle, o.ce_utilisateur as id_utilisateur ".
"FROM cel_images_mots_cles_srv comc ".
"INNER JOIN cel_images_srv o ON o.id_image = comc.id_image ";
"FROM cel_images_mots_cles comc ".
"INNER JOIN cel_images o ON o.id_image = comc.id_image ";
}
$liaisons = $this->recupererTous($requete_liaisons);
return $liaisons;
61,7 → 59,7
}
public function insererMotsCles($mots_cles) {
$requete_insertion_mots_cles = "INSERT INTO ".$this->table_mots_cles." (chemin, id_utilisateur, tag) ".
$requete_insertion_mots_cles = "INSERT INTO ".$this->table_mots_cles." (chemin, id_utilisateur, mot_cle) ".
" VALUES ";
foreach($mots_cles as $cle => $mot_cle) {
68,7 → 66,7
$requete_insertion_mots_cles .= "(".
$this->proteger($mot_cle['chemin']).", ".
$this->proteger($mot_cle['id_utilisateur']).", ".
$this->proteger($mot_cle['tag'])." ".
$this->proteger($mot_cle['mot_cle'])." ".
"), ";
}
77,12 → 75,12
}
public function obtenirInfosNouveauxMotsCles() {
$requete = "SELECT id_tag, id_utilisateur, chemin FROM ".$this->table_mots_cles;
$requete = "SELECT id_mot_cle, id_utilisateur, chemin FROM ".$this->table_mots_cles;
return $this->recupererTous($requete);
}
public function insererLiaisonsMotsCles($mots_cles, $liaisons, $correspondances) {
$requete_insertion_liaisons = "INSERT INTO ".$this->table_liaison." (id_element_lie, id_tag) ".
$requete_insertion_liaisons = "INSERT INTO ".$this->table_liaison." (id_element_lie, id_mot_cle) ".
" VALUES ";
$lier = false;
$mot_cles_inexistants = 0;
92,7 → 90,7
if(isset($mots_cles[$cle])) {
$cle_id_mot_cle_migre = $mots_cles[$cle]['chemin'].'-'.$liaison_mot_cle['id_utilisateur'];
if(isset($correspondances[$cle_id_mot_cle_migre])) {
$id_mot_cle_migre = $correspondances[$cle_id_mot_cle_migre]['id_tag'];
$id_mot_cle_migre = $correspondances[$cle_id_mot_cle_migre]['id_mot_cle'];
$requete_insertion_liaisons .= "(".
$this->proteger($liaison_mot_cle['id_element_lie']).", ".
$this->proteger($id_mot_cle_migre)." ".