Subversion Repositories Applications.referentiel

Compare Revisions

Ignore whitespace Rev 349 → Rev 350

/trunk/interfaces/squelettes/detail_referentiel.tpl.html
44,11 → 44,14
<input type="radio" name="usage" id="usage" value="personnel"/><label for="usage">personnel</label>
<input type="radio" name="usage" id="usage" value="professionnel"/><label for="usage">professionnel</label><br /><br />
Choississez la version que vous souhaitez télécharger :<br />
<!-- chercher comment inclure meta donnees et manuel technique -->
<? foreach ($versions as $version) { ?>
<input type="radio" name="version" id="version" checked value="<?=$version['version']?>"/><label for="version">version <?=$version['version'].' du '.$version['date_prod']?></label><br />
<? } ?>
<br />
Choississez le type d'encodage que vous souhaitez télécharger :<br />
<input type="radio" name="encodage" id="encodage" checked value="utf8"/><label for="encodage">utf-8</label>
<input type="radio" name="encodage" id="encodage" value="latin1"/><label for="encodage">iso-8859-1/latin1</label><br />
<br />
Sélectionnez les données :<br />
<input type="checkbox" name="filtres[]" id="nnr" value="nnr"/><label for="filtres">que les noms retenus</label><br />
<!-- à modifier pour tenir compte du référentiel -->
/trunk/interfaces/controleurs/Informations.php
111,6 → 111,7
$parametres['version'] = str_replace(".", "_", $parametres['version']);
if (isset($_POST["champs"])) $parametres['champs'] = implode(",",$_POST["champs"]);
if (isset($_POST["filtres"])) $parametres['filtres'] = implode(",",$_POST["filtres"]);
if (isset($_POST["encodage"])) $parametres['encodage'] = $_POST["encodage"];
$this->supprimerAncienExport($dossier);
$ref = $this->referentielDao->exporter($parametres);
$meta = $this->metaDao->exporter($parametres);
/trunk/services/modules/Referentiel.php
199,7 → 199,7
public function getElementExport($param) {
// Initialisation des variables
$info = array();
$p = $this->traiterParametresUrl(array("ref","version","champs","filtre"), $param, false);
$p = $this->traiterParametresUrl(array("ref","version","champs","filtre", "encodage"), $param, false);
$ref = $p['ref'].'_v'.$p['version'];
$racine_tmp = $this->config['chemins']['chemin_tmp'];
$dossier = $racine_tmp.date('Y_m_d').'/';
211,9 → 211,10
if (isset($p['champs'])) {
$champs = $this->formaterColonnes($p['champs'], $ref);
$requete = 'SELECT "'.implode('","', $champs['titre']).'" UNION (SELECT '.implode(', ',$champs['select']).
" INTO OUTFILE '".$fichier."' CHARACTER SET utf8 FIELDS TERMINATED BY '\t' OPTIONALLY ENCLOSED BY '' LINES TERMINATED BY '\n' ".
" INTO OUTFILE '".$fichier."' CHARACTER SET ".$p['encodage']." FIELDS TERMINATED BY '\t' OPTIONALLY ENCLOSED BY '' LINES TERMINATED BY '\n' ".
" FROM $ref a left join $ref b on b.num_nom=a.num_nom_retenu";
if (isset($p['filtre']) && $p['filtre'] != "*") {
$param_filtres = explode(",",$p["filtre"]);
$dernier_filtre = array_pop($param_filtres);
/trunk/bibliotheque/dao/ReferentielDao.php
122,7 → 122,7
private function construireUrlExport($parametres) {
$url = $this->url_jrest.self::SERVICE.'/Export';
$params_a_passer = array('ref', 'version', 'champs', 'filtres');
$params_a_passer = array('ref', 'version', 'champs', 'filtres', 'encodage');
foreach ($params_a_passer as $param_cle) {
if (isset($parametres[$param_cle]) && $parametres[$param_cle] != '') {
$valeur = urlencode(trim($parametres[$param_cle]));