Skip to content

C
clinicaltrials
Commit 75398703 authored by Romain Loth's avatar Romain Loth
Browse files
Options

fix print_scholar (matching+retrieval was limiting retrieved keywords) and... 

fix print_scholar (matching+retrieval was limiting retrieved keywords) and factorize full_scholar_info cascade as a str param
parent ac885b90
Show whitespace changes
Inline Side-by-side
Showing with 88 additions and 98 deletions
php_library/parametres.php
View file @ 75398703
......@@ -47,4 +47,65 @@ $opt = [
PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
PDO::ATTR_EMULATE_PREPARES => false,
];
/* Common SQL fragment to select full scholars infos (with labs, orgs, kws..) */
// about the query stucture cf. doc/cascade_full_scholar_info.sql
$sql_full_scholar_select = <<< ENDSQL
SELECT
scholars_orgs_and_keywords.*,
GROUP_CONCAT(htstr) AS hashtags_list
FROM (
SELECT
scholars_and_orgs.*,
GROUP_CONCAT(kwstr) AS keywords_list,
GROUP_CONCAT(keywords.kwid) AS keywords_ids,
COUNT(keywords.kwid) AS keywords_nb
FROM (
SELECT
scholars_and_labs.*,
GROUP_CONCAT(insts.orgid SEPARATOR ',') AS insts_ids,
GROUP_CONCAT(insts.label SEPARATOR '%%%') AS insts_list
FROM (
SELECT
scholars.*,
GROUP_CONCAT(labs.orgid SEPARATOR ',') AS labs_ids,
GROUP_CONCAT(labs.label SEPARATOR '%%%') AS labs_list
FROM scholars
LEFT JOIN sch_org AS map_labs
ON map_labs.uid = luid
LEFT JOIN (
SELECT * FROM orgs WHERE class='lab'
) AS labs
ON map_labs.orgid = labs.orgid
WHERE (record_status = 'active'
OR (record_status = 'legacy' AND valid_date >= NOW()))
GROUP BY luid
) AS scholars_and_labs
LEFT JOIN sch_org AS map_insts
ON map_insts.uid = luid
LEFT JOIN (
SELECT * FROM orgs WHERE class='inst'
) AS insts
ON map_insts.orgid = insts.orgid
GROUP BY luid
) AS scholars_and_orgs
LEFT JOIN sch_kw
ON sch_kw.uid = scholars_and_orgs.luid
LEFT JOIN keywords
ON sch_kw.kwid = keywords.kwid
GROUP BY luid
) AS scholars_orgs_and_keywords
LEFT JOIN sch_ht
ON sch_ht.uid = luid
LEFT JOIN hashtags
ON sch_ht.htid = hashtags.htid
GROUP BY luid
ENDSQL;
?>
print_directory.php
View file @ 75398703
......@@ -244,58 +244,7 @@ else {
// about the query stucture cf. doc/cascade_full_scholar_info.sql
$sql = <<< END_QUERY
SELECT * FROM (
SELECT
scholars_orgs_and_keywords.*,
GROUP_CONCAT(htstr) AS hashtags_list
FROM (
SELECT
scholars_and_orgs.*,
GROUP_CONCAT(kwstr) AS keywords_list,
COUNT(keywords.kwid) AS keywords_nb
FROM (
SELECT
scholars_and_labs.*,
GROUP_CONCAT(insts.orgid SEPARATOR ',') AS insts_ids,
GROUP_CONCAT(insts.label SEPARATOR '%%%') AS insts_list
FROM (
SELECT
scholars.*,
GROUP_CONCAT(labs.orgid SEPARATOR ',') AS labs_ids,
GROUP_CONCAT(labs.label SEPARATOR '%%%') AS labs_list
FROM scholars
LEFT JOIN sch_org AS map_labs
ON map_labs.uid = luid
LEFT JOIN (
SELECT * FROM orgs WHERE class='lab'
) AS labs
ON map_labs.orgid = labs.orgid
WHERE (record_status = 'active'
OR (record_status = 'legacy' AND valid_date >= NOW()))
GROUP BY luid
) AS scholars_and_labs
LEFT JOIN sch_org AS map_insts
ON map_insts.uid = luid
LEFT JOIN (
SELECT * FROM orgs WHERE class='inst'
) AS insts
ON map_insts.orgid = insts.orgid
GROUP BY luid
) AS scholars_and_orgs
LEFT JOIN sch_kw
ON sch_kw.uid = scholars_and_orgs.luid
LEFT JOIN keywords
ON sch_kw.kwid = keywords.kwid
GROUP BY luid
) AS scholars_orgs_and_keywords
LEFT JOIN sch_ht
ON sch_ht.uid = luid
LEFT JOIN hashtags
ON sch_ht.htid = hashtags.htid
GROUP BY luid
$sql_full_scholar_select
) AS full_scholars_info
{$filter}
END_QUERY;
......
print_scholar_directory.php
View file @ 75398703
......@@ -64,58 +64,38 @@ if ($userid) {
// +--------+------------+-----------+
// implementation with all details and infos to retrieve
// re-implementation with separated matching and full retrieval
// NB: we need the sch_kw mapping 3 times
// - one for the retrieval with all keywords
// - 2 for matching
// - one sch_kw for source scholar
// - one sch_kw for target scholar
// 1) and matching <=> 2 x left join keywords
// 2) full retrieval <=> full_scholars_info
$sql = <<< HERE_QUERY
SELECT
scholars_and_orgs.*,
COUNT(keywords.kwid) AS keywords_nb,
GROUP_CONCAT(keywords.kwid) AS keywords_ids,
GROUP_CONCAT(kwstr) AS keywords_list
matched.uid,
matched.sim,
full_scholars_info.*
FROM (
SELECT
scholars_and_labs.*,
GROUP_CONCAT(insts.label SEPARATOR '%%%') AS insts_list
FROM (
SELECT
scholars.*,
GROUP_CONCAT(labs.orgid SEPARATOR ',') AS labs_ids,
GROUP_CONCAT(labs.label SEPARATOR '%%%') AS labs_list
FROM scholars
LEFT JOIN sch_org AS map_labs
ON map_labs.uid = luid
LEFT JOIN (
SELECT * FROM orgs WHERE class='lab'
) AS labs
ON map_labs.orgid = labs.orgid
WHERE (record_status = 'active'
OR (record_status = 'legacy' AND valid_date >= NOW()))
GROUP BY luid
) AS scholars_and_labs
LEFT JOIN sch_org AS map_insts
ON map_insts.uid = luid
LEFT JOIN (
SELECT * FROM orgs WHERE class='inst'
) AS insts
ON map_insts.orgid = insts.orgid
GROUP BY luid
) AS scholars_and_orgs
LEFT JOIN sch_kw AS second_level
ON second_level.uid = scholars_and_orgs.luid
JOIN sch_kw ON sch_kw.kwid = second_level.kwid
JOIN keywords
ON sch_kw.kwid = keywords.kwid
WHERE sch_kw.uid = {$userid}
GROUP BY luid
ORDER BY count(sch_kw.kwid) DESC, second_level.uid != {$userid} ASC;
tgt.uid,
count(*) AS sim
FROM sch_kw AS src
LEFT JOIN sch_kw AS tgt ON tgt.kwid = src.kwid
WHERE src.uid = {$userid}
GROUP BY src.uid, tgt.uid
ORDER BY sim DESC, tgt.uid != src.uid ASC
) AS matched
JOIN (
${sql_full_scholar_select}
) AS full_scholars_info ON luid = matched.uid;
HERE_QUERY;
// print_r('=== print_scholar_directory query ===<br>');
// print_r($sql);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment