dev #103980 Domain / test now displays record thumbnails with paginator and...

dev #103980 Domain / test now displays record thumbnails with paginator and "generate thumbnails" button

VERSIONS_WIP/103980

+ - ticket #103980 : Administration / Domaines : l'écran de test/indexation affiche maintenant la liste des notices complète avec pagination et vignettes. Permet de générer les vignettes des notices.
\ No newline at end of file

application/modules/admin/controllers/CatalogueController.php

@@ -40,12 +40,16 @@ class Admin_CatalogueController extends ZendAfi_Controller_Action {
     if (!$catalogue = Class_Catalogue::find((int)$this->_getParam("id_catalogue", 0)))
       $this->_redirect("admin/catalogue/index");
 
+    $this->view->page = $this->_getParam('page', 1);
+    $this->view->nb_per_page = 20;
     $ret = ['requete' => '',
             'nb_notices' => 0,
             'avec_vignettes' => 0,
             'notices' => ''];
     $this->getRequest()->setParam('render', null);
-    $ret = array_merge($ret, $catalogue->getTestCatalogue());
+    $ret = array_merge($ret,
+                       $catalogue->getTestCatalogue($this->view->nb_per_page,
+                                                    $this->view->page));
 
     if ($catalogue->hasIndexer())
       $catalogue->indexWithBaskets();

application/modules/admin/controllers/SystemeController.php

@@ -41,8 +41,7 @@ class Admin_SystemeController extends Zend_Controller_Action {
     if ($this->_getParam('mode') != 'reset_no')
       return $this;
 
-    Zend_Registry::get('sql')
-      ->execute("update notices set url_vignette='',url_image='' where url_vignette='" . Class_WebService_Vignette::NO_DATA . "'");
+    Class_WebService_Vignette::resetNoDataThumbnails();
   }
 
 
@@ -89,16 +88,15 @@ class Admin_SystemeController extends Zend_Controller_Action {
 
 
   public function makecacheimagesAction() {
-    if ($records_count = Class_Notice::countBy(['url_vignette' => ''])) {
-      $record = Class_Notice::findFirstBy(['url_vignette' => '']);
-      $record->fetchUrlLocalVignette();
-    }
-
     $this->getHelper('ViewRenderer')->setNoRender();
 
-    $html = $records_count - 1;
+    $cache = new Class_Notice_Thumbnail_Cache();
+    $cache->build($this->getRequest());
+
 
-    if ($next_record = Class_Notice::findFirstBy(['url_vignette' => ''])) {
+    $html = $cache->getRecordCount();
+
+    if ($next_record = $cache->getNextRecord()) {
       $html .= $this->view->tag('div',
                                 $this->view->tag('a',
                                                  $next_record->getTitrePrincipal() . ' (' . $next_record->getAuteurPrincipal() . ')',
@@ -107,7 +105,12 @@ class Admin_SystemeController extends Zend_Controller_Action {
                                                                                    null,
                                                                                    true),
                                                   'target' => '_blank']));
-      $html .= '<script>makeCacheImages("/admin/systeme/makecacheimages")</script>';
+
+
+      $html .= sprintf('<script>makeCacheImages(\'%s\')</script>',
+                       $this->view->url($cache->getCallbackUrl($this->getRequest()),
+                                        null,
+                                        true));
     }
 
     $this->getResponse()->setBody($html);

application/modules/admin/views/scripts/catalogue/tester.phtml

@@ -18,7 +18,14 @@
                                                                ['alt' => $this->_('Paniers'),
                                                                 'class' => 'ico',
                                                                 'title' => $this->_('Paniers rattachés au domaine "%s"',
-                                                                                    $this->catalogue->getLibelle())])),
+                                                                                    $this->catalogue->getLibelle())]))
+                    .
+                    $this->tagPreview($this->url(['module' => 'opac',
+                                                  'controller' => 'recherche',
+                                                  'action' => 'simple',
+                                                  'id_catalogue' => $this->catalogue->getId()],
+                                               null, true),
+                                    $this->_('Visualiser le domaine "%s" dans un nouvel onglet', $this->catalogue->getLibelle())),
                   ['class' => 'header_actions']);
 
 
