Changeset 6132 for SRUAggregator


Ignore:
Timestamp:
04/08/15 08:43:17 (9 years ago)
Author:
emanuel.dima@uni-tuebingen.de
Message:
  1. beta-34: production settings and developments settings; misc
Location:
SRUAggregator/trunk
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed

  • SRUAggregator/trunk/aggregator.yml

    r6131 r6132  
    33  # additionalCQLEndpoints:
    44    # - https://clarin.ids-mannheim.de/digibibsru-new
    5     # - https://lux17.mpi.nl/ds/cqlsearch
    6     # - http://cqlservlet.mpi.nl/
    7     # - http://dspin.dwds.de:8088/ddc-sru/dingler/
    8     # - http://www.meertens.knaw.nl/mimore/srucql/
    9     # - http://gysseling.corpus.taalbanknederlands.inl.nl/gyssru/
    10     # - http://brievenalsbuit.inl.nl/zbsru/
    11     # - http://corpus3.aac.ac.at/ddconsru/
    12     #  - http://dspin.dwds.de:8088/ddc-sru/dta/
    135
    14   # AGGREGATOR_FILE_PATH: /data/fcsAggregator/fcsAggregatorCorpora.json
    15   # AGGREGATOR_FILE_PATH_BACKUP: /data/fcsAggregator/fcsAggregatorCorpora.backup.json
    16   AGGREGATOR_FILE_PATH: /Users/edima/fcsAggregatorCorpora.json
    17   AGGREGATOR_FILE_PATH_BACKUP: /Users/edima/fcsAggregatorCorpora.backup.json
    18   SCAN_MAX_DEPTH: 1 # recommended 3
     6  AGGREGATOR_FILE_PATH: /var/lib/aggregator/fcsAggregatorCorpora.json
     7  AGGREGATOR_FILE_PATH_BACKUP: /var/lib/aggregator/fcsAggregatorCorpora.backup.json
     8
     9  SCAN_MAX_DEPTH: 3 # recommended 3
    1910  SCAN_TASK_INITIAL_DELAY: 0
    2011  SCAN_TASK_INTERVAL: 12
    2112  SCAN_TASK_TIME_UNIT: HOURS
     13  SCAN_MAX_CONCURRENT_REQUESTS_PER_ENDPOINT: 4  # @depth2: 1=361s; 2=225s; 4=207s
    2214
    23   SCAN_MAX_CONCURRENT_REQUESTS_PER_ENDPOINT: 4  # @depth2: 1=361s; 2=225s; 4=207s
    2415  SEARCH_MAX_CONCURRENT_REQUESTS_PER_ENDPOINT: 4
    2516  SEARCH_MAX_CONCURRENT_REQUESTS_PER_SLOW_ENDPOINT: 2
    … …  
    3223
    3324  weblichtConfig:
    34     url: https://weblicht.sfs.uni-tuebingen.de/WebLicht-4/?input=
     25    url: https://weblicht.sfs.uni-tuebingen.de/weblicht/?input=
    3526    acceptedTcfLanguages:
    3627      - en
    … …  
    6051
    6152  appenders:
    62     - type: console
     53    - type: file
     54      currentLogFilename: /var/log/aggregator/access.log
     55      archivedLogFilenamePattern: /var/log/aggregator/access-%d.log.gz
     56      archivedFileCount: 5

  • SRUAggregator/trunk/pom.xml

    r6131 r6132  
    88        <groupId>eu.clarin.sru.fcs</groupId>
    99        <artifactId>aggregator</artifactId>
    10         <version>2.0.0-beta-33</version>
     10        <version>2.0.0-beta-34</version>
    1111        <name>FCS Aggregator</name>
    1212

  • SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/client/GenericClient.java

    r6131 r6132  
    4242                                try {
    4343                                        eq.maxConcurrentRequests = maxConcurrentRequestsCallback.getMaxConcurrentRequest(endpoint);
    44                                         log.info("CONCURRENCY LEVEL " + eq.maxConcurrentRequests
     44                                        log.debug("CONCURRENCY LEVEL " + eq.maxConcurrentRequests
    4545                                                        + " for operation: " + op.getClass().getSimpleName()
    4646                                                        + " for endpoint: " + endpoint);

  • SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/client/ThrottledClient.java

    r6131 r6132  
    1111import java.net.URI;
    1212import java.net.URISyntaxException;
    13 import java.util.logging.Level;
    14 import java.util.logging.Logger;
    15 import org.slf4j.LoggerFactory;
    1613
    1714/**
    … …  
    1916 */
    2017public class ThrottledClient {
    21         private static final org.slf4j.Logger log = LoggerFactory.getLogger(GenericClient.class);
    22 
    2318        public interface Stats {
    2419
    … …  
    9186                }
    9287        }
    93 
    9488}

  • SRUAggregator/trunk/src/main/resources/assets/js/main.js

    r6131 r6132  
    33"use strict";
    44
    5 var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-33";
     5var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-34";
    66var URLROOT = window.MyAggregator.URLROOT =
    77        window.location.pathname.substring(0, window.location.pathname.indexOf("/",2)) ||
    … …  
    119119        toEmbedded: function(doPushHistory) { this.gotoPage(doPushHistory, 'embed'); },
    120120
     121        renderLogin: function() {
     122                return false;
     123                // return  <li className="unauthenticated">
     124                //                      <a href="login" tabIndex="-1"><span className="glyphicon glyphicon-log-in"></span> LOGIN</a>
     125                //              </li>;
     126        },
     127
    121128        renderCollapsible: function() {
    122129                var classname = "navbar-collapse collapse " + (this.state.navbarCollapse?"in":"");
    … …  
    132139                                ),
    133140                                React.createElement("ul", {id: "CLARIN_header_right", className: "nav navbar-nav navbar-right"},
    134                                         React.createElement("li", {className: "unauthenticated"},
    135                                                 React.createElement("a", {href: "login", tabIndex: "-1"}, React.createElement("span", {className: "glyphicon glyphicon-log-in"}), " LOGIN")
    136                                         )
     141                                this.renderLogin()
    137142                                )
    138143                        )

  • SRUAggregator/trunk/src/main/resources/assets/js/main.jsx

    r6131 r6132  
    33"use strict";
    44
    5 var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-33";
     5var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-34";
    66var URLROOT = window.MyAggregator.URLROOT =
    77        window.location.pathname.substring(0, window.location.pathname.indexOf("/",2)) ||
    … …  
    119119        toEmbedded: function(doPushHistory) { this.gotoPage(doPushHistory, 'embed'); },
    120120
     121        renderLogin: function() {
     122                return false;
     123                // return  <li className="unauthenticated">
     124                //                      <a href="login" tabIndex="-1"><span className="glyphicon glyphicon-log-in"></span> LOGIN</a>
     125                //              </li>;
     126        },
     127
    121128        renderCollapsible: function() {
    122129                var classname = "navbar-collapse collapse " + (this.state.navbarCollapse?"in":"");
    … …  
    132139                                </ul>
    133140                                <ul id="CLARIN_header_right" className="nav navbar-nav navbar-right">
    134                                         <li className="unauthenticated">
    135                                                 <a href="login" tabIndex="-1"><span className="glyphicon glyphicon-log-in"></span> LOGIN</a>
    136                                         </li>
     141                                {this.renderLogin()}
    137142                                </ul>
    138143                        </div>

  • SRUAggregator/trunk/src/main/resources/assets/js/search.js

    r6131 r6132  
    152152
    153153Corpora.prototype.setAggregationContext = function(endpoints2handles) {
    154         console.log('setAggregationContext', endpoints2handles, this.corpora);
    155 
     154        // console.log('setAggregationContext', endpoints2handles, this.corpora);
    156155        var recurseSelect = function(select, corpus) {
    157156                corpus.selected = false;
    … …  
    927926                                        var langs = corpusHit.kwics.map(function(kwic) {return kwic.language;});
    928927                                        langs = _.uniq(langs.filter(function(l){ return l !== null; }));
    929                                         console.log("languages:", langs);
    930928                                        if (langs.length === 1) {
    931929                                                forceLanguage = langs[0];

  • SRUAggregator/trunk/src/main/resources/assets/js/search.jsx

    r6131 r6132  
    152152
    153153Corpora.prototype.setAggregationContext = function(endpoints2handles) {
    154         console.log('setAggregationContext', endpoints2handles, this.corpora);
    155 
     154        // console.log('setAggregationContext', endpoints2handles, this.corpora);
    156155        var recurseSelect = function(select, corpus) {
    157156                corpus.selected = false;
    … …  
    927926                                        var langs = corpusHit.kwics.map(function(kwic) {return kwic.language;});
    928927                                        langs = _.uniq(langs.filter(function(l){ return l !== null; }));
    929                                         console.log("languages:", langs);
    930928                                        if (langs.length === 1) {
    931929                                                forceLanguage = langs[0];
Note: See TracChangeset for help on using the changeset viewer.