Changeset 2879098

Timestamp:

03/13/2023 12:18:08 PM (3 years ago)

Author:

ccsd

Message:

fix query when affiliated author choice is selected

Location:

hal/trunk

Files:

• constantes.php (modified) (1 diff)
• wp-hal.php (modified) (8 diffs)

hal/trunk/constantes.php

@@ -7 +7 @@
 // Constante pour gérer certaines facettes
 define('wphal_delimiter', '_FacetSep_');
+define('wphal_delimiter_join', '_JoinSep_');
 
 // Constante pour l'API

hal/trunk/wp-hal.php

@@ -186 +186 @@
             $id = wphal_verifSolr($id);
 
-            $facets = wphal_buildfacet($option_choix, $type=="structId_i"?$id:0);
+            // in case the type is struct we need to split in order to build facet and display it back
+            $structIDs =[];
+            if($type=="structId_i"){
+                $structIDs = explode(' OR ', $id);
+            }
+
+            $facets = wphal_buildfacet($option_choix, $structIDs);
             $facetQuery = !empty($facets) ? 'facet.field='.implode("&facet.field=", $facets).'&facet.mincount=1&facet=true':'';
 
@@ -470 +476 @@
         <div class="display" id="wphal-affiliated" style="display: none;">
             <h3 class="wphal-titre">' . __('Auteurs affiliés', 'wp-hal') . '</h3>';
-            if (isset($json->facet_counts->facet_fields->affiliated) && !is_null($json->facet_counts->facet_fields->affiliated) && !empty($json->facet_counts->facet_fields->affiliated)) {
+            $parsed_facetfield = wphal_parse_affiliation_facet($json->facet_counts->facet_fields, $structIDs);
+            if (!empty($parsed_facetfield)) {
                 $content .= '<span id="triauteurs">';
                 $content .= '<button type="button" class="trial" id="triaff" onclick="toggleSort(this, true, \'wphal-aff\', \'affiliateduite\', \'triaff\'); return false;" style="font-size:16px;  text-decoration: none;" >Tri Alphabétique</button>';
@@ -478 +485 @@
                 $content .= '<div id="wphal-aff">';
                 $r = 0;
-                foreach ($json->facet_counts->facet_fields->affiliated as $res) {
+                foreach ($parsed_facetfield as $author=>$count) {
                     $r = $r + 1;
                     if ($r > 10) {
                         break;
                     }
-                    $name = explode(wphal_delimiter, $res[0]);
-                    if($name[2] == 0){
-                        $q = 'authLastNameFirstName_s:'.urlencode("\"".$name[3]."\"");
+                    $name = explode(wphal_delimiter, $author);
+                    if($name[1] == 0){
+                        $q = 'authLastNameFirstName_s:'.urlencode("\"".$name[2]."\"");
                     }else{
-                        $q = "authIdPerson_i:$name[2]";
-                    }
-                    $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><img alt="user" src=" ' . esc_url(plugin_dir_url(__FILE__) . '/img/user.svg').'" style="width:16px; margin-left:2px; margin-right:2px;"/><a href="' . esc_url(halv3 . '?q='. $q . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $name[3] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
+                        $q = "authIdPerson_i:$name[1]";
+                    }
+                    $content .= '<li class="metadata" data-percentage="' . $count . '"><img alt="user" src=" ' . esc_url(plugin_dir_url(__FILE__) . '/img/user.svg').'" style="width:16px; margin-left:2px; margin-right:2px;"/><a href="' . esc_url(halv3 . '?q='. $q . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $name[2] . '</a><span class="wphal-nbmetadata">' . $count . '</span></li>';
                 }
                 $i = 1;
                 $content .= '<div id="affiliateduite" style="display:none;">';
-                foreach ($json->facet_counts->facet_fields->affiliated as $res) {
+                foreach ($parsed_facetfield as $author=>$count) {
                     if ($r < 10) {
                         break;
@@ -500 +507 @@
                         $i = $i + 1;
                     } else {
-                        $name = explode(wphal_delimiter, $res[0]);
-                        if($name[2] == 0){
-                            $q = 'authLastNameFirstName_s:'.urlencode("\"".$name[3]."\"");
+                        $name = explode(wphal_delimiter, $author);
+                        if($name[1] == 0){
+                            $q = 'authLastNameFirstName_s:'.urlencode("\"".$name[2]."\"");
                         }else{
-                            $q = "authIdPerson_i:$name[2]";
+                            $q = "authIdPerson_i:$name[1]";
                         }
-                        $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><img alt="user" src=" ' . esc_url(plugin_dir_url(__FILE__) . '/img/user.svg').'" style="width:16px; margin-left:2px; margin-right:2px;"/><a href="' . esc_url(halv3 . '?q='. $q . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $name[3] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
+                        $content .= '<li class="metadata" data-percentage="' . $count . '"><img alt="user" src=" ' . esc_url(plugin_dir_url(__FILE__) . '/img/user.svg').'" style="width:16px; margin-left:2px; margin-right:2px;"/><a href="' . esc_url(halv3 . '?q='. $q . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $name[2] . '</a><span class="wphal-nbmetadata">' . $count . '</span></li>';
                     }
                 }
@@ -1001 +1008 @@
  *
  * @param array $option_choix
- * @param int $structID to buid prefixed facet
+ * @param array $structIDs to build prefixed facet
  * @return array
  */
-function wphal_buildfacet($option_choix, $structID=0)
+function wphal_buildfacet($option_choix, $structIDs)
 {
     $facetQuery = [];
@@ -1038 +1045 @@
             if ($option == 'affiliated') {
                 $facetField = 'structHasAuthIdHalPersonid_s';
-                $facetPrefix = $structID . wphal_delimiter;
-                $facetQuery[] = '&facet.field={!key=affiliated+facet.prefix=' . urlencode($facetPrefix) . '}' . urlencode($facetField);
+                foreach($structIDs as $k => $structID){
+                    $facetPrefix = $structID . wphal_delimiter;
+                    $facetQuery[] = '&facet.field={!key=affiliated_' . $k . '+facet.prefix=' . urlencode($facetPrefix) . '}' . urlencode($facetField);
+                }
             }
         }
@@ -1045 +1054 @@
     return $facetQuery;
 }
+
 function wphal_verifSolr($values){
     $verifsolr = explode(',',$values);
@@ -1064 +1074 @@
 
     return $solrsql;
+}
+
+
+/**
+ * parses the affiliation facet
+ *
+ * @return array
+ */
+function wphal_parse_affiliation_facet($facet_fields, $structIDs)
+{
+    $result=[];
+    foreach($structIDs as $k => $structID){
+        if(isset($facet_fields->{'affiliated_'.$k}) && !empty($facet_fields->{'affiliated_'.$k})){
+            foreach($facet_fields->{'affiliated_'.$k} as $r){
+                $t = explode(wphal_delimiter_join, $r[0]);
+                if (isset($result[$t[1]])){
+                    $result[$t[1]] = $r[1];
+                }else {
+                    $result[$t[1]] += $r[1];
+                }
+            }
+        }
+    }
+    return $result;
 }