Changeset 6093

Timestamp:

03/11/15 08:18:24 (9 years ago)

Author:

emanuel.dima@uni-tuebingen.de

Message:

22. beta-28: disabling sampa for now

Location:

SRUAggregator/trunk

Files:

• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/app/Aggregator.java (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/scan/ScanCrawlTask.java (modified) (1 diff)
• src/main/resources/assets/js/main.js (modified) (1 diff)
• src/main/resources/assets/js/main.jsx (modified) (1 diff)
• src/main/resources/assets/js/search.js (modified) (3 diffs)
• src/main/resources/assets/js/search.jsx (modified) (3 diffs)

SRUAggregator/trunk/pom.xml

@@ -8 +8 @@
         <groupId>eu.clarin.sru.fcs</groupId>
         <artifactId>Aggregator2</artifactId>
-        <version>2.0.0-beta-27</version>
+        <version>2.0.0-beta-28</version>
         <name>FCS Aggregator</name>
 

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/Aggregator.java

@@ -88 +88 @@
  * TODO: add the modes described above (except live)
  *
+ * TODO: update comments everywhere
+ *
+ * TODO: add some basic docs
+ *
  * TODO: Export search results to personal workspace using oauth
  *

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/scan/ScanCrawlTask.java

@@ -62 +62 @@
                         if (additionalCQLEndpoints != null && !additionalCQLEndpoints.isEmpty()) {
                                 institutions.add(0,
-                                                new Institution("ZZZ", null) {
+                                                new Institution("Unknown Institution", null) {
                                                         {
                                                                 for (URL u : additionalCQLEndpoints) {

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

@@ -3 +3 @@
 "use strict";
 
-var VERSION = "VERSION 2.0.0-beta-27";
+var VERSION = "VERSION 2.0.0-beta-28";
 var URLROOT = "/Aggregator-testing";
 

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

@@ -3 +3 @@
 "use strict";
 
-var VERSION = "VERSION 2.0.0-beta-27";
+var VERSION = "VERSION 2.0.0-beta-28";
 var URLROOT = "/Aggregator-testing";
 

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

@@ -24 +24 @@
 var layers = [
         {
+                id: "text",
+                name: "Text Resources",
+                searchPlaceholder: "Elephant",
+                searchLabel: "Search text",
+                searchLabelBkColor: "#fed",
+                className: '',
+        },
+        {
                 id: "sampa",
                 name: "Phonetic Transcriptions",
@@ -29 +37 @@
                 searchLabel: "SAMPA query",
                 searchLabelBkColor: "#eef",
-        },
-        {
-                id: "text",
-                name: "Text Resources",
-                searchPlaceholder: "Elephant",
-                searchLabel: "Search text",
-                searchLabelBkColor: "#fed",
+                disabled: true,
         },
 ];
 var layerMap = {
-        sampa: layers[0], 
-        text: layers[1],
+        text: layers[0],
+        sampa: layers[1], 
 };
 
@@ -466 +468 @@
                                                                         React.createElement("ul", {ref: "layerDropdownMenu", className: "dropdown-menu"}, 
                                                                                         layers.map(function(l) { 
-                                                                                                return React.createElement("li", {key: l.id}, " ", React.createElement("a", {tabIndex: "-1", href: "#", 
-                                                                                                        onClick: this.setLayer.bind(this, l.id)}, " ", l.name, " "));
+                                                                                                var cls = l.disabled ? 'disabled':'';
+                                                                                                var handler = function() { if (!l.disabled) this.setLayer(l.id); };
+                                                                                                return React.createElement("li", {key: l.id, className: cls}, " ", React.createElement("a", {tabIndex: "-1", href: "#", 
+                                                                                                        onClick: handler}, " ", l.name, " "));
                                                                                         }.bind(this))
                                                                                 

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

@@ -24 +24 @@
 var layers = [
         {
+                id: "text",
+                name: "Text Resources",
+                searchPlaceholder: "Elephant",
+                searchLabel: "Search text",
+                searchLabelBkColor: "#fed",
+                className: '',
+        },
+        {
                 id: "sampa",
                 name: "Phonetic Transcriptions",
@@ -29 +37 @@
                 searchLabel: "SAMPA query",
                 searchLabelBkColor: "#eef",
-        },
-        {
-                id: "text",
-                name: "Text Resources",
-                searchPlaceholder: "Elephant",
-                searchLabel: "Search text",
-                searchLabelBkColor: "#fed",
+                disabled: true,
         },
 ];
 var layerMap = {
-        sampa: layers[0], 
-        text: layers[1],
+        text: layers[0],
+        sampa: layers[1], 
 };
 
@@ -466 +468 @@
                                                                         <ul ref="layerDropdownMenu" className="dropdown-menu">
                                                                                 {       layers.map(function(l) { 
-                                                                                                return <li key={l.id}> <a tabIndex="-1" href="#" 
-                                                                                                        onClick={this.setLayer.bind(this, l.id)}> {l.name} </a></li>;
+                                                                                                var cls = l.disabled ? 'disabled':'';
+                                                                                                var handler = function() { if (!l.disabled) this.setLayer(l.id); };
+                                                                                                return <li key={l.id} className={cls}> <a tabIndex="-1" href="#" 
+                                                                                                        onClick={handler}> {l.name} </a></li>;
                                                                                         }.bind(this))
                                                                                 }