aboutsummaryrefslogtreecommitdiff
path: root/src/cgi-bin/dict.scm4
diff options
context:
space:
mode:
Diffstat (limited to 'src/cgi-bin/dict.scm4')
-rw-r--r--src/cgi-bin/dict.scm428
1 files changed, 15 insertions, 13 deletions
diff --git a/src/cgi-bin/dict.scm4 b/src/cgi-bin/dict.scm4
index 77c1b3a..3b24367 100644
--- a/src/cgi-bin/dict.scm4
+++ b/src/cgi-bin/dict.scm4
@@ -1,4 +1,4 @@
1;;;; Greek Dictionary Web Engine 1;;;; Greek Dictionary Web Engine
2;;;; Copyright (C) 2004, 2005, 2006, 2007, 2010, 2011 Sergey Poznyakoff 2;;;; Copyright (C) 2004, 2005, 2006, 2007, 2010, 2011, 2015 Sergey Poznyakoff
3;;;; 3;;;;
4;;;; This program is free software; you can redistribute it and/or modify 4;;;; This program is free software; you can redistribute it and/or modify
@@ -19,8 +19,11 @@
19(set! %load-path (cons "GUILE_SITE" %load-path)) 19(set! %load-path (cons "GUILE_SITE" %load-path))
20 20
21(setlocale LC_ALL "")
22
21(use-modules ifelse(IFACE,[CGI],(www cgi),(guile-user)) 23(use-modules ifelse(IFACE,[CGI],(www cgi),(guile-user))
22 (ice-9 rdelim) 24 (ice-9 rdelim)
23 (xmltools dict) 25 (xmltools dict)
24 (gamma sql) 26 (gamma sql)
27 (gamma syslog)
25 (ellinika elmorph) 28 (ellinika elmorph)
26 (ellinika sql) 29 (ellinika sql)
@@ -80,5 +83,5 @@ ifelse(IFACE,[CGI],(cgi:init))
80(define (join-widget widget-id tabindex) 83(define (join-widget widget-id tabindex)
81 (let* ((name (string-append "join" widget-id)) 84 (let* ((name (string-append "join" widget-id))
82 (selected-choice (or (let ((s (cgi:value name))) 85 (selected-choice (or (let ((s (cgi:value-u8 name)))
83 (if s 86 (if s
84 (string->number s) 87 (string->number s)
@@ -113,5 +116,5 @@ ifelse(IFACE,[CGI],(cgi:init))
113 <td> 116 <td>
114 <input size=\"36\" name=\"key\" tabindex=\"1\"") 117 <input size=\"36\" name=\"key\" tabindex=\"1\"")
115 (let ((value (cgi:value "key"))) 118 (let ((value (cgi:value-u8 "key")))
116 (if value 119 (if value
117 (begin 120 (begin
@@ -133,5 +136,5 @@ ifelse(IFACE,[CGI],(cgi:init))
133 (display "</td><td>") 136 (display "</td><td>")
134 137
135 (let ((selected-choice (or (let ((s (cgi:value "pos"))) 138 (let ((selected-choice (or (let ((s (cgi:value-u8 "pos")))
136 (if s 139 (if s
137 (string->number s) 140 (string->number s)
@@ -167,5 +170,5 @@ ifelse(IFACE,[CGI],(cgi:init))
167 (display (list-ref category 1)) 170 (display (list-ref category 1))
168 (display "</td><td>") 171 (display "</td><td>")
169 (let ((selected-choice (or (let ((s (cgi:value (list-ref category 0)))) 172 (let ((selected-choice (or (let ((s (cgi:value-u8 (list-ref category 0))))
170 (if s 173 (if s
171 (string->number s) 174 (string->number s)
@@ -354,5 +357,5 @@ ifelse(IFACE,[CGI],(cgi:init))
354 (if (or (not (string-null? key)) (not (null? theme))) 357 (if (or (not (string-null? key)) (not (null? theme)))
355 (set! where-cond (cons 358 (set! where-cond (cons
356 (if (string=? (cgi:value "joinpos") "0") 359 (if (string=? (cgi:value-u8 "joinpos") "0")
357 " AND" 360 " AND"
358 " OR") 361 " OR")
@@ -419,19 +422,18 @@ ifelse(IFACE,[CGI],(cgi:init))
419 422
420(define (dict-search) 423(define (dict-search)
421 (let ((keyval (if (cgi:value "ident") 424 (let ((keyval (or (cgi:value-u8 "ident")
422 (dict:decode-string (cgi:value "ident")) 425 (cgi:value-u8 "key")))
423 (cgi:value "key")))
424 (theme (do ((catlist (get-topic-list) (cdr catlist)) 426 (theme (do ((catlist (get-topic-list) (cdr catlist))
425 (ret '())) 427 (ret '()))
426 ((null? catlist) ret) 428 ((null? catlist) ret)
427 (let ((name (caar catlist))) 429 (let ((name (caar catlist)))
428 (let ((v (cgi:value name))) 430 (let ((v (cgi:value-u8 name)))
429 (if (and v (> (string->number v) 0)) 431 (if (and v (> (string->number v) 0))
430 (set! ret (append 432 (set! ret (append
431 ret 433 ret
432 (list (= (string->number 434 (list (= (string->number
433 (cgi:value (string-append "join" name))) 0) 435 (cgi:value-u8 (string-append "join" name))) 0)
434 v)))))))) 436 v))))))))
435 (pos (or (cgi:value "pos") "0"))) 437 (pos (or (cgi:value-u8 "pos") "0")))
436 438
437 (sql-catch-failure 439 (sql-catch-failure
@@ -522,5 +524,5 @@ dict.forms,articles.subindex,articles.meaning,(dict.pos & conv(\"100000\",16,10)
522 ((string=? name "lang")) 524 ((string=? name "lang"))
523 (else 525 (else
524 (let ((v (cgi:value name))) 526 (let ((v (cgi:value-u8 name)))
525 (cond ((and v (not (string-null? v))) 527 (cond ((and v (not (string-null? v)))
526 (display "&amp;") 528 (display "&amp;")

Return to:

Send suggestions and report system problems to the System administrator.