Project

General

Profile

« Previous | Next » 

Revision 45076

LAst changes from TEST - including: SEO changes, resultcollectedfromdatasourceid -> collectedfromdatasourceid | search datasets by dois | collectedfrom id/name instead of original value |widget for datasets || metrics

View differences:

modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/DataTables/Select-1.0.1/js/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/advancedsearchdatasources.js
83 83
					typeLimits.value.set('html', values.join(', '));
84 84
					typeLimits.style.display = '';
85 85
					break;
86
				case 'languageSearch':
86
				case 'language':
87 87
					languageLimits.value.set('html', values.join(', '));
88 88
					languageLimits.style.display = '';
89 89
					break;
......
232 232
		clear($('type'));
233 233
	});
234 234
	$('languageLimits').addEvent('click', function () {
235
		clear($('languageSearch'));
235
		clear($('language'));
236 236
	});
237 237
	$('contentLimits').addEvent('click', function () {
238 238
		clear($('datasourceContent'));
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/DataTables/Buttons-1.0.3/swf/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/DataTables/Buttons-1.0.3/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/searchprojects/view.html.php
72 72
			$this -> filters['sc39'] -> value = $sc39;
73 73
		}
74 74
		$this -> page = JRequest :: getUInt('page', self :: DEFAULT_PAGE);
75
		$this -> size = JRequest :: getUInt('size', self :: DEFAULT_SIZE);
75
		$this -> size = self :: DEFAULT_SIZE; //JRequest :: getUInt('size', self :: DEFAULT_SIZE);
76 76
		if ($this -> keyword == NULL)
77 77
			$this -> statistics = $model -> getProjectStatistics($locale,false);
78 78
		else {
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/searchpublications/view.html.php
29 29
			$this -> filters['type'] -> name = 'type';
30 30
			$this -> filters['type'] -> value = $type;
31 31
		}
32
		$language = JRequest :: getString('languageFilter');
32
		$language = JRequest :: getString('language');
33 33
		if ($language != NULL) {
34
			$this -> filters['languageFilter'] = new JObject();
35
			$this -> filters['languageFilter'] -> name = 'languageFilter';
36
			$this -> filters['languageFilter'] -> value = $language;
34
			$this -> filters['language'] = new JObject();
35
			$this -> filters['language'] -> name = 'language';
36
			$this -> filters['language'] -> value = $language;
37 37
		}
38 38
		$funder = JRequest :: getString('funder');
39 39
		if ($funder != NULL) {
......
90 90
			$this -> filters['project'] -> value = $project;
91 91
		}
92 92
		$this -> page = JRequest :: getUInt('page', self :: DEFAULT_PAGE);
93
		$this -> size = JRequest :: getUInt('size', self :: DEFAULT_SIZE);
93
		$this -> size = self :: DEFAULT_SIZE; //JRequest :: getUInt('size', self :: DEFAULT_SIZE);
94 94
		if ($this -> keyword == NULL)
95 95
			$this -> statistics = $model -> getPublicationStatistics($locale,false);
96 96
		else {
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/DataTables/Responsive-1.0.7/css/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/DataTables/Responsive-1.0.7/js/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/select2-3.4.5/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/ingestion2/tmpl/default.php
8 8

  
9 9
JHtml :: _('behavior.framework',true);
10 10
JViewLegacy:: loadHelper('DatasourceHelper');
11
$document->setTitle(" OpenAIRE - Deposit Publications & Data");
11 12

  
12 13
?>
13 14

  
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/article/tmpl/default.php
30 30
$document -> addScript( 'https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js');
31 31
$document->addStyleSheet(JRoute :: _(JUri :: base() . 'components/com_openaire/js/DataTables/DataTables-1.10.9/css/jquery.dataTables.min.css'));
32 32
$document->addScript(JRoute :: _(JUri :: base() . 'components/com_openaire/js/DataTables/DataTables-1.10.9/js/jquery.dataTables.min.js'));
33

  
34
$document->setTitle("Publication".(isset($this -> article -> title)?':'.$this -> article -> title:''));
33
$document->setTitle("OpenAIRE - Publication".(isset($this -> article -> title)?': '.(strlen($this -> article -> title) > 30?substr($this -> article -> title,0,30).'...':$this -> article -> title):''));
34
$document->setMetaData( 'description', (isset($this -> article -> title)?$this -> article -> title:''), true );
35 35
$application = JFactory :: getApplication();
36 36
$user = JFactory :: getUser();
37 37
$parameters = JComponentHelper :: getParams('com_openaire');
......
96 96
							$accessModeClass = NULL;
97 97
							$accessModeTitle = NULL;
98 98
						} ?>
99
						<h3<?php echo((($accessModeClass == NULL) ? '' : (' class="' . $accessModeClass . '"')) . (($accessModeTitle == NULL) ? '' : (' title="' . $accessModeTitle . '"'))); ?>><?php echo((($this -> article -> url == NULL) ? '' : ('<a target="_blank" class="custom-external" href="' . $this -> article -> url . '">')) . $this -> article -> title . (($this -> article -> url == NULL) ? '' : '</a>')); ?></h3>
99
						<h3<?php echo((($accessModeClass == NULL) ? '' : (' class="' . $accessModeClass . '"')) . (($accessModeTitle == NULL) ? '' : (' title="' . $accessModeTitle . '"'))); ?>><?php echo((($this -> article -> url == NULL) ? '' : ('<a target="_blank" class="custom-external" href="' .(((strpos($this -> article -> url, 'http://') !== false)||(strpos($this -> article -> url, 'https://') !== false))?'':'https://'). $this -> article -> url . '">')) . $this -> article -> title . (($this -> article -> url == NULL) ? '' : '</a>')); ?></h3>
100 100
					</div>	
101 101
					</div>
102
                                                                                                             <?php 
103
                                        if($this -> article -> underCuration){ ?>
104
                                        <div>
105
                                            <?php echo('<i>'.JText :: _('UNDER_CURATION_MESSAGE').'</i>'); ?>
106
                                            <span onmouseover="tooltip.pop(this, '#tooltip_project_curation')"> <img src="templates/<?php  echo($application->getTemplate()); ?>/styles/openaire/images/box_info<?php //echo ($project -> inferred)?"_ok":""?>.png" /></span>
107
                                            <div class="project-tooltip" style="display:none;"> 
108
						<div id="tooltip_project_curation"> 
109
                                                    <h4 style="margin:5px; text-align:center;"><?php echo(JText :: _('UNDER_CURATION_MESSAGE')); ?></h4>                                                                                         
110
                                                    <div style="text-align:center;"><?php echo(JText :: _('UNDER_CURATION_INFO') );?></div>				
111
						</div>
112
                                            </div>
113
                                        </div>
114
                                        <?php } ?>
102 115
			 		<?php if (($this -> article -> authors != NULL) || ($this -> article -> year != NULL)) { ?>				
103 116
						<div class="infoline authors">
104 117
							<?php $itemId = $this -> itemId;
......
159 172
							<!--<?php echo(JText :: _('TYPES_') . ' ' . implode(",", $this -> article -> type)); ?> -->
160 173
						</div>
161 174
					<?php }
162
					if ($this -> article -> subjects != NULL) {						
175
					if ($this -> article -> subjects != NULL || $this->article->inferredSubjects != NULL) {						
163 176
					$subjects_clean = array(); 
164 177
					$subjects_inferred= array(); 
165 178
					foreach ($this->article->subjects as $subject){
......
258 271
								<span class="dchdr"><?php echo(JText :: _('IDENTIFIERS_')."</span>" . implode(', ',$pidsToShow));?>
259 272
							</div>
260 273
					<?php }
261
					}
274
					}                                        
262 275
					if ($this -> article -> description != NULL) { ?>
263 276
						<div class="description">
264 277
							<?php echo($this -> article -> description); ?>
......
362 375
										echo '<p class="custom-blockquote custom-blockquote-nopad">'.(JText :: _('CITATIONS_TECHNOLOGY')).'</p>'; 	 			
363 376
										/* Remove the usort if citations are sorted from db*/
364 377
										 //usort($this -> article -> citations , function ($citation1, $citation2) {return explode("]",explode("[",$citation1 -> title)[1])[0] - explode("]",explode("[",$citation2 -> title)[1])[0] ;});										  
378
                                                                                        echo("<ul>");
365 379
											foreach (array_slice($this -> article -> citations, 0, OpenAireViewArticle :: MAX_RELATED) as $citation) {														 
366 380
													echo(PublicationHelper :: formatCitationLinks($citation));								
367 381
											}
......
374 388
														  echo(PublicationHelper :: formatCitationLinks($citation));								
375 389
													} ?>
376 390
												</div>
377
											<?php } ?>
391
											<?php } 
392
                                                                                        echo("</ul>");
393
                                                                                        ?>
378 394
									</div>
379 395
									
380 396
								<?php } ?>
......
901 917
					<?php } ?>
902 918
					<?php if ($this -> article -> projects != NULL) { ?>
903 919
						<div class="functionsSection">
904
							<h3 class="title"><?php echo(JText :: _('FUNDED_BY_PROJECTS')); ?></h3>
920
							<h3 class="title"><?php echo(JText :: _('FUNDED_BY_PROJECTS')); ?></h3>                                                                                                                 
905 921
							<ul class="line">								
906 922
								<?php foreach($this -> article -> projects as $project) {
907 923
									if (($project != NULL) && (($project -> acronym != NULL) || ($project -> title != NULL))) { ?>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/helpers/publicationhelper.php
138 138
	
139 139
	public static function formatCitationLinks($citation) {
140 140
		if(sizeof($citation -> ids)==0){
141
			return '<h6>'.$citation -> title.'</h6>';													
141
			return '<li>'.$citation -> title.'</li>';													
142 142
		}else{			
143 143
			$citationId=$citation -> ids[0];
144 144
			 if (sizeof($citation -> ids)>1){
145 145
				usort($citation -> ids, function ($a, $b) {if ($a->confidenceLevel == $b->confidenceLevel) {return 0;}return ($a->confidenceLevel > $b->confidenceLevel) ? -1 : 1;});
146 146
				$citationId=$citation -> ids[0];
147 147
			}  														 
148
			$link = '<h6>'.$citation -> title.'</h6>';														 
148
			$link = '<li>'.$citation -> title.'</li>';														 
149 149
			if(strcmp($citationId -> type,'openaire')==0){
150
				$link ='<h6><a href="'. JUri :: base() . 'index.php?option=com_openaire&view=article&articleId='.$citationId->id.'">'.$citation -> title.'</a></h6>';
150
				$link ='<li><a href="'. JUri :: base() . 'index.php?option=com_openaire&view=article&articleId='.$citationId->id.'">'.$citation -> title.'</a></li>';
151 151
			}else if(strcmp($citationId -> type,"pmid")==0){
152
				$link ='<h6><a target="_blank" class="custom-external" href="http://www.ncbi.nlm.nih.gov/pubmed/'.$citationId->id.'">'.$citation -> title.'</a></h6>';															 
152
				$link ='<li><a target="_blank" class="custom-external" href="http://www.ncbi.nlm.nih.gov/pubmed/'.$citationId->id.'">'.$citation -> title.'</a></li>';															 
153 153
			}else if(strcmp($citationId -> type,"pmcid")==0){
154
				$link ='<h6><a target="_blank" class="custom-external" href="http://europepmc.org/articles/'.$citationId->id.'">'.$citation -> title.'</a></h6>';															 
154
				$link ='<li><a target="_blank" class="custom-external" href="http://europepmc.org/articles/'.$citationId->id.'">'.$citation -> title.'</a></li>';															 
155 155
			}else if(strcmp($citationId -> type,"arxiv")==0){
156
				$link ='<h6><a target="_blank" class="custom-external" href="http://arxiv.org/abs/'.$citationId->id.'">'.$citation -> title.'</a></h6>';															 
156
				$link ='<li><a target="_blank" class="custom-external" href="http://arxiv.org/abs/'.$citationId->id.'">'.$citation -> title.'</a></li>';															 
157 157
			}else if(strcmp($citationId -> type,"doi")==0){
158
				$link ='<h6><a target="_blank" class="custom-external" href="http://dx.doi.org/'.$citationId->id.'">'.$citation -> title.'</a></h6>';															 
158
				$link ='<li><a target="_blank" class="custom-external" href="http://dx.doi.org/'.$citationId->id.'">'.$citation -> title.'</a></li>';															 
159 159
			}
160 160
/*pmid	15558770
161 161
doi	4821630
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/language/en-GB/en-GB.com_openaire.ini
114 114
DATASET_TYPE_="Dataset Type:"
115 115
DATASET="Dataset"
116 116
DATASETS="Datasets"
117
DATASETS_OF_PROJECT_S_S_S_="Datasets of Project %s (%s - %s)"
117 118
DATASOURCE="Data Provider"
118 119
DATASOURCE_LANGUAGE="Data Provider Language"
119 120
DATASOURCE_LANGUAGES_="Data Provider Languages:"
......
149 150
DOWNLOAD_PUBLICATIONS_CSV_FOR_FUNDER_="Download publications report (CSV) for"
150 151
DOWNLOAD_PUBLICATIONS_CSV_FOR_ALL_FUNDERS_="Download publications report (CSV) for all funders"
151 152
DYNAMICALLY_INCORPORATE_PUBLICATIONS_IN_YOUR_SITE_HTML_="Dynamically incorporate publications in your site (HTML)"
153
DYNAMICALLY_INCORPORATE_DATSETS_IN_YOUR_SITE_HTML_="Dynamically incorporate research data in your site (HTML)"
152 154
EC="EC"
153 155
EDIT="edit"
154 156
EMAIL_ADDRESS="thanos@di.uoa.gr"
......
299 301
MONTHLY="monthly"
300 302
MORE_INFORMATION="More information"
301 303
MORE_SEARCH_OPTIONS_="More search options &raquo;"
302
MOST_VIEWED_FUNDERS="Most viewed funders"
303
MOST_VIEWED_FUNDING_LEVEL_2="Most viewed funding level 2"
304
MOST_VIEWED_PROJECTS="Most viewed projects"
305
MOST_VIEWED_PUBLICATIONS="Most viewed publications"
304
MOST_VIEWED_FUNDERS="Popular funders"
305
MOST_VIEWED_FUNDING_LEVEL_2="Popular funding level 2"
306
MOST_VIEWED_PROJECTS="Popular projects"
307
MOST_VIEWED_PUBLICATIONS="Popular publications"
306 308
MY_DEPOSITIONS="My Depositions"
307 309
N_DATASETS_PAGE_N_OF_N="%d research data, page %d of %d"
308 310
N_DATASOURCES_PAGE_N_OF_N="%d data providers, page %d of %d"
......
400 402
ORCID_RESOLVED_VIA_ORCID_="ORCID (resolved via ORCID)"
401 403
ORCID_SEARCH_WITH_KEYWORD_ORCID="Search for author's publication, using authors orcid id or keyword search in author's metadata"
402 404
ORDER_BY_="Order by:"
405
ORGANIZATION="Organization"
403 406
ORGANIZATION_TYPE="Organization Type"
404 407
ORGANIZATION_TYPES_="Organization Types:"
405 408
ORGANIZATIONS="Organizations"
......
425 428
PROJECTS_FUNDED_BY="Projects funded by"
426 429
CONCEPTS="Contexts"
427 430
CONCEPTS_="Contexts:"
431
PAGE_VIEWS="Page Views"
428 432
PROJECT_CODE_="Project Code:"
429 433
PROJECT_NAME="Project name"
430 434
PUBLICATION="Publication"
......
550 554
UNKNOWN_COMPATIBILITY_STATUS="Unknown compatibility status"
551 555
UPDATED_S_="(updated %s)"
552 556
USAGE_STATISTICS="Usage Statistics"
557
USAGE_STATISTICS_MESSAGE_S_="The numbers and graphs below come from the OpenAIRE portal usage, and may indicate some impact that this %s has from OpenAIRE's outreach around the world."
553 558
USE_THIS_SERVICE_TO_GET_UPDATES_ON_THE_TOPICS_OF_YOUR_CHOICE="Use this service to get updates on the topics of your choice"
559
UNDER_CURATION_INFO="Bibliographic record accepted by the system, but not yet processed by OpenAIRE tools for information quality improvement and de-duplication."
560
UNDER_CURATION_MESSAGE="Record in preview"
554 561
VIA_="via "
555 562
VIEW_ADD_FILTERS="View/Add Filters"
556 563
VIEW_ALL_N="view all %d"
......
560 567
VIEW_MORE="View more"
561 568
VIEW_LESS_AUTHORS="View less authors"
562 569
VIEWS="Views"
563
VIEWS_TIMELINE="Views Timeline"
570
VIEWS_TIMELINE="Views Over Time"
564 571
WEEKLY="weekly"
565 572
WHAT_DO_YOU_THINK_OF_THIS_ARTICLE_="What do you think of this publication?"
566 573
WHAT_DO_YOU_THINK_OF_THIS_DATASET_="What do you think of this research data?"
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/models/piwik/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/models/search.php
68 68
    const PUBLICATION_YEAR = 'resultacceptanceyear';
69 69
    const PUBLICATION_ACCESS_MODE = 'resultbestlicense';
70 70
    const PUBLICATION_DATASOURCE = 'resulthostingdatasourceid';
71
    const RESULT_DATASOURCE = 'collectedfromdatasourceid';
71 72
    const PUBLICATION_PROJECT = 'relprojectid';
72 73
    const PUBLICATION_AUTHOR_ID = 'relpersonid';
73 74
    const PUBLICATION_ARTICLE = '0001';
......
1054 1055
            JLog :: add('Generated query is \'' . $query . '\'', JLog :: INFO, self :: LOG);
1055 1056
            /* if (($response = $this->performGet('search?action=refine&rTransformer=results_openaire_browse&fields=' . self :: PUBLICATION_TYPE . '&fields=' . self :: PUBLICATION_LANGUAGE . '&fields=' . self :: PUBLICATION_CONTEXT . '&fields=' . self :: PUBLICATION_FUNDER . '&fields=' . self :: PUBLICATION_FUNDING_STREAM . '&fields=' . self :: PUBLICATION_SCIENTIFIC_AREA . '&fields=' . self :: PUBLICATION_YEAR . '&fields=' . self :: PUBLICATION_ACCESS_MODE . '&fields=' . self :: PUBLICATION_DATASOURCE . '&fields=' . self :: PUBLICATION_CONTEXT . '&fields=' . self :: PUBLICATION_PROJECT . '&query=' . urlencode($query) . '&locale=' . c('-', '_', $locale))) == NULL)            
1056 1057
             */         
1057
            if (($response = $this->performGet('search?action=refine&rTransformer=results_openaire_browse&fields=resultcollectedfromdatasourceid&fields=' . self :: PUBLICATION_TYPE . '&fields=' . self :: PUBLICATION_LANGUAGE . '&fields=' . self :: PUBLICATION_CONTEXT . '&fields=' . self :: PUBLICATION_FUNDER . '&fields=' . self :: PUBLICATION_FUNDING_STREAM . '&fields=' . self :: PUBLICATION_SCIENTIFIC_AREA . '&fields=' . self :: PUBLICATION_FUNDING_STREAM_LEVEL2 . '&fields=' . self :: PUBLICATION_YEAR . '&fields=' . self :: PUBLICATION_ACCESS_MODE . '&fields=' . self :: PUBLICATION_DATASOURCE . '&fields=' . self :: PUBLICATION_CONTEXT .  '&query=' . urlencode($query) . '&locale=' . str_replace('-', '_', $locale))) == NULL)            
1058
            if (($response = $this->performGet('search?action=refine&rTransformer=results_openaire_browse&fields='. self :: RESULT_DATASOURCE.'&fields=' . self :: PUBLICATION_TYPE . '&fields=' . self :: PUBLICATION_LANGUAGE . '&fields=' . self :: PUBLICATION_CONTEXT . '&fields=' . self :: PUBLICATION_FUNDER . '&fields=' . self :: PUBLICATION_FUNDING_STREAM . '&fields=' . self :: PUBLICATION_SCIENTIFIC_AREA . '&fields=' . self :: PUBLICATION_FUNDING_STREAM_LEVEL2 . '&fields=' . self :: PUBLICATION_YEAR . '&fields=' . self :: PUBLICATION_ACCESS_MODE . '&fields=' . self :: PUBLICATION_DATASOURCE . '&fields=' . self :: PUBLICATION_CONTEXT .  '&query=' . urlencode($query) . '&locale=' . str_replace('-', '_', $locale))) == NULL)            
1058 1059
                throw new Exception('no HTTP response');
1059 1060
            if ($response->code != self :: HTTP_OK)
1060 1061
                throw new Exception('HTTP response code ' . $response->code);
......
1066 1067
            $statistics=null;
1067 1068
            if($allFunders){
1068 1069
                $statistics = $this->createStatistics($xpath, 
1069
                    array('type', 'languageFilter', 'funder', 'fundingStream', 'scientificArea', 'fundingStreamLevel2', 'year', 'accessMode', 'datasource', 'community'),
1070
                    array('type', 'language', 'funder', 'fundingStream', 'scientificArea', 'fundingStreamLevel2', 'year', 'accessMode', 'datasource', 'community'),
1070 1071
                    array('DOCUMENT_TYPE', 'DOCUMENT_LANGUAGE', 'FUNDER', 'FUNDING_STREAM', 'SCIENTIFIC_AREA', 'FUNDING_STREAM_LEVEL_2', 'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE', 'COMMUNITIES'), 
1071 1072
                    array('NO_DOCUMENT_TYPE_STATISTICS_FOUND', 'NO_DOCUMENT_LANGUAGE_STATISTICS_FOUND',
1072 1073
                'NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND', 'NO_FUNDING_STREAM_LEVEL2_STATISTICS_FOUND', 'NO_PUBLICATION_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND', 'NO_COMMUNITY_STATISTICS_FOUND'), 
1073
                    array(self :: PUBLICATION_TYPE, self :: PUBLICATION_LANGUAGE, self :: PUBLICATION_FUNDER, self :: PUBLICATION_FUNDING_STREAM, self :: PUBLICATION_SCIENTIFIC_AREA, self :: PUBLICATION_FUNDING_STREAM_LEVEL2,  self :: PUBLICATION_YEAR, self :: PUBLICATION_ACCESS_MODE, 'resultcollectedfromdatasourceid' , self :: PUBLICATION_CONTEXT));
1074
                    array(self :: PUBLICATION_TYPE, self :: PUBLICATION_LANGUAGE, self :: PUBLICATION_FUNDER, self :: PUBLICATION_FUNDING_STREAM, self :: PUBLICATION_SCIENTIFIC_AREA, self :: PUBLICATION_FUNDING_STREAM_LEVEL2,  self :: PUBLICATION_YEAR, self :: PUBLICATION_ACCESS_MODE, self :: RESULT_DATASOURCE , self :: PUBLICATION_CONTEXT));
1074 1075
            }else{
1075 1076
                $statistics = $this->createStatistics($xpath, 
1076
                    array('type', 'languageFilter', 'funder',  'year', 'accessMode', 'datasource', 'community'),
1077
                    array('type', 'language', 'funder',  'year', 'accessMode', 'datasource', 'community'),
1077 1078
                    array('DOCUMENT_TYPE', 'DOCUMENT_LANGUAGE', 'FUNDER',  'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE', 'COMMUNITIES'), 
1078 1079
                    array('NO_DOCUMENT_TYPE_STATISTICS_FOUND', 'NO_DOCUMENT_LANGUAGE_STATISTICS_FOUND',
1079 1080
                'NO_FUNDER_STATISTICS_FOUND',   'NO_PUBLICATION_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND', 'NO_COMMUNITY_STATISTICS_FOUND'), 
1080
                    array(self :: PUBLICATION_TYPE, self :: PUBLICATION_LANGUAGE, self :: PUBLICATION_FUNDER, self :: PUBLICATION_YEAR, self :: PUBLICATION_ACCESS_MODE, 'resultcollectedfromdatasourceid' , self :: PUBLICATION_CONTEXT));
1081
                    array(self :: PUBLICATION_TYPE, self :: PUBLICATION_LANGUAGE, self :: PUBLICATION_FUNDER, self :: PUBLICATION_YEAR, self :: PUBLICATION_ACCESS_MODE, self :: RESULT_DATASOURCE , self :: PUBLICATION_CONTEXT));
1081 1082
             
1082 1083
            }                
1083 1084
            JLog :: add('Retrieved publication statistics in ' . (microtime(TRUE) - $time) . ' s (locale: ' . $locale . ')', JLog :: INFO, self :: LOG);
......
1108 1109
            $xpath = new DOMXPath($document);
1109 1110
            $statistics=null;
1110 1111
            if($allFunders){
1111
                $statistics = $this->createStatistics($xpath, array('type', 'languageFilter', 'funder', 'fundingStream', 'scientificArea', 'year', 'accessMode', 'datasource'), array('TYPE', 'LANGUAGE', 'FUNDER', 'FUNDING_STREAM', 'SCIENTIFIC_AREA', 'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE'), array('NO_DATASET_TYPE_STATISTICS_FOUND', 'NO_DATASET_LANGUAGE_STATISTICS_FOUND', 'NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND', 'NO_PUBLICATION_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND'), array(self :: DATASET_TYPE, self :: DATASET_LANGUAGE, self :: DATASET_FUNDER, self :: DATASET_FUNDING_STREAM, self :: DATASET_SCIENTIFIC_AREA, self :: DATASET_YEAR, self :: DATASET_ACCESS_MODE, self :: DATASET_DATASOURCE));
1112
                $statistics = $this->createStatistics($xpath, array('type', 'language', 'funder', 'fundingStream', 'scientificArea', 'year', 'accessMode', 'datasource'), array('TYPE', 'LANGUAGE', 'FUNDER', 'FUNDING_STREAM', 'SCIENTIFIC_AREA', 'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE'), array('NO_DATASET_TYPE_STATISTICS_FOUND', 'NO_DATASET_LANGUAGE_STATISTICS_FOUND', 'NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND', 'NO_PUBLICATION_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND'), array(self :: DATASET_TYPE, self :: DATASET_LANGUAGE, self :: DATASET_FUNDER, self :: DATASET_FUNDING_STREAM, self :: DATASET_SCIENTIFIC_AREA, self :: DATASET_YEAR, self :: DATASET_ACCESS_MODE, self :: DATASET_DATASOURCE));
1112 1113
            }else{
1113
                $statistics = $this->createStatistics($xpath, array('type', 'languageFilter', 'funder', 'year', 'accessMode', 'datasource'), array('TYPE', 'LANGUAGE', 'FUNDER',   'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE'), array('NO_DATASET_TYPE_STATISTICS_FOUND', 'NO_DATASET_LANGUAGE_STATISTICS_FOUND', 'NO_FUNDER_STATISTICS_FOUND',  'NO_PUBLICATION_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND'), array(self :: DATASET_TYPE, self :: DATASET_LANGUAGE, self :: DATASET_FUNDER,   self :: DATASET_YEAR, self :: DATASET_ACCESS_MODE, self :: DATASET_DATASOURCE));
1114
                $statistics = $this->createStatistics($xpath, array('type', 'language', 'funder', 'year', 'accessMode', 'datasource'), array('TYPE', 'LANGUAGE', 'FUNDER',   'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE'), array('NO_DATASET_TYPE_STATISTICS_FOUND', 'NO_DATASET_LANGUAGE_STATISTICS_FOUND', 'NO_FUNDER_STATISTICS_FOUND',  'NO_PUBLICATION_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND'), array(self :: DATASET_TYPE, self :: DATASET_LANGUAGE, self :: DATASET_FUNDER,   self :: DATASET_YEAR, self :: DATASET_ACCESS_MODE, self :: DATASET_DATASOURCE));
1114 1115
            }                        
1115 1116
            JLog :: add('Retrieved dataset statistics in ' . (microtime(TRUE) - $time) . ' s (locale: ' . $locale . ')', JLog :: INFO, self :: LOG);
1116 1117
            return $statistics;
......
1293 1294
            if ($document->loadXML($response->body) == FALSE)
1294 1295
                throw new Exception('invalid XML response');
1295 1296
            $xpath = new DOMXPath($document);
1296
            $statistics = $this->createStatistics($xpath, array('type', 'languageFilter', 'content', 'compatibility'), array('TYPE', 'LANGUAGE', 'CONTENT', 'COMPATIBILITY'), array('NO_TYPE_STATISTICS_FOUND', 'NO_LANGUAGE_STATISTICS_FOUND', 'NO_CONTENT_STATISTICS_FOUND', 'NO_COMPATIBILITY_STATISTICS_FOUND'), array(self :: DATASOURCE_TYPE, self :: DATASOURCE_LANGUAGE, self :: DATASOURCE_CONTENT, self :: DATASOURCE_COMPATIBILITY));
1297
            $statistics = $this->createStatistics($xpath, array('type', 'language', 'content', 'compatibility'), array('TYPE', 'LANGUAGE', 'CONTENT', 'COMPATIBILITY'), array('NO_TYPE_STATISTICS_FOUND', 'NO_LANGUAGE_STATISTICS_FOUND', 'NO_CONTENT_STATISTICS_FOUND', 'NO_COMPATIBILITY_STATISTICS_FOUND'), array(self :: DATASOURCE_TYPE, self :: DATASOURCE_LANGUAGE, self :: DATASOURCE_CONTENT, self :: DATASOURCE_COMPATIBILITY));
1297 1298
            JLog :: add('Retrieved datasource statistics in ' . (microtime(TRUE) - $time) . ' s (locale: ' . $locale . ')', JLog :: INFO, self :: LOG);
1298 1299
            return $statistics;
1299 1300
        } catch (Exception $e) {
......
1401 1402
            $result->publications = $this->parsePublications($xpath);
1402 1403
            $result->statistics = $isRefine? $this->createStatisticsForPublications($xpath):NULL;
1403 1404
            $result->statistics = self ::_pruningStatisticsForFunders($result->statistics,$funder, $fundingStream, $scientificArea, $fundingStreamLevel2,'');
1404
                    //$this->createStatistics($xpath, array('type', 'languageFilter', 'funder', 'fundingStream', 'scientificArea', 'fundingStreamLevel2', 'project', 'year', 'accessMode', 'datasource'), array('DOCUMENT_TYPE', 'DOCUMENT_LANGUAGE', 'FUNDER', 'FUNDING_STREAM', 'SCIENTIFIC_AREA','FUNDING_STREAM_LEVEL2', 'PROJECT', 'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE'), array('NO_DOCUMENT_TYPE_STATISTICS_FOUND', 'NO_DOCUMENT_LANGUAGE_STATISTICS_FOUND', 'NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND','NO_FUNDING_STREAM_LEVEL2_STATISTICS_FOUND', 'NO_PROJECT_STATISTICS_FOUND', 'NO_PUBLICATION_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND'), array(self :: PUBLICATION_TYPE, self :: PUBLICATION_LANGUAGE, self :: PUBLICATION_FUNDER, self :: PUBLICATION_FUNDING_STREAM, self :: PUBLICATION_SCIENTIFIC_AREA, self::PUBLICATION_FUNDING_STREAM_LEVEL2, self :: PUBLICATION_FUNDING_STREAM_LEVEL2, self :: PUBLICATION_PROJECT, self :: PUBLICATION_YEAR, self :: PUBLICATION_ACCESS_MODE, self :: PUBLICATION_DATASOURCE));
1405
                    //$this->createStatistics($xpath, array('type', 'language', 'funder', 'fundingStream', 'scientificArea', 'fundingStreamLevel2', 'project', 'year', 'accessMode', 'datasource'), array('DOCUMENT_TYPE', 'DOCUMENT_LANGUAGE', 'FUNDER', 'FUNDING_STREAM', 'SCIENTIFIC_AREA','FUNDING_STREAM_LEVEL2', 'PROJECT', 'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE'), array('NO_DOCUMENT_TYPE_STATISTICS_FOUND', 'NO_DOCUMENT_LANGUAGE_STATISTICS_FOUND', 'NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND','NO_FUNDING_STREAM_LEVEL2_STATISTICS_FOUND', 'NO_PROJECT_STATISTICS_FOUND', 'NO_PUBLICATION_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND'), array(self :: PUBLICATION_TYPE, self :: PUBLICATION_LANGUAGE, self :: PUBLICATION_FUNDER, self :: PUBLICATION_FUNDING_STREAM, self :: PUBLICATION_SCIENTIFIC_AREA, self::PUBLICATION_FUNDING_STREAM_LEVEL2, self :: PUBLICATION_FUNDING_STREAM_LEVEL2, self :: PUBLICATION_PROJECT, self :: PUBLICATION_YEAR, self :: PUBLICATION_ACCESS_MODE, self :: PUBLICATION_DATASOURCE));
1405 1406
            JLog :: add('Simple search retrieved ' . count($result->publications) . ' publications in ' . (microtime(TRUE) - $time) . ' s (keyword: ' . $keyword . ', articles: ' . ($articles ? 'true' : 'false') . ', books: ' . ($books ? 'true' : 'false') . ', theses: ' . ($theses ? 'true' : 'false') . ', reports: ' . ($reports ? 'true' : 'false') . ', type: ' . (($type == NULL) ? 'null' : $type) . ', language: ' . (($language == NULL) ? 'null' : $language) . ', funder: ' . (($funder == NULL) ? 'null' : $funder) . ', funding stream: ' . (($fundingStream == NULL) ? 'null' : $fundingStream) . ', scientific area: ' . (($scientificArea == NULL) ? 'null' : $scientificArea) . ', year: ' . (($year == NULL) ? 'null' : $year) . ', access mode: ' . (($accessMode == NULL) ? 'null' : $accessMode) . ', datasource: ' . (($datasource == NULL) ? 'null' : $datasource) . ', page: ' . $page . ', size: ' . $size . ', locale: ' . $locale . ')', JLog :: INFO, self :: LOG);
1406 1407
            return $result;
1407 1408
        } catch (Exception $e) {
......
1441 1442
            $result->totalPublications = $this->parseTotalResults($xpath);
1442 1443
            $result->totalDatasets = 0;
1443 1444
            $result->publications = $this->parsePublications($xpath);
1444
            $result->statistics =$isRefine? $this->createStatistics($xpath, array('type', 'languageFilter', 'funder', 'fundingStream', 'scientificArea', 'project', 'year', 'accessMode', 'datasource'), array('DOCUMENT_TYPE', 'DOCUMENT_LANGUAGE', 'FUNDER', 'FUNDING_STREAM', 'SCIENTIFIC_AREA', 'PROJECT', 'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE'), array('NO_DOCUMENT_TYPE_STATISTICS_FOUND', 'NO_DOCUMENT_LANGUAGE_STATISTICS_FOUND', 'NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND', 'NO_PROJECT_STATISTICS_FOUND', 'NO_PUBLICATION_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND'), array(self :: PUBLICATION_TYPE, self :: PUBLICATION_LANGUAGE, self :: PUBLICATION_FUNDER, self :: PUBLICATION_FUNDING_STREAM, self :: PUBLICATION_SCIENTIFIC_AREA, self :: PUBLICATION_PROJECT, self :: PUBLICATION_YEAR, self :: PUBLICATION_ACCESS_MODE, self :: PUBLICATION_DATASOURCE)):NULL;
1445
            $result->statistics =$isRefine? $this->createStatistics($xpath, array('type', 'language', 'funder', 'fundingStream', 'scientificArea', 'project', 'year', 'accessMode', 'datasource'), array('DOCUMENT_TYPE', 'DOCUMENT_LANGUAGE', 'FUNDER', 'FUNDING_STREAM', 'SCIENTIFIC_AREA', 'PROJECT', 'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE'), array('NO_DOCUMENT_TYPE_STATISTICS_FOUND', 'NO_DOCUMENT_LANGUAGE_STATISTICS_FOUND', 'NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND', 'NO_PROJECT_STATISTICS_FOUND', 'NO_PUBLICATION_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND'), array(self :: PUBLICATION_TYPE, self :: PUBLICATION_LANGUAGE, self :: PUBLICATION_FUNDER, self :: PUBLICATION_FUNDING_STREAM, self :: PUBLICATION_SCIENTIFIC_AREA, self :: PUBLICATION_PROJECT, self :: PUBLICATION_YEAR, self :: PUBLICATION_ACCESS_MODE, self :: PUBLICATION_DATASOURCE)):NULL;
1445 1446
            JLog :: add('Simple search for DOIs retrieved ' . count($result->publications) . ' publications in ' . (microtime(TRUE) - $time) . ' s (query: ' . $query. ')', JLog :: INFO, self :: LOG);
1446 1447
            return $result;
1447 1448
        } catch (Exception $e) {
......
1465 1466
    // return a result (object) containing datasets and statistics
1466 1467
    private function _searchDatasets($keyword, $type, $language, $funder, $fundingStream, $scientificArea, $fundingStreamLevel2, $year, $accessMode, $datasource, $page, $size, $locale, $isRefine) {
1467 1468
        try {
1469
                $dois = explode(" ", preg_replace('/\s+/', ' ',$keyword));                  
1470
                $unique_dois =array_unique($dois);                
1471
                $pattern1 = '#\b(10[.][0-9]{4,}(?:[.][0-9]+)*/(?:(?!["&\'<>])\S)+)\b#';
1472
                $pattern2 = '#\b(10[.][0-9]{4,}(?:[.][0-9]+)*/(?:(?!["&\'<>])[[:graph:]])+)\b#';
1473
                if (preg_match($pattern1, $unique_dois[0]) || preg_match($pattern2, $unique_dois[0])) {
1474
                   $result= $this->_searchDatasetsWithDois($unique_dois,$page, $size, $locale,$isRefine);
1475
                    return $result;
1476
                }                         
1468 1477
            $time = microtime(TRUE);
1469 1478
            $query = self :: DATASET_QUERY;
1470 1479
            $query .= ($keyword == NULL) ? '' : ' and "' . str_replace('"', '\\"', $keyword) . '"';
......
1494 1503
            $result->datasets = $this->parseDatasets($xpath);
1495 1504
            $result->statistics = $isRefine?$this->createStatisticsForDatasets($xpath):NULL;
1496 1505
            $result->statistics=self ::_pruningStatisticsForFunders($result->statistics,$funder, $fundingStream, $scientificArea, $fundingStreamLevel2,'');
1497
                    //createStatistics($xpath, array('type', 'languageFilter', 'funder', 'fundingStream', 'scientificArea', 'year', 'accessMode', 'datasource'), array('DATASET_TYPE', 'DATASET_LANGUAGE', 'FUNDER', 'FUNDING_STREAM', 'SCIENTIFIC_AREA', 'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE'), array('NO_DATASET_TYPE_STATISTICS_FOUND', 'NO_DATASET_LANGUAGE_STATISTICS_FOUND', 'NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND', 'NO_PUBLICATION_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND'), array(self :: DATASET_TYPE, self :: DATASET_LANGUAGE, self :: DATASET_FUNDER, self :: DATASET_FUNDING_STREAM, self :: DATASET_SCIENTIFIC_AREA, self :: DATASET_YEAR, self :: DATASET_ACCESS_MODE, self :: DATASET_DATASOURCE));
1506
                    //createStatistics($xpath, array('type', 'language', 'funder', 'fundingStream', 'scientificArea', 'year', 'accessMode', 'datasource'), array('DATASET_TYPE', 'DATASET_LANGUAGE', 'FUNDER', 'FUNDING_STREAM', 'SCIENTIFIC_AREA', 'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE'), array('NO_DATASET_TYPE_STATISTICS_FOUND', 'NO_DATASET_LANGUAGE_STATISTICS_FOUND', 'NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND', 'NO_PUBLICATION_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND'), array(self :: DATASET_TYPE, self :: DATASET_LANGUAGE, self :: DATASET_FUNDER, self :: DATASET_FUNDING_STREAM, self :: DATASET_SCIENTIFIC_AREA, self :: DATASET_YEAR, self :: DATASET_ACCESS_MODE, self :: DATASET_DATASOURCE));
1498 1507
            JLog :: add('Simple search retrieved ' . count($result->datasets) . ' datasets in ' . (microtime(TRUE) - $time) . ' s (keyword: ' . $keyword . ', type: ' . (($type == NULL) ? 'null' : $type) . ', language: ' . (($language == NULL) ? 'null' : $language) . ', funder: ' . (($funder == NULL) ? 'null' : $funder) . ', funding stream: ' . (($fundingStream == NULL) ? 'null' : $fundingStream) . ', scientific area: ' . (($scientificArea == NULL) ? 'null' : $scientificArea) . ', year: ' . (($year == NULL) ? 'null' : $year) . ', access mode: ' . (($accessMode == NULL) ? 'null' : $accessMode) . ', datasource: ' . (($datasource == NULL) ? 'null' : $datasource) . ', page: ' . $page . ', size: ' . $size . ', locale: ' . $locale . ')', JLog :: INFO, self :: LOG);
1499 1508
            return $result;
1500 1509
        } catch (Exception $e) {
......
1503 1512
        }
1504 1513
    }
1505 1514

  
1515
 private function _searchDatasetsWithDois($dois, $page, $size, $locale,$isRefine) {
1516
        try {                
1517
            $time = microtime(TRUE);
1518
            $query = self :: DATASET_QUERY;
1519
            $query .= ' and (';
1520
            foreach ($dois as $doi) {
1521
                $query .= ' ((pidclassid exact doi) and (pid exact "'.$doi.'")) ';
1522
                $query .= 'OR';
1523
            }
1524
            if(count($dois)>0){
1525
                $query=substr($query, 0, -2);
1526
            }
1527
            $query .= ')';            
1528
            JLog :: add('Generated query is \'' . $query . '\'', JLog :: INFO, self :: LOG);
1529
            $completeQuery=$isRefine?'search?action=searchNrefine&sTransformer=results_openaire&rTransformer=results_openaire_browse&query=' . urlencode('(' . $query . ')') . '&page=' . $page . '&size=' . $size . '&fields=' . self :: PUBLICATION_TYPE . '&fields=' . self :: PUBLICATION_LANGUAGE . '&fields=' . self :: PUBLICATION_FUNDER . '&fields=' . self :: PUBLICATION_FUNDING_STREAM . '&fields=' . self :: PUBLICATION_SCIENTIFIC_AREA . '&fields=' . self :: PUBLICATION_YEAR . '&fields=' . self :: PUBLICATION_ACCESS_MODE . '&fields=' . self :: PUBLICATION_DATASOURCE . '&fields=' . self :: PUBLICATION_PROJECT . '&locale=' . str_replace('-', '_', $locale)
1530
                    :'search?action=search&sTransformer=results_openaire&query=' . urlencode('(' . $query . ')') . '&page=' . $page . '&size=' . $size   . '&locale=' . str_replace('-', '_', $locale);                
1531
            if (($response = $this->performGet($completeQuery)) == NULL)
1532
                throw new Exception('no HTTP response');
1533
            if ($response->code != self :: HTTP_OK)
1534
                throw new Exception('HTTP response code ' . $response->code);
1535
            $document = new DOMDocument();
1536
            $document->recover = TRUE;
1537
            if ($document->loadXML($response->body) == FALSE)
1538
                throw new Exception('invalid XML response');
1539
            $xpath = new DOMXPath($document);
1540
            $result = new JObject();
1541
            $result->totalPublications = 0;
1542
            $result->totalDatasets = $this->parseTotalResults($xpath);
1543
            $result->datasets = $this->parsePublications($xpath);
1544
            $result->statistics = $isRefine?$this->createStatisticsForDatasets($xpath):NULL;
1545
            $result->statistics=self ::_pruningStatisticsForFunders($result->statistics,$funder, $fundingStream, $scientificArea, $fundingStreamLevel2,'');
1546
                    //createStatistics($xpath, array('type', 'language', 'funder', 'fundingStream', 'scientificArea', 'year', 'accessMode', 'datasource'), array('DATASET_TYPE', 'DATASET_LANGUAGE', 'FUNDER', 'FUNDING_STREAM', 'SCIENTIFIC_AREA', 'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE'), array('NO_DATASET_TYPE_STATISTICS_FOUND', 'NO_DATASET_LANGUAGE_STATISTICS_FOUND', 'NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND', 'NO_PUBLICATION_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND'), array(self :: DATASET_TYPE, self :: DATASET_LANGUAGE, self :: DATASET_FUNDER, self :: DATASET_FUNDING_STREAM, self :: DATASET_SCIENTIFIC_AREA, self :: DATASET_YEAR, self :: DATASET_ACCESS_MODE, self :: DATASET_DATASOURCE));
1547
            JLog :: add('Simple search for DOIs retrieved ' . count($result->datasets) . ' datasets in ' . (microtime(TRUE) - $time) . ' s (query: ' . $query. ')', JLog :: INFO, self :: LOG);
1548
            return $result;
1549
        } catch (Exception $e) {
1550
            JLog :: add('Error performing dataset simple search for DOIs(query: ' . $query  . ', page: ' . $page . ', size: ' . $size . ', locale: ' . $locale . '): ' . $e->getMessage(), JLog :: ERROR, self :: LOG);
1551
            return NULL;
1552
        }
1553
    }
1506 1554
    // Perform a simple search for projects.
1507 1555
    // $keyword the keyword to search for
1508 1556
    // $funder the ID of the funder to use as filter or NULL for no funder filtering
......
1801 1849
            $query .= ($fundingStreamLevel2 == NULL) ? '' : (' and (' . self :: PUBLICATION_FUNDING_STREAM_LEVEL2 . ' exact "' . $fundingStreamLevel2 . '")');
1802 1850
            $query .= ($year == NULL) ? '' : (' and (' . self :: PUBLICATION_YEAR . ' exact ' . $year . ')');
1803 1851
            $query .= ($accessMode == NULL) ? '' : (' and (' . self :: PUBLICATION_ACCESS_MODE . ' exact "' . $accessMode . '")');
1804
            $query .= ($datasource == NULL) ? '' : (' and ((' . self :: PUBLICATION_DATASOURCE . ' exact "' . $datasource . '") or (' . 'resultcollectedfromdatasourceid' . ' exact "' . $datasource . '") )');
1852
            $query .= ($datasource == NULL) ? '' : (' and ((' . self :: PUBLICATION_DATASOURCE . ' exact "' . $datasource . '") or (' . self :: RESULT_DATASOURCE . ' exact "' . $datasource . '") )');
1805 1853
            $query .= ($project == NULL) ? '' : (' and (' . self :: PUBLICATION_PROJECT . ' exact "' . $project . '")');
1806 1854
            $query .= ($author == NULL) ? '' : (' and (' . self :: PUBLICATION_AUTHOR_ID . ' exact "' . $author . '")');
1807 1855
            $query .= ($community == NULL) ? '' : (' and (' . self :: PUBLICATION_CONTEXT . ' exact "' . $community . '")');
......
1822 1870
            $result->publications = $this->parsePublications($xpath);
1823 1871
            $result->statistics = $isRefine?$this->createStatisticsForPublications($xpath):NULL;
1824 1872
            $result->statistics=self ::_pruningStatisticsForFunders($result->statistics,$funder, $fundingStream, $scientificArea, $fundingStreamLevel2,'');
1825
                    //$this->createStatistics($xpath, array('type', 'languageFilter', 'funder', 'fundingStream', 'scientificArea', 'fundingStreamLevel2', 'project', 'year', 'accessMode', 'datasource', 'community'), array('DOCUMENT_TYPE', 'DOCUMENT_LANGUAGE', 'FUNDER', 'FUNDING_STREAM', 'SCIENTIFIC_AREA','FUNDING_STREAM_LEVEL_2', 'PROJECT', 'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE', 'COMMUNITY'), array('NO_DOCUMENT_TYPE_STATISTICS_FOUND', 'NO_DOCUMENT_LANGUAGE_STATISTICS_FOUND', 'NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND', 'NO_FUNDING_STREAM_LEVEL_2_STATISTICS_FOUND', 'NO_PROJECT_STATISTICS_FOUND', 'NO_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_CONTEXT_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND'), array(self :: PUBLICATION_TYPE, self :: PUBLICATION_LANGUAGE, self :: PUBLICATION_FUNDER, self :: PUBLICATION_FUNDING_STREAM, self :: PUBLICATION_SCIENTIFIC_AREA, self::PUBLICATION_FUNDING_STREAM_LEVEL2, self :: PUBLICATION_PROJECT, self :: PUBLICATION_YEAR, self :: PUBLICATION_ACCESS_MODE, self :: PUBLICATION_DATASOURCE, self :: PUBLICATION_CONTEXT));
1873
                    //$this->createStatistics($xpath, array('type', 'language', 'funder', 'fundingStream', 'scientificArea', 'fundingStreamLevel2', 'project', 'year', 'accessMode', 'datasource', 'community'), array('DOCUMENT_TYPE', 'DOCUMENT_LANGUAGE', 'FUNDER', 'FUNDING_STREAM', 'SCIENTIFIC_AREA','FUNDING_STREAM_LEVEL_2', 'PROJECT', 'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE', 'COMMUNITY'), array('NO_DOCUMENT_TYPE_STATISTICS_FOUND', 'NO_DOCUMENT_LANGUAGE_STATISTICS_FOUND', 'NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND', 'NO_FUNDING_STREAM_LEVEL_2_STATISTICS_FOUND', 'NO_PROJECT_STATISTICS_FOUND', 'NO_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_CONTEXT_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND'), array(self :: PUBLICATION_TYPE, self :: PUBLICATION_LANGUAGE, self :: PUBLICATION_FUNDER, self :: PUBLICATION_FUNDING_STREAM, self :: PUBLICATION_SCIENTIFIC_AREA, self::PUBLICATION_FUNDING_STREAM_LEVEL2, self :: PUBLICATION_PROJECT, self :: PUBLICATION_YEAR, self :: PUBLICATION_ACCESS_MODE, self :: PUBLICATION_DATASOURCE, self :: PUBLICATION_CONTEXT));
1826 1874
            $result->totalDatasets = 0;
1827 1875
            JLog :: add('Browse retrieved ' . count($result->publications) . ' publications in ' . (microtime(TRUE) - $time) . ' s (type: ' . (($type == NULL) ? 'null' : $type) . ', language: ' . (($language == NULL) ? 'null' : $language) . ', funder: ' . (($funder == NULL) ? 'null' : $funder) . ', funding stream: ' . (($fundingStream == NULL) ? 'null' : $fundingStream) . ', scientific area: ' . (($scientificArea == NULL) ? 'null' : $scientificArea) . ', year: ' . (($year == NULL) ? 'null' : $year) . ', access mode: ' . (($accessMode == NULL) ? 'null' : $accessMode) . ', datasource: ' . (($datasource == NULL) ? 'null' : $datasource) . ', community: ' . (($community == NULL) ? 'null' : $community) . ', page: ' . $page . ', size: ' . $size . ', locale: ' . $locale . ', project: ' . (($project == NULL) ? 'null' : $project) . ', author: ' . (($author == NULL) ? 'null' : $author) . ')', JLog :: INFO, self :: LOG);
1828 1876
            return $result;
......
1996 2044
            $query .= ($fundingStreamLevel2 == NULL) ? '' : (' and (' . self :: DATASET_FUNDING_STREAM_LEVEL2 . ' exact "' . $fundingStreamLevel2 . '")');
1997 2045
            $query .= ($year == NULL) ? '' : (' and (' . self :: DATASET_YEAR . ' exact ' . $year . ')');
1998 2046
            $query .= ($accessMode == NULL) ? '' : (' and (' . self :: DATASET_ACCESS_MODE . ' exact "' . $accessMode . '")');
1999
            $query .= ($datasource == NULL) ? '' : (' and ((' . self :: DATASET_DATASOURCE . ' exact "' . $datasource . '") or (' . 'resultcollectedfromdatasourceid' . ' exact "' . $datasource . '") )');
2047
            $query .= ($datasource == NULL) ? '' : (' and ((' . self :: DATASET_DATASOURCE . ' exact "' . $datasource . '") or (' . self :: RESULT_DATASOURCE . ' exact "' . $datasource . '") )');
2000 2048
            //$query .= ($datasource == NULL) ? '' : (' and (' . self :: DATASET_DATASOURCE . ' exact "' . $datasource . '")');
2001 2049
            $query .= ($project == NULL) ? '' : (' and (' . self :: DATASET_PROJECT . ' exact "' . $project . '")');
2002 2050
            $query .= ($author == NULL) ? '' : (' and (' . self :: DATASET_AUTHOR_ID . ' exact "' . $author . '")');
......
2017 2065
            $result->datasets = $this->parseDatasets($xpath);
2018 2066
            $result->statistics = $isRefine?$this->createStatisticsForDatasets($xpath):NULL;
2019 2067
            $result->statistics=self ::_pruningStatisticsForFunders($result->statistics,$funder, $fundingStream, $scientificArea, $fundingStreamLevel2,'');          
2020
                    //createStatistics($xpath, array('type', 'languageFilter', 'funder', 'fundingStream', 'scientificArea', 'year', 'accessMode', 'datasource'), array('DATASET_TYPE', 'DATASET_LANGUAGE', 'FUNDER', 'FUNDING_STREAM', 'SCIENTIFIC_AREA', 'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE'), array('NO_DATASET_TYPE_STATISTICS_FOUND', 'NO_DATASET_LANGUAGE_STATISTICS_FOUND', 'NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND', 'NO_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND'), array(self :: DATASET_TYPE, self :: DATASET_LANGUAGE, self :: DATASET_FUNDER, self :: DATASET_FUNDING_STREAM, self :: DATASET_SCIENTIFIC_AREA, self :: DATASET_YEAR, self :: DATASET_ACCESS_MODE, self :: DATASET_DATASOURCE));
2068
                    //createStatistics($xpath, array('type', 'language', 'funder', 'fundingStream', 'scientificArea', 'year', 'accessMode', 'datasource'), array('DATASET_TYPE', 'DATASET_LANGUAGE', 'FUNDER', 'FUNDING_STREAM', 'SCIENTIFIC_AREA', 'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE'), array('NO_DATASET_TYPE_STATISTICS_FOUND', 'NO_DATASET_LANGUAGE_STATISTICS_FOUND', 'NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND', 'NO_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND'), array(self :: DATASET_TYPE, self :: DATASET_LANGUAGE, self :: DATASET_FUNDER, self :: DATASET_FUNDING_STREAM, self :: DATASET_SCIENTIFIC_AREA, self :: DATASET_YEAR, self :: DATASET_ACCESS_MODE, self :: DATASET_DATASOURCE));
2021 2069
            JLog :: add('Browse retrieved ' . count($result->datasets) . ' datasets in ' . (microtime(TRUE) - $time) . ' s (type: ' . (($type == NULL) ? 'null' : $type) . ', language: ' . (($language == NULL) ? 'null' : $language) . ', funder: ' . (($funder == NULL) ? 'null' : $funder) . ', funding stream: ' . (($fundingStream == NULL) ? 'null' : $fundingStream) . ', scientific area: ' . (($scientificArea == NULL) ? 'null' : $scientificArea) . ', year: ' . (($year == NULL) ? 'null' : $year) . ', access mode: ' . (($accessMode == NULL) ? 'null' : $accessMode) . ', datasource: ' . (($datasource == NULL) ? 'null' : $datasource) . ', page: ' . $page . ', size: ' . $size . ', locale: ' . $locale . ', project: ' . (($project == NULL) ? 'null' : $project) . ', author: ' . (($author == NULL) ? 'null' : $author) . ')', JLog :: INFO, self :: LOG);
2022 2070
            return $result;
2023 2071
        } catch (Exception $e) {
......
2279 2327
            $result = new JObject();
2280 2328
            $result->totalDatasources = $this->parseTotalResults($xpath);
2281 2329
            $result->datasources = $this->parseDatasources($xpath);
2282
            $result->statistics = $isRefine?$this->createStatistics($xpath, array('type', 'languageFilter', 'content', 'compatibility'), array('TYPE', 'LANGUAGE', 'CONTENT', 'COMPATIBILITY'), array('NO_TYPE_STATISTICS_FOUND', 'NO_LANGUAGE_STATISTICS_FOUND', 'NO_CONTENT_STATISTICS_FOUND', 'NO_COMPATIBILITY_STATISTICS_FOUND'), array(self :: DATASOURCE_TYPE, self :: DATASOURCE_LANGUAGE, self :: DATASOURCE_CONTENT, self :: DATASOURCE_COMPATIBILITY)):NULL;
2330
            $result->statistics = $isRefine?$this->createStatistics($xpath, array('type', 'language', 'content', 'compatibility'), array('TYPE', 'LANGUAGE', 'CONTENT', 'COMPATIBILITY'), array('NO_TYPE_STATISTICS_FOUND', 'NO_LANGUAGE_STATISTICS_FOUND', 'NO_CONTENT_STATISTICS_FOUND', 'NO_COMPATIBILITY_STATISTICS_FOUND'), array(self :: DATASOURCE_TYPE, self :: DATASOURCE_LANGUAGE, self :: DATASOURCE_CONTENT, self :: DATASOURCE_COMPATIBILITY)):NULL;
2283 2331
            JLog :: add('Browse retrieved ' . count($result->datasources) . ' datasources in ' . (microtime(TRUE) - $time) . ' s (type: ' . (($type == NULL) ? 'null' : $type) . ', language: ' . (($language == NULL) ? 'null' : $language) . ', content: ' . (($content == NULL) ? 'null' : $content) . ', compatibility: ' . (($compatibility == NULL) ? 'null' : $compatibility) . ', page: ' . $page . ', size: ' . $size . ', locale: ' . $locale . ')', JLog :: INFO, self :: LOG);
2284 2332
            return $result;
2285 2333
        } catch (Exception $e) {
......
2435 2483
            $result->publications = $this->parsePublications($xpath);
2436 2484
            $result->statistics =$this->createStatisticsForPublications($xpath,'Filter');
2437 2485
            $result->statistics=self ::_pruningStatisticsForFunders($result->statistics,$funder, $fundingStream, $scientificArea, $fundingStreamLevel2,"Filter");
2438
                    //$this->createStatistics($xpath, array('typeFilter', 'languageFilter', 'funderFilter', 'fundingStreamFilter', 'scientificAreaFilter', 'yearFilter', 'accessModeFilter', 'datasourceFilter'), array('DOCUMENT_TYPE', 'DOCUMENT_LANGUAGE', 'FUNDER', 'FUNDING_STREAM', 'SCIENTIFIC_AREA', 'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE'), array('NO_DOCUMENT_TYPE_STATISTICS_FOUND', 'NO_DOCUMENT_LANGUAGE_STATISTICS_FOUND', 'NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND', 'NO_PUBLICATION_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND'), array(self :: PUBLICATION_TYPE, self :: PUBLICATION_LANGUAGE, self :: PUBLICATION_FUNDER, self :: PUBLICATION_FUNDING_STREAM, self :: PUBLICATION_SCIENTIFIC_AREA, self :: PUBLICATION_YEAR, self :: PUBLICATION_ACCESS_MODE, self :: PUBLICATION_DATASOURCE));
2486
                    //$this->createStatistics($xpath, array('typeFilter', 'language', 'funderFilter', 'fundingStreamFilter', 'scientificAreaFilter', 'yearFilter', 'accessModeFilter', 'datasourceFilter'), array('DOCUMENT_TYPE', 'DOCUMENT_LANGUAGE', 'FUNDER', 'FUNDING_STREAM', 'SCIENTIFIC_AREA', 'PUBLICATION_YEAR', 'ACCESS_MODE', 'DATASOURCE'), array('NO_DOCUMENT_TYPE_STATISTICS_FOUND', 'NO_DOCUMENT_LANGUAGE_STATISTICS_FOUND', 'NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND', 'NO_PUBLICATION_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND'), array(self :: PUBLICATION_TYPE, self :: PUBLICATION_LANGUAGE, self :: PUBLICATION_FUNDER, self :: PUBLICATION_FUNDING_STREAM, self :: PUBLICATION_SCIENTIFIC_AREA, self :: PUBLICATION_YEAR, self :: PUBLICATION_ACCESS_MODE, self :: PUBLICATION_DATASOURCE));
2439 2487
            JLog :: add('Advanced search retrieved ' . count($result->publications) . ' publications in ' . (microtime(TRUE) - $time) . ' s (keywords: [' . implode(', ', $keywords) . '], fields: [' . implode(', ', $fields) . '], constraints: [' . implode(', ', $constraints) . '], types: [' . implode(', ', $types) . '], languages: [' . implode(', ', $languages) . '], funders: [' . implode(', ', $funders) . '], funding streams: [' . implode(', ', $fundingStreams) . '], scientific areas: [' . implode(', ', $scientificAreas) . '], date: ' . $date . ', from month: ' . $fromMonth . ', from year: ' . $fromYear . ', to month: ' . $toMonth . ', to year: ' . $toYear . ', access modes: [' . implode(', ', $accessModes) . '], datasources: [' . implode(', ', $datasources) . '], type: ' . (($type == NULL) ? 'null' : $type) . ', language: ' . (($language == NULL) ? 'null' : $language) . ', funder: ' . (($funder == NULL) ? 'null' : $funder) . ', funding stream: ' . (($fundingStream == NULL) ? 'null' : $fundingStream) . ', scientific area: ' . (($scientificArea == NULL) ? 'null' : $scientificArea) . ', year: ' . (($year == NULL) ? 'null' : $year) . ', access mode: ' . (($accessMode == NULL) ? 'null' : $accessMode) . ', datasource: ' . (($datasource == NULL) ? 'null' : $datasource) . ', page: ' . $page . ', size: ' . $size . ', locale: ' . $locale . ')', JLog :: INFO, self :: LOG);
2440 2488
            return $result;
2441 2489
        } catch (Exception $e) {
......
4110 4158
            throw new Exception('error parsing publication');
4111 4159
        if (($titleNodes = $xpath->query('./field[@name = "title"]/@value', $resultNode)) == FALSE)
4112 4160
            throw new Exception('error parsing publication');
4161
        if (($curationNodes = $xpath->query('./field[@name = "underCuration"]/@value', $resultNode)) == FALSE)
4162
            throw new Exception('error parsing publication');
4113 4163
        if (($authorNodes = $xpath->query('./field[@name = "hasAuthor"]', $resultNode)) == FALSE)
4114 4164
            throw new Exception('error parsing publication');
4115 4165
        if (($dateNodes = $xpath->query('./field[@name = "dateofacceptance"]/@value', $resultNode)) == FALSE)
......
4158 4208
        $publication->accessMode = NULL;
4159 4209
        $publication->url = NULL;
4160 4210
        $publication->title = (($titleNode = $titleNodes->item(0)) == NULL) ? NULL : trim($titleNode->nodeValue);
4211
        $publication->underCuration = (($curationNode = $curationNodes->item(0)) == NULL) ? NULL : trim($curationNode->nodeValue);
4161 4212
        $publication->authors = array();
4162 4213
        $publication->year = (($dateNode = $dateNodes->item(0)) == NULL) ? NULL : intval(trim($dateNode->nodeValue));
4163 4214
        $publication->date = ($dateNode == NULL) ? NULL : strtotime(trim($dateNode->nodeValue));
......
4262 4313
        foreach ($datasourceNodes as $datasourceNode) {
4263 4314
            if (($idNodes = $xpath->query('./field[@name = "hostedby"]/@value_original', $datasourceNode)) == FALSE)
4264 4315
                throw new Exception('error parsing publication');
4265
            if (($nameNodes = $xpath->query('./field[@name = "hostedby"]/@value', $datasourceNode)) == FALSE)
4316
            if (($nameNodes = $xpath->query('./field[@name = "hostedbyname"]/@value', $datasourceNode)) == FALSE)
4266 4317
                throw new Exception('error parsing publication');
4267 4318
            if (($urlNodes = $xpath->query('./field[@name = "url"]/@value', $datasourceNode)) == FALSE)
4268 4319
                throw new Exception('error parsing publication');
......
4289 4340
                $publication->datasources[] = $datasource;
4290 4341
        }
4291 4342
        foreach ($collectedFromNodes as $collectedFromNode) {
4292
            if (($idNodes = $xpath->query('./@value_original', $collectedFromNode)) == FALSE)
4343
            if (($idNodes = $xpath->query('./field[@name = "collectedfromid"]/@value', $collectedFromNode)) == FALSE)
4293 4344
                throw new Exception('error parsing publication');
4294
            if (($nameNodes = $xpath->query('./@value', $collectedFromNode)) == FALSE)
4345
            if (($nameNodes = $xpath->query('./field[@name = "collectedfromname"]/@value', $collectedFromNode)) == FALSE)
4295 4346
                throw new Exception('error parsing publication');
4296 4347
            $collectedFrom = new JObject();
4297 4348
            $collectedFrom->id = (($idNode = $idNodes->item(0)) == NULL) ? NULL : trim($idNode->nodeValue);
......
4775 4826
                $dataset->datasources[] = $datasource;
4776 4827
        }
4777 4828
        foreach ($collectedFromNodes as $collectedFromNode) {
4778
            if (($idNodes = $xpath->query('./@value_original', $collectedFromNode)) == FALSE)
4829
            if (($idNodes = $xpath->query('./field[@name = "collectedfromid"]/@value', $collectedFromNode)) == FALSE)
4779 4830
                throw new Exception('error parsing dataset');
4780
            if (($nameNodes = $xpath->query('./@value', $collectedFromNode)) == FALSE)
4781
                throw new Exception('error parsing dataset');
4831
            if (($nameNodes = $xpath->query('./field[@name = "collectedfromname"]/@value', $collectedFromNode)) == FALSE)
4832
                throw new Exception('error parsing dataset');            
4782 4833
            $collectedFrom = new JObject();
4783 4834
            $collectedFrom->id = (($idNode = $idNodes->item(0)) == NULL) ? NULL : trim($idNode->nodeValue);
4784 4835
            $collectedFrom->name = (($nameNode = $nameNodes->item(0)) == NULL) ? NULL : trim($nameNode->nodeValue);
......
5343 5394
    }
5344 5395
    private function createStatisticsForPublications($xpath,$filter =''){         
5345 5396
        return $this->createStatistics($xpath, 
5346
                array('funder'.$filter, 'fundingStream'.$filter,  'fundingStreamLevel1'.$filter, 'fundingStreamLevel2'.$filter, 'project'.$filter, 'year'.$filter, 'accessMode'.$filter,  'type'.$filter, 'languageFilter'.$filter,'datasource'.$filter, 'community'.$filter), 
5397
                array('funder'.$filter, 'fundingStream'.$filter,  'fundingStreamLevel1'.$filter, 'fundingStreamLevel2'.$filter, 'project'.$filter, 'year'.$filter, 'accessMode'.$filter,  'type'.$filter, 'language'.$filter,'datasource'.$filter, 'community'.$filter), 
5347 5398
                array( 'FUNDER', 'FUNDING_STREAM', 'SCIENTIFIC_AREA','FUNDING_STREAM_LEVEL_2', 'PROJECT', 'PUBLICATION_YEAR', 'ACCESS_MODE', 'DOCUMENT_TYPE', 'DOCUMENT_LANGUAGE', 'DATASOURCE', 'COMMUNITY', 'COMMUNITY'), 
5348 5399
                array( 'NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND','NO_FUNDING_STREAM_LEVEL2_STATISTICS_FOUND', 'NO_PROJECT_STATISTICS_FOUND', 'NO_PUBLICATION_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND','NO_DOCUMENT_TYPE_STATISTICS_FOUND', 'NO_DOCUMENT_LANGUAGE_STATISTICS_FOUND', 'NO_DATASOURCE_STATISTICS_FOUND', 'NO_CONTEXT_STATISTICS_FOUND'), 
5349 5400
                array(self :: PUBLICATION_FUNDER,self :: PUBLICATION_FUNDING_STREAM, self :: PUBLICATION_SCIENTIFIC_AREA, self::PUBLICATION_FUNDING_STREAM_LEVEL2, self :: PUBLICATION_PROJECT,self :: PUBLICATION_YEAR, self :: PUBLICATION_ACCESS_MODE, self :: PUBLICATION_TYPE, self :: PUBLICATION_LANGUAGE,   self :: PUBLICATION_DATASOURCE, self :: PUBLICATION_CONTEXT));        
5350 5401
    }
5351 5402
   private function createStatisticsForDatasets($xpath){     
5352 5403
        return $this->createStatistics($xpath, 
5353
                array('funder', 'fundingStream', 'fundingStreamLevel1', 'fundingStreamLevel2', 'year', 'accessMode','type', 'languageFilter',  'datasource'), 
5404
                array('funder', 'fundingStream', 'fundingStreamLevel1', 'fundingStreamLevel2', 'year', 'accessMode','type', 'language',  'datasource'), 
5354 5405
                array( 'FUNDER', 'FUNDING_STREAM', 'SCIENTIFIC_AREA', 'FUNDING_STREAM_LEVEL_2',  'PUBLICATION_YEAR', 'ACCESS_MODE','TYPE', 'LANGUAGE', 'DATASOURCE'), 
5355 5406
                array( 'NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND', 'NO_FUNDING_STREAM_LEVEL2_STATISTICS_FOUND', 'NO_YEAR_STATISTICS_FOUND', 'NO_ACCESS_MODE_STATISTICS_FOUND','NO_TYPE_STATISTICS_FOUND', 'NO_LANGUAGE_STATISTICS_FOUND', 'NO_STATISTICS_FOUND'),
5356 5407
                array( self :: DATASET_FUNDER, self :: DATASET_FUNDING_STREAM, self :: DATASET_SCIENTIFIC_AREA, self::DATASET_FUNDING_STREAM_LEVEL2, self :: DATASET_YEAR, self :: DATASET_ACCESS_MODE,self :: DATASET_TYPE, self :: DATASET_LANGUAGE, self :: DATASET_DATASOURCE));
......
5363 5414
                array('NO_FUNDER_STATISTICS_FOUND', 'NO_FUNDING_STREAM_STATISTICS_FOUND', 'NO_SCIENTIFIC_AREA_STATISTICS_FOUND', 'NO_FUNDING_STREAM_LEVEL2_STATISTICS_FOUND',  'NO_START_YEAR_STATISTICS_FOUND', 'NO_END_YEAR_STATISTICS_FOUND', 'NO_SPECIAL_CLAUSE_39_STATISTICS_FOUND'), 
5364 5415
                array(self :: PROJECT_FUNDER, self :: PROJECT_FUNDING_STREAM, self :: PROJECT_SCIENTIFIC_AREA, self::PROJECT_FUNDING_STREAM_LEVEL2, self :: PROJECT_START_YEAR, self :: PROJECT_END_YEAR, self :: PROJECT_SC39));
5365 5416
            
5366
    }    
5417
    }  
5418
    private function _validateResultsSize($size=10){
5419
        if($size > 50){
5420
            $size = 10;
5421
        }
5422
        return $size;
5423
    }
5367 5424
  
5368 5425
}
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/images/tooltip/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/css/tooltip/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/project.js
42 42
                var viewsTimelineFrame = document.createElement('iframe');
