From 6958a8ef9b2e76d689ba0fc161bce5e4b4a45a87 Mon Sep 17 00:00:00 2001
From: argirok <argirokokogiannaki@gmail.com>
Date: Mon, 18 Sep 2023 12:23:33 +0300
Subject: [PATCH 1/8] fix parameter for grant openaire access to Orcid

---
 orcid/my-orcid-links/myOrcidLinks.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/orcid/my-orcid-links/myOrcidLinks.component.ts b/orcid/my-orcid-links/myOrcidLinks.component.ts
index d77e14a4..5fbe58b8 100644
--- a/orcid/my-orcid-links/myOrcidLinks.component.ts
+++ b/orcid/my-orcid-links/myOrcidLinks.component.ts
@@ -163,7 +163,7 @@ export class MyOrcidLinksComponent {
 
     if(typeof document !== 'undefined') {
       this.tokenUrl = properties.orcidTokenURL
-        + "clientid="+properties.orcidClientId
+        + "client_id=" + properties.orcidClientId
         // + "&response_type=code&scope=/activities/update"
         // + "&response_type=code&scope=/authenticate /activities/update /person/update /read-limited"
         + "&response_type=code&scope=/activities/update /read-limited"

From adae1f074953b1316956cd7a7964a5bb76933426 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Tue, 19 Sep 2023 16:38:16 +0300
Subject: [PATCH 2/8] [Library | develop]: searchProjects.service.ts: Added
 more checks if startdate and enddate properties exist in the response |
 entity-metadata.component.ts: Added "From" or "Until" before startYear and
 endYear respectively when only one of them exists in data.

---
 landingPages/landing-utils/entity-metadata.component.ts | 4 ++--
 services/searchProjects.service.ts                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/landingPages/landing-utils/entity-metadata.component.ts b/landingPages/landing-utils/entity-metadata.component.ts
index c15f50e0..aba2fc82 100644
--- a/landingPages/landing-utils/entity-metadata.component.ts
+++ b/landingPages/landing-utils/entity-metadata.component.ts
@@ -60,10 +60,10 @@ import {RouterHelper} from "../../utils/routerHelper.class";
         <span>{{year}}</span>
       </ng-container>
       <ng-container *ngIf="startYear && !endYear">
-        <span>{{startYear}}</span>
+        <span>From {{startYear}}</span>
       </ng-container>
       <ng-container *ngIf="!startYear && endYear">
-        <span>{{endYear}}</span>
+        <span>Until {{endYear}}</span>
       </ng-container>
       <ng-container *ngIf="startYear && endYear">
         <ng-container>
diff --git a/services/searchProjects.service.ts b/services/searchProjects.service.ts
index 2109666f..b513b737 100644
--- a/services/searchProjects.service.ts
+++ b/services/searchProjects.service.ts
@@ -248,10 +248,10 @@ export class SearchProjectsService {
                   }
                 }
             }
