Skip to content

Commit 71bbb04

Browse files
arvyyarvyy
committed
fix code indentation; expand documentation on rest/stdio api
1 parent ddd5b33 commit 71bbb04

File tree

9 files changed

+992
-853
lines changed

9 files changed

+992
-853
lines changed

‎README.adoc

Lines changed: 262 additions & 137 deletions
Large diffs are not rendered by default.

‎src/main/resources/logback.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
</appender>
2525

2626
<root level="INFO">
27-
<appender-ref ref="STDOUT" />"
27+
<!--
28+
<appender-ref ref="STDOUT" />
29+
-->
2830
<appender-ref ref="FILE" />
2931
</root>
3032

31-
</configuration>
33+
</configuration>

‎src/main/scheme/main.scm

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@
1010
(scmindex repl-ui))
1111

1212
(define config-file
13-
(cond
14-
((= 0 (vector-length command-line-arguments)) "./config/configuration.scm")
15-
(else (vector-ref command-line-arguments 0))))
13+
(cond
14+
((= 0 (vector-length command-line-arguments)) "./config/configuration.scm")
15+
(else (vector-ref command-line-arguments 0))))
1616

1717
(define config (with-input-from-file config-file read))
1818

1919
(define solr-core (deploy-setting/solr-core config))
2020
(define solr-client
21-
(cond
22-
((deploy-setting/solr-embed config) (create-embedded-solr-client (deploy-setting/solr-home config) solr-core))
23-
(else (create-http-solr-client (deploy-setting/solr-url config)))))
21+
(cond
22+
((deploy-setting/solr-embed config) (create-embedded-solr-client (deploy-setting/solr-home config) solr-core))
23+
(else (create-http-solr-client (deploy-setting/solr-url config)))))
2424

2525
(let ((funcs (read-specs (deploy-setting/spec-index config))))
26-
(index-types solr-client solr-core funcs))
26+
(index-types solr-client solr-core funcs))
2727

2828
(when (deploy-setting/enable-web config)
29-
(init-web-ui config solr-client solr-core))
29+
(init-web-ui config solr-client solr-core))
3030

3131
(when (deploy-setting/enable-repl config)
32-
(init-repl-ui config solr-client solr-core))
32+
(init-repl-ui config solr-client solr-core))

‎src/main/scheme/scmindex/domain.scm

