Changeset 3458796

Timestamp:

02/11/2026 09:04:22 AM (11 days ago)

Author:

ccsd

Message:

Add possibility to limit display a certains document types

Location:

hal/trunk

Files:

• constantes.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• wp-hal.php (modified) (14 diffs)

hal/trunk/constantes.php

@@ -1 +1 @@
 <?php
 /**
- * Created on: 26/05/14
- * Updated on: 15/11/22
+ * Created on: 2024-05-26
+ * Updated on: 2022-02-10
  */
 
@@ -31 +31 @@
 
 // Constante de version du plugin
-define('wphal_version', '2.6.1');
+define('wphal_version', '2.7,1');

hal/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.9
 PHP Version: 7.0 or higher
-Stable tag: 2.6
+Stable tag: 2.7.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -81 +81 @@
 
 == Changelog ==
+
+2.7.1
+*Release Date - Feb 2026
+
+* add possibility to display only one docment type. (thx to R.Trouville)
 
 = 2.7 =

hal/trunk/wp-hal.php

@@ -4 +4 @@
  * Plugin URI: http://www.ccsd.cnrs.fr
  * Description: Crée une page qui remonte les publications d'un auteur ou d'une structure en relation avec HAL et un widget des dernières publications d'un auteur ou d'une structure.
- * Version: 2.6.1
+ * Version: 2.7.1
  * Author: CCSD
  * Author URI: http://www.ccsd.cnrs.fr
@@ -18 +18 @@
 require_once("constantes.php");
 