-            if(resData.hasOwnProperty("startdate")) {
+            if(resData.hasOwnProperty("startdate")  && resData['startdate']) {
               result.startYear = resData.startdate.split('-')[0];
             }
-            if(resData.hasOwnProperty("enddate")) {
+            if(resData.hasOwnProperty("enddate") && resData['enddate']) {
               result.endYear = resData.enddate.split('-')[0];
             }
             // Measure

From be187c3fed3aac65731a9f7d7a1e10efa7a78346 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Tue, 19 Sep 2023 16:40:56 +0300
Subject: [PATCH 3/8] [Library | develop]: citation.class.ts: Updated bibtex to
 include case for type="software" - add @software instead of @misc.

---
 landingPages/landing-utils/citeThis/citation.class.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/landingPages/landing-utils/citeThis/citation.class.ts b/landingPages/landing-utils/citeThis/citation.class.ts
index 986b9244..03a3766c 100644
--- a/landingPages/landing-utils/citeThis/citation.class.ts
+++ b/landingPages/landing-utils/citeThis/citation.class.ts
@@ -6,7 +6,7 @@ export class Citation{
   public fileSuffix:string[]=[".bib", ".ris"];
   public fileFormatOptions: Option[]=[{label: "bibtex (.bib)", value: "bibtex"}, {label: "ris (.ris)", value: "ris"}];
   //https://github.com/citation-style-language/styles
-  bibtex:string =`<?xml version="1.0" encoding="UTF-8"?><style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US"><info><title>BibTeX generic citation style</title><id>http://www.zotero.org/styles/bibtex</id><link href="http://www.zotero.org/styles/bibtex" rel="self" /><link href="http://www.bibtex.org/" rel="documentation" /><author><name>Markus Schaffner</name></author><contributor><name>Richard Karnesky</name><email>karnesky+zotero@gmail.com</email><uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri></contributor><category citation-format="author-date" /><category field="generic-base" /><updated>2012-09-14T21:22:32+00:00</updated><rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights></info><macro name="zotero2bibtexType"><choose><if type="bill book graphic legal_case legislation motion_picture report song" match="any"><text value="book" /></if><else-if type="chapter" match="any"><text value="inbook" /></else-if><else-if type="article article-journal article-magazine article-newspaper" match="any"><text value="article" /></else-if><else-if type="thesis" match="any"><text value="phdthesis" /></else-if><else-if type="manuscript" match="any"><text value="unpublished" /></else-if><else-if type="paper-conference" match="any"><text value="inproceedings" /></else-if><else-if type="report" match="any"><text value="techreport" /></else-if><else><text value="misc" /></else></choose></macro><macro name="citeKey"><group delimiter="_"><text macro="author-short" text-case="lowercase" /><text macro="issued-year" /></group></macro><macro name="author-short"><names variable="author"><name form="short" delimiter="_" delimiter-precedes-last="always" /><substitute><names variable="editor" /><names variable="translator" /><choose><if type="bill book graphic legal_case legislation motion_picture report song" match="any"><text variable="title" form="short" /></if><else><text variable="title" form="short" /></else></choose></substitute></names></macro><macro name="issued-year"><date variable="issued"><date-part name="year" /></date></macro><macro name="issued-month"><date variable="issued"><date-part name="month" form="short" strip-periods="true" /></date></macro><macro name="author"><names variable="author"><name sort-separator=", " delimiter=" and " delimiter-precedes-last="always" name-as-sort-order="all" /></names></macro><macro name="editor-translator"><names variable="editor translator" delimiter=", "><name sort-separator=", " delimiter=" and " delimiter-precedes-last="always" name-as-sort-order="all" /></names></macro><macro name="title"><text variable="title" /></macro><macro name="number"><text variable="issue" /><text variable="number" /></macro><macro name="container-title"><choose><if type="chapter paper-conference" match="any"><text variable="container-title" prefix=" booktitle={" suffix="}" /></if><else><text variable="container-title" prefix=" journal={" suffix="}" /></else></choose></macro><macro name="publisher"><choose><if type="thesis"><text variable="publisher" prefix=" school={" suffix="}" /></if><else-if type="report"><text variable="publisher" prefix=" institution={" suffix="}" /></else-if><else><text variable="publisher" prefix=" publisher={" suffix="}" /></else></choose></macro><macro name="pages"><text variable="page" /></macro><macro name="edition"><text variable="edition" /></macro><citation et-al-min="11" et-al-use-first="10" disambiguate-add-year-suffix="true" disambiguate-add-names="false" disambiguate-add-givenname="false" collapse="year"><sort><key macro="author" /><key variable="issued" /></sort><layout delimiter="_"><text macro="citeKey" /></layout></citation><bibliography hanging-indent="false" et-al-min="11" et-al-use-first="10"><sort><key macro="author" /><key variable="issued" /></sort><layout><text macro="zotero2bibtexType" prefix=" @" /><group prefix="{" suffix=" }" delimiter=", "><text macro="citeKey" /><text variable="publisher-place" prefix=" place={" suffix="}" /><!--Fix This--><text variable="chapter-number" prefix=" chapter={" suffix="}" /><!--Fix This--><text macro="edition" prefix=" edition={" suffix="}" /><!--Is this in CSL? <text variable="type" prefix=" type={" suffix="}"/>--><text variable="collection-title" prefix=" series={" suffix="}" /><text macro="title" prefix=" title={" suffix="}" /><text variable="volume" prefix=" volume={" suffix="}" /><!--Not in CSL<text variable="rights" prefix=" rights={" suffix="}"/>--><text variable="ISBN" prefix=" ISBN={" suffix="}" /><text variable="ISSN" prefix=" ISSN={" suffix="}" /><!--Not in CSL <text variable="LCCN" prefix=" callNumber={" suffix="}"/>--><text variable="archive_location" prefix=" archiveLocation={" suffix="}" /><text variable="URL" prefix=" url={" suffix="}" /><text variable="DOI" prefix=" DOI={" suffix="}" /><text variable="abstract" prefix=" abstractNote={" suffix="}" /><text variable="note" prefix=" note={" suffix="}" /><text macro="number" prefix=" number={" suffix="}" /><text macro="container-title" /><text macro="publisher" /><text macro="author" prefix=" author={" suffix="}" /><text macro="editor-translator" prefix=" editor={" suffix="}" /><text macro="issued-year" prefix=" year={" suffix="}" /><text macro="issued-month" prefix=" month={" suffix="}" /><text macro="pages" prefix=" pages={" suffix="}" /><text variable="collection-title" prefix=" collection={" suffix="}" /></group></layout></bibliography></style>`;
+  bibtex:string =`<?xml version="1.0" encoding="UTF-8"?><style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US"><info><title>BibTeX generic citation style</title><id>http://www.zotero.org/styles/bibtex</id><link href="http://www.zotero.org/styles/bibtex" rel="self" /><link href="http://www.bibtex.org/" rel="documentation" /><author><name>Markus Schaffner</name></author><contributor><name>Richard Karnesky</name><email>karnesky+zotero@gmail.com</email><uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri></contributor><category citation-format="author-date" /><category field="generic-base" /><updated>2012-09-14T21:22:32+00:00</updated><rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights></info><macro name="zotero2bibtexType"><choose><if type="bill book graphic legal_case legislation motion_picture report song" match="any"><text value="book" /></if><else-if type="chapter" match="any"><text value="inbook" /></else-if><else-if type="article article-journal article-magazine article-newspaper" match="any"><text value="article" /></else-if><else-if type="thesis" match="any"><text value="phdthesis" /></else-if><else-if type="manuscript" match="any"><text value="unpublished" /></else-if><else-if type="paper-conference" match="any"><text value="inproceedings" /></else-if><else-if type="report" match="any"><text value="techreport" /></else-if><else-if type="software" match="any"><text value="software" /></else-if><else><text value="misc" /></else></choose></macro><macro name="citeKey"><group delimiter="_"><text macro="author-short" text-case="lowercase" /><text macro="issued-year" /></group></macro><macro name="author-short"><names variable="author"><name form="short" delimiter="_" delimiter-precedes-last="always" /><substitute><names variable="editor" /><names variable="translator" /><choose><if type="bill book graphic legal_case legislation motion_picture report song" match="any"><text variable="title" form="short" /></if><else><text variable="title" form="short" /></else></choose></substitute></names></macro><macro name="issued-year"><date variable="issued"><date-part name="year" /></date></macro><macro name="issued-month"><date variable="issued"><date-part name="month" form="short" strip-periods="true" /></date></macro><macro name="author"><names variable="author"><name sort-separator=", " delimiter=" and " delimiter-precedes-last="always" name-as-sort-order="all" /></names></macro><macro name="editor-translator"><names variable="editor translator" delimiter=", "><name sort-separator=", " delimiter=" and " delimiter-precedes-last="always" name-as-sort-order="all" /></names></macro><macro name="title"><text variable="title" /></macro><macro name="number"><text variable="issue" /><text variable="number" /></macro><macro name="container-title"><choose><if type="chapter paper-conference" match="any"><text variable="container-title" prefix=" booktitle={" suffix="}" /></if><else><text variable="container-title" prefix=" journal={" suffix="}" /></else></choose></macro><macro name="publisher"><choose><if type="thesis"><text variable="publisher" prefix=" school={" suffix="}" /></if><else-if type="report"><text variable="publisher" prefix=" institution={" suffix="}" /></else-if><else><text variable="publisher" prefix=" publisher={" suffix="}" /></else></choose></macro><macro name="pages"><text variable="page" /></macro><macro name="edition"><text variable="edition" /></macro><citation et-al-min="11" et-al-use-first="10" disambiguate-add-year-suffix="true" disambiguate-add-names="false" disambiguate-add-givenname="false" collapse="year"><sort><key macro="author" /><key variable="issued" /></sort><layout delimiter="_"><text macro="citeKey" /></layout></citation><bibliography hanging-indent="false" et-al-min="11" et-al-use-first="10"><sort><key macro="author" /><key variable="issued" /></sort><layout><text macro="zotero2bibtexType" prefix=" @" /><group prefix="{" suffix=" }" delimiter=", "><text macro="citeKey" /><text variable="publisher-place" prefix=" place={" suffix="}" /><!--Fix This--><text variable="chapter-number" prefix=" chapter={" suffix="}" /><!--Fix This--><text macro="edition" prefix=" edition={" suffix="}" /><!--Is this in CSL? <text variable="type" prefix=" type={" suffix="}"/>--><text variable="collection-title" prefix=" series={" suffix="}" /><text macro="title" prefix=" title={" suffix="}" /><text variable="volume" prefix=" volume={" suffix="}" /><!--Not in CSL<text variable="rights" prefix=" rights={" suffix="}"/>--><text variable="ISBN" prefix=" ISBN={" suffix="}" /><text variable="ISSN" prefix=" ISSN={" suffix="}" /><!--Not in CSL <text variable="LCCN" prefix=" callNumber={" suffix="}"/>--><text variable="archive_location" prefix=" archiveLocation={" suffix="}" /><text variable="URL" prefix=" url={" suffix="}" /><text variable="DOI" prefix=" DOI={" suffix="}" /><text variable="abstract" prefix=" abstractNote={" suffix="}" /><text variable="note" prefix=" note={" suffix="}" /><text macro="number" prefix=" number={" suffix="}" /><text macro="container-title" /><text macro="publisher" /><text macro="author" prefix=" author={" suffix="}" /><text macro="editor-translator" prefix=" editor={" suffix="}" /><text macro="issued-year" prefix=" year={" suffix="}" /><text macro="issued-month" prefix=" month={" suffix="}" /><text macro="pages" prefix=" pages={" suffix="}" /><text variable="collection-title" prefix=" collection={" suffix="}" /></group></layout></bibliography></style>`;
   ieee:string =`<?xml version="1.0" encoding="utf-8"?> <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only"> <info> <title>IEEE</title> <id>http://www.zotero.org/styles/ieee</id> <link href="http://www.zotero.org/styles/ieee" rel="self"/> <link href="http://www.ieee.org/documents/style_manual.pdf" rel="documentation"/> <link href="http://www.ieee.org/documents/auinfo07.pdf" rel="documentation"/> <author> <name>Michael Berkowitz</name> <email>mberkowi@gmu.edu</email> </author> <contributor> <name>Julian Onions</name> <email>julian.onions@gmail.com</email> </contributor> <contributor> <name>Rintze Zelle</name> <uri>http://twitter.com/rintzezelle</uri> </contributor> <contributor> <name>Stephen Frank</name> <uri>http://www.zotero.org/sfrank</uri> </contributor> <contributor> <name>Sebastian Karcher</name> </contributor> <category citation-format="numeric"/> <category field="engineering"/> <category field="generic-base"/> <updated>2016-10-06T15:32:30+00:00</updated> <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights> </info> <locale xml:lang="en"> <terms> <term name="chapter" form="short">ch.</term> <term name="presented at">presented at the</term> <term name="available at">available</term> </terms> </locale> <!-- Macros --> <macro name="edition"> <choose> <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any"> <choose> <if is-numeric="edition"> <group delimiter=" "> <number variable="edition" form="ordinal"/> <text term="edition" form="short"/> </group> </if> <else> <text variable="edition" text-case="capitalize-first" suffix="."/> </else> </choose> </if> </choose> </macro> <macro name="issued"> <choose> <if type="article-journal report" match="any"> <date variable="issued"> <date-part name="month" form="short" suffix=" "/> <date-part name="year" form="long"/> </date> </if> <else-if type=" bill book chapter graphic legal_case legislation motion_picture paper-conference song thesis" match="any"> <date variable="issued"> <date-part name="year" form="long"/> </date> </else-if> <else> <date variable="issued"> <date-part name="day" form="numeric-leading-zeros" suffix="-"/> <date-part name="month" form="short" suffix="-" strip-periods="true"/> <date-part name="year" form="long"/> </date> </else> </choose> </macro> <macro name="author"> <names variable="author"> <name and="text" et-al-min="7" et-al-use-first="1" initialize-with=". "/> <label form="short" prefix=", " text-case="capitalize-first"/> <et-al font-style="italic"/> <substitute> <names variable="editor"/> <names variable="translator"/> </substitute> </names> </macro> <macro name="editor"> <names variable="editor"> <name initialize-with=". " delimiter=", " and="text"/> <label form="short" prefix=", " text-case="capitalize-first"/> </names> </macro> <macro name="locators"> <group delimiter=", "> <text macro="edition"/> <group delimiter=" "> <text term="volume" form="short"/> <number variable="volume" form="numeric"/> </group> <group delimiter=" "> <number variable="number-of-volumes" form="numeric"/> <text term="volume" form="short" plural="true"/> </group> <group delimiter=" "> <text term="issue" form="short"/> <number variable="issue" form="numeric"/> </group> </group> </macro> <macro name="title"> <choose> <if type="bill book graphic legal_case legislation motion_picture song" match="any"> <text variable="title" font-style="italic"/> </if> <else> <text variable="title" quotes="true"/> </else> </choose> </macro> <macro name="publisher"> <choose> <if type=" bill book chapter graphic legal_case legislation motion_picture paper-conference song" match="any"> <group delimiter=": "> <text variable="publisher-place"/> <text variable="publisher"/> </group> </if> <else> <group delimiter=", "> <text variable="publisher"/> <text variable="publisher-place"/> </group> </else> </choose> </macro> <macro name="event"> <choose> <if type="paper-conference speech" match="any"> <choose> <!-- Published Conference Paper --> <if variable="container-title"> <group delimiter=", "> <group delimiter=" "> <text term="in"/> <text variable="container-title" font-style="italic"/> </group> <text variable="event-place"/> </group> </if> <!-- Unpublished Conference Paper --> <else> <group delimiter=", "> <group delimiter=" "> <text term="presented at"/> <text variable="event"/> </group> <text variable="event-place"/> </group> </else> </choose> </if> </choose> </macro> <macro name="access"> <choose> <if type="webpage"> <choose> <if variable="URL"> <group delimiter=". "> <text term="online" prefix="[" suffix="]" text-case="capitalize-first"/> <group delimiter=": "> <text term="available at" text-case="capitalize-first"/> <text variable="URL"/> </group> <group prefix="[" suffix="]" delimiter=": "> <text term="accessed" text-case="capitalize-first"/> <date variable="accessed"> <date-part name="day" form="numeric-leading-zeros" suffix="-"/> <date-part name="month" form="short" suffix="-" strip-periods="true"/> <date-part name="year" form="long"/> </date> </group> </group> </if> </choose> </if> </choose> </macro> <macro name="page"> <group> <label variable="page" form="short" suffix=" "/> <text variable="page"/> </group> </macro> <macro name="citation-locator"> <group delimiter=" "> <choose> <if locator="page"> <label variable="locator" form="short"/> </if> <else> <label variable="locator" form="short" text-case="capitalize-first"/> </else> </choose> <text variable="locator"/> </group> </macro> <!-- Citation --> <citation collapse="citation-number"> <sort> <key variable="citation-number"/> </sort> <layout delimiter=", "> <group prefix="[" suffix="]" delimiter=", "> <text variable="citation-number"/> <text macro="citation-locator"/> </group> </layout> </citation> <!-- Bibliography --> <bibliography entry-spacing="0" second-field-align="flush"> <layout suffix="."> <!-- Citation Number --> <text variable="citation-number" prefix="[" suffix="]"/> <!-- Author(s) --> <text macro="author" suffix=", "/> <!-- Rest of Citation --> <choose> <!-- Specific Formats --> <if type="article-journal"> <group delimiter=", "> <text macro="title"/> <text variable="container-title" font-style="italic" form="short"/> <text macro="locators"/> <text macro="page"/> <text macro="issued"/> </group> </if> <else-if type="paper-conference speech" match="any"> <group delimiter=", "> <text macro="title"/> <text macro="event"/> <text macro="issued"/> <text macro="locators"/> <text macro="page"/> </group> </else-if> <else-if type="report"> <group delimiter=", "> <text macro="title"/> <text macro="publisher"/> <group delimiter=" "> <text variable="genre"/> <text variable="number"/> </group> <text macro="issued"/> </group> </else-if> <else-if type="thesis"> <group delimiter=", "> <text macro="title"/> <text variable="genre"/> <text macro="publisher"/> <text macro="issued"/> </group> </else-if> <else-if type="webpage post-weblog" match="any"> <group delimiter=", " suffix=". "> <text macro="title"/> <text variable="container-title" font-style="italic"/> <text macro="issued"/> </group> <text macro="access"/> </else-if> <else-if type="patent"> <group delimiter=", "> <text macro="title"/> <text variable="number"/> <text macro="issued"/> </group> </else-if> <!-- Generic/Fallback Formats --> <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any"> <group delimiter=", " suffix=". "> <text macro="title"/> <text macro="locators"/> </group> <group delimiter=", "> <text macro="publisher"/> <text macro="issued"/> <text macro="page"/> </group> </else-if> <else-if type="article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any"> <group delimiter=", "> <text macro="title"/> <text variable="container-title" font-style="italic"/> <text macro="locators"/> <text macro="publisher"/> <text macro="page"/> <text macro="issued"/> </group> </else-if> <else-if type="chapter paper-conference" match="any"> <group delimiter=", " suffix=", "> <text macro="title"/> <group delimiter=" "> <text term="in"/> <text variable="container-title" font-style="italic"/> </group> <text macro="locators"/> </group> <text macro="editor" suffix=" "/> <group delimiter=", "> <text macro="publisher"/> <text macro="issued"/> <text macro="page"/> </group> </else-if> <else> <group delimiter=", " suffix=". "> <text macro="title"/> <text variable="container-title" font-style="italic"/> <text macro="locators"/> </group> <group delimiter=", "> <text macro="publisher"/> <text macro="page"/> <text macro="issued"/> </group> </else> </choose> </layout> </bibliography> </style> `;
   chicago:string =`<?xml version="1.0" encoding="utf-8"?> <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="display-and-sort" page-range-format="chicago"> <info> <title>Chicago Manual of Style 16th edition (full note)</title> <id>http://www.zotero.org/styles/chicago-fullnote-bibliography</id> <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography" rel="self"/> <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/> <author> <name>Julian Onions</name> <email>julian.onions@gmail.com</email> </author> <contributor> <name>Simon Kornblith</name> <email>simon@simonster.com</email> </contributor> <contributor> <name>Elena Razlogova</name> <email>elena.razlogova@gmail.com</email> </contributor> <contributor> <name>Frank Bennett</name> <email>biercenator@gmail.com</email> </contributor> <contributor> <name>Andrew Dunning</name> <email>andrew.dunning@utoronto.ca</email> </contributor> <category citation-format="note"/> <category field="generic-base"/> <summary>Chicago format with full notes and bibliography</summary> <updated>2016-11-03T13:30:08+00:00</updated> <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights> </info> <locale xml:lang="en"> <terms> <term name="editor" form="verb-short">ed.</term> <term name="translator" form="verb-short">trans.</term> <term name="translator" form="short">trans.</term> <term name="editortranslator" form="verb-short"> <single>ed. and trans.</single> <multiple>ed. and trans.</multiple> </term> <term name="editortranslator" form="verb"> <single>Edited and translated by</single> <multiple>Edited and translated by</multiple> </term> <term name="translator" form="short">trans.</term> </terms> </locale> <macro name="editor-translator"> <group delimiter=", "> <group delimiter=" "> <choose> <if variable="container-author reviewed-author" match="any"> <group> <names variable="container-author reviewed-author"> <label form="verb-short" text-case="lowercase" suffix=" "/> <name and="text" delimiter=", "/> </names> </group> </if> </choose> </group> <names variable="editor translator" delimiter=", "> <label form="verb-short" text-case="lowercase" suffix=" "/> <name and="text" delimiter=", "/> </names> </group> </macro> <macro name="secondary-contributors-note"> <choose> <if type="chapter paper-conference" match="none"> <text macro="editor-translator"/> </if> </choose> </macro> <macro name="container-contributors-note"> <choose> <if type="chapter paper-conference" match="any"> <text macro="editor-translator"/> </if> </choose> </macro> <macro name="secondary-contributors"> <choose> <if type="chapter paper-conference" match="none"> <names variable="editor translator" delimiter=". "> <label form="verb" text-case="capitalize-first" suffix=" "/> <name and="text" delimiter=", "/> </names> </if> </choose> </macro> <macro name="container-contributors"> <choose> <if type="chapter paper-conference" match="any"> <group delimiter=", "> <choose> <if variable="author"> <choose> <if variable="container-author" match="any"> <names variable="container-author"> <label form="verb-short" text-case="lowercase" suffix=" "/> <name and="text" delimiter=", "/> </names> </if> </choose> <!--This includes page numers after the container author, e.g. for Introductions --> <choose> <if variable="container-author author" match="all"> <group delimiter=". "> <text variable="page"/> <names variable="editor translator" delimiter=", "> <label form="verb" suffix=" "/> <name and="text" delimiter=", "/> </names> </group> </if> <else> <names variable="editor translator" delimiter=", "> <label form="verb" text-case="lowercase" suffix=" "/> <name and="text" delimiter=", "/> </names> </else> </choose> </if> </choose> </group> </if> </choose> </macro> <macro name="recipient-note"> <names variable="recipient" delimiter=", "> <label form="verb" text-case="lowercase" suffix=" "/> <name and="text" delimiter=", "/> </names> </macro> <macro name="contributors-note"> <group delimiter=" "> <names variable="author"> <name and="text" sort-separator=", " delimiter=", "/> <label form="short" prefix=", "/> <substitute> <names variable="editor"/> <names variable="translator"/> </substitute> </names> <text macro="recipient-note"/> </group> </macro> <macro name="editor"> <names variable="editor"> <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/> <label form="short" prefix=", "/> </names> </macro> <macro name="translator"> <names variable="translator"> <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/> <label form="verb-short" prefix=", "/> </names> </macro> <macro name="recipient"> <group delimiter=" "> <choose> <if type="personal_communication"> <choose> <if variable="genre"> <text variable="genre" text-case="capitalize-first"/> </if> <else> <text term="letter" text-case="capitalize-first"/> </else> </choose> </if> </choose> <text macro="recipient-note"/> </group> </macro> <macro name="contributors"> <group delimiter=". "> <names variable="author"> <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/> <substitute> <text macro="editor"/> <text macro="translator"/> </substitute> </names> <text macro="recipient"/> </group> </macro> <macro name="recipient-short"> <names variable="recipient"> <label form="verb" text-case="lowercase" suffix=" "/> <name form="short" and="text" delimiter=", "/> </names> </macro> <macro name="contributors-short"> <group delimiter=" "> <names variable="author"> <name form="short" and="text" delimiter=", "/> <substitute> <names variable="editor"/> <names variable="translator"/> </substitute> </names> <text macro="recipient-short"/> </group> </macro> <macro name="contributors-sort"> <names variable="author"> <name name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/> <substitute> <names variable="editor"/> <names variable="translator"/> <text macro="title"/> </substitute> </names> </macro> <macro name="interviewer-note"> <names variable="interviewer" delimiter=", "> <label form="verb" text-case="lowercase" suffix=" "/> <name and="text" delimiter=", "/> </names> </macro> <macro name="interviewer"> <names variable="interviewer" delimiter=", "> <label form="verb" text-case="capitalize-first" suffix=" "/> <name and="text" delimiter=", "/> </names> </macro> <macro name="title-note"> <choose> <if variable="title" match="none"> <text variable="genre"/> </if> <else-if type="book graphic motion_picture song" match="any"> <text variable="title" text-case="title" font-style="italic"/> <group delimiter=" " prefix=", "> <text term="version"/> <text variable="version"/> </group> </else-if> <else-if type="legal_case interview patent" match="any"> <text variable="title"/> </else-if> <else-if variable="reviewed-author"> <text variable="title" font-style="italic" prefix="review of "/> </else-if> <else> <text variable="title" text-case="title" quotes="true"/> </else> </choose> </macro> <macro name="title"> <choose> <if variable="title" match="none"> <choose> <if type="personal_communication" match="none"> <text variable="genre" text-case="capitalize-first"/> </if> </choose> </if> <else-if type="book graphic motion_picture song" match="any"> <text variable="title" text-case="title" font-style="italic"/> <group prefix=" (" suffix=")" delimiter=" "> <text term="version"/> <text variable="version"/> </group> </else-if> <else-if variable="reviewed-author"> <group delimiter=", "> <text variable="title" font-style="italic" prefix="Review of "/> <names variable="reviewed-author"> <label form="verb-short" text-case="lowercase" suffix=" "/> <name and="text" delimiter=", "/> </names> </group> </else-if> <else-if type="bill legislation legal_case interview patent" match="any"> <text variable="title"/> </else-if> <else> <text variable="title" text-case="title" quotes="true"/> </else> </choose> </macro> <macro name="title-short"> <choose> <if variable="title" match="none"> <choose> <if type="interview"> <text term="interview"/> </if> <else-if type="manuscript speech" match="any"> <text variable="genre" form="short"/> </else-if> <else-if type="personal_communication"> <text macro="issued"/> </else-if> </choose> </if> <else-if type="book graphic motion_picture song" match="any"> <text variable="title" text-case="title" form="short" font-style="italic"/> </else-if> <else-if type="legal_case" variable="title-short" match="all"> <text variable="title" font-style="italic" form="short"/> </else-if> <else-if type="patent interview" match="any"> <text variable="title" form="short"/> </else-if> <else-if type="legal_case bill legislation" match="any"> <text variable="title"/> </else-if> <else> <text variable="title" text-case="title" form="short" quotes="true"/> </else> </choose> </macro> <macro name="date-disambiguate"> <choose> <if disambiguate="true"> <text macro="issued"/> </if> </choose> </macro> <macro name="description-note"> <group delimiter=", "> <text macro="interviewer-note"/> <text variable="medium"/> <choose> <if variable="title" match="none"/> <else-if type="manuscript thesis speech" match="any"/> <else-if type="patent"> <group delimiter=" "> <text variable="authority"/> <text variable="number"/> </group> </else-if> <else> <text variable="genre"/> </else> </choose> </group> </macro> <macro name="description"> <group delimiter=", "> <group delimiter=". "> <text macro="interviewer"/> <text variable="medium" text-case="capitalize-first"/> </group> <choose> <if variable="title" match="none"/> <else-if type="thesis speech" match="any"/> <else-if type="patent"> <group delimiter=" "> <text variable="authority"/> <text variable="number"/> </group> </else-if> <else> <text variable="genre" text-case="capitalize-first"/> </else> </choose> </group> </macro> <macro name="container-title-note"> <group delimiter=" "> <choose> <if type="chapter paper-conference" match="any"> <text term="in"/> </if> </choose> <choose> <if type="bill legislation legal_case" match="none"> <text variable="container-title" text-case="title" font-style="italic"/> </if> </choose> </group> </macro> <macro name="container-title"> <group delimiter=" "> <choose> <if type="chapter paper-conference" match="any"> <text term="in" text-case="capitalize-first"/> </if> </choose> <choose> <if type="bill legislation legal_case" match="none"> <text variable="container-title" text-case="title" font-style="italic"/> </if> </choose> </group> </macro> <macro name="collection-title"> <choose> <if match="none" type="article-journal"> <choose> <if match="none" is-numeric="collection-number"> <group delimiter=", "> <text variable="collection-title" text-case="title"/> <text variable="collection-number"/> </group> </if> <else> <group delimiter=" "> <text variable="collection-title" text-case="title"/> <text variable="collection-number"/> </group> </else> </choose> </if> </choose> </macro> <macro name="collection-title-journal"> <choose> <if type="article-journal"> <group delimiter=" "> <text variable="collection-title"/> <text variable="collection-number"/> </group> </if> </choose> </macro> <macro name="edition-note"> <choose> <if type="book chapter graphic motion_picture paper-conference report song" match="any"> <choose> <if is-numeric="edition"> <group delimiter=" "> <number variable="edition" form="ordinal"/> <text term="edition" form="short"/> </group> </if> <else> <text variable="edition"/> </else> </choose> </if> </choose> </macro> <macro name="edition"> <choose> <if type="book chapter graphic motion_picture paper-conference report song" match="any"> <choose> <if is-numeric="edition"> <group delimiter=" "> <number variable="edition" form="ordinal"/> <text term="edition" form="short"/> </group> </if> <else> <text variable="edition" text-case="capitalize-first" suffix="."/> </else> </choose> </if> </choose> </macro> <macro name="locators-note-join-with-space"> <choose> <if type="article-journal" variable="volume" match="all"> <choose> <if match="none" variable="collection-title"> <text macro="locators-note"/> </if> </choose> </if> </choose> </macro> <macro name="locators-note-join-with-comma"> <choose> <if type="article-journal" match="none"> <text macro="locators-note"/> </if> <else-if type="article-journal"> <choose> <if variable="volume" match="none"> <text macro="locators-note"/> </if> <else-if match="any" variable="collection-title"> <text macro="locators-note"/> </else-if> </choose> </else-if> </choose> </macro> <macro name="locators-note"> <choose> <if type="article-journal"> <group delimiter=", "> <text macro="collection-title-journal"/> <number variable="volume"/> <group delimiter=" "> <text term="issue" form="short"/> <number variable="issue"/> </group> </group> </if> <else-if type="bill legislation legal_case" match="any"> <text macro="legal-cites"/> </else-if> <else-if type="book chapter graphic motion_picture paper-conference report song" match="any"> <group delimiter=", "> <text macro="edition-note"/> <group delimiter=" "> <text term="volume" form="short"/> <number variable="volume" form="numeric"/> </group> <choose> <if variable="locator" match="none"> <group delimiter=" "> <number variable="number-of-volumes" form="numeric"/> <text term="volume" form="short" plural="true"/> </group> </if> </choose> </group> </else-if> </choose> </macro> <macro name="legal-cites"> <choose> <if type="legal_case" match="any"> <group delimiter=" "> <choose> <if variable="container-title"> <text variable="volume"/> <text variable="container-title"/> <group delimiter=" "> <!--change to label variable="section" as that becomes available --> <text term="section" form="symbol"/> <text variable="section"/> </group> <text variable="page"/> </if> <else> <text variable="number" prefix="No. "/> </else> </choose> </group> </if> <else-if type="bill legislation" match="any"> <group delimiter=", "> <choose> <if variable="number"> <!--There's a public law number--> <text variable="number" prefix="Pub. L. No. "/> <group delimiter=" "> <!--change to label variable="section" as that becomes available --> <text term="section" form="symbol"/> <text variable="section"/> </group> <group delimiter=" "> <text variable="volume"/> <text variable="container-title"/> <text variable="page-first"/> </group> </if> <else> <group delimiter=" "> <text variable="volume"/> <text variable="container-title"/> <!--change to label variable="section" as that becomes available --> <text term="section" form="symbol"/> <text variable="section"/> </group> </else> </choose> </group> </else-if> </choose> </macro> <macro name="locators-join-with-space"> <choose> <if type="article-journal" variable="volume" match="all"> <choose> <if match="none" variable="collection-title"> <text macro="locators"/> </if> </choose> </if> </choose> </macro> <macro name="locators-join-with-comma"> <choose> <if type="bill chapter legislation legal_case paper-conference" match="any"> <text macro="locators"/> </if> <else-if type="article-journal"> <choose> <if variable="volume" match="none"> <text macro="locators"/> </if> <else-if match="any" variable="collection-title"> <text macro="locators"/> </else-if> </choose> </else-if> </choose> </macro> <macro name="locators-join-with-period"> <choose> <if type="bill legislation legal_case article-journal chapter paper-conference" match="none"> <text macro="locators"/> </if> </choose> </macro> <macro name="locators"> <choose> <if type="article-journal"> <group delimiter=", "> <text macro="collection-title-journal"/> <number variable="volume"/> <group delimiter=" "> <text term="issue" form="short"/> <number variable="issue"/> </group> </group> </if> <else-if type="bill legislation legal_case" match="any"> <text macro="legal-cites"/> </else-if> <else-if type="book graphic motion_picture report song" match="any"> <group delimiter=". "> <text macro="edition"/> <group delimiter=" "> <text term="volume" form="short" text-case="capitalize-first"/> <number variable="volume" form="numeric"/> </group> <group delimiter=" "> <number variable="number-of-volumes" form="numeric"/> <text term="volume" form="short" plural="true"/> </group> </group> </else-if> <else-if type="chapter paper-conference" match="any"> <group delimiter=". "> <text macro="edition"/> <choose> <if variable="page" match="none"> <group delimiter=" "> <text term="volume" form="short" text-case="capitalize-first"/> <number variable="volume" form="numeric"/> </group> </if> </choose> </group> </else-if> </choose> </macro> <macro name="locators-newspaper"> <choose> <if type="article-newspaper"> <group delimiter=", "> <group delimiter=" "> <number variable="edition"/> <text term="edition"/> </group> <group delimiter=" "> <text term="section" form="short"/> <text variable="section"/> </group> </group> </if> </choose> </macro> <macro name="event-note"> <text variable="event"/> </macro> <macro name="event"> <choose> <if variable="title"> <group delimiter=" "> <text term="presented at"/> <text variable="event"/> </group> </if> <else> <group delimiter=" "> <text term="presented at" text-case="capitalize-first"/> <text variable="event"/> </group> </else> </choose> </macro> <macro name="originally-published"> <group delimiter=", "> <group delimiter=": "> <text variable="original-publisher-place"/> <text variable="original-publisher"/> </group> <date variable="original-date" form="text" date-parts="year"/> </group> </macro> <macro name="reprint-note"> <!--needs localization--> <choose> <if variable="original-date issued" match="all"> <choose> <!--for whatever reason in notes, when we have both original and new publishers, reprint doesn't appear--> <if variable="original-publisher original-publisher-place" match="none"> <text value="repr."/> </if> </choose> </if> </choose> </macro> <macro name="reprint"> <!--needs localization--> <choose> <if variable="original-date issued" match="all"> <text value="reprint" text-case="capitalize-first"/> </if> </choose> </macro> <macro name="publisher"> <choose> <if type="thesis"> <text variable="publisher"/> </if> <else-if type="speech"> <text variable="event-place"/> </else-if> <else> <group delimiter=": "> <text variable="publisher-place"/> <text variable="publisher"/> </group> </else> </choose> </macro> <macro name="issued"> <choose> <if variable="issued"> <choose> <if type="graphic report" match="any"> <date variable="issued" form="text"/> </if> <else-if type="legal_case"> <group delimiter=" "> <text variable="authority"/> <choose> <if variable="container-title" match="any"> <!--Only print year for cases published in reporters--> <date variable="issued" form="numeric" date-parts="year"/> </if> <else> <date variable="issued" form="text"/> </else> </choose> </group> </else-if> <else-if type="book bill chapter graphic legislation motion_picture paper-conference report song thesis" match="any"> <date variable="issued"> <date-part name="year"/> </date> </else-if> <else-if type="patent"> <group delimiter=", "> <group delimiter=" "> <!--Needs Localization--> <text value="filed"/> <date variable="submitted" form="text"/> </group> <group delimiter=" "> <choose> <if variable="issued submitted" match="all"> <text term="and"/> </if> </choose> <!--Needs Localization--> <text value="issued"/> <date variable="issued" form="text"/> </group> </group> </else-if> <else> <date variable="issued" form="text"/> </else> </choose> </if> <else-if variable="status"> <text variable="status"/> </else-if> <else-if variable="accessed URL" match="all"/> <else> <text term="no date" form="short"/> </else> </choose> </macro> <macro name="point-locators-subsequent"> <choose> <if type="legal_case" variable="locator" match="all"> <choose> <if locator="page"> <group delimiter=":"> <number variable="volume"/> <text variable="locator"/> </group> </if> <else> <group delimiter=" "> <label variable="locator" form="short"/> <text variable="locator"/> </group> </else> </choose> </if> <else-if variable="locator"> <choose> <if locator="page" match="none"> <group delimiter=" "> <choose> <if type="book graphic motion_picture report song" match="any"> <choose> <if variable="volume"> <group delimiter=", "> <group delimiter=" "> <text term="volume" form="short"/> <number variable="volume" form="numeric"/> </group> <label variable="locator" form="short"/> </group> </if> <else> <label variable="locator" form="short"/> </else> </choose> </if> <else> <label variable="locator" form="short"/> </else> </choose> <text variable="locator"/> </group> </if> <else-if type="book graphic motion_picture report song" match="any"> <group delimiter=":"> <number variable="volume" form="numeric"/> <text variable="locator"/> </group> </else-if> <else> <text variable="locator"/> </else> </choose> </else-if> </choose> </macro> <macro name="point-locators-join-with-colon"> <choose> <if type="article-journal"> <choose> <if variable="locator page" match="any"> <choose> <if variable="volume issue" match="any"> <text macro="point-locators"/> </if> </choose> </if> </choose> </if> </choose> </macro> <macro name="point-locators-join-with-comma"> <choose> <if type="article-journal" match="none"> <text macro="point-locators"/> </if> <else-if variable="volume issue" match="none"> <text macro="point-locators"/> </else-if> </choose> </macro> <macro name="point-locators"> <choose> <if variable="locator" match="none"> <choose> <if type="article-journal chapter paper-conference" match="any"> <text variable="page"/> </if> </choose> </if> <else-if type="article-journal"> <group delimiter=" "> <choose> <if locator="page" match="none"> <label variable="locator" form="short" suffix=" "/> </if> </choose> <text variable="locator"/> </group> </else-if> <else-if type="legal_case"/> <else> <group delimiter=" "> <choose> <if locator="page" match="none"> <label variable="locator" form="short"/> </if> </choose> <text variable="locator"/> </group> </else> </choose> </macro> <macro name="locators-chapter"> <choose> <if type="chapter paper-conference" match="any"> <choose> <if variable="author container-author" match="all"/> <else> <choose> <if variable="page"> <number variable="volume" suffix=":"/> <text variable="page"/> </if> </choose> </else> </choose> </if> </choose> </macro> <macro name="locators-journal-join-with-colon"> <choose> <if type="article-journal"> <choose> <if variable="volume issue" match="any"> <text variable="page"/> </if> </choose> </if> </choose> </macro> <macro name="locators-journal-join-with-comma"> <choose> <if type="article-journal"> <choose> <if variable="volume issue" match="none"> <text variable="page"/> </if> </choose> </if> </choose> </macro> <macro name="archive-note"> <choose> <if type="thesis"> <group delimiter=" "> <text variable="archive"/> <text variable="archive_location" prefix="(" suffix=")"/> </group> </if> <else> <group delimiter=", "> <text variable="archive_location"/> <text variable="archive"/> <text variable="archive-place"/> </group> </else> </choose> </macro> <macro name="archive"> <choose> <if type="thesis"> <group delimiter=" "> <text variable="archive"/> <text variable="archive_location" prefix="(" suffix=")"/> </group> </if> <else> <group delimiter=". "> <text variable="archive_location" text-case="capitalize-first"/> <text variable="archive"/> <text variable="archive-place"/> </group> </else> </choose> </macro> <macro name="issue-note-join-with-space"> <choose> <if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="any"> <!--Chicago doesn't use publisher/place for Newspapers and we want the date delimited by a comma--> <choose> <if type="article-newspaper" match="none"> <choose> <if type="article-journal" match="none"> <text macro="issue-note"/> </if> <else-if variable="issue volume" match="any"> <text macro="issue-note"/> </else-if> </choose> </if> </choose> </if> </choose> </macro> <macro name="issue-note-join-with-comma"> <choose> <if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="none"> <text macro="issue-note"/> </if> <else-if type="article-newspaper"> <text macro="issue-note"/> </else-if> <else-if type="article-journal"> <choose> <if variable="volume issue" match="none"> <text macro="issue-note"/> </if> </choose> </else-if> </choose> </macro> <macro name="issue-note"> <choose> <if type="bill legislation legal_case" match="any"> <text macro="issued" prefix="(" suffix=")"/> </if> <else-if type="article-journal"> <choose> <if variable="volume issue" match="any"> <text macro="issued" prefix="(" suffix=")"/> </if> <else> <text macro="issued"/> </else> </choose> </else-if> <else-if type="article-newspaper"> <text macro="issued"/> </else-if> <else-if variable="publisher-place event-place publisher genre" match="any"> <group prefix="(" suffix=")" delimiter=", "> <choose> <if variable="title" match="none"/> <else-if type="manuscript thesis speech" match="any"> <text variable="genre"/> </else-if> </choose> <text macro="event-note"/> <group delimiter="; "> <text macro="originally-published"/> <group delimiter=", "> <text macro="reprint-note"/> <text macro="publisher"/> </group> </group> <text macro="issued"/> </group> </else-if> <else> <text macro="issued"/> </else> </choose> </macro> <macro name="issue-join-with-space"> <choose> <if type="article-journal" match="any"> <choose> <if variable="issue volume" match="any"> <text macro="issue"/> </if> </choose> </if> <else-if type="bill legislation legal_case" match="any"> <text macro="issue"/> </else-if> </choose> </macro> <macro name="issue-join-with-period"> <choose> <if type="article-journal bill legislation legal_case" match="none"> <choose> <if type="speech" variable="publisher publisher-place" match="any"> <text macro="issue"/> </if> </choose> </if> </choose> </macro> <macro name="issue-join-with-comma"> <choose> <if type="bill legislation legal_case" match="none"> <choose> <if type="article-journal" match="none"> <choose> <if type="speech" variable="publisher publisher-place" match="none"> <text macro="issue"/> </if> </choose> </if> <else-if variable="volume issue" match="none"> <text macro="issue"/> </else-if> </choose> </if> </choose> </macro> <macro name="issue"> <choose> <if type="bill legislation legal_case" match="any"> <text macro="issued" prefix="(" suffix=")"/> </if> <else-if type="article-journal"> <choose> <if variable="issue volume" match="any"> <text macro="issued" prefix="(" suffix=")"/> </if> <else> <text macro="issued"/> </else> </choose> </else-if> <else-if type="speech"> <group delimiter=", "> <group delimiter=" "> <choose> <if variable="title" match="none"/> <else> <text variable="genre" text-case="capitalize-first"/> </else> </choose> <text macro="event"/> </group> <text variable="event-place"/> <text macro="issued"/> </group> </else-if> <!--Chicago doesn't use publisher/place for Newspapers --> <else-if type="article-newspaper"> <text macro="issued"/> </else-if> <else-if variable="publisher-place publisher" match="any"> <group delimiter=", "> <choose> <if type="thesis"> <text variable="genre" text-case="capitalize-first"/> </if> </choose> <group delimiter=". "> <text macro="originally-published"/> <group delimiter=", "> <text macro="reprint"/> <text macro="publisher"/> </group> </group> <text macro="issued"/> </group> </else-if> <else> <text macro="issued"/> </else> </choose> </macro> <macro name="access-note"> <group delimiter=", "> <choose> <if type="graphic report" match="any"> <text macro="archive-note"/> </if> <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none"> <text macro="archive-note"/> </else-if> </choose> <choose> <if variable="issued" match="none"> <group delimiter=" "> <text term="accessed"/> <date variable="accessed" form="text"/> </group> </if> </choose> <choose> <if type="legal_case" match="none"> <choose> <if variable="DOI"> <text variable="DOI" prefix="doi:"/> </if> <else> <text variable="URL"/> </else> </choose> </if> </choose> </group> </macro> <macro name="access"> <group delimiter=". "> <choose> <if type="graphic report" match="any"> <text macro="archive"/> </if> <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none"> <text macro="archive"/> </else-if> </choose> <choose> <if variable="issued" match="none"> <group delimiter=" "> <text term="accessed" text-case="capitalize-first"/> <date variable="accessed" form="text"/> </group> </if> </choose> <choose> <if type="legal_case" match="none"> <choose> <if variable="DOI"> <text variable="DOI" prefix="doi:"/> </if> <else> <text variable="URL"/> </else> </choose> </if> </choose> </group> </macro> <macro name="case-locator-subsequent"> <choose> <if type="legal_case"> <group delimiter=" "> <text variable="volume"/> <text variable="container-title"/> </group> </if> </choose> </macro> <macro name="case-pinpoint-subsequent"> <choose> <if type="legal_case"> <group delimiter=" "> <choose> <if locator="page"> <text term="at"/> <text variable="locator"/> </if> <else> <label variable="locator"/> <text variable="locator"/> </else> </choose> </group> </if> </choose> </macro> <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true"> <layout suffix="." delimiter="; "> <choose> <if position="ibid-with-locator"> <group delimiter=", "> <text term="ibid"/> <text macro="point-locators-subsequent"/> </group> </if> <else-if position="ibid"> <text term="ibid"/> </else-if> <else-if position="subsequent"> <group delimiter=", "> <text macro="contributors-short"/> <group delimiter=" "> <group delimiter=", "> <text macro="title-short"/> <!--if title & author are the same: --> <text macro="date-disambiguate"/> <text macro="case-locator-subsequent"/> </group> <text macro="case-pinpoint-subsequent"/> </group> <choose> <if match="none" type="legal_case"> <text macro="point-locators-subsequent"/> </if> </choose> </group> </else-if> <else> <group delimiter=", "> <group delimiter=": "> <group delimiter=", "> <group delimiter=" "> <group delimiter=", "> <group delimiter=" "> <group delimiter=", "> <group delimiter=", "> <text macro="contributors-note"/> <text macro="title-note"/> </group> <text macro="description-note"/> <text macro="secondary-contributors-note"/> <text macro="container-title-note"/> <text macro="container-contributors-note"/> </group> <text macro="locators-note-join-with-space"/> </group> <text macro="locators-note-join-with-comma"/> <text macro="collection-title"/> <text macro="issue-note-join-with-comma"/> </group> <text macro="issue-note-join-with-space"/> </group> <text macro="locators-newspaper"/> <text macro="point-locators-join-with-comma"/> </group> <text macro="point-locators-join-with-colon"/> </group> <text macro="access-note"/> </group> </else> </choose> </layout> </citation> <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0"> <sort> <key macro="contributors-sort"/> <key variable="title"/> <key variable="genre"/> <key variable="issued"/> </sort> <layout suffix="."> <group delimiter=". "> <group delimiter=": "> <group delimiter=", "> <group delimiter=" "> <group delimiter=". "> <group delimiter=" "> <group delimiter=", "> <group delimiter=". "> <group delimiter=". "> <text macro="contributors"/> <text macro="title"/> </group> <text macro="description"/> <text macro="secondary-contributors"/> <group delimiter=", "> <text macro="container-title"/> <text macro="container-contributors"/> </group> <text macro="locators-join-with-period"/> </group> <text macro="locators-join-with-comma"/> <text macro="locators-chapter"/> </group> <text macro="locators-join-with-space"/> </group> <text macro="collection-title"/> <text macro="issue-join-with-period"/> </group> <text macro="issue-join-with-space"/> </group> <text macro="issue-join-with-comma"/> <text macro="locators-journal-join-with-comma"/> <text macro="locators-newspaper"/> </group> <text macro="locators-journal-join-with-colon"/> </group> <text macro="access"/> </group> </layout> </bibliography> </style> `;
   science:string ='<?xml version="1.0" encoding="utf-8"?> <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US"> <info> <title>Science</title> <id>http://www.zotero.org/styles/science</id> <link href="http://www.zotero.org/styles/science" rel="self"/> <link href="http://www.sciencemag.org/about/authors/prep/res/refs.dtl" rel="documentation"/> <author> <name>Julian Onions</name> <email>julian.onions@gmail.com</email> </author> <contributor> <name>Sebastian Karcher</name> </contributor> <contributor> <name>Greg Barendt</name> </contributor> <category citation-format="numeric"/> <category field="science"/> <issn>0036-8075</issn> <eissn>1095-9203</eissn> <summary>The Science journal style.</summary> <updated>2014-08-28T01:36:46+00:00</updated> <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights> </info> <macro name="editor"> <names variable="editor" delimiter=", "> <name initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> <label form="short" prefix=", " text-case="capitalize-first"/> </names> </macro> <macro name="author"> <names variable="author"> <name sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> <label form="short" prefix=", " text-case="capitalize-first"/> <et-al font-style="italic"/> <substitute> <names variable="editor"/> </substitute> </names> </macro> <macro name="access"> <choose> <if variable="page" match="none"> <text macro="access-value"/> </if> <else-if is-numeric="page" match="none"> <text macro="access-value"/> </else-if> </choose> </macro> <macro name="access-value"> <choose> <if variable="DOI"> <text variable="DOI" prefix=", doi:"/> </if> <else> <group prefix=" (" suffix=")"> <text value="available at "/> <text variable="URL"/> </group> </else> </choose> </macro> <macro name="title"> <choose> <if type="bill book graphic legal_case legislation motion_picture report song" match="any"> <text variable="title" font-style="italic"/> </if> <else> <text variable="title"/> </else> </choose> </macro> <macro name="article-details"> <group delimiter=", "> <group delimiter=". "> <text macro="title"/> <text form="short" variable="container-title" font-style="italic"/> <text variable="volume" font-weight="bold"/> </group> <text variable="page"/> </group> <text macro="issued" prefix=" (" suffix=")"/> <text macro="access"/> </macro> <macro name="publisher"> <group delimiter=", "> <text variable="publisher"/> <text variable="publisher-place"/> </group> </macro> <macro name="pages"> <label variable="page" form="short" suffix=" "/> <text variable="page" form="short"/> </macro> <macro name="issued"> <date variable="issued" delimiter=" "> <date-part name="year"/> </date> </macro> <macro name="edition"> <choose> <if is-numeric="edition"> <group delimiter=" "> <text term="edition" form="short"/> <number variable="edition" form="numeric"/> </group> </if> <else> <text variable="edition" suffix="."/> </else> </choose> </macro> <citation collapse="citation-number"> <sort> <key variable="citation-number"/> </sort> <layout prefix="(" suffix=")" delimiter=", "> <text variable="citation-number" font-style="italic"/> </layout> </citation> <bibliography et-al-min="6" et-al-use-first="1" second-field-align="flush"> <layout suffix="."> <text variable="citation-number" suffix=". "/> <group delimiter=", "> <text macro="author"/> <choose> <if type="thesis"> <group delimiter=" "> <group delimiter=", "> <group> <!-- Always print, even if no university given --> <text value="thesis"/> </group> <text macro="publisher"/> </group> <text macro="issued" prefix="(" suffix=")"/> </group> </if> <else-if type="bill book graphic legal_case legislation motion_picture song chapter paper-conference" match="any"> <group delimiter=" "> <choose> <if type="chapter paper-conference" match="any"> <group delimiter=", "> <group delimiter=" "> <text term="in"/> <text variable="container-title" font-style="italic"/> </group> <text macro="editor"/> </group> </if> <else> <text macro="title"/> </else> </choose> <group prefix="(" suffix=")" delimiter="; "> <group delimiter=", "> <text macro="publisher"/> <text macro="edition"/> <text macro="issued"/> </group> <text variable="URL"/> </group> </group> <group delimiter=" of "> <group> <label variable="volume" form="short" suffix=" "/> <number variable="volume"/> </group> <text variable="collection-title" font-style="italic"/> </group> <choose> <if type="chapter paper-conference" match="any"> <text macro="pages"/> </if> </choose> </else-if> <else-if type="article-journal"> <choose> <if variable="page"> <choose> <if is-numeric="page" match="none"> <group> <group delimiter=", "> <text variable="container-title" form="short" font-style="italic"/> <group> <text term="in press"/> </group> </group> <text macro="access"/> </group> </if> <else> <text macro="article-details"/> </else> </choose> </if> <else> <text macro="article-details"/> </else> </choose> </else-if> <else-if type="report"> <group> <group delimiter=", "> <text variable="title" quotes="true"/> <text variable="collection-title" font-style="italic"/> </group> <group prefix=" (" suffix=")" delimiter=", "> <group delimiter=" "> <text variable="genre" form="short"/> <number variable="number"/> </group> <text variable="publisher"/> <text variable="publisher-place"/> <text macro="issued"/> </group> </group> <text macro="pages"/> <text macro="access"/> </else-if> <else> <group> <group delimiter=", "> <text macro="editor"/> <group delimiter=". "> <text macro="title"/> <text form="short" variable="container-title" font-style="italic"/> <text variable="volume" font-weight="bold"/> </group> </group> <text macro="issued" prefix=" (" suffix=")"/> </group> <text macro="pages"/> <text macro="access"/> </else> </choose> </group> </layout> </bibliography> </style>';

From 46a8928a208989cc37b5ec416745148fd8b05e0d Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Tue, 19 Sep 2023 16:45:17 +0300
Subject: [PATCH 4/8] [Library | develop]: project.component.ts: [Bug fix] In
 method "getProjectInfo()", added this.projectInfo.id = this.projectId; -
 direct link action button was not working, id was missing.

---
 landingPages/project/project.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/landingPages/project/project.component.ts b/landingPages/project/project.component.ts
index 34936cd8..4e7eb8ba 100644
--- a/landingPages/project/project.component.ts
+++ b/landingPages/project/project.component.ts
@@ -464,6 +464,7 @@ export class ProjectComponent {
     this.subscriptions.push(this._projectService.getProjectInfo(id, this.properties).subscribe(
       data => {
         this.projectInfo = data;
+        this.projectInfo.id = this.projectId;
 
         this.actionsAfterGettingProjectInfo();
       },

From bc514b62d121ec7e1e7a06b5c016d99bf72c5fc6 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Tue, 19 Sep 2023 16:48:08 +0300
Subject: [PATCH 5/8] [Library | develop]: result-preview.component.ts: Added
 method "isNumber()" | resultLanding.component.html: [Bug fix] Updated view of
 bip indicators - format the numbers correctly.

---
 utils/result-preview/result-preview.component.html | 8 +++++---
 utils/result-preview/result-preview.component.ts   | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html
index d8608abb..04f65a8f 100644
--- a/utils/result-preview/result-preview.component.html
+++ b/utils/result-preview/result-preview.component.html
@@ -214,7 +214,8 @@
               <a class="uk-flex uk-flex-middle uk-link-reset">
                 <icon customClass="bip-icon-hover" [flex]="true" [ratio]="0.7"
                       [name]="result.measure.bip[0].icon"></icon>
-                <span class="uk-margin-xsmall-left">{{result.measure.bip[0].value}}</span>
+                <span *ngIf="isNumber(result.measure.bip[0].value)" class="uk-margin-xsmall-left">{{formatNumber(result.measure.bip[0].value)}}</span>
+                <span *ngIf="!isNumber(result.measure.bip[0].value)" class="uk-margin-xsmall-left">{{result.measure.bip[0].value}}</span>
               </a>
               <div uk-drop="pos: top-right" class="uk-card uk-card-default uk-border uk-box-no-shadow uk-padding-small">
                 <table>
@@ -223,7 +224,8 @@
                       <icon [flex]="true" [ratio]="0.7" [name]="metric.icon"></icon>
                     </td>
                     <td class="uk-text-capitalize">{{metric.name}}</td>
-                    <td class="uk-text-bolder">{{metric.value}}</td>
+                    <td *ngIf="isNumber(metric.value)" class="uk-text-bolder">{{metric.value | number}}</td>
+                    <td *ngIf="!isNumber(metric.value)"class="uk-text-bolder">{{metric.value}}</td>
                   </tr>
                 </table>
                 <div class="uk-margin-top uk-flex uk-flex-middle uk-flex-center">
@@ -252,7 +254,7 @@
                 <div class="uk-margin-top uk-flex uk-flex-middle uk-flex-center">
                   <span class="uk-text-uppercase">Powered by </span>
                   <img class="uk-margin-xsmall-left" width="15" src="assets/common-assets/logo-small-usage-counts.png"
-                    loading="lazy" alt="BIP!">
+                    loading="lazy" alt="Usage counts">
                 </div>
               </div>
             </ng-container>
diff --git a/utils/result-preview/result-preview.component.ts b/utils/result-preview/result-preview.component.ts
index 9c041854..6352e9b9 100644
--- a/utils/result-preview/result-preview.component.ts
+++ b/utils/result-preview/result-preview.component.ts
@@ -223,6 +223,10 @@ export class ResultPreviewComponent implements OnInit, OnChanges {
     return formatted.number + formatted.size;
   }
 
+  public isNumber(value): boolean {
+    return typeof value === 'number';
+  }
+
   public getAccessLabel(accessRight) : string {
     if(accessRight) {
       return (accessRight + (accessRight.toLowerCase().endsWith(" access") ? "" : " access"));

From 966dedde45872fee8f9e55d90d7dbb0e367c9c75 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Wed, 20 Sep 2023 10:48:20 +0300
Subject: [PATCH 6/8] [Library | develop]: searchSorting.component.ts: Added
 sorting options (generalOptions), "citation_count,descending",
 "popularity,descending", "influence,descending", "impulse,descending" |
 searchResearchResults.component.ts: Added the new sorting options in the
 checks.

---
 searchPages/searchResearchResults.component.ts     | 4 +++-
 searchPages/searchUtils/searchSorting.component.ts | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/searchPages/searchResearchResults.component.ts b/searchPages/searchResearchResults.component.ts
index 5e4e3c59..f4f03fa7 100644
--- a/searchPages/searchResearchResults.component.ts
+++ b/searchPages/searchResearchResults.component.ts
@@ -160,7 +160,9 @@ export class SearchResearchResultsComponent {
 
       this.searchUtils.validateSize(params['size']);
       this.searchUtils.sortBy = (params['sortBy']) ? params['sortBy'] : '';
-      if (this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending" && this.searchUtils.sortBy != "resultdateofacceptance,ascending") {
+      if (this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending" && this.searchUtils.sortBy != "resultdateofacceptance,ascending"
+        && this.searchUtils.sortBy != "citation_count,descending" && this.searchUtils.sortBy != "popularity,descending"
+        && this.searchUtils.sortBy != "influence,descending" && this.searchUtils.sortBy != "impulse,descending") {
         this.searchUtils.sortBy = "";
       }
       this.selectedFields = [];
diff --git a/searchPages/searchUtils/searchSorting.component.ts b/searchPages/searchUtils/searchSorting.component.ts
index f70ac1cf..7a1e7fe8 100644
--- a/searchPages/searchUtils/searchSorting.component.ts
+++ b/searchPages/searchUtils/searchSorting.component.ts
@@ -23,6 +23,10 @@ export class SearchSortingComponent {
     {value: '', label: 'Relevance'},
     {value: 'resultdateofacceptance,descending', label: 'Date (most recent)'},
     {value: 'resultdateofacceptance,ascending', label: 'Date (least recent)'},
+    {value: 'citation_count,descending', label: 'Citation Count'},
+    {value: 'popularity,descending', label: 'Popularity'},
+    {value: 'influence,descending', label: 'Influence'},
+    {value: 'impulse,descending', label: 'Impulse'}
   ];
   private communityOptions = [
     {value: '', label: 'Title'},

From 0d22ba8a3b119c43537e94317b4f2a0f4b35757b Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Wed, 20 Sep 2023 14:13:34 +0300
Subject: [PATCH 7/8] [Library | develop]: searchSorting.component.ts: Do not
 add new sorting options in production yet.

---
 .../searchUtils/searchSorting.component.ts    | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/searchPages/searchUtils/searchSorting.component.ts b/searchPages/searchUtils/searchSorting.component.ts
index 7a1e7fe8..e75e3930 100644
--- a/searchPages/searchUtils/searchSorting.component.ts
+++ b/searchPages/searchUtils/searchSorting.component.ts
@@ -1,5 +1,6 @@
 import {Component, Input, Output, EventEmitter} from '@angular/core';
 import {Option} from "../../sharedComponents/input/input.component";
+import {properties} from "../../../../environments/environment";
 
 @Component({
   selector: 'search-sorting',
@@ -19,15 +20,21 @@ export class SearchSortingComponent {
   @Input() entityType: string = '';
   @Output() sortByChange = new EventEmitter();
   public options: Option[];
-  private generalOptions = [
-    {value: '', label: 'Relevance'},
-    {value: 'resultdateofacceptance,descending', label: 'Date (most recent)'},
-    {value: 'resultdateofacceptance,ascending', label: 'Date (least recent)'},
-    {value: 'citation_count,descending', label: 'Citation Count'},
-    {value: 'popularity,descending', label: 'Popularity'},
-    {value: 'influence,descending', label: 'Influence'},
-    {value: 'impulse,descending', label: 'Impulse'}
-  ];
+  private generalOptions = properties.environment != "production" ?
+    [
+      {value: '', label: 'Relevance'},
+      {value: 'resultdateofacceptance,descending', label: 'Date (most recent)'},
+      {value: 'resultdateofacceptance,ascending', label: 'Date (least recent)'},
+      {value: 'citation_count,descending', label: 'Citation Count'},
+      {value: 'popularity,descending', label: 'Popularity'},
+      {value: 'influence,descending', label: 'Influence'},
+      {value: 'impulse,descending', label: 'Impulse'}
+    ] :
+    [
+      {value: '', label: 'Relevance'},
+      {value: 'resultdateofacceptance,descending', label: 'Date (most recent)'},
+      {value: 'resultdateofacceptance,ascending', label: 'Date (least recent)'}
+    ];
   private communityOptions = [
     {value: '', label: 'Title'},
     {value: 'creationdate,descending', label: 'Creation Date (most recent)'},

From d10df32853e4ffa29add4447f5a69ea1b8e8722f Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Tue, 26 Sep 2023 11:38:09 +0300
Subject: [PATCH 8/8] Result Preview: Fix space betwwen ngIf and class.

---
 utils/result-preview/result-preview.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html
index 04f65a8f..c4574c8d 100644
--- a/utils/result-preview/result-preview.component.html
+++ b/utils/result-preview/result-preview.component.html
@@ -225,7 +225,7 @@
                     </td>
                     <td class="uk-text-capitalize">{{metric.name}}</td>
                     <td *ngIf="isNumber(metric.value)" class="uk-text-bolder">{{metric.value | number}}</td>
-                    <td *ngIf="!isNumber(metric.value)"class="uk-text-bolder">{{metric.value}}</td>
+                    <td *ngIf="!isNumber(metric.value)" class="uk-text-bolder">{{metric.value}}</td>
                   </tr>
                 </table>
                 <div class="uk-margin-top uk-flex uk-flex-middle uk-flex-center">