/trunk/bibliotheque/dao/RechercheDao.php |
---|
68,7 → 68,7 |
$type, |
$parametres, |
$limitation, |
array('mots', 'sci', 'bot', 'lieu-stockage', 'zg', 'p', 'pr', 'str-d', 'veg', 'projets') |
array('mots', 'sci', 'bot', 'lieu-stockage', 'zg', 'p', 'pr', 'str-d', 'veg') |
); |
} |
/trunk/bibliotheque/dao/CollectionDao.php |
---|
25,7 → 25,7 |
* @return array un tableau contenant les informations sur la collection. |
*/ |
public function getCollection($id) { |
$url = $this->url_jrest.self::SERVICE_COLLECTION."/*/$id/*"; |
$url = $this->url_jrest.self::SERVICE_COLLECTION."/$id/*"; |
$json = $this->envoyerRequeteConsultation($url); |
$donnees = json_decode($json, true); |
return $donnees['collections']; |
/trunk/bibliotheque/dao/Ontologie.php |
---|
121,8 → 121,7 |
if (is_array($valeur) && count($valeur) > 0) { |
$valeur_formatee = array( |
'id' => $valeur['cmlv_id_valeur'], |
'parent' => $valeur['cmlv_ce_parent'], |
'projet' => $valeur['cmlv_ce_projet'], |
'parent' => $valeur['cmlv_ce_parent'], |
'nom' => $valeur['cmlv_nom'], |
'abreviation' => $valeur['cmlv_abreviation'], |
'description' => $valeur['cmlv_description'], |
/trunk/bibliotheque/dao/Dao.php |
---|
90,7 → 90,6 |
protected function envoyerRequeteConsultation($url) { |
$url = $this->traiterUrlParametres($url); |
Debug::printr($url); |
$retour = $this->envoyerRequete($url, 'GET'); |
return $retour; |
} |
/trunk/bibliotheque/dao/StructureDao.php |
---|
24,7 → 24,7 |
* @return array un tableau contenant les informations sur la structure. |
*/ |
public function getStructure($id_structure) { |
$url = $this->url_jrest.self::SERVICE_STRUCTURE."/*/$id_structure/*"; |
$url = $this->url_jrest.self::SERVICE_STRUCTURE."/$id_structure/*"; |
$json = $this->envoyerRequeteConsultation($url); |
$donnees = json_decode($json, true); |
return $donnees['structures']; |
38,19 → 38,11 |
*/ |
public function getStructureParZoneGeo($type_recherche) { |
$url = $this->url_jrest.self::SERVICE_STRUCTURE."/ParZoneGeo/$type_recherche"; |
$url = $this->limiterParProjets($url); |
$json = $this->envoyerRequeteConsultation($url); |
$donnees = json_decode($json, true); |
return $donnees; |
} |
private function limiterParProjets($url) { |
if (Config::get('projets') != '') { |
$url .= '/'.Config::get('projets'); |
} |
return $url; |
} |
/** |
* Retourne l'ensemble des informations du personnel d'une structure. |
* |