Skip to content
Snippets Groups Projects
Commit 1b16cfa6 authored by cmaeder's avatar cmaeder
Browse files

added sally bundle and adjusted routes 

old SearchDB.main no longer works
parent d1267ba2
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
pom.xml
+ 0
− 2
View file @ 1b16cfa6
...@@ -73,8 +73,6 @@ ...@@ -73,8 +73,6 @@
<scala-version>2.11.5</scala-version> <scala-version>2.11.5</scala-version>
<camel-version>2.14.1</camel-version> <camel-version>2.14.1</camel-version>
<bundle.export-package>info.kwarc.mmt.errorview*</bundle.export-package> <bundle.export-package>info.kwarc.mmt.errorview*</bundle.export-package>
<!-- <bundle.embed-dependency>sqlite-jdbc</bundle.embed-dependency> -->
<bundle.import-package>!org.sqlite;*</bundle.import-package>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
......
src/main/resource/search.html → src/main/resource/static/search.html
+ 2
− 2
View file @ 1b16cfa6
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<head> <head>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.10/angular.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.10/angular.min.js"></script>
<script src="static/search.js"></script> <script src="search.js"></script>
<link rel="stylesheet" href="static/search.css"/> <link rel="stylesheet" href="search.css"/>
</head> </head>
<body> <body>
<h3>Show</h3> <h3>Show</h3>
......
src/main/resource/static/search.js
+ 2
− 2
View file @ 1b16cfa6
...@@ -20,14 +20,14 @@ angular.module('searchApp', []).controller('SearchController', ...@@ -20,14 +20,14 @@ angular.module('searchApp', []).controller('SearchController',
}; };
$scope.search = function() { $scope.search = function() {
if ($scope.searchText) { if ($scope.searchText) {
$http.get('search' + $scope.query()).success(function(data) { $http.get('/sally/error/search' + $scope.query()).success(function(data) {
$scope.results = data; $scope.results = data;
}); });
}; };
$scope.count(); $scope.count();
}; };
$scope.count = function() { $scope.count = function() {
$http.get('count' + $scope.query()).success(function(data) { $http.get('/sally/error/count' + $scope.query()).success(function(data) {
$scope.number = data[0].count; $scope.number = data[0].count;
}); });
}; };
......
src/main/scala/BundleStarter.scala 0 → 100644
+ 46
− 0
View file @ 1b16cfa6
package info.kwarc.mmt.errorview
import info.kwarc.sally4.servlet.SallyServlet
import org.apache.camel.component.sql.SqlComponent
import org.apache.camel.impl.DefaultCamelContext
import org.apache.felix.ipojo.annotations._
import org.slf4j.{Logger, LoggerFactory}
import org.sqlite.SQLiteDataSource
@Component
@Instantiate
class BundleStarter {
@Requires
var sallyServlet : SallyServlet = null
val log : Logger = LoggerFactory.getLogger(getClass)
@Validate
def start(): Unit = {
log.info("Starting ... " + sallyServlet)
val sqlComponent: SqlComponent = new SqlComponent()
val ds: SQLiteDataSource = new SQLiteDataSource()
val dbName = "errors.db"
ds.setDatabaseName(dbName)
ds.setUrl("jdbc:sqlite:" + dbName)
sqlComponent.setDataSource(ds)
val context = new DefaultCamelContext()
context.addComponent("db", sqlComponent)
context.addComponent("servlet", sallyServlet.getCamelComponent)
sallyServlet.init(context, getClass.getClassLoader)
.serveStaticFiles("error/static", "static")
/*
.initTemplating("/home/maeder/mmt-errorview/src/main/resource/static/")
.setDebugTemplating(true)
*/
context.addRoutes(new SearchDB("servlet:///error/"))
context.start()
}
@Invalidate
def stop(): Unit = {
log.info("Stopping...")
}
}
src/main/scala/SearchDB.scala
+ 5
− 5
View file @ 1b16cfa6
...@@ -9,7 +9,7 @@ import org.apache.camel.scala.dsl.builder.RouteBuilder ...@@ -9,7 +9,7 @@ import org.apache.camel.scala.dsl.builder.RouteBuilder
import org.apache.camel.util.jndi.JndiContext import org.apache.camel.util.jndi.JndiContext
import org.eclipse.jetty.server.handler.ResourceHandler import org.eclipse.jetty.server.handler.ResourceHandler
class SearchDB extends RouteBuilder { class SearchDB(prefix: String) extends RouteBuilder {
def query2HashMap(ex: Exchange): util.HashMap[String, String] = { def query2HashMap(ex: Exchange): util.HashMap[String, String] = {
val hm = new util.HashMap[String, String]() val hm = new util.HashMap[String, String]()
...@@ -19,15 +19,15 @@ class SearchDB extends RouteBuilder { ...@@ -19,15 +19,15 @@ class SearchDB extends RouteBuilder {
} }
Table.columns.map { col => Table.columns.map { col =>
(("jetty:http://localhost:8383/count/" + col) transform ((prefix + "count/" + col) transform
(ex => "%" + ex.getIn.getHeader("text") + "%")) --> (ex => "%" + ex.getIn.getHeader("text") + "%")) -->
("db:SELECT COUNT(*) as count FROM errors WHERE " + col + " LIKE #") marshal ("db:SELECT COUNT(*) as count FROM errors WHERE " + col + " LIKE #") marshal
new DataFormatDefinition(new JacksonDataFormat()) new DataFormatDefinition(new JacksonDataFormat())
(("jetty:http://localhost:8383/search/" + col) transform query2HashMap) --> ((prefix + "search/" + col) transform query2HashMap) -->
("db:SELECT * FROM errors WHERE " + col + " LIKE :#text LIMIT :#limit") marshal ("db:SELECT * FROM errors WHERE " + col + " LIKE :#text LIMIT :#limit") marshal
new DataFormatDefinition(new JacksonDataFormat()) new DataFormatDefinition(new JacksonDataFormat())
} }
"jetty:http://localhost:8383/static?matchOnUriPrefix=true&handlers=#staticHandler" --> "log:a" // prefix + "static?matchOnUriPrefix=true&handlers=#staticHandler" --> "log:a"
} }
object SearchDB { object SearchDB {
...@@ -39,7 +39,7 @@ object SearchDB { ...@@ -39,7 +39,7 @@ object SearchDB {
val jdni = new JndiContext() val jdni = new JndiContext()
jdni.bind("staticHandler", resHandler) jdni.bind("staticHandler", resHandler)
context.setJndiContext(jdni) context.setJndiContext(jdni)
context.addRoutes(new SearchDB()) context.addRoutes(new SearchDB("jetty:http://localhost:8383/"))
context.start() context.start()
} }
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment