Changeset 6057 for SRUAggregator
- Timestamp:
- 02/25/15 14:54:04 (9 years ago)
- Location:
- SRUAggregator/trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
SRUAggregator/trunk/aggregator.yml
r6051 r6057 1 1 aggregatorParams: 2 CENTER_REGISTRY_URL: http://centres.clarin.eu/restxml/2 # CENTER_REGISTRY_URL: http://centres.clarin.eu/restxml/ 3 3 additionalCQLEndpoints: 4 4 - https://clarin.ids-mannheim.de/digibibsru-new -
SRUAggregator/trunk/pom.xml
r6051 r6057 8 8 <groupId>eu.clarin.sru.fcs</groupId> 9 9 <artifactId>Aggregator2</artifactId> 10 <version>2.0.0-alpha-2 3</version>10 <version>2.0.0-alpha-24</version> 11 11 <name>FCS Aggregator</name> 12 12 -
SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/Aggregator.java
r6049 r6057 91 91 * the view (search for next set of results) 92 92 * 93 * TODO: Use weblicht with results94 *95 93 * TODO: Export search results to personal workspace as csv, excel, tcf, plain 96 94 * text: ask Marie/Wei about oauth ways to do that ndg oauth; ask Menzo, Willem, -
SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/AggregatorConfiguration.java
r6049 r6057 93 93 return SEARCH_MAX_CONCURRENT_REQUESTS_PER_ENDPOINT; 94 94 } 95 96 @JsonIgnore 97 public String getWEBLICHT_URL() { 98 return WEBLICHT_URL; 99 } 95 100 } 96 101 public Params aggregatorParams = new Params(); -
SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/rest/RestService.java
r6043 r6057 251 251 } 252 252 253 return url == null ? Response.status(503).entity("error while exporting to weblicht").build() 254 : Response.ok().entity(url).build(); 253 URI weblichtUri = new URI(Aggregator.getInstance().getParams().getWEBLICHT_URL() 254 + url); 255 return url == null 256 ? Response.status(503).entity("error while exporting to weblicht").build() 257 : Response.seeOther(weblichtUri).entity(weblichtUri).build(); 255 258 } 256 259 } -
SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/scan/ScanCrawler.java
r6043 r6057 201 201 String ret = map.get("en"); 202 202 if (ret == null || ret.trim().isEmpty()) { 203 ret = map.get("eng"); 204 } 205 if (ret == null || ret.trim().isEmpty()) { 203 206 ret = map.get(null); 204 207 } 205 208 if (ret == null || ret.trim().isEmpty()) { 206 209 ret = map.get("de"); 210 } 211 if (ret == null || ret.trim().isEmpty()) { 212 ret = map.get("deu"); 207 213 } 208 214 if (ret == null || ret.trim().isEmpty()) { -
SRUAggregator/trunk/src/main/resources/assets/js/corpora.js
r6043 r6057 181 181 var expansive = corpus.expanded ? {overflow:'hidden'} 182 182 : {whiteSpace:'nowrap', overflow:'hidden', textOverflow: 'ellipsis'}; 183 return React.createElement("div", {className: corpusContainerClass, key: corpus. title},183 return React.createElement("div", {className: corpusContainerClass, key: corpus.id}, 184 184 React.createElement("div", {className: "row corpus", onClick: this.toggleExpansion.bind(this, corpus)}, 185 185 React.createElement("div", {className: "col-sm-1 vcenter"}, -
SRUAggregator/trunk/src/main/resources/assets/js/main.js
r6049 r6057 3 3 "use strict"; 4 4 5 var VERSION = "VERSION 2.0.0.α2 2";5 var VERSION = "VERSION 2.0.0.α24"; 6 6 var URLROOT = "/Aggregator-testing"; 7 7 -
SRUAggregator/trunk/src/main/resources/assets/js/main.jsx
r6051 r6057 3 3 "use strict"; 4 4 5 var VERSION = "VERSION 2.0.0.α2 3";5 var VERSION = "VERSION 2.0.0.α24"; 6 6 var URLROOT = "/Aggregator-testing"; 7 7 -
SRUAggregator/trunk/src/main/resources/assets/js/search.js
r6049 r6057 270 270 }, 271 271 272 getToWeblichtLink: function(format) { 273 return 'rest/search/'+this.state.searchId+'/toWeblicht?format='+format; 274 }, 275 272 276 setLanguageAndFilter: function(languageObj, languageFilter) { 273 277 this.state.corpora.setVisibility(this.state.searchLayerId, … … 427 431 results: this.filterResults(), 428 432 getDownloadLink: this.getDownloadLink, 433 getToWeblichtLink: this.getToWeblichtLink, 429 434 searchedLanguage: this.state.language}) 430 435 ) … … 527 532 searchedLanguage: PT.array.isRequired, 528 533 getDownloadLink: PT.func.isRequired, 534 getToWeblichtLink: PT.func.isRequired, 529 535 }, 530 536 … … 537 543 toggleKwic: function() { 538 544 this.setState({displayKwic:!this.state.displayKwic}); 545 }, 546 547 zoom: function(e) { 548 e.stopPropagation(); 539 549 }, 540 550 … … 603 613 604 614 renderDiagnostic: function(d) { 605 return React.createElement("div", {className: "alert alert-warning" },615 return React.createElement("div", {className: "alert alert-warning", key: d.uri}, 606 616 React.createElement("div", null, "Diagnostic: ", d.message) 607 617 ); … … 654 664 return false; 655 665 } 656 return React.createElement(Panel, {key: corpusHit.corpus. title,666 return React.createElement(Panel, {key: corpusHit.corpus.id, 657 667 title: this.renderPanelTitle(corpusHit.corpus), 658 668 info: this.renderPanelInfo(corpusHit.corpus)}, … … 709 719 }, 710 720 721 renderToWeblichtLinks: function() { 722 return ( 723 React.createElement("div", {className: "dropdown"}, 724 React.createElement("button", {className: "btn btn-default", 'aria-expanded': "false", 'data-toggle': "dropdown"}, 725 React.createElement("span", {className: "glyphicon glyphicon-download-alt", 'aria-hidden': "true"}), 726 " ", " Use Weblicht ", " ", 727 React.createElement("span", {className: "caret"}) 728 ), 729 React.createElement("ul", {className: "dropdown-menu"}, 730 React.createElement("li", null, " ", React.createElement("a", {href: this.props.getToWeblichtLink("text")}, 731 " ", " As Plain Text file")) 732 ) 733 ) 734 ); 735 }, 736 711 737 renderToolbox: function(hits) { 712 738 if (hits <= 0) { … … 716 742 React.createElement("div", {className: "toolbox float-left inline"}, 717 743 this.renderDownloadLinks() 744 ), 745 React.createElement("div", {className: "toolbox float-left inline"}, 746 this.renderToWeblichtLinks() 718 747 ), 719 748 React.createElement("div", {className: "float-right inline", style: {marginTop:15}}, -
SRUAggregator/trunk/src/main/resources/assets/js/search.jsx
r6049 r6057 270 270 }, 271 271 272 getToWeblichtLink: function(format) { 273 return 'rest/search/'+this.state.searchId+'/toWeblicht?format='+format; 274 }, 275 272 276 setLanguageAndFilter: function(languageObj, languageFilter) { 273 277 this.state.corpora.setVisibility(this.state.searchLayerId, … … 427 431 results={this.filterResults()} 428 432 getDownloadLink={this.getDownloadLink} 433 getToWeblichtLink={this.getToWeblichtLink} 429 434 searchedLanguage={this.state.language}/> 430 435 </div> … … 527 532 searchedLanguage: PT.array.isRequired, 528 533 getDownloadLink: PT.func.isRequired, 534 getToWeblichtLink: PT.func.isRequired, 529 535 }, 530 536 … … 537 543 toggleKwic: function() { 538 544 this.setState({displayKwic:!this.state.displayKwic}); 545 }, 546 547 zoom: function(e) { 548 e.stopPropagation(); 539 549 }, 540 550 … … 603 613 604 614 renderDiagnostic: function(d) { 605 return <div className="alert alert-warning" >615 return <div className="alert alert-warning" key={d.uri}> 606 616 <div>Diagnostic: {d.message}</div> 607 617 </div>; … … 654 664 return false; 655 665 } 656 return <Panel key={corpusHit.corpus. title}666 return <Panel key={corpusHit.corpus.id} 657 667 title={this.renderPanelTitle(corpusHit.corpus)} 658 668 info={this.renderPanelInfo(corpusHit.corpus)}> … … 709 719 }, 710 720 721 renderToWeblichtLinks: function() { 722 return ( 723 <div className="dropdown"> 724 <button className="btn btn-default" aria-expanded="false" data-toggle="dropdown" > 725 <span className="glyphicon glyphicon-download-alt" aria-hidden="true"/> 726 {" "} Use Weblicht {" "} 727 <span className="caret"/> 728 </button> 729 <ul className="dropdown-menu"> 730 <li> <a href={this.props.getToWeblichtLink("text")}> 731 {" "} As Plain Text file</a></li> 732 </ul> 733 </div> 734 ); 735 }, 736 711 737 renderToolbox: function(hits) { 712 738 if (hits <= 0) { … … 716 742 <div className="toolbox float-left inline"> 717 743 {this.renderDownloadLinks()} 744 </div> 745 <div className="toolbox float-left inline"> 746 {this.renderToWeblichtLinks()} 718 747 </div> 719 748 <div className="float-right inline" style={{marginTop:15}}>
Note: See TracChangeset
for help on using the changeset viewer.