2.28.1

vanderbilt-redcap · Jan 18, 2021 · 55a99b2 · 55a99b2
1 parent e6c0204
commit 55a99b2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/CareerDev.php b/CareerDev.php
@@ -10,7 +10,7 @@ class CareerDev {
 	public static $passedModule = NULL;
 
 	public static function getVersion() {
-		return "2.28.0";
+		return "2.28.1";
 	}
 
 	public static function getLockFile($pid) {

diff --git a/brag.php b/brag.php
@@ -86,14 +86,15 @@
     $recordCitations = $pubs->getSortedCitationsInTimespan($startTs, $endTs, "Included", FALSE);
     foreach ($recordCitations as $citation) {
         $pmid = $citation->getPMID();
-        if (in_array($pmid, $allPMIDs)) {
+        if (isset($allPMIDs[$pmid])) {
             if (!isset($multipleScholarPMIDs[$pmid])) {
                 $multipleScholarPMIDs[$pmid] = [];
+                $multipleScholarPMIDs[$pmid][] = $allPMIDs[$pmid];
             }
             $multipleScholarPMIDs[$pmid][] = ["lastName" => $lastNames[$recordId], "firstName" => $firstNames[$recordId]];
         } else {
             $allCitations[] = $citation;
-            $allPMIDs[] = $pmid;
+            $allPMIDs[$pmid] = ["lastName" => $lastNames[$recordId], "firstName" => $firstNames[$recordId]];
         }
     }
 }
@@ -107,6 +108,7 @@
     }
     $pmid = $citation->getPMID();
     if (isset($multipleScholarPMIDs[$pmid])) {
+        // Application::log("Calling getCitation $pmid with multiple: ".REDCapManagement::json_encode_with_spaces($multipleScholarPMIDs[$pmid]));
         $citationStr .= $citation->getCitation($multipleScholarPMIDs[$pmid]);
     } else {
         $citationStr .= $citation->getCitation();

diff --git a/classes/Citation.php b/classes/Citation.php
@@ -651,11 +651,13 @@ private static function addPeriodIfExtant($str) {
 
 	public function getCitation($multipleNamesToBold = []) {
 	    if (!empty($multipleNamesToBold)) {
+	        // Application::log("Has multiple names to bold: ".REDCapManagement::json_encode_with_spaces($multipleNamesToBold));
 	        $authorList = $this->getAuthorList();
 	        foreach ($multipleNamesToBold as $nameAry) {
 	            $firstName = $nameAry["firstName"];
 	            $lastName = $nameAry["lastName"];
 	            $authorList = self::boldName($lastName, $firstName, $authorList);
+	            // Application::log("Bolding $lastName $firstName: ".REDCapManagement::json_encode_with_spaces($authorList));
             }
 	        $authors = self::addPeriodIfExtant(implode(", ", $authorList));
         } else {

diff --git a/install.php b/install.php
@@ -6,6 +6,7 @@
 use \Vanderbilt\CareerDevLibrary\REDCapManagement;
 use \ExternalModules\ExternalModules;
 
+ini_set("memory_limit", "4096M");
 ini_set('display_errors', 1);
 ini_set('display_startup_errors', 1);
 error_reporting(E_ALL);

diff --git a/publications/updateBibliometrics.php b/publications/updateBibliometrics.php
@@ -1,10 +1,12 @@
 <?php
 
 use \Vanderbilt\CareerDevLibrary\Download;
+use \Vanderbilt\CareerDevLibrary\Upload;
 use \Vanderbilt\CareerDevLibrary\Publications;
 use \Vanderbilt\CareerDevLibrary\Application;
 
 require_once(dirname(__FILE__)."/../classes/Download.php");
+require_once(dirname(__FILE__)."/../classes/Upload.php");
 require_once(dirname(__FILE__)."/../Application.php");
 require_once(dirname(__FILE__)."/../classes/Publications.php");
 

diff --git a/publications/updateBibliometricsForOneRecord.php b/publications/updateBibliometricsForOneRecord.php
@@ -1,10 +1,12 @@
 <?php
 
 use \Vanderbilt\CareerDevLibrary\Download;
+use \Vanderbilt\CareerDevLibrary\Upload;
 use \Vanderbilt\CareerDevLibrary\Publications;
 use \Vanderbilt\CareerDevLibrary\Application;
 
 require_once(dirname(__FILE__)."/../classes/Download.php");
+require_once(dirname(__FILE__)."/../classes/Upload.php");
 require_once(dirname(__FILE__)."/../Application.php");
 require_once(dirname(__FILE__)."/../classes/Publications.php");