Changeset 6144 for SRUAggregator
- Timestamp:
- 04/14/15 22:18:50 (9 years ago)
- Location:
- SRUAggregator/trunk
- Files:
-
- 3 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
SRUAggregator/trunk/pom.xml
r6134 r6144 8 8 <groupId>eu.clarin.sru.fcs</groupId> 9 9 <artifactId>aggregator</artifactId> 10 <version>2.0.0-beta-3 4</version>10 <version>2.0.0-beta-35</version> 11 11 <name>FCS Aggregator</name> 12 12 … … 28 28 <url>http://oss.sonatype.org/content/repositories/snapshots</url> 29 29 </repository> 30 </repositories> 30 </repositories> 31 31 32 32 <dependencies> … … 102 102 </exclusions> 103 103 </dependency> 104 104 105 105 <dependency> 106 106 <groupId>org.apache.poi</groupId> -
SRUAggregator/trunk/src/main/resources/assets/index.html
r6129 r6144 14 14 <script src="http://cdnjs.cloudflare.com/ajax/libs/es5-shim/3.4.0/es5-shim.js"></script> 15 15 <script src="http://cdnjs.cloudflare.com/ajax/libs/es5-shim/3.4.0/es5-sham.js"></script> 16 <![endif]--> 16 <![endif]--> 17 17 18 18 <style> … … 57 57 <script src="js/main.js"></script> 58 58 59 <link href="clarinservices/clarinservices.css" rel="stylesheet"> 60 <script src="clarinservices/clarinservices.js"></script> 61 59 62 <!-- Piwik --> 60 63 <script type="text/javascript"> -
SRUAggregator/trunk/src/main/resources/assets/js/main.js
r6132 r6144 3 3 "use strict"; 4 4 5 var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-34"; 6 var URLROOT = window.MyAggregator.URLROOT = 7 window.location.pathname.substring(0, window.location.pathname.indexOf("/",2)) || 5 var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-35"; 6 7 var URLROOT = window.MyAggregator.URLROOT = 8 window.location.pathname.substring(0, window.location.pathname.indexOf("/",2)) || 8 9 "/Aggregator"; 9 10 … … 49 50 }, 10000); 50 51 }, 51 52 52 53 ajax: function(ajaxObject) { 53 54 var that = this; … … 92 93 }, 93 94 94 getPageFns: function() { 95 getPageFns: function() { 95 96 return { 96 97 '': this.renderAggregator, … … 139 140 ), 140 141 React.createElement("ul", {id: "CLARIN_header_right", className: "nav navbar-nav navbar-right"}, 141 this.renderLogin() 142 React.createElement("li", null, 143 React.createElement("div", {id: "clarinservices", style: {padding:10}}) 144 ), 145 this.renderLogin() 142 146 ) 143 147 ) … … 156 160 ) 157 161 ), 158 162 159 163 React.createElement("div", {className: "navbar navbar-default navbar-static-top", role: "navigation"}, 160 164 React.createElement("div", {className: "container"}, … … 203 207 stats: {}, 204 208 activeTab: 0, 205 // searchStats: {}, 206 // lastScanStats: {}, 209 // searchStats: {}, 210 // lastScanStats: {}, 207 211 }; 208 212 }, … … 237 241 renderCollections: function(colls) { 238 242 return React.createElement("div", {style: {marginLeft:40}}, 239 colls.length === 0 ? 243 colls.length === 0 ? 240 244 React.createElement("div", {style: {color:"#a94442"}}, "NO collections found") 241 : 245 : 242 246 React.createElement("div", null, 243 247 colls.length, " root collection(s):", … … 255 259 React.createElement("div", {className: classes}, 256 260 React.createElement("div", null, 257 d.counter <= 1 ? false : 261 d.counter <= 1 ? false : 258 262 React.createElement("div", {className: "inline", style: {margin:"5px 5px 5px 5px"}}, 259 263 React.createElement("span", {className: "badge", style: {backgroundColor:'#ae7241'}}, "x ", d.counter) … … 264 268 React.createElement("div", null, "Context: ", React.createElement("a", {href: d.context}, d.context)) 265 269 ) 266 ); 270 ); 267 271 }, 268 272 … … 272 276 React.createElement("div", {className: "inline alert alert-danger", role: "alert"}, 273 277 React.createElement("div", null, 274 e.counter <= 1 ? false : 278 e.counter <= 1 ? false : 275 279 React.createElement("div", {className: "inline", style: {margin:"5px 5px 5px 5px"}}, 276 280 React.createElement("span", {className: "badge", style: {backgroundColor:'#c94442'}}, "x ", e.counter, " ") … … 282 286 xc.cause ? React.createElement("div", null, "Caused by: ", xc.cause) : false 283 287 ) 284 ); 288 ); 285 289 }, 286 290 … … 292 296 React.createElement("ul", {className: "list-inline list-unstyled", style: {marginBottom:0}}, 293 297 React.createElement("li", null, 294 stat.version == "LEGACY" ? 295 React.createElement("span", {style: {color:'#a94442'}}, "legacy ", React.createElement("i", {className: "glyphicon glyphicon-thumbs-down"}), " ") 298 stat.version == "LEGACY" ? 299 React.createElement("span", {style: {color:'#a94442'}}, "legacy ", React.createElement("i", {className: "glyphicon glyphicon-thumbs-down"}), " ") 296 300 : React.createElement("span", {style: {color:'#3c763d'}}, React.createElement("i", {className: "glyphicon glyphicon-thumbs-up"}), " "), 297 301 … … 300 304 ), 301 305 React.createElement("div", {style: {marginLeft:40}}, 302 isScan ? 306 isScan ? 303 307 React.createElement("div", null, "Max concurrent scan requests:", " ", " ", stat.maxConcurrentRequests, " ") : 304 308 React.createElement("div", null, "Max concurrent search requests:", " ", " ", stat.maxConcurrentRequests, " ") … … 307 311 React.createElement("div", {style: {marginLeft:40}}, 308 312 React.createElement("span", null, stat.numberOfRequests), " request(s)," + ' ' + 309 "average:", this.renderWaitTimeSecs(stat.avgExecutionTime), "," + ' ' + 313 "average:", this.renderWaitTimeSecs(stat.avgExecutionTime), "," + ' ' + 310 314 "max: ", this.renderWaitTimeSecs(stat.maxExecutionTime) 311 315 ), 312 316 isScan ? this.renderCollections(stat.rootCollections) : false, 313 (errors && errors.length) ? 317 (errors && errors.length) ? 314 318 React.createElement("div", {className: "inline", style: {marginLeft:40}}, 315 319 errors.map(this.renderError) 316 320 ) : false, 317 321 318 (diagnostics && diagnostics.length) ? 322 (diagnostics && diagnostics.length) ? 319 323 React.createElement("div", {className: "inline", style: {marginLeft:40}}, 320 324 diagnostics.map(this.renderDiagnostic) … … 381 385 var HelpPage = React.createClass({displayName: 'HelpPage', 382 386 openHelpDesk: function() { 383 window.open('http://support.clarin-d.de/mail/form.php?queue=Aggregator&lang=en', 387 window.open('http://support.clarin-d.de/mail/form.php?queue=Aggregator&lang=en', 384 388 '_blank', 'height=560,width=370'); 385 389 }, … … 391 395 React.createElement("h1", null, "Help"), 392 396 React.createElement("h3", null, "Performing search in FCS corpora"), 393 React.createElement("p", null, "To perform simple keyword search in all CLARIN-D Federated Content Search cent ers" + ' ' +394 "and their corpora, go to the search field at the top of the page," + ' ' + 397 React.createElement("p", null, "To perform simple keyword search in all CLARIN-D Federated Content Search centres" + ' ' + 398 "and their corpora, go to the search field at the top of the page," + ' ' + 395 399 "enter your query, and click 'search' button or press the 'Enter' key."), 396 397 React.createElement("p", null, "When the search starts, the page will start filling in with the corpora responses." + ' ' + 400 401 React.createElement("p", null, "When the search starts, the page will start filling in with the corpora responses." + ' ' + 398 402 "After the entire search process has ended you have the option to download the results" + ' ' + 399 403 "in various formats." … … 407 411 408 412 React.createElement("h3", null, "Adjusting search criteria"), 409 React.createElement("p", null, "The FCS Aggregator makes possible to select specific corpora based on their name" + ' ' + 413 React.createElement("p", null, "The FCS Aggregator makes possible to select specific corpora based on their name" + ' ' + 410 414 "or language and to specify the number of search results (hits) per corpus per page." + ' ' + 411 "The user interface controls that allows to change these options are located" + ' ' + 412 "right below the search fiels on the main page. The current options are" + ' ' + 413 "to filter resources based on their language, to select specific resources, and" + ' ' + 415 "The user interface controls that allows to change these options are located" + ' ' + 416 "right below the search fiels on the main page. The current options are" + ' ' + 417 "to filter resources based on their language, to select specific resources, and" + ' ' + 414 418 "to set the maximum number of hits."), 415 419 416 420 417 421 React.createElement("h3", null, "More help"), 418 React.createElement("p", null, "More detailed information on using FCS Aggregator is available" + ' ' + 419 "at the Aggegator wiki page. If you still cannot find an answer to your question," + ' ' + 422 React.createElement("p", null, "More detailed information on using FCS Aggregator is available at the", 423 React.createElement("a", {href: "http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/FCS_Aggregator"}, 424 "Aggregator wiki page" 425 ), "." + ' ' + 426 "If you still cannot find an answer to your question," + ' ' + 420 427 "or if want to send a feedback, you can write to Clarin-D helpdesk: "), 421 428 React.createElement("button", {type: "button", className: "btn btn-default btn-lg", onClick: this.openHelpDesk}, 422 429 React.createElement("span", {className: "glyphicon glyphicon-question-sign", 'aria-hidden': "true"}), 423 430 "Â HelpDesk" 424 ) 431 ) 425 432 ) 426 433 ) -
SRUAggregator/trunk/src/main/resources/assets/js/main.jsx
r6133 r6144 3 3 "use strict"; 4 4 5 var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-34"; 6 var URLROOT = window.MyAggregator.URLROOT = 7 window.location.pathname.substring(0, window.location.pathname.indexOf("/",2)) || 5 var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-35"; 6 7 var URLROOT = window.MyAggregator.URLROOT = 8 window.location.pathname.substring(0, window.location.pathname.indexOf("/",2)) || 8 9 "/Aggregator"; 9 10 … … 49 50 }, 10000); 50 51 }, 51 52 52 53 ajax: function(ajaxObject) { 53 54 var that = this; … … 92 93 }, 93 94 94 getPageFns: function() { 95 getPageFns: function() { 95 96 return { 96 97 '': this.renderAggregator, … … 139 140 </ul> 140 141 <ul id="CLARIN_header_right" className="nav navbar-nav navbar-right"> 141 {this.renderLogin()} 142 <li> 143 <div id="clarinservices" style={{padding:10}}/> 144 </li> 145 {this.renderLogin()} 142 146 </ul> 143 147 </div> … … 156 160 </div> 157 161 </div> 158 162 159 163 <div className="navbar navbar-default navbar-static-top" role="navigation"> 160 164 <div className="container"> … … 203 207 stats: {}, 204 208 activeTab: 0, 205 // searchStats: {}, 206 // lastScanStats: {}, 209 // searchStats: {}, 210 // lastScanStats: {}, 207 211 }; 208 212 }, … … 237 241 renderCollections: function(colls) { 238 242 return <div style={{marginLeft:40}}> 239 { colls.length === 0 ? 243 { colls.length === 0 ? 240 244 <div style={{color:"#a94442"}}>NO collections found</div> 241 : 245 : 242 246 <div> 243 247 {colls.length} root collection(s): … … 253 257 var classes = "inline alert alert-warning " + (d.diagnostic.uri === 'LEGACY' ? "legacy" : ""); 254 258 return <div key={d.diagnostic.uri}> 255 <div className={classes} > 259 <div className={classes} > 256 260 <div> 257 { d.counter <= 1 ? false : 261 { d.counter <= 1 ? false : 258 262 <div className="inline" style={{margin:"5px 5px 5px 5px"}}> 259 263 <span className="badge" style={{backgroundColor:'#ae7241'}}>x {d.counter}</span> … … 264 268 <div>Context: <a href={d.context}>{d.context}</a></div> 265 269 </div> 266 </div>; 270 </div>; 267 271 }, 268 272 … … 272 276 <div className="inline alert alert-danger" role="alert"> 273 277 <div> 274 { e.counter <= 1 ? false : 278 { e.counter <= 1 ? false : 275 279 <div className="inline" style={{margin:"5px 5px 5px 5px"}}> 276 280 <span className="badge" style={{backgroundColor:'#c94442'}}>x {e.counter} </span> … … 282 286 { xc.cause ? <div>Caused by: {xc.cause}</div> : false} 283 287 </div> 284 </div>; 288 </div>; 285 289 }, 286 290 … … 292 296 <ul className='list-inline list-unstyled' style={{marginBottom:0}}> 293 297 <li> 294 { stat.version == "LEGACY" ? 295 <span style={{color:'#a94442'}}>legacy <i className="glyphicon glyphicon-thumbs-down"></i> </span> 296 : <span style={{color:'#3c763d'}}><i className="glyphicon glyphicon-thumbs-up"></i> </span> 298 { stat.version == "LEGACY" ? 299 <span style={{color:'#a94442'}}>legacy <i className="glyphicon glyphicon-thumbs-down"></i> </span> 300 : <span style={{color:'#3c763d'}}><i className="glyphicon glyphicon-thumbs-up"></i> </span> 297 301 } 298 302 { " "+endpoint[0] } … … 300 304 </ul> 301 305 <div style={{marginLeft:40}}> 302 { isScan ? 306 { isScan ? 303 307 <div>Max concurrent scan requests:{" "} {stat.maxConcurrentRequests} </div> : 304 308 <div>Max concurrent search requests:{" "} {stat.maxConcurrentRequests} </div> … … 307 311 <div style={{marginLeft:40}}> 308 312 <span>{stat.numberOfRequests}</span> request(s), 309 average:{this.renderWaitTimeSecs(stat.avgExecutionTime)}, 313 average:{this.renderWaitTimeSecs(stat.avgExecutionTime)}, 310 314 max: {this.renderWaitTimeSecs(stat.maxExecutionTime)} 311 315 </div> 312 316 { isScan ? this.renderCollections(stat.rootCollections) : false } 313 { (errors && errors.length) ? 317 { (errors && errors.length) ? 314 318 <div className='inline' style={{marginLeft:40}}> 315 319 { errors.map(this.renderError) } 316 320 </div> : false 317 321 } 318 { (diagnostics && diagnostics.length) ? 322 { (diagnostics && diagnostics.length) ? 319 323 <div className='inline' style={{marginLeft:40}}> 320 324 { diagnostics.map(this.renderDiagnostic) } … … 381 385 var HelpPage = React.createClass({ 382 386 openHelpDesk: function() { 383 window.open('http://support.clarin-d.de/mail/form.php?queue=Aggregator&lang=en', 387 window.open('http://support.clarin-d.de/mail/form.php?queue=Aggregator&lang=en', 384 388 '_blank', 'height=560,width=370'); 385 389 }, … … 391 395 <h1>Help</h1> 392 396 <h3>Performing search in FCS corpora</h3> 393 <p>To perform simple keyword search in all CLARIN-D Federated Content Search centres 394 and their corpora, go to the search field at the top of the page, 397 <p>To perform simple keyword search in all CLARIN-D Federated Content Search centres 398 and their corpora, go to the search field at the top of the page, 395 399 enter your query, and click 'search' button or press the 'Enter' key.</p> 396 397 <p>When the search starts, the page will start filling in with the corpora responses. 400 401 <p>When the search starts, the page will start filling in with the corpora responses. 398 402 After the entire search process has ended you have the option to download the results 399 403 in various formats. … … 407 411 408 412 <h3>Adjusting search criteria</h3> 409 <p>The FCS Aggregator makes possible to select specific corpora based on their name 413 <p>The FCS Aggregator makes possible to select specific corpora based on their name 410 414 or language and to specify the number of search results (hits) per corpus per page. 411 The user interface controls that allows to change these options are located 412 right below the search fiels on the main page. The current options are 413 to filter resources based on their language, to select specific resources, and 415 The user interface controls that allows to change these options are located 416 right below the search fiels on the main page. The current options are 417 to filter resources based on their language, to select specific resources, and 414 418 to set the maximum number of hits.</p> 415 419 416 420 417 421 <h3>More help</h3> 418 <p>More detailed information on using FCS Aggregator is available 419 at the Aggegator wiki page. If you still cannot find an answer to your question, 422 <p>More detailed information on using FCS Aggregator is available at the 423 <a href="http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/FCS_Aggregator"> 424 Aggregator wiki page 425 </a>. 426 If you still cannot find an answer to your question, 420 427 or if want to send a feedback, you can write to Clarin-D helpdesk: </p> 421 428 <button type="button" className="btn btn-default btn-lg" onClick={this.openHelpDesk} > 422 429 <span className="glyphicon glyphicon-question-sign" aria-hidden="true"></span> 423 430 HelpDesk 424 </button> 431 </button> 425 432 </div> 426 433 </div> … … 490 497 <h3>Statistics</h3> 491 498 <button type="button" className="btn btn-default btn-lg" onClick={function() {main.toStatistics(true);}} > 492 <span className="glyphicon glyphicon-cog" aria-hidden="true"> </span> 499 <span className="glyphicon glyphicon-cog" aria-hidden="true"> </span> 493 500 View server log 494 501 </button> … … 513 520 <div className="container"> 514 521 <div id="CLARIN_footer_left"> 515 <a title="about" href="about" onClick={this.toAbout}> 522 <a title="about" href="about" onClick={this.toAbout}> 516 523 <span className="glyphicon glyphicon-info-sign"></span> 517 524 <span>{VERSION}</span>
Note: See TracChangeset
for help on using the changeset viewer.