@@ -30,23 +37,44 @@ if (!$this->notices)
 else {
   echo $this->ligneInfos($this->_('Notices trouvées'), $this->nb_notices);
   echo $this->ligneInfos($this->_('Avec vignettes en cache'), $this->avec_vignettes);
+
+  echo $this->Admin_GenerateImageCache(
+    $this->url(['module' => 'admin',
+                'controller' => 'systeme',
+                'action' => 'makecacheimages',
+                'id_catalogue' => $this->catalogue->getId(),
+                'reset_no' => 1],
+               null,
+               true));
+
+  if (!$this->isPopup())
+    echo $this->button((new Class_Entity())
+            ->setText($this->_('Modifier le domaine '))
+            ->setAttribs(['title' => $this->_('Modifier le domaine : %s',
+                                              $this->catalogue->getLibelle())])
+            ->setUrl($this->url(['action' => 'edit',
+                                 'id_catalogue' => $this->catalogue->getId()]))
+            ->setImage($this->tagImg(Class_Admin_Skin::current()
+                                          ->getIconUrl('buttons', 'configuration'))));
 }
 
+echo $this->pager($this->nb_notices,
+                  $this->nb_per_page,
+                  $this->page,
+                  $this->url(['module' => 'admin',
+                              'controller' => 'catalogue',
+                              'action' => 'tester',
+                              'id_catalogue' => $this->catalogue->getId()],
+                             null,
+                             true));
 
 if ($this->notices) {
   echo $this->listeNotices_Tableau($this->notices,
-                                   ['liste_codes' => 'T;J;A;N']);
+                                   ['liste_codes' => implode(';',
+                                                             [Class_Codification::CODE_THUMBNAIL,
+                                                              Class_TypeDoc::CODE_FACETTE,
+                                                              Class_Codification::CODE_TITRE,
+                                                              Class_CodifAuteur::CODE_FACETTE,
+                                                              Class_Codification::CODE_ANNEE ]),
+                                    'open_links_in_new_tab' => '1']);
 }
-
-
-echo $this->tagNotice('Affichage des 20 premières notices uniquement.');
-
-if (!$this->isPopup())
-  echo $this->button((new Class_Entity())
-          ->setText($this->_('Modifier le domaine '))
-          ->setAttribs(['title' => $this->_('Modifier le domaine : %s',
-                                            $this->catalogue->getLibelle())])
-          ->setUrl($this->url(['action' => 'edit',
-                               'id_catalogue' => $this->catalogue->getId()]))
-          ->setImage($this->tagImg(Class_Admin_Skin::current()
-                                        ->getIconUrl('buttons', 'configuration'))));

application/modules/admin/views/scripts/systeme/cacheimages.phtml

-<script src="<?php echo URL_ADMIN_JS?>jquery-1.6.4.min"> </script>
-<script src="<?php echo URL_ADMIN_JS?>cacheimages.js"> </script>
-
 <?php
 
 echo $this->tag('h2', $this->_('Base de données'));
@@ -20,14 +17,4 @@ echo $this->button(
                       ->setUrl($this->url(['mode' => 'reset_no']))
                       ->setImage($this->tagImg(Class_Admin_Skin::current()->getIconUrl('buttons', 'generate'))));
 
-echo $this->button(
-  (new Class_Entity())->setText($this->_('Constitution du cache'))
-                      ->setAttribs(['onclick' => 'makeCacheImages(); return false;'])
-                      ->setImage($this->tagImg(Class_Admin_Skin::current()->getIconUrl('actions', 'down'),
-                                               ['style' => 'filter: invert();'])));
-
-// Constitution du cache des images
-echo BR.BR.'<div id="bloc_restantes" align="center" style="display:none">';
-echo $this->tag('h2', $this->_('Constitution du cache en cours...'));
-echo $this->tag('h3', $this->_('Notices à traiter: %s', '<span id="restantes"></span>'));
-echo '</div>';
+echo $this->Admin_GenerateImageCache();