-
-if (wphal_locale == 'fr_FR') {
-    define('wphal_lang', 'fr');
-} elseif (wphal_locale == 'es_ES') {
-    define('wphal_lang', 'es');
-} else {
+$generalLang = preg_replace('/_.*/', '', wphal_locale);
+switch ($generalLang) {
+case 'fr':
+case 'es':
+case 'en':
+    // Known languages...
+    define('wphal_lang', $generalLang);
+    break;
+default:
     define('wphal_lang', 'en');
 }
@@ -29 +32 @@
 function wphal_is_curl_installed() {
     $loaded_extentions = get_loaded_extensions();
-    if  (in_array  ('curl', $loaded_extentions)) {
-        return true;
-    }
-    else {
-        return false;
-    }
+    return (bool) (in_array('curl', $loaded_extentions));
 }
 
@@ -41 +39 @@
 add_shortcode( 'nb-doc', 'wphal_nb_doc' );
 
-
 function wphal_charger_languages() {
     load_plugin_textdomain('wp-hal', false, dirname(plugin_basename(__FILE__)) . '/lang/');
@@ -53 +50 @@
 
     $settings_link = '<a href="admin.php?page=wp-hal.php">' . __( 'Paramètres', 'wp-hal' ) . '</a>';
-
     array_unshift( $links, $settings_link );
-
     return $links;
 }
+
 
 add_filter( 'query_vars', 'wphal_query_vars' );
@@ -88 +84 @@
     // delete all "hal namespace" transients
     $sql = "
-            DELETE 
+            DELETE
             FROM {$wpdb->options}
             WHERE option_name like '\_transient\_hal\_%'
@@ -112 +108 @@
     if ( false === ( $value = get_transient( $transient_id ) ) ) {
         $json = wphal_do_common_curl_call($url);
-        if($json)
-            set_transient( $transient_id, $json, $cache_expiration);
+        if ($json) {
+            set_transient($transient_id, $json, $cache_expiration);
+        }
         return $json;
     } else{
@@ -145 +142 @@
     return $json->response->numFound;
 }
+
 /**
  * PLUGIN SHORTCODE CV-HAL
@@ -174 +172 @@
             'type' => $default_type,
             'id' => $default_id,
-            'contact' => $default_contact
+            'contact' => $default_contact,
+            'doctype_s' => null,
+            'debug' => false,
+            'option_groupe' => get_option('option_groupe')
         ),
             $param
         ));
+        if ($doctype_s && !preg_match("/^[A-Z_ ]*$/", $doctype_s)) {
+            // Control of shortcode doctype_s which must be a valid doctype or a valid expression for doctype_s
+            // can accept: "ART OR REPORT AND NOT UNDEFINED"
+            $doctype_s = null;
+        }
+        if (! in_array($option_groupe, ['paginer', 'grouper'])) {
+            $option_groupe = 'paginer';
+        }
+            
         $content = 'Plugin is not configured correctly or shortcode parameters are not valid, please check the <a href="https://doc.hal.science/afficher-une-liste-de-publications-dans-wordpress/" target="_blank" id="wrong_params">documentation</a>';
 
@@ -196 +206 @@
             $facetQuery = !empty($facets) ? 'facet.field='.implode("&facet.field=", $facets).'&facet.limit=200&facet.mincount=1&facet=true':'';
 
-            if (get_option('option_groupe') == 'grouper') {
+            $url = wphal_api . '?q=*:*&fq=' . $type . ':(' . urlencode($id) . ')';
+            if (!empty($doctype_s) && $doctype_s != "") {
+                    $url .= '&fq=docType_s:('.$doctype_s.')';
+            }
+            switch ($option_groupe) {
+            case 'grouper':
                 //cURL sur l'API pour récupérer les données
-                $url = wphal_api . '?q=*:*&fq=' . $type . ':(' . urlencode($id) . ')&group=true&group.field=docType_s&group.limit=1000&fl=docid,citationFull_s&'.$facetQuery.'&sort=' . wphal_producedDateY . '&wt=json&json.nl=arrarr';
-            } elseif (get_option('option_groupe') == 'paginer') {
-                $url = wphal_api . '?q=*:*&fq=' . $type . ':(' . urlencode($id) . ')&fl=docid,citationFull_s&'.$facetQuery.'&sort=' . wphal_producedDateY . '&wt=json&json.nl=arrarr';
-            }
+                $url .= '&group=true&group.field=docType_s&group.limit=1000';
+                break;
+            case 'paginer':
+                break;
+            default:
+                // impossible 2 cases only
+            }
+            $url .= '&fl=docid,citationFull_s&'.$facetQuery.'&sort=' . wphal_producedDateY . '&wt=json&json.nl=arrarr';
 
             $json = wphal_do_get_data($url);
             if(!isset($json->error)){
-            $hal_page = (get_query_var('hal_page')) ? get_query_var('hal_page') : 1;
-
-            $content = '<div id="wphal-content">';
+                $content = "";
+                $hal_page = (get_query_var('hal_page')) ? get_query_var('hal_page') : 1;
+                if ($debug) {
+                    $formattedJson = str_replace(["\n", ' '], ['<br />', '&nbsp;'] , json_encode($json,JSON_PRETTY_PRINT));
+                    $content .= sprintf('<div class="debug"><ul><li>Option groupe: %s</li><li>url=%s</li><li>doctype_s: %s</li><li>json result:  %s</li></ul></div>',
+                                        $option_groupe, $url, $doctype_s, $formattedJson );
+                }
+            
+                $content .= '<div id="wphal-content">';
             if (is_array($option_choix) && !empty($option_choix)){
                 $content .= '<ul id="wphal-menu">';
@@ -261 +286 @@
                 }
                 $content .= '</ul></li>';
-
                 $content .= '</ul><br/><hr>';
             }
@@ -772 +796 @@
     <div class="display" id="publications">';
         if(null === $json || !isset($jsontype->response)) {
-            if (get_option('option_groupe') == 'grouper') {
+            if ($option_groupe == 'grouper') {
                 $doctype = file_get_contents(plugin_dir_path(__FILE__) . 'json' . DIRECTORY_SEPARATOR . 'doctype_fr.json');
                 $jsontype = json_decode($doctype);
@@ -796 +820 @@
                     }
                 }
-            } elseif (get_option('option_groupe') == 'paginer') {
+            } elseif ($option_groupe == 'paginer') {
 
 //LISTE DES DOCUMENTS AVEC PAGINATION
@@ -821 +845 @@
 
                 $url = wphal_api . '?q=*:*&fq=' . $type . ':(' . urlencode($id) . ')&fl=docid,citationFull_s,keyword_s,bookTitle_s,producedDate_s,authFullName_s&start=' . $premiereEntree . '&rows=' . $messagesParPage . '&sort=' . wphal_producedDateY . '&wt=json';
+                if (!empty($doctype_s) && $doctype_s != "") {
+                    $url .= '&fq=docType_s:('.$doctype_s.')';
+                }
                 $json = wphal_do_get_data($url);