Lines changed: 110 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
(define-library
2-
(scmindex domain)
3-
(import (scheme base)
4-
(scheme read)
5-
(scheme write))
6-
(export
7-
8-
make-search-result
9-
search-result?
10-
search-result-items
11-
search-result-total
12-
search-result-libs
13-
search-result-params
14-
search-result-tags
15-
search-result-returns
16-
17-
make-search-result-facet
18-
search-result-facet?
19-
search-result-facet-value
20-
search-result-facet-count
21-
22-
make-func
23-
func?
24-
func-lib
25-
func-name
26-
func-param-names
27-
func-signature
28-
func-param-signatures
29-
func-syntax-param-signatures
30-
func-tags
31-
func-param-types
32-
func-return-types
33-
func-supertypes
34-
35-
func->json
36-
json->func
37-
search-result->json
38-
)
39-
(begin
2+
(scmindex domain)
3+
(import (scheme base)
4+
(scheme read)
5+
(scheme write))
6+
(export
7+
8+
make-search-result
9+
search-result?
10+
search-result-items
11+
search-result-total
12+
search-result-libs
13+
search-result-params
14+
search-result-tags
15+
search-result-returns
16+
17+
make-search-result-facet
18+
search-result-facet?
19+
search-result-facet-value
20+
search-result-facet-count
21+
22+
make-func
23+
func?
24+
func-lib
25+
func-name
26+
func-param-names
27+
func-signature
28+
func-param-signatures
29+
func-syntax-param-signatures
30+
func-tags
31+
func-param-types
32+
func-return-types
33+
func-supertypes
34+
35+
func->json
36+
json->func
37+
search-result->json)
38+
39+
(begin
4040

4141
(define-record-type <scmindex-function>
42-
(make-func
43-
lib
44-
name
45-
param-names
46-
signature
47-
param-signatures
48-
syntax-param-signatures
49-
tags
50-
param-types
51-
return-types
52-
supertypes)
53-
54-
func?
55-
56-
(lib func-lib)
57-
(name func-name)
58-
(param-names func-param-names)
59-
(signature func-signature)
60-
(param-signatures func-param-signatures)
61-
(syntax-param-signatures func-syntax-param-signatures)
62-
(tags func-tags)
63-
(param-types func-param-types)
64-
(return-types func-return-types)
65-
(supertypes func-supertypes))
42+
(make-func
43+
lib
44+
name
45+
param-names
46+
signature
47+
param-signatures
48+
syntax-param-signatures
49+
tags
50+
param-types
51+
return-types
52+
supertypes)
53+
54+
func?
55+
56+
(lib func-lib)
57+
(name func-name)
58+
(param-names func-param-names)
59+
(signature func-signature)
60+
(param-signatures func-param-signatures)
61+
(syntax-param-signatures func-syntax-param-signatures)
62+
(tags func-tags)
63+
(param-types func-param-types)
64+
(return-types func-return-types)
65+
(supertypes func-supertypes))
6666

6767
;;TODO move to util?
6868
(define (->string obj)
@@ -71,8 +71,8 @@
7171
(get-output-string port))
7272

7373
(define (read* str)
74-
(define port (open-input-string str))
75-
(read port))
74+
(define port (open-input-string str))
75+
(read port))
7676

7777
(define (func->json func)
7878
`((lib . ,(->string (func-lib func)))
@@ -81,60 +81,60 @@
8181
(signature . ,(->string (func-signature func)))
8282
(param_signatures . ,(->string (func-param-signatures func)))
8383
(syntax_param_signatures . ,(->string (func-syntax-param-signatures func)))
84-
(tags . ,(list->vector (map ->string (func-tags func))))
85-
(param_types . ,(list->vector (map ->string (func-param-types func))))
86-
(return_types . ,(list->vector (map ->string (func-return-types func))))
87-
(super_types . ,(list->vector (map ->string (func-supertypes func))))))
84+
(tags . ,(list->vector (map symbol->string (func-tags func))))
85+
(param_types . ,(list->vector (map symbol->string (func-param-types func))))
86+
(return_types . ,(list->vector (map symbol->string (func-return-types func))))
87+
(super_types . ,(list->vector (map symbol->string (func-supertypes func))))))
8888

8989
(define (json->func json)
90-
(define (get field type default)
91-
(cond
92-
((assoc field json) =>
93-
(lambda (value)
94-
(case type
95-
((sexpr) (read* (cdr value)))
96-
((symbol) (string->symbol (cdr value)))
97-
((symbol-lst) (map string->symbol (vector->list (cdr value))))
98-
(else (cdr value)))))
99-
(else default)))
100-
(make-func
101-
(get 'lib 'sexpr #f)
102-
(get 'name 'symbol #f)
103-
(get 'param_names 'symbol-lst '())
104-
(get 'signature 'sexpr #f)
105-
(get 'param_signatures 'sexpr '())
106-
(get 'syntax_param_signatures 'sexpr '())
107-
(get 'tags 'symbol-lst '())
108-
(get 'param_types 'symbol-lst '())
109-
(get 'return_types 'symbol-lst '())
110-
(get 'supertypes 'symbol-lst '())))
90+
(define (get field type default)
91+
(cond
92+
((assoc field json) =>
93+
(lambda (value)
94+
(case type
95+
((sexpr) (read* (cdr value)))
96+
((symbol) (string->symbol (cdr value)))
97+
((symbol-lst) (map string->symbol (vector->list (cdr value))))
98+
(else (cdr value)))))
99+
(else default)))
100+
(make-func
101+
(get 'lib 'sexpr #f)
102+
(get 'name 'symbol #f)
103+
(get 'param_names 'symbol-lst '())
104+
(get 'signature 'sexpr #f)
105+
(get 'param_signatures 'sexpr '())
106+
(get 'syntax_param_signatures 'sexpr '())
107+
(get 'tags 'symbol-lst '())
108+
(get 'param_types 'symbol-lst '())
109+
(get 'return_types 'symbol-lst '())
110+
(get 'supertypes 'symbol-lst '())))
111111

112112
(define-record-type <search-result>
113-
(make-search-result items total libs params tags returns)
114-
search-result?
115-
(items search-result-items)
116-
(total search-result-total)
117-
(libs search-result-libs)
118-
(params search-result-params)
119-
(tags search-result-tags)
120-
(returns search-result-returns))
113+
(make-search-result items total libs params tags returns)
114+
search-result?
115+
(items search-result-items)
116+
(total search-result-total)
117+
(libs search-result-libs)
118+
(params search-result-params)
119+
(tags search-result-tags)
120+
(returns search-result-returns))
121121

122122
(define-record-type <search-result-facet>
123-
(make-search-result-facet value count)
124-
search-result-facet?
125-
(value search-result-facet-value)
126-
(count search-result-facet-count))
123+
(make-search-result-facet value count)
124+
search-result-facet?
125+
(value search-result-facet-value)
126+
(count search-result-facet-count))
127127

128128
(define (search-result->json sr)
129-
`((items . ,(list->vector (map func->json (search-result-items sr))))
130-
(total . ,(search-result-total sr))
131-
(libs . ,(list->vector (map search-result-facet->json (search-result-libs sr))))
132-
(params . ,(list->vector (map search-result-facet->json (search-result-params sr))))
133-
(returns . ,(list->vector (map search-result-facet->json (search-result-returns sr))))
134-
(tags . ,(list->vector (map search-result-facet->json (search-result-tags sr))))))
129+
`((items . ,(list->vector (map func->json (search-result-items sr))))
130+
(total . ,(search-result-total sr))
131+
(libs . ,(list->vector (map search-result-facet->json (search-result-libs sr))))
132+
(params . ,(list->vector (map search-result-facet->json (search-result-params sr))))
133+
(returns . ,(list->vector (map search-result-facet->json (search-result-returns sr))))
134+
(tags . ,(list->vector (map search-result-facet->json (search-result-tags sr))))))
135135

136136
(define (search-result-facet->json f)
137-
`((value . ,(->string (search-result-facet-value f)))
138-
(count . ,(search-result-facet-count f))))
137+
`((value . ,(search-result-facet-value f))
138+
(count . ,(search-result-facet-count f))))
139139

140-
))
140+
))

0 commit comments

Comments
 (0)