library/Class/Catalogue.php

@@ -345,10 +345,14 @@ class CatalogueLoader extends Storm_Model_Loader {
     if ($catalogue && $catalogue->isEmpty())
       return [];
 
-    if(isset($preferences['only_img']) && ($preferences['only_img'] == 1)
+    if(isset($preferences['only_img']) && ($preferences['only_img'] == Class_Catalogue::ONLY_IMG)
        && (($catalogue && Class_Catalogue::getLoader()->hasFilters($preferences['id_catalogue'])) || !$catalogue))
       $conditions[] = "url_vignette > '' and url_vignette != '" . Class_WebService_Vignette::NO_DATA . "' ";
 
+
+    if (isset($preferences['only_img']) && ($preferences['only_img'] == Class_Catalogue::WITHOUT_IMG))
+      $conditions[] = "url_vignette=''";
+
     $join = (isset($preferences['avec_avis']) && ($preferences['avec_avis'] == 1))
       ? ' INNER JOIN notices_avis ON notices.clef_oeuvre=notices_avis.clef_oeuvre '
       : '';
@@ -645,7 +649,10 @@ class CatalogueLoader extends Storm_Model_Loader {
 class Class_Catalogue extends Storm_Model_Abstract {
   use Trait_TreeNode, Trait_Translator, Trait_CustomFields, Trait_Facetable;
 
-  const CODE_FACETTE = 'Q';
+  const
+    CODE_FACETTE = 'Q',
+    ONLY_IMG = 1,
+    WITHOUT_IMG = 2;
 
   protected
     $_table_name = 'catalogue',
@@ -827,9 +834,8 @@ class Class_Catalogue extends Storm_Model_Abstract {
   }
 
 
-  public function getTestCatalogue() {
+  public function getTestCatalogue($nb_per_page = 20, $page = 1) {
     $preferences = $this->toArray();
-    $preferences['nb_notices'] = 20;
     $requetes = Class_Catalogue::getLoader()->getRequetes($preferences);
 
     if(empty($requetes['req_liste']))
@@ -839,9 +845,10 @@ class Class_Catalogue extends Storm_Model_Abstract {
     $temps = time();
 
     $ret["notices"] = Class_Notice::findAllByRequeteRecherche($requetes['req_ids'],
-                                                              $preferences['nb_notices'],
-                                                              1);
+                                                              $nb_per_page,
+                                                              $page);
     $ret["temps_execution"] = time() - $temps;
+
     $ret["nb_notices"] = fetchOne($requetes["req_comptage"]);
 
     $req = $requetes["req_comptage"];

library/Class/Codification.php

@@ -42,10 +42,10 @@
  * R: résumé
  * S: section
  * T: type de doc
- * U:
+ * U: vignette/image
  * V: disponibilité
  * W: éditeur
- * X:
+ * X: index dewey pcdm4
  * Y: annexe
  * Z: tag
  * 5: données autorités
@@ -68,7 +68,9 @@ class Class_Codification {
     CODE_AVAILABILITY='V',
     CODE_AUTHORITY_DATAS='5',
     CODE_URL = '8',
-    CODE_NOUVEAUTE = '9';
+    CODE_NOUVEAUTE = '9',
+    CODE_INDEX_DEWEY_PCDM4 = 'X',
+    CODE_THUMBNAIL = 'U';
 
 
   protected
@@ -92,7 +94,7 @@ class Class_Codification {
       return '';
 
     switch($type) {
-      case "X":
+      case Class_Codification::CODE_INDEX_DEWEY_PCDM4:
         $lib=[" ", $this->_('Livres et Vidéos'), $this->_('Musique')];
         $l=Class_AdminVar::get("FACETTE_PCDM4_LIBELLE"); if(trim($l)) $lib[2]=$l;
         $l=Class_AdminVar::get("FACETTE_DEWEY_LIBELLE"); if(trim($l)) $lib[1]=$l;
@@ -147,6 +149,7 @@ class Class_Codification {
        Class_Codification::CODE_NOUVEAUTE        => [    $this->_("Nouveauté"),       $this->_("Nouveauté")],
        Class_Codification::CODE_PRIX             => [    $this->_("Prix"),            $this->_("Prix")],
        Class_CodifEmplacement::CODE_FACETTE      => [    $this->_('Emplacement'),     $this->_('Emplacement')],
+       Class_Codification::CODE_THUMBNAIL        => [    $this->_('Vignette'),        $this->_('Vignette')],
        Class_Codification::CODE_AUTHORITY_DATAS  => [    $this->_('Autorité'),        $this->_('Autorité')],];
 
     $this->addThesauriToNomChamps();

library/Class/Notice.php

@@ -51,18 +51,21 @@ class NoticeLoader extends Storm_Model_Loader {
   }
 
 
-  public function getNoticeIdsByRequeteRecherche($req) {
+  public function getNoticeIdsByRequeteRecherche($req, $clear_cache = false) {
     if (!$req)
       return [];
 
-    $closure = function() use ($req) {
-      return Zend_Registry::get('sql')->fetchAllByColumn($req);
-    };
+    $cache = (new Storm_Cache())->useImplodeExplodeSerialization();
+    $cache_key = [$req, __CLASS__, __FUNCTION__];
 
-    return (new Storm_Cache())
-      ->useImplodeExplodeSerialization()
-      ->memoize([$req, __CLASS__, __FUNCTION__],
-                $closure);
+    if ($clear_cache)
+      $cache->remove($cache_key);
+
+    return $cache->memoize($cache_key,
+                           function() use ($req)
+                           {
+                             return Zend_Registry::get('sql')->fetchAllByColumn($req);
+                           });
   }
 
 

library/Class/Notice/Thumbnail/Cache.php

+<?php
+/**
+ * Copyright (c) 2012-2020, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+ */
+
+
+class Class_Notice_Thumbnail_Cache {
+  protected
+    $_remaining_records_count,
+    $_next_record;
+
+
+  public function build($request) {
+    $this->_next_record = null;
+    $this->_remaining_records_count = 0;
+
+    if ($request->getParam('reset_no'))
+      Class_WebService_Vignette::resetNoDataThumbnails();
+
+    return ($id_catalogue = $request->getParam('id_catalogue'))
+      ? $this->_updateNextRecordForCatalogue($request)
+      : $this->_updateNextRecordForAll();
+  }
+
+
+  public function getCallbackUrl($request) {
+    return array_filter( ['module' => 'admin',
+                          'controller' => 'systeme',
+                          'action' => 'makecacheimages',
+                          'id_catalogue' => $request->getParam('id_catalogue')] );
+  }
+
+
+  protected function _updateNextRecordForCatalogue($request) {
+    if (!$catalog = Class_Catalogue::find($request->getParam('id_catalogue')))
+      return $this;
+
+    $requetes = Class_Catalogue::getRequetes(['id_catalogue' => $catalog->getId(),
+                                              'only_img' => Class_Catalogue::WITHOUT_IMG]);
+
+    if (!$ids = Class_Notice::getNoticeIdsByRequeteRecherche($requetes['req_ids'], true))
+      return $this;
+
+    $this->_remaining_records_count = count($ids);
+
+    $this->_updateThumbnailForRecord(Class_Notice::find($ids[0]));
+
+    if ($this->_remaining_records_count > 0)
+      $this->_next_record = Class_Notice::find($ids[1]);
+
+    return $this;
+  }
+
+
+  protected function _updateNextRecordForAll() {
+    if (!$this->_remaining_records_count = Class_Notice::countBy(['url_vignette' => '']))
+      return $this;
+
+    $this->_updateThumbnailForRecord($this->_firstRecordWithoutThumbnail());
+    $this->_next_record = $this->_firstRecordWithoutThumbnail();
+    return $this;
+  }
+
+
+  protected function _updateThumbnailForRecord($record) {
+    $record->fetchUrlLocalVignette();
+    $this->_remaining_records_count --;
+    return $this;
+  }
+
+
+  public function getNextRecord() {
+    return $this->_next_record;
+  }
+
+
+  public function getRecordCount() {
+    return $this->_remaining_records_count;
+  }
+
+
+  public function isBuiltDone() {
+    return empty($this->_next_record);
+  }
+
+
+  protected function _firstRecordWithoutThumbnail() {
+    return Class_Notice::findFirstBy(['url_vignette' => '']);
+  }
+}

library/Class/Thumbs.php

-<?php
-/**
- * Copyright (c) 2012, Agence Française Informatique (AFI). All rights reserved.
- *
- * BOKEH is free software; you can redistribute it and/or modify
- * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
- * the Free Software Foundation.
- *
- * There are special exceptions to the terms and conditions of the AGPL as it
- * is applied to this software (see README file).
- *
- * BOKEH is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
- * along with BOKEH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA 
- */
-
-class Class_Thumbs
-{
-
-  var $config = array(
-    'album' => array(
-        "max_width" => 9999,
-        "max_height" => 9999,
-        "thumb_max_width" => 160,
-        "thumb_max_height" => 120
-    ) 
-  );
-
-  private $name;
-  private $path_to_save;
-  private $type;
-  private $working_img;
-
-  function __construct($path_to_img="",$type_img='avatar')
-  {
-    $this->type = $type_img;
-    $this->name = str_replace(dirname($path_to_img).'/','',$path_to_img);
-    $this->path_to_save = dirname($path_to_img).'/';
-    $this->working_img = $path_to_img;
-  }
-
-  //---------------------------------------------------------------------
-  // traite une image fabrique le thumb et retaille la grande image
-  //---------------------------------------------------------------------
-  public function traiteImage($adresse_fichier,$creer_thumb,$type)
-  {
-    // parametres du fichier
-    if(file_exists($adresse_fichier)==false) return array("erreur_image"=>"fichier image non trouvé");
-
-    // test si assez de memoire
-    $ret=$this->testConsoMemoire($adresse_fichier);
-
-    // Si pas assez de memoire : on degage
-    if($ret["statut"]==false)
-    {
-      return false;
-    }
-
-    // Grande image
-    $thumb = Thumbs_ThumbLib::create($adresse_fichier);
-    if($this->config[$type]["max_width"] != 9999)
-    {
-      $thumb->resize($this->config[$type]["max_width"], $this->config[$type]["max_height"]);
-      $thumb->save($adresse_fichier);
-    }
-
-    // thumb
-    if($creer_thumb==true)
-    {
-      $fic=pathinfo($adresse_fichier);
-      $path_thumbs=str_replace("/big","/thumbs",$fic["dirname"]);
-      if(file_exists($path_thumbs)==false) mkdir($path_thumbs);
-      $thumb->resize($this->config[$type]["thumb_max_width"], $this->config[$type]["thumb_max_height"]);
-      $thumb->save($path_thumbs.'/'.$fic["basename"]);
-    }
-
-    // retour
-    return $ret;
-  }
-  
-  //---------------------------------------------------------------------
-  // teste la capacité de la memoire pour traiter l'image
-  //---------------------------------------------------------------------
-  function testConsoMemoire($fic)
-{
-  // parametres
-  $facteur_pixels=204;
-  $marge_securite=100;
-  
-  // limite memoire 
-  $mem_limit=ini_get("memory_limit");
-  $mem_max=intval(str_replace("M","",$mem_limit))*1024;
-  $mem_used=intval(memory_get_usage()/1024);
-  $mem_dispo=($mem_max-$mem_used)-$marge_securite;
-  
-  // estimation memoire pour l'image
-  $info=getimagesize ($fic);
-  $pixels=$info[0]*$info[1];
-  $mem_image=intval($pixels/$facteur_pixels);
-  
-  // si pas assez de memoire calcul de la taille pour retrecir
-  if($mem_image<$mem_dispo) $ret["statut"]=true;
-  else 
-  {
-    $ret["statut"]=false;
-    $facteur=1.0;
-    $new_mem=$mem_image;
-    
-    While($new_mem > $mem_dispo)
-    {
-      $facteur-=0.01;
-      $new_witdh=intval($info[0]*$facteur);
-      $new_height=intval($info[1]*$facteur);
-      $new_mem=intval(($new_witdh*$new_height)/204);
-    }
-    $facteur=(1.0-$facteur)*100;
-    $new_dim=intval($new_witdh)." x ".$new_height;
-  }
-  
-  
-  // retour
-  $ret["fichier"]=$fic;
-  $ret["memoire_php_ini"]=$mem_limit."o";
-  $ret["memoire_utilisee"]=$mem_used.' Ko';
-  $ret["memoire_disponible"]=$mem_dispo.' Ko';
-  $ret["memoire_image"]=$mem_image.' Ko';
-  $ret["dimentions_origine"]=$info[0]." x ".$info[1]." pixels";
-  if($ret["statut"]==false)
-  {
-    $ret["dimentions_max"]=$new_dim." pixels";
-    $ret["diminution"]=$facteur."%";
-    $ret["msg"]="l'image est trop grande. Elle doit être réduite de ".$ret["diminution"].". ";
-    $ret["msg"].="Sa taille d'origine est de ".$ret["dimentions_origine"].". ";
-    $ret["msg"].="Sa nouvelle taille doit être au maximum de ".$ret["dimentions_max"];
-  }
-  return $ret;
-}
-
-  //---------------------------------------------------------------------
-  // proportions pour un container sans deformer l'image
-  //---------------------------------------------------------------------
-  static function getProportionsAffichage($hauteur_max,$largeur_max,$adresse_img,$ne_pas_forcer=false)
-  {
-    // dimentions initiales de l'image
-    $info=getimagesize($adresse_img);
-    $largeur=$info[0];
-    $hauteur=$info[1];
-    if(!$largeur or !$hauteur) return "";
-
-    // si option ne_pas_forcer et si l'image est plus petite on n'y touche pas
-    if($ne_pas_forcer and $largeur <= $largeur_max and $hauteur <= $hauteur_max) return;
-
-    // calcul du ratio
-    $ratio_hauteur = $hauteur_max/$hauteur;
-    $ratio_largeur = $largeur_max/$largeur;
-    $ratio = min($ratio_hauteur, $ratio_largeur);
-
-    // nouvelles dimentions
-    $largeur = intval($ratio*$largeur);
-    $hauteur = intval($ratio*$hauteur);
-
-    // retour sous la forme html
-    $html=' height="'.$hauteur.'px" width="'.$largeur.'px" ';
-    return $html;
-  }
-
-  //---------------------------------------------------------------------
-  // fabrique les thumbs pour tout un dossier
-  // attention : les images doivent etre de type .jpg
-  //---------------------------------------------------------------------
-  function saveDossier()
-  {
-    // verifie si le dossier existe et cree le dossier thumbs
-    if(file_exists($this->path_to_save)== false) return false;
-    $controle=file_exists($this->path_to_save.'thumbs');
-    if(file_exists($this->path_to_save.'thumbs')== false) mkdir($this->path_to_save.'thumbs');
-
-    // parcourir le dossier
-    $handle = opendir($this->path_to_save);
-    if(!$handle) return false;
-    while(false !== ($fic = readdir($handle)))
-    {
-      if(substr($fic,-4)!= ".jpg") continue;
-      $this->working_img=$this->path_to_save.$fic;
-      $this->name=$fic;
-      $this->saveImg();
-    }
-    closedir($handle);
-  }
-
-  function saveImg()
-  {
-    // Grande image
-    $thumb = Thumbs_ThumbLib::create($this->working_img);