43 43
                viewsTimelineFrame.src=viewsTimelineUrl; 
44 44
                viewsTimelineFrame.width='100%';
45
                viewsTimelineFrame.height='600px';
45
                viewsTimelineFrame.height='400px';
46 46
                jQuery('#viewsTimeline .frame').append(viewsTimelineFrame);
47 47
                jQuery('#viewsTimeline iframe').load(function(){
48 48
                        jQuery('#viewsTimeline .loading').hide();  
......
67 67
                $('snippet').style.display='none';
68 68
		return false;
69 69
	});
70
        //snippet for datasets
71
        var snippet2 = $('snippet2');
72
	var showSnippet2 = $('showSnippet2');
73
	var hideSnippet2 = $('hideSnippet2');
74
	showSnippet2.snippet2 = snippet;
75
	showSnippet2.addEvent('click', function () {
76
		//this.snippet.show();
77
                $('snippet2').style.display='block';
78
		return false;
79
	});
80
	hideSnippet2.snippet2 = snippet2;
81
	hideSnippet2.addEvent('click', function () {
82
		//this.snippet.hide();
83
                $('snippet2').style.display='none';
84
		return false;
85
	});
70 86
	// tabs
71 87
	var iframes = $$('iframe');
72 88
	iframeReady(iframes, 0, iframes.length);
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/article.js
57 57
                var viewsTimelineFrame = document.createElement('iframe');
