diff --git a/landingPages/dataset/dataset.component.html b/landingPages/dataset/dataset.component.html
index d0ed7ca8..aba66f89 100644
--- a/landingPages/dataset/dataset.component.html
+++ b/landingPages/dataset/dataset.component.html
@@ -41,9 +41,9 @@
- - Publisher: {{datasetInfo.publisher}}
-
- - Embargo end date: {{datasetInfo.embargoEndDate}}
+
+ - Embargo end date: {{datasetInfo.embargoEndDate}}
- 0">
diff --git a/landingPages/dataset/dataset.service.ts b/landingPages/dataset/dataset.service.ts
index 9af7342d..e0562057 100644
--- a/landingPages/dataset/dataset.service.ts
+++ b/landingPages/dataset/dataset.service.ts
@@ -43,7 +43,8 @@ export class DatasetService {
res[1]['language'], //11
res[1]['country'], //12
res[2], //13
- (res[1]['extraInfo']!= undefined && res[1]['extraInfo']['citations']!= undefined)? res[1]['extraInfo']['citations']['citation']:null //14
+ (res[1]['extraInfo']!= undefined && res[1]['extraInfo']['citations']!= undefined)? res[1]['extraInfo']['citations']['citation']:null, //14
+ res[1]['journal'] //15
]).map(res => this.parseDatasetInfo(res));
}
@@ -235,7 +236,18 @@ export class DatasetService {
});
}
this.datasetInfo.similarResearchResults = this.parsingFunctions.sortByPercentage(this.datasetInfo.similarResearchResults);
+ if(data[15] != null) {
+ this.datasetInfo.journal = {"journal": "", "issn": "", "lissn": "", "eissn": "", "issue": "", "volume": "", "start_page": "", "end_page": ""}
+ this.datasetInfo.journal['journal'] = data[15].content;
+ this.datasetInfo.journal['issn'] = data[15].issn;
+ this.datasetInfo.journal['lissn'] = data[15].lissn;
+ this.datasetInfo.journal['eissn'] = data[15].eissn;
+ this.datasetInfo.journal['issue'] = data[15].iss;
+ this.datasetInfo.journal['volume'] = data[15].vol;
+ this.datasetInfo.journal['start_page'] = data[15].sp;
+ this.datasetInfo.journal['end_page'] = data[15].ep;
+ }
return this.datasetInfo;
}
diff --git a/landingPages/landing-utils/resultLanding.module.ts b/landingPages/landing-utils/resultLanding.module.ts
index 5233be99..077bd173 100644
--- a/landingPages/landing-utils/resultLanding.module.ts
+++ b/landingPages/landing-utils/resultLanding.module.ts
@@ -12,20 +12,22 @@ import {FundedByComponent} from './fundedBy.component';
import {PublishedInComponent} from './publishedIn.component';
import {AvailableOnComponent} from './availableOn.component';
import {TabTableComponent} from './tabTable.component';
+import {ShowPublisherComponent} from "./showPublisher.component";
@NgModule({
imports: [
CommonModule, FormsModule, RouterModule, PagingModule
],
declarations: [
+ ShowPublisherComponent,
ShowAuthorsComponent,ShowIdentifiersComponent,ShowSubjectsComponent,
FundedByComponent,PublishedInComponent,AvailableOnComponent,TabTableComponent
],
providers:[
],
exports: [
- ShowAuthorsComponent,ShowIdentifiersComponent,ShowSubjectsComponent,
- FundedByComponent,PublishedInComponent,AvailableOnComponent,TabTableComponent
+ ShowAuthorsComponent, ShowIdentifiersComponent, ShowSubjectsComponent,
+ FundedByComponent, PublishedInComponent, AvailableOnComponent, TabTableComponent, ShowPublisherComponent
]
})
export class ResultLandingModule { }
diff --git a/landingPages/landing-utils/showPublisher.component.ts b/landingPages/landing-utils/showPublisher.component.ts
new file mode 100644
index 00000000..117feb1a
--- /dev/null
+++ b/landingPages/landing-utils/showPublisher.component.ts
@@ -0,0 +1,71 @@
+import {Component, Input} from '@angular/core';
+
+@Component({
+ selector: 'showPublisher',
+ template: `
+ - Publisher: {{publisher}}
+ -
+ Journal:
+ {{journal['journal']}},
+ volume
+ 0">{{journal['volume'] | number}} 0)">{{journal['volume']}},
+
+ issue
+ 0">{{journal['issue'] | number}} 0)">{{journal['issue']}},
+
+ pages
+ page
+ 0">{{journal['start_page'] | number}} 0)">{{journal['start_page']}}- 0">{{journal['end_page'] | number}} 0)">{{journal['end_page']}}
+ (issn: {{journal['issn']}}, eissn: {{journal['eissn']}}, lissn: {{journal['lissn']}}
+ >)
+
+ -
+
+
+ Link to Sherpa/RoMEO
+
+
+ `
+})
+
+export class ShowPublisherComponent {
+ @Input() publisher;
+ @Input() journal;
+ @Input() sherpaUrl= 'http://www.sherpa.ac.uk/romeo/search.php?issn=';
+
+
+ constructor() {
+
+ }
+
+ ngOnInit() {}
+
+}
diff --git a/landingPages/orp/orp.component.html b/landingPages/orp/orp.component.html
index 67d556f7..056fe84e 100644
--- a/landingPages/orp/orp.component.html
+++ b/landingPages/orp/orp.component.html
@@ -28,7 +28,8 @@
- - Publisher: {{orpInfo.publisher}}
+
- Embargo end date: {{orpInfo.embargoEndDate}}
- 0">
diff --git a/landingPages/orp/orp.service.ts b/landingPages/orp/orp.service.ts
index c5286fac..06da7655 100644
--- a/landingPages/orp/orp.service.ts
+++ b/landingPages/orp/orp.service.ts
@@ -41,7 +41,8 @@ export class OrpService {
res[1]['oaf:result']['language'], //11
res[1]['oaf:result']['country'], //12
res[2], //13
- (res[1]['extraInfo']!= undefined && res[1]['extraInfo']['citations']!= undefined)? res[1]['extraInfo']['citations']['citation']:null //14
+ (res[1]['extraInfo']!= undefined && res[1]['extraInfo']['citations']!= undefined)? res[1]['extraInfo']['citations']['citation']:null, //14
+ res[1]['oaf:result']['journal'] //15
]).map(res => this.parseOrpInfo(res));
}
@@ -202,7 +203,18 @@ export class OrpService {
});
}
this.orpInfo.similarResearchResults = this.parsingFunctions.sortByPercentage(this.orpInfo.similarResearchResults);
+ if(data[15] != null) {
+ this.orpInfo.journal = {"journal": "", "issn": "", "lissn": "", "eissn": "", "issue": "", "volume": "", "start_page": "", "end_page": ""}
+ this.orpInfo.journal['journal'] = data[15].content;
+ this.orpInfo.journal['issn'] = data[15].issn;
+ this.orpInfo.journal['lissn'] = data[15].lissn;
+ this.orpInfo.journal['eissn'] = data[15].eissn;
+ this.orpInfo.journal['issue'] = data[15].iss;
+ this.orpInfo.journal['volume'] = data[15].vol;
+ this.orpInfo.journal['start_page'] = data[15].sp;
+ this.orpInfo.journal['end_page'] = data[15].ep;
+ }
return this.orpInfo;
}
diff --git a/landingPages/publication/publication.component.html b/landingPages/publication/publication.component.html
index 4d37e09d..916cbe9c 100644
--- a/landingPages/publication/publication.component.html
+++ b/landingPages/publication/publication.component.html
@@ -32,49 +32,8 @@
- - Publisher: {{publicationInfo.publisher}}
- -
- Journal:
- {{publicationInfo.journal['journal']}},
- volume
- 0">{{publicationInfo.journal['volume'] | number}} 0)">{{publicationInfo.journal['volume']}},
-
- issue
- 0">{{publicationInfo.journal['issue'] | number}} 0)">{{publicationInfo.journal['issue']}},
-
- pages
- page
- 0">{{publicationInfo.journal['start_page'] | number}} 0)">{{publicationInfo.journal['start_page']}}- 0">{{publicationInfo.journal['end_page'] | number}} 0)">{{publicationInfo.journal['end_page']}}
- (issn: {{publicationInfo.journal['issn']}}, eissn: {{publicationInfo.journal['eissn']}}, lissn: {{publicationInfo.journal['lissn']}}
- >)
-
-
+
- Embargo end date: {{publicationInfo.embargoEndDate}}
- 0">
diff --git a/landingPages/software/software.component.html b/landingPages/software/software.component.html
index 8d4602f3..096a0ad6 100644
--- a/landingPages/software/software.component.html
+++ b/landingPages/software/software.component.html
@@ -38,7 +38,8 @@
- - Publisher: {{softwareInfo.publisher}}
+
- Embargo end date: {{softwareInfo.embargoEndDate}}
- 0">
diff --git a/landingPages/software/software.service.ts b/landingPages/software/software.service.ts
index 5685615e..052250a1 100644
--- a/landingPages/software/software.service.ts
+++ b/landingPages/software/software.service.ts
@@ -43,7 +43,8 @@ export class SoftwareService {
res[1]['language'],
res[1]['country'],
res[1]['programmingLanguage'],
- res[2]
+ res[2],
+ res[1]['journal'] //15
]).map(res => this.parseSoftwareInfo(res));
}
@@ -223,7 +224,18 @@ export class SoftwareService {
});
}
this.softwareInfo.similarResearchResults = this.parsingFunctions.sortByPercentage(this.softwareInfo.similarResearchResults);
+ if(data[15] != null) {
+ this.softwareInfo.journal = {"journal": "", "issn": "", "lissn": "", "eissn": "", "issue": "", "volume": "", "start_page": "", "end_page": ""}
+ this.softwareInfo.journal['journal'] = data[15].content;
+ this.softwareInfo.journal['issn'] = data[15].issn;
+ this.softwareInfo.journal['lissn'] = data[15].lissn;
+ this.softwareInfo.journal['eissn'] = data[15].eissn;
+ this.softwareInfo.journal['issue'] = data[15].iss;
+ this.softwareInfo.journal['volume'] = data[15].vol;
+ this.softwareInfo.journal['start_page'] = data[15].sp;
+ this.softwareInfo.journal['end_page'] = data[15].ep;
+ }
return this.softwareInfo;
}
}
diff --git a/login/utils/helper.class.ts b/login/utils/helper.class.ts
index f90da66b..c5afc208 100644
--- a/login/utils/helper.class.ts
+++ b/login/utils/helper.class.ts
@@ -210,16 +210,19 @@ export class COOKIE{
this.setCookie(name, '', -1);
}
public static setCookie(name: string, value: string, expireDays: number, path: string = '/') {
+ //TODO fix domain?
let d:Date = new Date();
d.setTime(d.getTime() + expireDays * 24 * 60 * 60 * 1000);
let expires:string = `expires=${d.toUTCString()}`;
// let cpath:string = path ? `; path=${path}` : '';
let domain = "";
- if(document.domain.indexOf(".di.uoa.gr")!= -1){ // for development
- domain = ".di.uoa.gr";
- }else if(document.domain.indexOf(".openaire.eu") != -1){
- domain = ".openaire.eu";
+ if(typeof document !== 'undefined'){
+ if(document.domain.indexOf(".di.uoa.gr")!= -1){ // for development
+ domain = ".di.uoa.gr";
+ }else if(document.domain.indexOf(".openaire.eu") != -1){
+ domain = ".openaire.eu";
+ }
+ document.cookie = name+'='+value+'; path='+path+'; domain='+domain+';';
}
- document.cookie = name+'='+value+'; path='+path+'; domain='+domain+';';
}
}
diff --git a/utils/entities/datasetInfo.ts b/utils/entities/datasetInfo.ts
index b876d441..f51a7735 100644
--- a/utils/entities/datasetInfo.ts
+++ b/utils/entities/datasetInfo.ts
@@ -15,6 +15,7 @@ export class DatasetInfo {
"type": string, "year":string}[];
identifiers: Map;
publisher: string;
+ journal: {"journal": string, "issn": string, "lissn": string, "eissn": string, "issue": string, "volume": string, "start_page": string, "end_page": string};
languages: string[];
countries: string[];
subjects: string[];
diff --git a/utils/entities/orpInfo.ts b/utils/entities/orpInfo.ts
index 6e868057..9c473a8e 100644
--- a/utils/entities/orpInfo.ts
+++ b/utils/entities/orpInfo.ts
@@ -13,6 +13,7 @@ export class OrpInfo {
"type": string, "year":string}[];
identifiers: Map;
publisher: string;
+ journal: {"journal": string, "issn": string, "lissn": string, "eissn": string, "issue": string, "volume": string, "start_page": string, "end_page": string};
languages: string[];
countries: string[];
subjects: string[];
diff --git a/utils/entities/softwareInfo.ts b/utils/entities/softwareInfo.ts
index d876b437..f1304af3 100644
--- a/utils/entities/softwareInfo.ts
+++ b/utils/entities/softwareInfo.ts
@@ -14,6 +14,7 @@ export class SoftwareInfo {
"type": string, "year":string}[];
identifiers: Map;
publisher: string;
+ journal: {"journal": string, "issn": string, "lissn": string, "eissn": string, "issue": string, "volume": string, "start_page": string, "end_page": string};
languages: string[];
countries: string[];
subjects: string[];