-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
`
})
diff --git a/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts b/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts
index 1ea91f3..cae770e 100644
--- a/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts
+++ b/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts
@@ -4,21 +4,20 @@ import {FormsModule} from '@angular/forms';
import {AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module';
import {OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
-import {AdvancedSearchDataProvidersModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchDataProviders.module';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
@NgModule({
imports: [
CommonModule, FormsModule,
AdvancedSearchDataProvidersRoutingModule,
- AdvancedSearchDataProvidersModule
+ SearchDataProvidersModule
],
declarations: [
OpenaireAdvancedSearchDataProvidersComponent
],
- providers:[FreeGuard],
+ providers:[],
exports: [
OpenaireAdvancedSearchDataProvidersComponent
]
diff --git a/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts b/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts
deleted file mode 100644
index 0c2f540..0000000
--- a/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import {NgModule} from '@angular/core';
-import {RouterModule} from '@angular/router';
-
-import {OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-
-
-@NgModule({
- imports: [
- RouterModule.forChild([
- { path: '', component: OpenaireAdvancedSearchDatasetsComponent, canActivate: [FreeGuard], data: {
- redirect: '/error'
- }, canDeactivate: [PreviousRouteRecorder] }
-
- ])
- ]
-})
-export class AdvancedSearchDatasetsRoutingModule { }
diff --git a/src/app/searchPages/advanced/advancedSearchDatasets.component.ts b/src/app/searchPages/advanced/advancedSearchDatasets.component.ts
deleted file mode 100644
index 73fe09c..0000000
--- a/src/app/searchPages/advanced/advancedSearchDatasets.component.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import {Component} from '@angular/core';
-import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
-import {ActivatedRoute} from "@angular/router";
-import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
-
-
-@Component({
- selector: 'openaire-advanced-search-datasets',
- template: `
-
-
+
+
`
})
diff --git a/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts b/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts
index 562cc56..6999c82 100644
--- a/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts
+++ b/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts
@@ -3,20 +3,19 @@ import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';
import {AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganizations-routing.module';
import {OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {AdvancedSearchOrganizationsModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchOrganizations.module';
+import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module";
@NgModule({
imports: [
CommonModule, FormsModule,
- AdvancedSearchOrganizationsModule,
+ SearchOrganizationsModule,
AdvancedSearchOrganizationsRoutingModule
],
declarations: [
OpenaireAdvancedSearchOrganizationsComponent
],
- providers:[FreeGuard],
+ providers:[],
exports: [
OpenaireAdvancedSearchOrganizationsComponent
]
diff --git a/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts b/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts
deleted file mode 100644
index 59be22e..0000000
--- a/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import {NgModule} from '@angular/core';
-import {RouterModule} from '@angular/router';
-
-import {OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-
-
-@NgModule({
- imports: [
- RouterModule.forChild([
- { path: '', component: OpenaireAdvancedSearchOrpsComponent, canActivate: [FreeGuard], data: {
- redirect: '/error'
- }, canDeactivate: [PreviousRouteRecorder] }
-
- ])
- ]
-})
-export class AdvancedSearchOrpsRoutingModule { }
diff --git a/src/app/searchPages/advanced/advancedSearchOrps.component.ts b/src/app/searchPages/advanced/advancedSearchOrps.component.ts
deleted file mode 100644
index 7512aca..0000000
--- a/src/app/searchPages/advanced/advancedSearchOrps.component.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import {Component} from '@angular/core';
-import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
-import {ActivatedRoute} from "@angular/router";
-import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
-
-
-@Component({
- selector: 'openaire-advanced-search-orps',
- template: `
-
-
+
+
`
})
diff --git a/src/app/searchPages/advanced/advancedSearchProjects.module.ts b/src/app/searchPages/advanced/advancedSearchProjects.module.ts
index 8b10d2f..11b0e61 100644
--- a/src/app/searchPages/advanced/advancedSearchProjects.module.ts
+++ b/src/app/searchPages/advanced/advancedSearchProjects.module.ts
@@ -3,20 +3,19 @@ import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';
import {AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module';
import {OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
-import {AdvancedSearchProjectsModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchProjects.module';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {SearchProjectsModule} from "../../openaireLibrary/searchPages/searchProjects.module";
@NgModule({
imports: [
CommonModule, FormsModule,
- AdvancedSearchProjectsModule,
+ SearchProjectsModule,
AdvancedSearchProjectsRoutingModule
],
declarations: [
OpenaireAdvancedSearchProjectsComponent
],
- providers:[FreeGuard],
+ providers:[],
exports: [
OpenaireAdvancedSearchProjectsComponent
]
diff --git a/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts b/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts
deleted file mode 100644
index 54dc255..0000000
--- a/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import {NgModule} from '@angular/core';
-import {RouterModule} from '@angular/router';
-import {OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-
-
-@NgModule({
- imports: [
- RouterModule.forChild([
- { path: '', component: OpenaireAdvancedSearchPublicationsComponent, canActivate: [FreeGuard], data: {
- redirect: '/error'
- }, canDeactivate: [PreviousRouteRecorder] }
-
- ])
- ]
-})
-export class AdvancedSearchPublicationsRoutingModule { }
diff --git a/src/app/searchPages/advanced/advancedSearchPublications.component.ts b/src/app/searchPages/advanced/advancedSearchPublications.component.ts
deleted file mode 100644
index 26fa98f..0000000
--- a/src/app/searchPages/advanced/advancedSearchPublications.component.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import {Component} from '@angular/core';
-import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
-import {ActivatedRoute} from "@angular/router";
-import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
-
-
-@Component({
- selector: 'openaire-advanced-search-publications',
- template: `
- Search OpenAIRE
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -106,9 +57,5 @@ $(document).ready(function(){
};
-
-
-
-
diff --git a/src/main.ts b/src/main.ts
index 9e8c381..1054b60 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,9 +2,9 @@ import { enableProdMode } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { AppModule } from './app/app.module';
-import { environment } from './environments/environment';
+import {portalProperties} from "./environments/environment-aggregator";
-if (environment.production) {
+if (portalProperties.production) {
enableProdMode();
}
diff --git a/src/styles.css b/src/styles.css
index 1927393..403d0a9 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -1,2 +1,8 @@
/* You can add global styles to this file, and also import other style files */
@import '~@angular/material/prebuilt-themes/indigo-pink.css';
+
+
+@import "assets/common-assets/common/theme.css";
+@import "assets/common-assets/common/custom.css";
+@import "assets/common-assets/library.css";
+@import "assets/portal-custom.css";
-
+
+
+
+
+
+
+
+
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index d5204e3..3dbf610 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -1,208 +1,230 @@
import {Component} from '@angular/core';
+import {Subscription} from 'rxjs';
import {ActivatedRoute, Router} from '@angular/router';
import {Location} from '@angular/common';
import "rxjs/add/observable/zip";
-import {Meta, Title} from '@angular/platform-browser';
+import {Title, Meta} from '@angular/platform-browser';
import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
-import {FetchDataproviders} from '../openaireLibrary/utils/fetchEntitiesClasses/fetchDataproviders.class';
-import {SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service';
-import {SearchProjectsService} from '../openaireLibrary/services/searchProjects.service';
-import {SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service';
-import {RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
-import {SearchFields} from '../openaireLibrary/utils/properties/searchFields';
-import {NumberUtils} from '../openaireLibrary/utils/number-utils.class';
+import { SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service';
+import { SearchProjectsService} from '../openaireLibrary/services/searchProjects.service';
+import { SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service';
+import { RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
+import { SearchFields} from '../openaireLibrary/utils/properties/searchFields';
+import { NumberUtils} from '../openaireLibrary/utils/number-utils.class';
-import {RouterHelper} from '../openaireLibrary/utils/routerHelper.class';
-import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
-import {ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes';
+import { RouterHelper} from '../openaireLibrary/utils/routerHelper.class';
+import { EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
+import { ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes';
import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
-import {SEOService} from '../openaireLibrary/sharedComponents/SEO/SEO.service';
-import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class";
-import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
+import { SEOService } from '../openaireLibrary/sharedComponents/SEO/SEO.service';
import {SearchResearchResultsService} from "../openaireLibrary/services/searchResearchResults.service";
-
+import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
+import {Filter} from "../openaireLibrary/searchPages/searchUtils/searchHelperClasses.class";
import {FilterInfo, PortalAggregators} from "../utils/aggregators";
+import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class";
+import {properties} from "../../environments/environment";
+import {portalProperties} from "../../environments/environment-aggregator";
+import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
@Component({
selector: 'home',
templateUrl: 'home.component.html',
})
export class HomeComponent {
- public piwiksub: any;
- public subfunders: any;
- public pageTitle = "OpenAIRE"
- public keyword: string = "";
- public searchFields: SearchFields = new SearchFields();
- public errorCodes: ErrorCodes = new ErrorCodes();
- public routerHelper: RouterHelper = new RouterHelper();
+ // public pageTitle = "OpenAIRE - Explore |" ;
+ public keyword:string = "";
- public publicationsSize: any = null;
- public datasetsSize: any = null;
+ public searchFields:SearchFields = new SearchFields();
+ public errorCodes:ErrorCodes = new ErrorCodes();
+ public routerHelper:RouterHelper = new RouterHelper();
+
+ public publicationsSize:any = null;
+ public datasetsSize:any = null;
+ public datasetsLinkedSize:any = null;
+ public softwareLinkedSize:any = null;
public softwareSize: any = null;
public otherSize: any = null;
- public organizationsSize: any = null;
- public fundersSize: any = null;
- public projectsSize: any = null;
- public datasourcesSize: any = null;
+ public fundersSize:any = null;
+ public projectsSize:any = null;
+ public datasourcesSize:any = null;
- public fetchDataproviders: FetchDataproviders;
-
- showPublications: boolean = false;
- showDatasets: boolean = false;
- showSoftware: boolean = false;
- showOrp: boolean = false;
- showOrganizations: boolean = false;
- showProjects: boolean = false;
- showDataProviders: boolean = false;
+ showPublications: boolean = portalProperties.entities.publication.isEnabled;
+ showDatasets: boolean = portalProperties.entities.dataset.isEnabled;
+ showSoftware: boolean = portalProperties.entities.software.isEnabled;
+ showOrp: boolean = portalProperties.entities.other.isEnabled;
+ showOrganizations: boolean = portalProperties.entities.organization.isEnabled;
+ showProjects: boolean = portalProperties.entities.project.isEnabled;
+ showDataProviders: boolean = portalProperties.entities.datasource.isEnabled;
properties: EnvProperties;
- public subPub;
- public subSoft;
- public subOrp;
- public subData;
- public subProjects;
- public subOrg;
- public subDataPr;
- customFilter:SearchCustomFilter= null;
+ public readMore: boolean = false;
- constructor(
+ subs: Subscription[] = [];
+
+ resultsQuickFilter: { filter: Filter, selected: boolean, filterId: string, value: string } = {
+ filter: null,
+ selected: true,
+ filterId: "resultbestaccessright",
+ value: "Open Access"
+ };
+ selectedEntity = "all";
+ selectedEntitySimpleUrl;
+ selectedEntityAdvancedUrl;
+ resultTypes:Filter = {values:[],filterId:"type", countSelectedValues: 0, filterType: 'checkbox', originalFilterId: "", valueIsExact: true, title: "Result Types",filterOperator:"or"};
+ public pageContents = null;
+ customFilter:SearchCustomFilter= null;
+ aggregatorId;
+ aggregator:FilterInfo;
+ constructor (
private route: ActivatedRoute,
private _router: Router,
private _searchResearchResultsService: SearchResearchResultsService,
private _searchDataprovidersService: SearchDataprovidersService,
private _searchProjectsService: SearchProjectsService,
private _searchOrganizationsService: SearchOrganizationsService,
- private _refineFieldResultsService: RefineFieldResultsService,
- private location: Location, private _piwikService: PiwikService,
- private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService
+ private _refineFieldResultsService:RefineFieldResultsService,
+ private location: Location, private _piwikService:PiwikService,
+ private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService,
+ private helper: HelperService
) {
- let id = this.route.snapshot.paramMap.get('id');
- console.log(id);
- let agg:FilterInfo = PortalAggregators.getFilterInfoByMenuId(id);
- this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
- let description = "openAIRE, open access, publications, research results, European commission, search";
-
- let title = "OpenAIRE | "+agg.title;
+ this.aggregatorId = this.route.snapshot.paramMap.get('id');
+ this.aggregator = PortalAggregators.getFilterInfoByMenuId(this.aggregatorId);
+ this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(this.aggregator);
+ let description = "OpenAIRE Explore: Over 100M of research deduplicated, 170K research software, 11M research data. One of the largest open scholarly records collection worldwide.";
+ let title = "OpenAIRE - Explore| " +this.aggregator.title;
this._title.setTitle(title);
- this._meta.updateTag({content: description}, "name='description'");
- this._meta.updateTag({content: description}, "property='og:description'");
- this._meta.updateTag({content: title}, "property='og:title'");
+ this._meta.updateTag({content:description},"name='description'");
+ this._meta.updateTag({content:description},"property='og:description'");
+ this._meta.updateTag({content:title},"property='og:title'");
- // this.customFilter.setValues("Country", "country", "CA" , "Canada");
+
+ }
+
+ private getPageContents() {
+ this.subs.push(this.helper.getPageHelpContents(this.properties, 'openaire', this._router.url).subscribe(contents => {
+ this.pageContents = contents;
+ }));
+ }
+
+ public getKeys(obj: {}) {
+ return Object.keys(obj);
+ }
+
+ createRange(number){
+ var items: number[] = [];
+ for(var i = 1; i <= number; i++){
+ items.push(i);
+ }
+ return items;
+ }
+
+ public ceil(num: number) {
+ return Math.ceil(num);
}
public ngOnInit() {
+ this.properties = properties;
+ this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.baseLink+this._router.url, false);
+ this.getPageContents();
- this.route.data
- .subscribe((data: { envSpecific: EnvProperties }) => {
- this.properties = data.envSpecific;
- this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this._router.url, false);
- let url = this.properties.baseLink + this._router.url;
- this._meta.updateTag({content: url}, "property='og:url'");
- if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
- this.piwiksub = this._piwikService.trackView(this.properties, "OpenAIRE").subscribe();
- }
- this.showPublications = true;
- this.showOrp = true;
- this.showOrganizations = true;
- this.showDatasets = true;
- this.showSoftware = true;
- this.showProjects = true;
- this.showDataProviders = true;
- this.getNumbers();
+ if(this.properties!=null){
+ var url = this.properties.domain + this.properties.baseLink+this._router.url;
+ this._meta.updateTag({content:url},"property='og:url'");
+ if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
+ this.subs.push(this._piwikService.trackView(this.properties, "OpenAIRE").subscribe());
+ }
- /* this.config.getCommunityInformation(this.properties.adminToolsAPIURL, this.properties.adminToolsCommunity).subscribe(data => {
- let showEntity = {};
- for (let i = 0; i < data['entities'].length; i++) {
+ //this.config.getCommunityInformation(this.properties, this.properties.adminToolsCommunity ).subscribe(data => {
+ /* this.subs.push(this.config.communityInformationState.subscribe(data => {
+ if(data) {
+ var showEntity = {};
+ for (var i = 0; i < data['entities'].length; i++) {
- showEntity["" + data['entities'][i]["pid"] + ""] = data['entities'][i]["isEnabled"];
- }
- this.showPublications = showEntity["publication"];
- this.showDatasets = showEntity["dataset"];
- this.showProjects = showEntity["project"];
- this.showDataProviders = showEntity["datasource"];
- this.getNumbers();
- // if(this.showDataProviders) {
- // this.fetchDataproviders.getResultsForHome(this.numResults, this.properties);
- // }
- },
- error => {
- this.handleError("Error getting community information", error);
+ showEntity["" + data['entities'][i]["pid"] + ""] = data['entities'][i]["isEnabled"];
}
- );*/
-
- });
+ this.showPublications = showEntity["publication"];
+ this.showDatasets = showEntity["dataset"];
+ this.showSoftware = showEntity["software"];
+ this.showOrp = showEntity["orp"];
+ this.showProjects = showEntity["project"];
+ this.showDataProviders = showEntity["datasource"];
+ this.showOrganizations = showEntity["organization"];*/
+ if(this.showPublications){
+ this.resultTypes.values.push({name: "Publications" , id:"publications",selected:true, number:0});
+ }
+ if(this.showDatasets){
+ this.resultTypes.values.push({name: "Research data" , id:"datasets",selected:true, number:0});
+ }
+ if(this.showSoftware){
+ this.resultTypes.values.push({name: "Software" , id:"software",selected:true, number:0});
+ }
+ if(this.showOrp){
+ this.resultTypes.values.push({name: "Other research products" , id:"other",selected:true, number:0});
+ }
+ this.getNumbers();
+ /* }
+ },
+ error => {
+ this.handleError("Error getting community information", error);
+ }
+ ));*/
+ }
}
-
public ngOnDestroy() {
- if (this.piwiksub) {
- this.piwiksub.unsubscribe();
+ for (let sub of this.subs) {
+ sub.unsubscribe();
}
- if (this.subfunders) {
- this.subfunders.unsubscribe();
- }
- if (this.subPub) {
- this.subPub.unsubscribe();
- }
- if (this.subOrp) {
- this.subOrp.unsubscribe();
- }
- if (this.subSoft) {
- this.subSoft.unsubscribe();
- }
- if (this.subData) {
- this.subData.unsubscribe();
- }
- if (this.subProjects) {
- this.subProjects.unsubscribe();
- }
- if (this.subOrg) {
- this.subOrg.unsubscribe();
- }
- if (this.subDataPr) {
- this.subDataPr.unsubscribe();
- }
-
}
private getNumbers() {
- let refineQuery = null;
+ let refineQuery = null
if(this.customFilter){
refineQuery= "&fq="+StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId )));
}
- if (this.showPublications) {
- this.subPub = this._searchResearchResultsService.numOfSearchResults("publication","", this.properties,refineQuery).subscribe(
+ if(this.showPublications){
+ this.subs.push(this._searchResearchResultsService.numOfSearchResults("publication", "", this.properties, refineQuery).subscribe(
data => {
- if (data && data > 0) {
+ if(data && data != null && data > 0 ){
this.publicationsSize = NumberUtils.roundNumber(data);
- }else{
- this.showPublications = false;
+
}
},
err => {
+ //console.log(err);
this.handleError("Error getting number of publications", err);
}
- );
+ ));
}
- if (this.showDatasets) {
- this.subData = this._searchResearchResultsService.numOfSearchResults("dataset","", this.properties,refineQuery).subscribe(
+ if(this.showDatasets){
+ this.subs.push(this._searchResearchResultsService.numOfSearchResults("dataset", "", this.properties, refineQuery).subscribe(
data => {
- if (data && data > 0) {
+ if(data && data != null && data > 0 ){
this.datasetsSize = NumberUtils.roundNumber(data);
- }else{
- this.showDatasets = false;
}
},
err => {
+ //console.log(err);
this.handleError("Error getting number of research data", err);
}
- );
+ ));
+ /*this.subs.push(this._searchResearchResultsService.numOfSearchResultsLinkedToPub("dataset", this.properties, refineQuery).subscribe(
+ data => {
+ if(data && data != null && data > 0 ){
+ this.datasetsLinkedSize = NumberUtils.roundNumber(data);
+ }
+ },
+ err => {
+ //console.log(err);
+ this.handleError("Error getting number of linkedresearch data", err);
+ }
+ ));*/
+
}
if (this.showSoftware) {
- this.subSoft = this._searchResearchResultsService.numOfSearchResults("software","", this.properties,refineQuery).subscribe(
+ this.subs.push(this._searchResearchResultsService.numOfSearchResults("software", "", this.properties, refineQuery).subscribe(
data => {
if (data && data > 0) {
this.softwareSize = NumberUtils.roundNumber(data);
@@ -213,10 +235,21 @@ export class HomeComponent {
err => {
this.handleError("Error getting number of software data", err);
}
- );
+ ));
+ /* this.subs.push(this._searchResearchResultsService.numOfSearchResultsLinkedToPub("software", this.properties, refineQuery).subscribe(
+ data => {
+ if(data && data != null && data > 0 ){
+ this.softwareLinkedSize = NumberUtils.roundNumber(data);
+ }
+ },
+ err => {
+ //console.log(err);
+ this.handleError("Error getting number of linked software", err);
+ }
+ ));*/
}
if (this.showOrp) {
- this.subOrp = this._searchResearchResultsService.numOfSearchResults("other","", this.properties,refineQuery).subscribe(
+ this.subs.push(this._searchResearchResultsService.numOfSearchResults("other", "", this.properties, refineQuery).subscribe(
data => {
if (data && data > 0) {
this.otherSize = NumberUtils.roundNumber(data);
@@ -227,54 +260,79 @@ export class HomeComponent {
err => {
this.handleError("Error getting number of software data", err);
}
- );
+ ));
}
- if (this.showProjects) {
- this.subfunders = this._refineFieldResultsService.getRefineFieldsResultsByEntityName(["funder"], "project", this.properties, refineQuery).subscribe(
+ if(this.showProjects){
+ this.subs.push(this._refineFieldResultsService.getRefineFieldsResultsByEntityName(["funder"],"project", this.properties, refineQuery).subscribe(
data => {
- if (data[0] && data[0] > 0) {
+
+
+ if(data[0] && data[0] > 0 ){
this.projectsSize = NumberUtils.roundNumber(data[0]);
}
- else{
- this.showProjects = false;
- }
- if (data[1].length > 0 && data[1][0].filterId == "funder" && data[1][0].values) {
+ if(data[1].length > 0 && data[1][0].filterId == "funder" && data[1][0].values ){
this.fundersSize = NumberUtils.roundNumber(data[1][0].values.length);
}
+
},
err => {
+ //console.log(err);
this.handleError("Error getting 'funder' field results of projects", err);
- });
+ }));
}
- if (this.showDataProviders) {
- this.subDataPr = this._searchDataprovidersService.numOfSearchDataproviders("", this.properties, refineQuery).subscribe(
+ if(this.showDataProviders){
+ this.subs.push(this._searchDataprovidersService.numOfSearchDataproviders("", this.properties, refineQuery).subscribe(
data => {
- if (data && data > 0) {
+ if(data && data != null && data > 0 ){
this.datasourcesSize = NumberUtils.roundNumber(data);
- }else{
- this.showDataProviders = false;
}
+
},
err => {
+ //console.log(err);
this.handleError("Error getting number of content providers", err);
}
- );
- }
- if (this.showOrganizations) {
- this.subOrg = this._searchOrganizationsService.numOfSearchOrganizations("", this.properties, refineQuery).subscribe(
- data => {
- if (data && data > 0) {
- this.organizationsSize = NumberUtils.roundNumber(data);
- }
- },
- err => {
- this.handleError("Error getting number of Organizations", err);
- }
- );
+ ));
}
}
private handleError(message: string, error) {
- console.error("Home Page: " + message, error);
+ console.error("Home Page: "+message, error);
+ }
+ entityChanged($event){
+ this.selectedEntity = $event.entity;
+ this.selectedEntitySimpleUrl = $event.simpleUrl;
+ this.selectedEntityAdvancedUrl = $event.advancedUrl;
+ }
+ goTo(simple:boolean){
+ let url = (simple)?this.selectedEntitySimpleUrl:this.selectedEntityAdvancedUrl;
+ let parameterNames = [];
+ let parameterValues = [];
+ if (this.selectedEntity == "result") {
+ if (this.resultTypes) {
+ let values = [];
+ for(let value of this.resultTypes.values){
+ if (value.selected) {
+ values.push(value.id);
+ }
+ }
+ if (values.length > 0 && values.length !=4) {
+ parameterNames.push("type");
+ parameterValues.push(values.join(","));
+ }
+ if (this.resultsQuickFilter) {
+ parameterNames.push("qf");
+ parameterValues.push("" + this.resultsQuickFilter.selected);
+ }
+ }
+ }
+ if(this.keyword.length > 0) {
+ parameterNames.push("fv0");
+ parameterValues.push(this.keyword);
+ parameterNames.push("f0");
+ parameterValues.push("q");
+ }
+ console.log( this.routerHelper.createQueryParams(parameterNames, parameterValues))
+ this._router.navigate([url], {queryParams: this.routerHelper.createQueryParams(parameterNames, parameterValues)});
}
}
diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts
index 5b3084d..90b37b1 100644
--- a/src/app/home/home.module.ts
+++ b/src/app/home/home.module.ts
@@ -3,52 +3,54 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
-import{HomeRoutingModule} from './home-routing.module';
-import{HomeComponent} from './home.component';
+import {HomeRoutingModule} from './home-routing.module';
+import {HomeComponent} from './home.component';
-import { DataProvidersServiceModule} from '../openaireLibrary/services/dataProvidersService.module';
+import { DataProvidersServiceModule} from '../openaireLibrary/services/dataProvidersService.module';
import { SearchResearchResultsServiceModule} from '../openaireLibrary/services/searchResearchResultsService.module';
-import { ProjectsServiceModule} from '../openaireLibrary/services/projectsService.module';
-// import { PublicationsServiceModule} from '../openaireLibrary/services/publicationsService.module';
-import { OrganizationsServiceModule} from '../openaireLibrary/services/organizationsService.module';
+import { ProjectsServiceModule} from '../openaireLibrary/services/projectsService.module';
+import { OrganizationsServiceModule} from '../openaireLibrary/services/organizationsService.module';
import { SearchFormModule} from '../openaireLibrary/searchPages/searchUtils/searchForm.module';
-import {PiwikServiceModule} from '../openaireLibrary/utils/piwik/piwikService.module';
+import { PiwikServiceModule} from '../openaireLibrary/utils/piwik/piwikService.module';
import {HelperModule} from '../openaireLibrary/utils/helper/helper.module';
import {RefineFieldResultsServiceModule} from '../openaireLibrary/services/refineFieldResultsService.module';
-import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
-import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {Schema2jsonldModule} from '../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module';
import { SEOServiceModule } from '../openaireLibrary/sharedComponents/SEO/SEOService.module';
import {ErrorMessagesModule} from '../openaireLibrary/utils/errorMessages.module';
-// import {SoftwareServiceModule} from "../openaireLibrary/services/softwareService.module";
-// import {OrpsServiceModule} from "../openaireLibrary/services/orpsService.module";
-// import {AggregatorNavBarComponent} from "../utils/aggregatorNavBar.component";
+import {EntitiesSelectionModule} from "../openaireLibrary/searchPages/searchUtils/entitiesSelection.module";
+import {QuickSelectionsModule} from "../openaireLibrary/searchPages/searchUtils/quick-selections.module";
+import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
+import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
+import {arrow_right} from "../openaireLibrary/utils/icons/icons";
- @NgModule({
+@NgModule({
imports: [
CommonModule, FormsModule, RouterModule,
- RefineFieldResultsServiceModule,
- DataProvidersServiceModule, SearchResearchResultsServiceModule, ProjectsServiceModule,
- OrganizationsServiceModule,
- SearchFormModule,
- PiwikServiceModule,
- HomeRoutingModule,
- HelperModule,
- ErrorMessagesModule,
- Schema2jsonldModule, SEOServiceModule,
+ RefineFieldResultsServiceModule,
+ DataProvidersServiceModule, SearchResearchResultsServiceModule,
+ ProjectsServiceModule, OrganizationsServiceModule,
+ SearchFormModule,
+ PiwikServiceModule,
+ HomeRoutingModule,
+ HelperModule,
+ ErrorMessagesModule,
+ SEOServiceModule, EntitiesSelectionModule, QuickSelectionsModule, IconsModule
],
declarations: [
- HomeComponent//, AggregatorNavBarComponent
- ],
+ HomeComponent
+ ],
providers:[
- FreeGuard, PreviousRouteRecorder, ConfigurationService
- ],
+ PreviousRouteRecorder
+ ],
exports: [
- HomeComponent//, AggregatorNavBarComponent
- ]
+ HomeComponent
+ ]
})
-export class HomeModule { }
+export class HomeModule {
+ constructor(private iconsService: IconsService) {
+ this.iconsService.registerIcons([arrow_right]);
+ }
+}
diff --git a/src/app/landingPages/result/libResult.module.ts b/src/app/landingPages/result/libResult.module.ts
new file mode 100644
index 0000000..39be478
--- /dev/null
+++ b/src/app/landingPages/result/libResult.module.ts
@@ -0,0 +1,13 @@
+import {NgModule} from '@angular/core';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {OpenaireResultComponent} from './result.component';
+import {ResultRoutingModule} from './result-routing.module';
+import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
+
+@NgModule({
+ imports: [ResultRoutingModule, ResultLandingModule],
+ declarations:[OpenaireResultComponent],
+ providers:[PreviousRouteRecorder],
+ exports:[OpenaireResultComponent]
+})
+export class LibResultModule { }
diff --git a/src/app/landingPages/result/result-routing.module.ts b/src/app/landingPages/result/result-routing.module.ts
new file mode 100644
index 0000000..9b72a94
--- /dev/null
+++ b/src/app/landingPages/result/result-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import {OpenaireResultComponent } from './result.component';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+
+
+@NgModule({
+ imports: [
+ RouterModule.forChild([
+ { path: '', component: OpenaireResultComponent, data: {
+ redirect: '/error', community : 'openaire'
+ },canDeactivate: [PreviousRouteRecorder] }
+ ])
+]
+})
+export class ResultRoutingModule { }
diff --git a/src/app/landingPages/result/result.component.ts b/src/app/landingPages/result/result.component.ts
new file mode 100644
index 0000000..860e401
--- /dev/null
+++ b/src/app/landingPages/result/result.component.ts
@@ -0,0 +1,7 @@
+import {Component} from '@angular/core';
+
+@Component({
+ selector: 'openaire-publication',
+ template: `
-
-
+
- Search for more than
-
-
- {{publicationsSize.number|number}}{{publicationsSize.size}}
- {{((showDatasets || showSoftware || showOrp) ? " publications, "
- : " publications ")}}
-
-
- {{datasetsSize.number|number}}{{datasetsSize.size}}
- {{((showSoftware || showOrp) ? " research data, " : " research data ")}}
-
-
- {{otherSize.number|number}}{{otherSize.size}}
- {{((showSoftware) ? " other research products, " : " other research products ")}}
-
-
- {{softwareSize.number|number}}{{softwareSize.size}}
- software
-
-
-
- - from - {{organizationsSize.number|number}}{{organizationsSize.size}} - organizations - - - {{((showOrganizations && showOrganizations) ? " and " : " from ")}} - {{datasourcesSize.number|number}}{{datasourcesSize.size}} - content providers - - - {{((showDataProviders && datasourcesSize) ? " and " : " from ")}} - {{fundersSize.number|number}}{{fundersSize.size}} - funders - - - linked together for an integrated discovery of scientific output + +
+
+
+ - - from - {{organizationsSize.number|number}}{{organizationsSize.size}} - organizations - - - {{((showOrganizations && showOrganizations) ? " and " : " from ")}} - {{datasourcesSize.number|number}}{{datasourcesSize.size}} - content providers - - - {{((showDataProviders && datasourcesSize) ? " and " : " from ")}} - {{fundersSize.number|number}}{{fundersSize.size}} - funders - - - linked together for an integrated discovery of scientific output + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Extracted Metadata Combined.
+
+ The OpenAIRE Research Graph is one of the largest open scholarly record collections worldwide, key in fostering Open Science and establishing its practices in the daily research activities. Conceived as a public and transparent good, populated out of data sources trusted by scientists, the Graph aims at bringing discovery, monitoring, and assessment of science back in the hands of the scientific community.
+
+ Imagine a vast collection of research products all linked together, contextualised and openly available. For the past ten years OpenAIRE has been working to gather this valuable record. OpenAIRE is pleased to announce the release of its Research Graph, a massive collection of metadata and links between scientific products such as articles, datasets, software, and other research products, entities like organisations, funders, funding streams, projects, communities, and data sources.
+
+ As of today, the OpenAIRE Research Graph aggregates around 450Mi metadata records with links collecting from 10,000 data sources trusted by scientists! After cleaning, deduplication, and fine-grained classification processes, they narrow down to ~100Mi publications, ~8Mi datasets, ~200K software research products, 8Mi other products linked together with semantic relations.
+
+ More than 10Mi full-texts of Open Access publications are mined by algorithms to enrich metadata records with additional properties and links among research products, funders, projects, communities, and organizations. Thanks to the mining algorithm, the graph is completed with 480Mi semantic relations.
+ Read more
+
+
+ Read less
+
+
+
+
+ 
+
+
+
+ 
+
+
+
+
-
+
+
+
+
+
+
+
+
+ 
+
+
+ Deposit your research
+
+
+
+ Deposit Deposit in a repository of your choice.
+ Select an OpenAIRE compatible
+ repository (2.0 +) so that your research is linked to your funding information. Use Zenodo, a catch-all repository hosted by CERN to deposit all your research results (publications, data, software, etc.)
+ + Select an OpenAIRE compatible
+ repository (2.0 +) so that your research is linked to your funding information. Use Zenodo, a catch-all repository hosted by CERN to deposit all your research results (publications, data, software, etc.)
+
+
+ 
+
+
+ Link your work
+
+
+
+ Link Connect all your research.
+ If you can't find your research results in OpenAIRE, don't worry! Use our Link Out service , that reaches out to many
+ external sources via APIs, to connect
+ your research results and claim them to your project.
+ + If you can't find your research results in OpenAIRE, don't worry! Use our Link Out service , that reaches out to many
+ external sources via APIs, to connect
+ your research results and claim them to your project.
+
+
+`,
+ showNumbersInHhomePage:false,
+ searchFormSection: `{Search Form Section}
{This is section One}
{This is section Two}