58 58
                viewsTimelineFrame.src=viewsTimelineUrl; 
59 59
                viewsTimelineFrame.width='100%';
60
                viewsTimelineFrame.height='600px';
60
                viewsTimelineFrame.height='400px';
61 61
                jQuery('#viewsTimeline .frame').append(viewsTimelineFrame);
62 62
                jQuery('#viewsTimeline iframe').load(function(){
63 63
                        jQuery('#viewsTimeline .loading').hide();  
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/dataset.js
57 57
                var viewsTimelineFrame = document.createElement('iframe');
58 58
                viewsTimelineFrame.src=viewsTimelineUrl; 
59 59
                viewsTimelineFrame.width='100%';
60
                viewsTimelineFrame.height='600px';
60
                viewsTimelineFrame.height='400px';
61 61
                jQuery('#viewsTimeline .frame').append(viewsTimelineFrame);
62 62
                jQuery('#viewsTimeline iframe').load(function(){
63 63
                        jQuery('#viewsTimeline .loading').hide();  
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/citeproc/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/organization.js
31 31
                var viewsTimelineFrame = document.createElement('iframe');
32 32
                viewsTimelineFrame.src=viewsTimelineUrl; 
33 33
                viewsTimelineFrame.width='100%';
34
                viewsTimelineFrame.height='600px';
34
                viewsTimelineFrame.height='400px';
35 35
                jQuery('#viewsTimeline .frame').append(viewsTimelineFrame);
36 36
                jQuery('#viewsTimeline iframe').load(function(){
37 37
                        jQuery('#viewsTimeline .loading').hide();  
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/advancedsearchpublications.js
134 134
					typeLimits.value.set('html', values.join(', '));
135 135
					typeLimits.style.display = '';
136 136
					break;
137
				case 'languageSearch':
137
				case 'language':
138 138
					languageLimits.value.set('html', values.join(', '));
139 139
					languageLimits.style.display = '';
140 140
					break;
......
346 346
		clear($('type'));
347 347
	});
348 348
	$('languageLimits').addEvent('click', function () {
349
		clear($('languageSearch'));
349
		clear($('language'));
350 350
	});
351 351
	$('funderLimits').addEvent('click', function () {
352 352
		clear($('funder'));
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/jstree/themes/default/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/jstree/themes/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/jstree/libs/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/jstree/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/DataTables/Scroller-1.3.0/css/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/DataTables/Scroller-1.3.0/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/DataTables/Scroller-1.3.0/js/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/DataTables/DataTables-1.10.9/images/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/DataTables/DataTables-1.10.9/css/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/DataTables/DataTables-1.10.9/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/DataTables/DataTables-1.10.9/js/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/DataTables/Select-1.0.1/css/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/DataTables/Select-1.0.1/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/DataTables/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/DataTables/Buttons-1.0.3/css/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/DataTables/Buttons-1.0.3/js/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/DataTables/Responsive-1.0.7/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/js/datasource.js
84 84
                var viewsTimelineFrame = document.createElement('iframe');
85 85
                viewsTimelineFrame.src=viewsTimelineUrl; 
86 86
                viewsTimelineFrame.width='100%';
87
                viewsTimelineFrame.height='600px';
87
                viewsTimelineFrame.height='250px';
88 88
                jQuery('#viewsTimeline .frame').append(viewsTimelineFrame);
89 89
                jQuery('#viewsTimeline iframe').load(function(){
90 90
                        jQuery('#viewsTimeline .loading').hide();  
......
95 95
                var fundersPieFrame = document.createElement('iframe');
96 96
                fundersPieFrame.src=fundersPieUrl; 
97 97
                fundersPieFrame.width='100%';
98
                fundersPieFrame.height='600px';
98
                fundersPieFrame.height='250px';
99 99
                jQuery('#fundersPie .frame').append(fundersPieFrame);
100 100
                jQuery('#fundersPie iframe').load(function(){
101 101
                        jQuery('#fundersPie .loading').hide();  
......
105 105
                var scientificAreaPieFrame = document.createElement('iframe');
106 106
                scientificAreaPieFrame.src=scientificAreaPieUrl; 
107 107
                scientificAreaPieFrame.width='100%';
108
                scientificAreaPieFrame.height='600px';
108
                scientificAreaPieFrame.height='250px';
109 109
                jQuery('#scientificAreaPie .frame').append(scientificAreaPieFrame);
110 110
                jQuery('#scientificAreaPie iframe').load(function(){
111 111
                        jQuery('#scientificAreaPie .loading').hide();  
......
162 162
		selectTab(0);			
163 163
	});
164 164
});
165
 
165

  
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/searchprojects/tmpl/default.php
17 17
JViewLegacy:: loadHelper('BrowseHelper');
18 18
JViewLegacy:: loadHelper('OpenaireHelper');
19 19
OpenaireHelper::initSearchAjaxUrls($document, $this -> itemId);
20
$document->setTitle("Search Projects");
20
$document->setTitle("OpenAIRE - Search Projects");
21 21
?>
22 22

  
23 23
<div id="main-column">
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/searchpublications/tmpl/default.php
17 17
JViewLegacy:: loadHelper('BrowseHelper');
18 18
JViewLegacy:: loadHelper('OpenaireHelper');
19 19
OpenaireHelper::initSearchAjaxUrls($document, $this -> itemId);
20
$document->setTitle("Search Publications");
20
$document->setTitle("OpenAIRE - Search Publications");
21 21
$document->addScriptDeclaration("var searchUrl = '" .JRoute :: _("index.php?option=com_openaire&view=searchpublications&Itemid=" . $itemId ). "'");
22 22

  
23 23
?>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/widget/view.raw.php
14 14
		$this -> ga = JRequest :: getString('ga');
15 15
		$this -> hideOnEmpty = (JRequest :: getString('hideOnEmpty') == 'true');
16 16

  
17
                $this -> type = JRequest :: getString('type','publication');
18
                $this -> type = ($this -> type != 'publication' && $this -> type != 'dataset')?'publication':$this -> type;
17 19
		if ($this->projectId == NULL && JRequest :: getString('ga') != NULL)
18 20
			$this->projectId = "corda_______::".md5(JRequest :: getString('ga'));
19 21

  
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/dataset/tmpl/default.php
35 35

  
36 36
//$author = $document->getMetaData('author');
37 37
//if(!empty($author)){
38
$document->setTitle("Dataset".(isset($this -> dataset -> title)?':'.$this -> dataset -> title:''));
38
$document->setTitle("OpenAIRE - Dataset".(isset($this -> dataset -> title)?': '.(strlen($this -> dataset -> title) > 30?mb_substr($this -> dataset -> title,0,30).'...':$this -> dataset -> title):''));
39
$document->setMetaData( 'description', (isset($this -> dataset -> title)?$this -> dataset -> title:''), true );
40

  
39 41
//$document->setMetaData('author','');
40 42
//}
41 43
$application = JFactory :: getApplication();
......
438 440
                                                        <?php if($this -> usageStats -> clicks == null || $this -> usageStats -> clicks -> value == 0) { ?>
439 441
                                                                <div class="box-info" ><?php echo(JText :: _('NO_IMPACT_STATISTICS_FOUND')); ?></div>
440 442
                                                                <?php }else{ ?>
441
 
443
                                                                <div class="box-info"><?php JText :: printf('USAGE_STATISTICS_MESSAGE_S_', JText :: _('DATASET'));   ?></div>
442 444
                                                                <div class="  uk-grid   ">
443 445
                                                                    <div class="usageStats uk-width-1-5 uk-vertical-align ">
444
                                                                        <h6 class="uk-vertical-align-middle  uk-text-center"><div class="views uk-vertical-align-middle uk-text-center " ><?php echo( $this -> usageStats -> clicks -> value); ?></div><br><?php echo(JText :: _('VIEWS')); ?></h6>
446
                                                                        <h6 class="uk-vertical-align-middle  uk-text-center"><div class="views uk-vertical-align-middle uk-text-center " ><?php echo( $this -> usageStats -> clicks -> value); ?></div><br><?php echo(JText :: _('PAGE_VIEWS')); ?></h6>
445 447
                                                                    </div>
446 448
                                                                    <div id="viewsTimeline" class="usageStats uk-width-3-5  ">  
447
                                                                        <h6><?php echo(JText :: _('VIEWS_TIMELINE')); ?></h6>
449
                                                                        <h6 class=" uk-container-center uk-width-1-2"><?php echo(JText :: _('VIEWS_TIMELINE')); ?></h6>
448 450

  
449 451
                                                                         <div class="loading">
450 452
                                                                             <?php echo(JText :: _('PLEASE_WAIT_CHART_IS_LOADING_')); ?>
451 453
                                                                             <img  class="loader  " src="./components/com_openaire/images/loader.gif" />
452 454
                                                                         </div>
453 455
                                                                             <?php
454
                                                                             $url = $this -> chartsUrl .'chart.php?com=query&persistent=false&data='.urlencode('{"query":"resTimeline","resTitle":"'.$this -> datasetId.    '","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Views"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2015","min":"1996"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Time"}').'&h=60%&w=50%';                                          
456
                                                                             $url = $this -> chartsUrl .'chart.php?com=query&persistent=false&data='.urlencode('{"query":"resTimeline","resTitle":"'.$this -> datasetId.    '","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Views"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2015","min":"1996"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Time"}').'&h=60%&w=80%';                                          
455 457
                                                                            $document->addScriptDeclaration("var viewsTimelineUrl = '" . $url . "'");
456 458
                                                                         ?>
457 459
                                                                            <div class="frame"> </div>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/widget/tmpl/default.php
18 18
document.getElementById('oa_widget').appendChild(script);
19 19
var data = document.createElement('script');
20 20
data.setAttribute('type', 'text/javascript');
21
data.setAttribute('src', '<?php echo(JUri :: base() . 'index.php?option=com_openaire&view=data&format=raw&projectId=' . $this -> projectId .'&hideOnEmpty=' . ($this -> hideOnEmpty ? 'true' : 'false')); ?>');
21
data.setAttribute('src', '<?php echo(JUri :: base() . 'index.php?option=com_openaire&view=data&format=raw&projectId=' . $this -> projectId .'&type=' . $this -> type .'&hideOnEmpty=' . ($this -> hideOnEmpty ? 'true' : 'false')); ?>');
22 22
document.getElementById('oa_widget').appendChild(data);
23 23

  
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/datasource/tmpl/default.php
18 18
$document -> addStyleSheet(JRoute :: _(JUri :: base() . 'components/com_openaire/css/tabcontent.css'));
19 19
$document->addStyleSheet(JRoute :: _(JUri :: base() . 'components/com_openaire/js/DataTables/DataTables-1.10.9/css/jquery.dataTables.min.css'));
20 20
$document->addScript(JRoute :: _(JUri :: base() . 'components/com_openaire/js/DataTables/DataTables-1.10.9/js/jquery.dataTables.min.js'));
21
$document->setTitle("Data Provider:".(($this -> datasource==NULL)?"" :($this -> datasource -> name == NULL) ? "" :": ". $this -> datasource -> name));
22 21

  
22
$document->setTitle("OpenAIRE - Data Provider:".(isset($this -> datasource -> name)?': '.(strlen($this -> datasource -> name) > 30?mb_substr($this -> datasource -> name,0,30).'...':$this -> datasource -> name):''));
23
$document->setMetaData( 'description', (isset($this -> datasource -> name)?$this ->datasource -> name:''), true );
24

  
23 25
$parameters = JComponentHelper :: getParams('com_openaire');
24 26
$dataproviders_statistics= array();
25 27
?>
......
345 347
                                    <?php if($this -> usageStats -> clicks == null || $this -> usageStats -> clicks -> value == 0) { ?>
346 348
                                    <div class="box-info" ><?php echo(JText :: _('NO_IMPACT_STATISTICS_FOUND')); ?></div>
347 349
                                    <?php }else{ ?>
350
                                    <div class="box-info"><?php JText :: printf('USAGE_STATISTICS_MESSAGE_S_', JText :: _('DATASOURCE'));   ?></div>
348 351
                                     <div class="  uk-grid   ">
349 352
                                        <div class="usageStats uk-width-1-5 uk-vertical-align ">
350
                                            <h6 class="uk-vertical-align-middle  uk-text-center"><div class="views uk-vertical-align-middle uk-text-center " ><?php echo( $this -> usageStats -> clicks -> value); ?></div><br><?php  echo(JText :: _('VIEWS')); ?></h6>
353
                                            <h6 class="uk-vertical-align-middle  uk-text-center"><div class="views uk-vertical-align-middle uk-text-center " ><?php echo( $this -> usageStats -> clicks -> value); ?></div><br><?php  echo(JText :: _('PAGE_VIEWS')); ?></h6>
351 354
                                        </div>
352 355
                                        <div id="viewsTimeline" class="usageStats uk-width-3-5  ">  
353
                                            <h6><?php echo(JText :: _('VIEWS_TIMELINE')); ?></h6>
356
                                            <h6 class=" uk-container-center uk-width-1-2"><?php echo(JText :: _('VIEWS_TIMELINE')); ?></h6>
354 357

  
355 358
                                             <div class="loading">
356 359
                                                 <?php echo(JText :: _('PLEASE_WAIT_CHART_IS_LOADING_')); ?>
357 360
                                                 <img  class="loader  " src="./components/com_openaire/images/loader.gif" />
358 361
                                             </div>
359 362
                                                 <?php
360
                                                $url = $this->projectStatisticsChartUrl.'chart.php?com=query&persistent=false&data='.urlencode('{"query":"dtsrcTimeline","dtsrcName":"'.$this -> datasourceId.'","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Views"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2015","min":"1996"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Time"}').'&h=60%&w=50%';
363
                                                $url = $this->projectStatisticsChartUrl.'chart.php?com=query&persistent=false&data='.urlencode('{"query":"dtsrcTimeline","dtsrcName":"'.$this -> datasourceId.'","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Views"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2015","min":"1996"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Time"}').'&h=60%&w=80%';
361 364
                                                 $document->addScriptDeclaration("var viewsTimelineUrl = '" . $url . "'");
362 365
                                                 ?>
363 366
                                                <div class="frame"> </div>
......
375 378
                                                 <img  class="loader  " src="./components/com_openaire/images/loader.gif" />
376 379
                                             </div>
377 380
                                                 <?php
378
                                                $fundersPieUrl = $this -> projectStatisticsChartUrl.'chart.php?com=query&persistent=false&data='.urlencode('{"query":"dtsrcFund","dtsrcName":"'.$this -> datasourceId.'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["'.JText :: _('FUNDERS').'"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": ["'.$sanitized.'"], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}').'&h=60%&w=50%';
381
                                                $fundersPieUrl = $this -> projectStatisticsChartUrl.'chart.php?com=query&persistent=false&data='.urlencode('{"query":"dtsrcFund","dtsrcName":"'.$this -> datasourceId.'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["'.JText :: _('FUNDERS').'"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": ["'.$sanitized.'"], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}').'&h=60%&w=80%';
379 382
                                                 $document->addScriptDeclaration("var fundersPieUrl = '" . $fundersPieUrl . "'");
380 383
                                                 ?>
381 384
                                                <div class="frame"> </div>
......
389 392
                                             <img  class="loader  " src="./components/com_openaire/images/loader.gif" />
390 393
                                             </div>
391 394
                                                 <?php
392
                                                $scientificAreaPie = $this -> projectStatisticsChartUrl.'chart.php?com=query&persistent=false&data='.urlencode('{"query":"dtsrcAreas","dtsrcName":"'.$this ->datasourceId.'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["SCIENTIFIC AREA"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": ["'.$sanitized.'"], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}').'&h=60%&w=50%';
395
                                                $scientificAreaPie = $this -> projectStatisticsChartUrl.'chart.php?com=query&persistent=false&data='.urlencode('{"query":"dtsrcAreas","dtsrcName":"'.$this ->datasourceId.'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["SCIENTIFIC AREA"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": ["'.$sanitized.'"], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}').'&h=60%&w=80%';
393 396
                                                 $document->addScriptDeclaration("var scientificAreaPieUrl = '" . $scientificAreaPie . "'");
394 397
                                                 ?>
395 398
                                                <div class="frame"> </div>
......
464 467

  
465 468
                                                        ?>
466 469
                                                </tbody>
467
                                            </table>                                     
468
                                    </div>
470
                                            </table>
471
                                    <!--</div>-->
469 472
                                     <?php } ?>
470 473
                                    
471 474
                                      </div>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/searchdatasets/view.html.php
25 25
			$this -> filters['type'] -> name = 'type';
26 26
			$this -> filters['type'] -> value = $type;
27 27
		}
28
		$language = JRequest :: getString('languageFilter');
28
		$language = JRequest :: getString('language');
29 29
		if ($language != NULL) {
30
			$this -> filters['languageFilter'] = new JObject();
31
			$this -> filters['languageFilter'] -> name = 'languageFilter';
32
			$this -> filters['languageFilter'] -> value = $language;
30
			$this -> filters['language'] = new JObject();
31
			$this -> filters['language'] -> name = 'language';
32
			$this -> filters['language'] -> value = $language;
33 33
		}
34 34
		$funder = JRequest :: getString('funder');
35 35
		if ($funder != NULL) {
......
74 74
			$this -> filters['datasource'] -> value = $datasource;
75 75
		}
76 76
		$this -> page = JRequest :: getUInt('page', self :: DEFAULT_PAGE);
77
		$this -> size = JRequest :: getUInt('size', self :: DEFAULT_SIZE);
77
		$this -> size = self :: DEFAULT_SIZE; //JRequest :: getUInt('size', self :: DEFAULT_SIZE);
78 78
		if ($this -> keyword == NULL)
79 79
			$this -> statistics = $model -> getDatasetStatistics($locale, false);
80 80
		else {
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/search/tmpl/default.php
17 17
$document -> addStyleSheet(JRoute :: _(JUri :: base() . 'components/com_openaire/css/tooltip/tooltip1.css'));
18 18
$document -> addStyleSheet(JRoute :: _(JUri :: base() . 'templates/' . JFactory :: getApplication() -> getTemplate() . '/styles/openaire/css/tooltip.css'));
19 19
$document->addScriptDeclaration("var searchUrl = '" .JRoute :: _("index.php?option=com_openaire&view=search&Itemid=" . $itemId ). "'");
20
$document->setTitle(" OpenAIRE - Search Publications, datasets, projects ...");
21

  
20 22
?>
21 23

  
22 24
<div id="main-column">
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/data/view.raw.php
16 16
        function display($template = NULL) {
17 17
                $projectId = JRequest :: getString('projectId');
18 18
                $this -> hideOnEmpty = (JRequest :: getString('hideOnEmpty') == 'true');
19
                $this -> type = JRequest :: getString('type','publication');
19 20

  
20 21
                $this -> data = new JObject();
22
                $this -> data -> via = JText :: _('VIA_');
23
                $this -> data -> openAireImageUrl = JUri :: base() . 'components/com_openaire/images/openairepluslogo.png';
21 24

  
22 25
                if ($projectId != null) {
23
                        $locale = JFactory :: getLanguage() -> getTag();
24
                        $model = $this -> getModel(self :: MODEL);
25
                        $project = $model -> getProject($projectId, $locale);
26
                        $result = $model -> browsePublications(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, 1, $locale, $projectId, NULL,FALSE); // fetch the first publication to view how many there are...
27
                        $result = $model -> browsePublications(NULL, NULL, NULL, NULL, NULL, NULL, NULL,NULL, NULL, NULL, 1, $result -> totalPublications, $locale, $projectId, NULL,FALSE); // ... and then fetch them all
26
                     $locale = JFactory :: getLanguage() -> getTag();
27
                    $model = $this -> getModel(self :: MODEL);
28
                    $project = $model -> getProject($projectId, $locale);                    
28 29

  
30
                    if( $this -> type == 'publication'){
29 31
                        $this -> data -> title = JText :: sprintf('PUBLICATIONS_OF_PROJECT_S_S_S_', $project -> title, $project -> acronym, $project -> call);
30
                        $this -> data -> publications = $result -> publications;
31
                        $this -> data -> via = JText :: _('VIA_');
32
                        $this -> data -> openAireImageUrl = JUri :: base() . 'components/com_openaire/images/openairepluslogo.png';
33

  
32
                        $result = $model -> browsePublications(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, 1, $locale, $projectId, NULL,FALSE); // fetch the first publication to view how many there are...
33
                        $result = $model -> browsePublications(NULL, NULL, NULL, NULL, NULL, NULL, NULL,NULL, NULL, NULL, 1, $result -> totalPublications, $locale, $projectId, NULL,FALSE); // ... and then fetch them all                        
34
                        $this -> data -> publications = $result -> publications;                 
34 35
                        if (count($errors = $this -> get('Errors')) > 0) {
35 36
                                JLog :: add('Error viewing data: ' . implode("\n", $errors), JLog :: ERROR, self :: LOG);
36 37
                                return FALSE;
37 38
                        }
39
                    }else{
40
                        $this -> data -> title = JText :: sprintf('DATASETS_OF_PROJECT_S_S_S_', $project -> title, $project -> acronym, $project -> call);
41
                        $result = $model -> browseDatasets(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,  1, 1, $locale, $projectId, NULL,FALSE); // fetch the first dataset to view how many there are...
42
                        $result = $model -> browseDatasets(NULL, NULL, NULL, NULL, NULL, NULL, NULL,NULL, NULL,  1, $result -> totalDatasets, $locale, $projectId, NULL,FALSE); // ... and then fetch them all                        
43
                        $this -> data -> publications = $result -> datasets;
44
                   
45
                        if (count($errors = $this -> get('Errors')) > 0) {
46
                                JLog :: add('Error viewing data: ' . implode("\n", $errors), JLog :: ERROR, self :: LOG);
47
                                return FALSE;
48
                        }
49
                    }    
50
                   
38 51

  
39 52
                } else {
40 53
                        JLog :: add('No project id!!!', JLog :: ERROR, self :: LOG);
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/datasource/view.html.php
22 22
	
23 23
	function display($template = NULL) {
24 24
		$model = $this -> getModel(self :: MODEL);
25
 		$this -> itemId = JRequest :: getUInt('Itemid', 0);
25
		$this -> itemId = JRequest :: getUInt('Itemid', 0);
26 26
		$this -> datasourceId = JRequest :: getString('datasourceId');
27 27
		$locale = JFactory :: getLanguage() -> getTag();
28 28
		JViewLegacy:: loadHelper('PiwikHelper');
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/searchpublicationsraw/tmpl/default_browse.php
22 22
                        echo(BrowseHelper :: formatStatistic($this -> result['accessMode'], $baseUrl,"Pub"));
23 23
                        echo(BrowseHelper :: formatStatistic($this -> result['year'], $baseUrl,"Pub"));
24 24
                        echo(BrowseHelper :: formatStatistic($this -> result['type'], $baseUrl,"Pub"));
25
			echo(BrowseHelper :: formatStatistic($this -> result['languageFilter'], $baseUrl,"Pub"));			
25
			echo(BrowseHelper :: formatStatistic($this -> result['language'], $baseUrl,"Pub"));			
26 26
			echo(BrowseHelper :: formatStatistic($this -> result['datasource'], $baseUrl,"Pub"));			
27 27
			echo(BrowseHelper :: formatStatistic($this -> result['community'], $baseUrl,"Pub"));
28 28
		} ?>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/advancedsearchorganizations/tmpl/default.php
15 15
JViewLegacy :: loadHelper('StatisticHelper');
16 16
JViewLegacy:: loadHelper('OpenaireHelper');
17 17
OpenaireHelper::initSearchAjaxUrls($document, $this -> itemId);
18
$document->setTitle("Search Organizations");
18
$document->setTitle("OpenAIRE - Search Organizations");
19 19
?>
20 20

  
21 21
<div id="main-column">
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/searchdatasetsraw/tmpl/default_browse.php
21 21
                        echo(BrowseHelper :: formatStatistic($this -> result['year'], $baseUrl,"Data"));
22 22
			echo(BrowseHelper :: formatStatistic($this -> result['accessMode'], $baseUrl,"Data"));
23 23
                        echo(BrowseHelper :: formatStatistic($this -> result['type'], $baseUrl,"Data"));
24
			echo(BrowseHelper :: formatStatistic($this -> result['languageFilter'], $baseUrl,"Data"));			                        
24
			echo(BrowseHelper :: formatStatistic($this -> result['language'], $baseUrl,"Data"));			                        
25 25
                        echo(BrowseHelper :: formatStatistic($this -> result['datasource'], $baseUrl,"Data"));
26 26
			
27 27
			
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/searchorganizations/view.html.php
32 32
			$this -> filters['type'] -> value = $type;
33 33
		}
34 34
		$this -> page = JRequest :: getUInt('page', self :: DEFAULT_PAGE);
35
		$this -> size = JRequest :: getUInt('size', self :: DEFAULT_SIZE);
35
		$this -> size = self :: DEFAULT_SIZE; //JRequest :: getUInt('size', self :: DEFAULT_SIZE);
36 36
		if ($this -> keyword == NULL)
37 37
			$this -> statistics = $model -> getOrganizationStatistics($locale);
38 38
		else {
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/advancedsearchdatasources/tmpl/default.php
15 15
JViewLegacy :: loadHelper('StatisticHelper');
16 16
JViewLegacy:: loadHelper('OpenaireHelper');
17 17
OpenaireHelper::initSearchAjaxUrls($document, $this -> itemId);
18
$document->setTitle("Search Datasources");
18
$document->setTitle("OpenAIRE - Search Datasources");
19 19

  
20 20
?>
21 21

  
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/advancedsearchpeople/view.html.php
43 43
		}
44 44
		$this -> page = JRequest :: getUInt('page', self :: DEFAULT_PAGE);
45 45
		$this -> size = JRequest :: getUInt('size', self :: MIN_SIZE);
46
                $this -> size = ($this -> size > self :: MAX_SIZE || $this -> size < 1) ? self :: MIN_SIZE : $this -> size;
46 47
		if ((($this -> keywords != NULL) && ($this -> fields != NULL) && ($this -> constraints != NULL)) || ($this -> countries != NULL)) {
47 48
			JViewLegacy :: loadHelper('PiwikHelper');
48 49
			PiwikHelper :: logPageView('advancedSearchPeople', 'keywords=' . urlencode(implode(',', $this -> keywords)) . '&fields=' . urlencode(implode(',', $this -> fields)) . '&constraints=' . urlencode(implode(',', $this -> constraints)) . '&countries=' . urlencode(implode(',', $this -> countries)) . '&country=' . urlencode($country) . '&page=' . urlencode($this -> page) . '&size=' . urlencode($this -> size) . '&locale=' . urlencode($locale));
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/organization/tmpl/default.php
13 13

  
14 14
$document = JFactory :: getDocument();
15 15
$document -> addScript(JRoute :: _(JUri :: base() . 'components/com_openaire/js/organization.js'));
16
$document->setTitle("Organization:".(($this -> organizationId == NULL) &&($this -> organization -> name == NULL) ? '' : $this -> organization -> name));
16
$document->setTitle("OpenAIRE - Organization:".(isset($this -> organizationId) && isset($this -> organization -> name)?': '.(strlen($this -> organization -> name) > 30?substr($this -> organization -> name,0,30).'...':$this -> organization -> name):''));
17
$document->setMetaData( 'description', (isset($this -> organization -> name)?$this ->organization -> name:''), true );
18

  
17 19
$document->addStyleSheet(JRoute :: _(JUri :: base() . 'components/com_openaire/js/DataTables/DataTables-1.10.9/css/jquery.dataTables.min.css'));
18 20
$document->addScript(JRoute :: _(JUri :: base() . 'components/com_openaire/js/DataTables/DataTables-1.10.9/js/jquery.dataTables.min.js'));
19 21
$parameters = JComponentHelper :: getParams('com_openaire');
......
30 32
		<div class="projectInfo">
31 33
			<div class="organizationBox">
32 34
				<div class="organizationIcon">
33
				<h3><?php echo((($this -> organization -> url == NULL) ? '' : ('<a target="_blank" class="custom-external" href="' . $this -> organization -> url . '">')) . (($this -> organization -> shortName == NULL) ? $this -> organization -> name : $this -> organization -> shortName) . (($this -> organization -> url == NULL) ? '' : '</a>')); ?></h3>
35
				<h3><?php echo((($this -> organization -> url == NULL) ? '' : ('<a target="_blank" class="custom-external" href="' . (((strpos($this -> organization -> url, 'http://') !== false)||(strpos($this -> organization -> url, 'https://') !== false))?'':'https://').$this -> organization -> url . '">')) . (($this -> organization -> shortName == NULL) ? $this -> organization -> name : $this -> organization -> shortName) . (($this -> organization -> url == NULL) ? '' : '</a>')); ?></h3>
34 36
				</div>
35 37
				<dl class="uk-description-list-horizontal">
36 38
					<dt><?php echo(JText :: _('NAME')); ?></dt>
......
162 164
                                    <?php if($this -> usageStats -> clicks == null || $this -> usageStats -> clicks -> value == 0) { ?>
163 165
                                            <div class="box-info" ><?php echo(JText :: _('NO_IMPACT_STATISTICS_FOUND')); ?></div>
164 166
                                            <?php }else{ ?>
165
 
167
                                            <div class="box-info"><?php JText :: printf('USAGE_STATISTICS_MESSAGE_S_', JText :: _('ORGANIZATION'));   ?></div>
166 168
                                             <div class="  uk-grid   ">
167 169
                                                                    <div class="usageStats uk-width-1-5 uk-vertical-align ">
168
                                                                        <h6 class="uk-vertical-align-middle  uk-text-center"><div class="views uk-vertical-align-middle uk-text-center " ><?php echo( $this -> usageStats -> clicks -> value); ?></div><br><?php echo(JText :: _('VIEWS')); ?></h6>
170
                                                                        <h6 class="uk-vertical-align-middle  uk-text-center"><div class="views uk-vertical-align-middle uk-text-center " ><?php echo( $this -> usageStats -> clicks -> value); ?></div><br><?php echo(JText :: _('PAGE_VIEWS')); ?></h6>
169 171
                                                                    </div>
170 172
                                                                    <div id="viewsTimeline" class="usageStats uk-width-3-5  ">  
171
                                                                        <h6><?php echo(JText :: _('VIEWS_TIMELINE')); ?></h6>
173
                                                                        <h6 class=" uk-container-center uk-width-1-2"><?php echo(JText :: _('VIEWS_TIMELINE')); ?></h6>
172 174

  
173 175
                                                                         <div class="loading">
174 176
                                                                             <?php echo(JText :: _('PLEASE_WAIT_CHART_IS_LOADING_')); ?>
175 177
                                                                             <img  class="loader  " src="./components/com_openaire/images/loader.gif" />
176 178
                                                                         </div>
177 179
                                                                             <?php
178
                                                                             $url = $this -> chartsUrl  .'chart.php?com=query&persistent=false&data='.urlencode('{"query":"orgTimeline","orgTitle":"'.$this -> organizationId.    '","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Views"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2015","min":"1996"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Time"}').'&h=60%&w=50%';     
180
                                                                             $url = $this -> chartsUrl  .'chart.php?com=query&persistent=false&data='.urlencode('{"query":"orgTimeline","orgTitle":"'.$this -> organizationId.    '","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Views"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2015","min":"1996"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Time"}').'&h=60%&w=80%';     
179 181
                                                                            $document->addScriptDeclaration("var viewsTimelineUrl = '" . $url . "'");
180 182
                                                                            
181 183
                                                                         ?>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/browsepeople/view.html.php
25 25
			$this -> filters['country'] -> value = $country;
26 26
		}
27 27
		$this -> page = JRequest :: getUInt('page', self :: DEFAULT_PAGE);
28
		$this -> size = JRequest :: getUInt('size', self :: DEFAULT_SIZE);
28
		$this -> size = self :: DEFAULT_SIZE; //JRequest :: getUInt('size', self :: DEFAULT_SIZE);
29 29
		JViewLegacy :: loadHelper('PiwikHelper');
30 30
		PiwikHelper :: logPageView('browsePeople', 'country=' . urlencode($country) . '&page=' . urlencode($this -> page) . '&size=' . urlencode($this -> size) . '&locale=' . urlencode($locale));
31 31
		$this -> result = $model -> browsePeople($country, $this -> page, $this -> size, $locale, TRUE);
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/advancedsearchpublications/tmpl/default.php
15 15
JViewLegacy :: loadHelper('StatisticHelper');
16 16
JViewLegacy:: loadHelper('OpenaireHelper');
17 17
OpenaireHelper::initSearchAjaxUrls($document, $this -> itemId);
18
$document->setTitle("Search Publications");
18
$document->setTitle("OpenAIRE - Search Publications");
19 19
?>
20 20

  
21 21
<div id="main-column">
......
29 29
				foreach ($this -> types as $type)
30 30
					$baseUrl .= '&type%5B%5D=' . urlencode($type);
31 31
				foreach ($this -> languages as $language)
32
					$baseUrl .= '&languageSearch%5B%5D=' . urlencode($language);
32
					$baseUrl .= '&language%5B%5D=' . urlencode($language);
33 33
				foreach ($this -> funders as $funder)
34 34
					$baseUrl .= '&funder%5B%5D=' . urlencode($funder);
35 35
				foreach ($this -> fundingStreams as $fundingStream)
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/searchorganizations/tmpl/default.php
17 17
JViewLegacy:: loadHelper('BrowseHelper');
18 18
JViewLegacy:: loadHelper('OpenaireHelper');
19 19
OpenaireHelper::initSearchAjaxUrls($document, $this -> itemId);
20
$document->setTitle("Search Organizations");
20
$document->setTitle("OpenAIRE - Search Organizations");
21 21
?>
22 22

  
23 23
<div id="main-column">
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/advancedsearchdatasources/tmpl/default_form.php
145 145
									</div>
146 146
								<?php } ?>
147 147
							</div>
148
							<div id="languageSearch" class="filterItem">
149
								<?php if ($this -> statistics['languageFilter'] -> data == NULL) { ?>
150
									<div class="box-info"><?php echo($this -> statistics['languageFilter'] -> error); ?></div>
148
							<div id="language" class="filterItem">
149
								<?php if ($this -> statistics['language'] -> data == NULL) { ?>
150
									<div class="box-info"><?php echo($this -> statistics['language'] -> error); ?></div>
151 151
								<?php } else { ?>
152 152
									<a class="editRef">
153
										<h2><?php echo($this -> statistics['languageFilter'] -> title); ?></h2>
153
										<h2><?php echo($this -> statistics['language'] -> title); ?></h2>
154 154
										<div class="editClearOptions">
155 155
											<?php echo(JText :: _('EDIT')); ?>
156 156
										</div>
157 157
									</a>
158 158
									<div class="hiddenAdvancedSearch flowWrapper">
159 159
										<?php foreach ($this -> languages as $language) { ?>
160
											<input type="hidden" name="languageSearch[]" value="<?php echo($language); ?>" />
160
											<input type="hidden" name="language[]" value="<?php echo($language); ?>" />
161 161
										<?php } ?>
162 162
										<div class="updateFilters">
163 163
											<input type="button" value="<?php echo(JText :: _('OK')); ?>" class="uk-button uk-button-mini okElement" />
......
170 170
											<a class="selectAll"><?php echo(JText :: _('SELECT_ALL')); ?></a>&nbsp;|&nbsp;<a class="deselectAll"><?php echo(JText :: _('DESELECT_ALL')); ?></a>
171 171
										</div>
172 172
										<div class="filterListingBlock">
173
											<?php foreach ($this -> statistics['languageFilter'] -> data as $row) { ?>
173
											<?php foreach ($this -> statistics['language'] -> data as $row) { ?>
174 174
												<div class="filterRow">
175 175
													<input type="checkbox" value="<?php echo($row -> id); ?>"<?php echo(in_array($row -> id, $this -> languages, TRUE) ? ' checked="checked"' : ''); ?> />
176 176
													<label><?php echo($row -> name); ?></label>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/advancedsearchpeople/tmpl/default.php
15 15
JViewLegacy :: loadHelper('StatisticHelper');
16 16
JViewLegacy:: loadHelper('OpenaireHelper');
17 17
OpenaireHelper::initSearchAjaxUrls($document, $this -> itemId);
18
$document->setTitle("Search People");
18
$document->setTitle("OpenAIRE - Search People");
19 19
?>
20 20

  
21 21
<div id="main-column">
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/projectfundings/index.html
1
<html><body></body></html>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/browsepeople/tmpl/default.php
13 13
$document -> addStyleSheet(JRoute :: _(JUri :: base() . 'templates/' . JFactory :: getApplication() -> getTemplate() . '/styles/openaire/css/tooltip.css'));
14 14
JViewLegacy :: loadHelper('FilterHelper');
15 15
JViewLegacy :: loadHelper('StatisticHelper');
16
$document->setTitle(" OpenAIRE - Browse People");
16 17

  
17 18
?>
18 19

  
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/advancedsearchpublications/tmpl/default_form.php
171 171
									</div>
172 172
								<?php } ?>
173 173
							</div>
174
							<div id="languageSearch" class="filterItem">
175
								<?php if ($this -> statistics['languageFilter'] -> data == NULL) { ?>
176
									<div class="box-info"><?php echo($this -> statistics['languageFilter'] -> error); ?></div>
174
							<div id="language" class="filterItem">
175
								<?php if ($this -> statistics['language'] -> data == NULL) { ?>
176
									<div class="box-info"><?php echo($this -> statistics['language'] -> error); ?></div>
177 177
								<?php } else { ?>
178 178
									<a class="editRef">
179
										<h2><?php echo($this -> statistics['languageFilter'] -> title); ?></h2>
179
										<h2><?php echo($this -> statistics['language'] -> title); ?></h2>
180 180
										<div class="editClearOptions">
181 181
											<?php echo(JText :: _('EDIT')); ?>
182 182
										</div>
183 183
									</a>
184 184
									<div class="hiddenAdvancedSearch flowWrapper">
185 185
										<?php foreach ($this -> languages as $language) { ?>
186
											<input type="hidden" name="languageSearch[]" value="<?php echo($language); ?>" />
186
											<input type="hidden" name="language[]" value="<?php echo($language); ?>" />
187 187
										<?php } ?>
188 188
										<div class="updateFilters">
189 189
											<input type="button" value="<?php echo(JText :: _('OK')); ?>" class="uk-button uk-button-mini okElement" />
......
196 196
											<a class="selectAll"><?php echo(JText :: _('SELECT_ALL')); ?></a>&nbsp;|&nbsp;<a class="deselectAll"><?php echo(JText :: _('DESELECT_ALL')); ?></a>
197 197
										</div>
198 198
										<div class="filterListingBlock">
199
											<?php foreach ($this -> statistics['languageFilter'] -> data as $row) { ?>
199
											<?php foreach ($this -> statistics['language'] -> data as $row) { ?>
200 200
												<div class="filterRow">
201 201
													<input type="checkbox" value="<?php echo($row -> id); ?>"<?php echo(in_array($row -> id, $this -> languages, TRUE) ? ' checked="checked"' : ''); ?> />
202 202
													<label><?php echo($row -> name); ?></label>
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/browsedatasets/tmpl/default.php
13 13
$document -> addStyleSheet(JRoute :: _(JUri :: base() . 'templates/' . JFactory :: getApplication() -> getTemplate() . '/styles/openaire/css/tooltip.css'));
14 14
JViewLegacy :: loadHelper('FilterHelper');
15 15
JViewLegacy :: loadHelper('StatisticHelper');
16
$document->setTitle(" OpenAIRE - Browse Datasets");
16 17

  
17 18
?>
18 19
<div id="main-column">
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/advancedsearchorganizations/view.html.php
49 49
		}
50 50
		$this -> page = JRequest :: getUInt('page', self :: DEFAULT_PAGE);
51 51
		$this -> size = JRequest :: getUInt('size', self :: MIN_SIZE);
52
                $this -> size = ($this -> size > self :: MAX_SIZE || $this -> size < 1) ? self :: MIN_SIZE : $this -> size;
52 53
		if ((($this -> keywords != NULL) && ($this -> fields != NULL) && ($this -> constraints != NULL)) || ($this -> countries != NULL) || ($this -> types != NULL)) {
53 54
			JViewLegacy :: loadHelper('PiwikHelper');
54 55
			PiwikHelper :: logPageView('advancedSearchOrganizations', 'keywords=' . urlencode(implode(',', $this -> keywords)) . '&fields=' . urlencode(implode(',', $this -> fields)) . '&constraints=' . urlencode(implode(',', $this -> constraints)) . '&countries=' . urlencode(implode(',', $this -> countries)) . '&types=' . urlencode(implode(',', $this -> types)) . '&country=' . urlencode($country) . '&type=' . urlencode($type) . '&page=' . urlencode($this -> page) . '&size=' . urlencode($this -> size) . '&locale=' . urlencode($locale));
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/claims/tmpl/default.php
25 25
$document->addStyleSheet(JRoute :: _(JUri :: base() . 'components/com_openaire/js/DataTables/Select-1.0.1/css/select.dataTables.min.css'));
26 26
$document->addScript(JRoute :: _(JUri :: base() . 'components/com_openaire/js/DataTables/Select-1.0.1/js/dataTables.select.min.js'));
27 27

  
28
$document->setTitle("Claims");
28
$document->setTitle("OpenAIRE - Claims");
29 29
$document->addStyleSheet('https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/themes/smoothness/jquery-ui.css');
30 30
$document->addScript("https://code.jquery.com/ui/1.11.1/jquery-ui.min.js");
31 31
//$document->addScript(JRoute :: _(JUri :: base() . 'templates/yoo_solar/js/jquery.min.js'));
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/browseorganizations/tmpl/default.php
13 13
$document -> addStyleSheet(JRoute :: _(JUri :: base() . 'templates/' . JFactory :: getApplication() -> getTemplate() . '/styles/openaire/css/tooltip.css'));
14 14
JViewLegacy :: loadHelper('FilterHelper');
15 15
JViewLegacy :: loadHelper('StatisticHelper');
16
$document->setTitle(" OpenAIRE - Browse Organizations");
16 17

  
17 18
?>
18 19

  
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/advancedsearchdatasources/view.html.php
35 35
		$this -> fields = $this -> getParameter('field');
36 36
		$this -> constraints = $this -> getParameter('constraint');
37 37
		$this -> types = $this -> getParameter('type');
38
		$this -> languages = $this -> getParameter('languageSearch');
38
		$this -> languages = $this -> getParameter('language');
39 39
		$this -> contents = $this -> getParameter('content');
40 40
		$this -> compatibilities = $this -> getParameter('compatibility');
41 41
		$this -> filters = array();
......
65 65
		}
66 66
		$this -> page = JRequest :: getUInt('page', self :: DEFAULT_PAGE);
67 67
		$this -> size = JRequest :: getUInt('size', self :: MIN_SIZE);
68
                $this -> size = ($this -> size > self :: MAX_SIZE || $this -> size < 1) ? self :: MIN_SIZE : $this -> size;
68 69
		if ((($this -> keywords != NULL) && ($this -> fields != NULL) && ($this -> constraints != NULL)) || ($this -> types != NULL) || ($this -> languages != NULL) || ($this -> contents != NULL) || ($this -> compatibilities != NULL)) {
69 70
			JViewLegacy :: loadHelper('PiwikHelper');
70 71
			PiwikHelper :: logPageView('advancedSearchDatasources', 'keywords=' . urlencode(implode(',', $this -> keywords)) . '&fields=' . urlencode(implode(',', $this -> fields)) . '&constraints=' . urlencode(implode(',', $this -> constraints)) . '&types=' . urlencode(implode(',', $this -> types)) . '&languages=' . urlencode(implode(',', $this -> languages)) . '&contents=' . urlencode(implode(',', $this -> contents)) . '&compatibilities=' . urlencode(implode(',', $this -> compatibilities)) . '&type=' . urlencode($type) . '&language=' . urlencode($language) . '&content=' . urlencode($content) . '&compatibility=' . urlencode($compatibility) . '&page=' . urlencode($this -> page) . '&size=' . urlencode($this -> size) . '&locale=' . urlencode($locale));
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/browsedatasources/tmpl/default.php
14 14
$document -> addStyleSheet(JRoute :: _(JUri :: base() . 'templates/' . JFactory :: getApplication() -> getTemplate() . '/styles/openaire/css/tooltip.css'));
15 15
JViewLegacy :: loadHelper('FilterHelper');
16 16
JViewLegacy :: loadHelper('StatisticHelper');
17
$document->setTitle(" OpenAIRE - Browse Data Providers");
17 18

  
18 19
?>
19 20

  
modules/uoa-joomla/branches/beta-functionalities/joomla-3.4/com_openaire/site/views/searchdatasources/tmpl/default.php
17 17
JViewLegacy:: loadHelper('BrowseHelper');
18 18
JViewLegacy:: loadHelper('OpenaireHelper');
19 19
OpenaireHelper::initSearchAjaxUrls($document, $this -> itemId);
20
$document->setTitle("Search Data Sources");
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff