Overview
| Comment: | Basic publish function in datashare done |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.60 |
| Files: | files | file ages | folders |
| SHA1: |
9a4d32c70faf538aab845962a05b46c9 |
| User & Date: | mrwellan on 2014-08-22 10:36:03 |
| Other Links: | branch diff | manifest | tags |
Context
|
2014-08-22
| ||
| 16:53 | More of datashare working check-in: 8d86e61bbb user: mrwellan tags: v1.60 | |
| 10:36 | Basic publish function in datashare done check-in: 9a4d32c70f user: mrwellan tags: v1.60 | |
| 09:54 | Reduced some debug noise check-in: 673a973513 user: mrwellan tags: v1.60 | |
Changes
Modified datashare.scm from [54be62dd3e] to [54278f4e4b].
| ︙ | ︙ | |||
98 99 100 101 102 103 104 |
(if (and (number? iteration)
(>= iteration next-iteration))
(set! next-iteration (+ iteration 1))))
iter-qry area version-name)
;; now store the data
(sqlite3:execute db "INSERT INTO pkgs (area,version_name,iteration,store_type,submitter,source_path,quality,comment)
VALUES (?,?,?,?,?,?,?,?);"
| | | 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 |
(if (and (number? iteration)
(>= iteration next-iteration))
(set! next-iteration (+ iteration 1))))
iter-qry area version-name)
;; now store the data
(sqlite3:execute db "INSERT INTO pkgs (area,version_name,iteration,store_type,submitter,source_path,quality,comment)
VALUES (?,?,?,?,?,?,?,?);"
area version-name next-iteration (conc store-type) submitter source-path quality comment)))
(sqlite3:finalize! iter-qry)
next-iteration))
(define (datashare:get-pkg-record db area version-name iteration)
#f)
;; Create the sqlite db
|
| ︙ | ︙ | |||
212 213 214 215 216 217 218 219 220 221 | (let* ((areas (configf:get-section configdat "areas")) (label-size "70x") (areas-sel (iup:listbox #:expand "HORIZONTAL" #:dropdown "YES")) (version-tb (iup:textbox #:expand "HORIZONTAL")) ;; #:size "50x")) (areas-sel (iup:listbox #:expand "HORIZONTAL" #:dropdown "YES")) (component (iup:listbox #:expand "HORIZONTAL" #:dropdown "YES" )) (version-val (iup:textbox #:expand "HORIZONTAL" #:size "50x")) ;; (iteration (iup:textbox #:expand "YES" #:size "20x")) ;; (iteration (iup:textbox #:expand "HORIZONTAL" #:size "20x")) (comment-tb (iup:textbox #:expand "YES" #:multiline "YES")) | > < | | | | | | | | | > > > | | | | < | 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 |
(let* ((areas (configf:get-section configdat "areas"))
(label-size "70x")
(areas-sel (iup:listbox #:expand "HORIZONTAL" #:dropdown "YES"))
(version-tb (iup:textbox #:expand "HORIZONTAL")) ;; #:size "50x"))
(areas-sel (iup:listbox #:expand "HORIZONTAL" #:dropdown "YES"))
(component (iup:listbox #:expand "HORIZONTAL" #:dropdown "YES" ))
(version-val (iup:textbox #:expand "HORIZONTAL" #:size "50x"))
;; (copy-link (iup:toggle #:expand "HORIZONTAL"))
;; (iteration (iup:textbox #:expand "YES" #:size "20x"))
;; (iteration (iup:textbox #:expand "HORIZONTAL" #:size "20x"))
(comment-tb (iup:textbox #:expand "YES" #:multiline "YES"))
(source-tb (iup:textbox #:expand "HORIZONTAL"
#:value (or (configf:lookup configdat "target" "basepath")
"")))
(publish (lambda (publish-type)
(let* ((area-num (or (string->number (iup:attribute areas-sel "VALUE")) 0))
(area-dat (if (> area-num 0)(list-ref areas (- area-num 1))'("NOT SELECTED" "NOT SELECTED")))
(area-path (cadr area-dat))
(area-name (car area-dat))
(version (iup:attribute version-tb "VALUE"))
(comment (iup:attribute comment-tb "VALUE"))
(spath (iup:attribute source-tb "VALUE"))
(submitter (current-user-name))
(quality 2)
;; (import-type (if (equal? (iup:attribute copy-link "VALUE") "ON" )
;; 'copy
;; 'link))
(db (datashare:open-db configdat))
(iteration (datashare:register-data db area-name version publish-type submitter quality spath comment))
(dest-store (datastore:get-best-storage configdat)))
(if iteration
(if (eq? 'copy publish-type)
(datashare:import-data spath dest-store area-name version iteration))
(print "ERROR: Failed to get an iteration number"))
(sqlite3:finalize! db))))
(copy (iup:button "Copy and Publish"
#:expand "HORIZONTAL"
#:action (lambda (obj)
(publish 'copy))))
(link (iup:button "Link and Publish"
#:expand "HORIZONTAL"
#:action (lambda (obj)
|
| ︙ | ︙ | |||
264 265 266 267 268 269 270 271 272 273 274 275 276 277 |
;; (print "Adding num=" num ", areadat=" areadat)
(iup:attribute-set! areas-sel (conc num) (car areadat))
(+ 1 num))
1 areas)
(iup:vbox
(iup:hbox (iup:label "Area:" #:size label-size) areas-sel)
(iup:hbox (iup:label "Version:" #:size label-size) version-tb)
;; (iup:label "Iteration:") iteration)
(iup:hbox (iup:label "Comment:" #:size label-size) comment-tb)
(iup:hbox (iup:label "Source base path:" #:size label-size) source-tb browse-btn)
(iup:hbox copy link))))
(define (datashare:get-view configdat)
(iup:vbox
| > | 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 |
;; (print "Adding num=" num ", areadat=" areadat)
(iup:attribute-set! areas-sel (conc num) (car areadat))
(+ 1 num))
1 areas)
(iup:vbox
(iup:hbox (iup:label "Area:" #:size label-size) areas-sel)
(iup:hbox (iup:label "Version:" #:size label-size) version-tb)
;; (iup:hbox (iup:label "Link only" #:size label-size) copy-link)
;; (iup:label "Iteration:") iteration)
(iup:hbox (iup:label "Comment:" #:size label-size) comment-tb)
(iup:hbox (iup:label "Source base path:" #:size label-size) source-tb browse-btn)
(iup:hbox copy link))))
(define (datashare:get-view configdat)
(iup:vbox
|
| ︙ | ︙ |
Added widgets.scm version [3d56925ea9].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 |
(require-library srfi-4 iup)
(import srfi-4 iup iup-pplot iup-glcanvas) ;; iup-web
(define (popup dlg . args)
(apply show dlg #:modal? 'yes args)
(destroy! dlg))
(define (properties ih)
(popup (element-properties-dialog ih))
'default)
(define dlg
(dialog
(vbox
(hbox ; headline
(fill)
(frame (label " Inspect control and dialog classes "
fontsize: 15))
(fill)
margin: '0x0)
(label "")
(label "Dialogs" fontsize: 12)
(hbox
(button "dialog"
action: (lambda (self) (properties (dialog (vbox)))))
(button "color-dialog"
action: (lambda (self) (properties (color-dialog))))
(button "file-dialog"
action: (lambda (self) (properties (file-dialog))))
(button "font-dialog"
action: (lambda (self) (properties (font-dialog))))
(button "message-dialog"
action: (lambda (self) (properties (message-dialog))))
(fill)
margin: '0x0)
(hbox
(button "layout-dialog"
action: (lambda (self) (properties (layout-dialog))))
(button "element-properties-dialog"
action: (lambda (self)
(properties
(element-properties-dialog (create 'user)))))
(fill)
margin: '0x0)
(label "")
(label "Composition widgets" fontsize: 12)
(hbox
(button "fill"
action: (lambda (self) (properties (fill))))
(button "hbox"
action: (lambda (self) (properties (hbox))))
(button "vbox"
action: (lambda (self) (properties (vbox))))
(button "zbox"
action: (lambda (self) (properties (zbox))))
(button "radio"
action: (lambda (self) (properties (radio (vbox)))))
(button "normalizer"
action: (lambda (self) (properties (normalizer))))
(button "cbox"
action: (lambda (self) (properties (cbox))))
(button "sbox"
action: (lambda (self) (properties (sbox (vbox)))))
(button "split"
action: (lambda (self) (properties (split (vbox) (vbox)))))
(fill)
margin: '0x0)
(label "")
(label "Standard widgets" fontsize: 12)
(hbox
(button "button"
action: (lambda (self) (properties (button))))
(button "canvas"
action: (lambda (self) (properties (canvas))))
(button "frame"
action: (lambda (self) (properties (frame))))
(button "label"
action: (lambda (self) (properties (label))))
(button "listbox"
action: (lambda (self) (properties (listbox))))
(button "progress-bar"
action: (lambda (self) (properties (progress-bar))))
(button "spin"
action: (lambda (self) (properties (spin))))
(fill)
margin: '0x0)
(hbox
(button "tabs"
action: (lambda (self) (properties (tabs))))
(button "textbox"
action: (lambda (self) (properties (textbox))))
(button "toggle"
action: (lambda (self) (properties (toggle))))
(button "treebox"
action: (lambda (self) (properties (treebox))))
(button "valuator"
action: (lambda (self) (properties (valuator ""))))
(fill)
margin: '0x0)
(label "")
(label "Additional widgets" fontsize: 12)
(hbox
(button "cells"
action: (lambda (self) (properties (cells))))
(button "color-bar"
action: (lambda (self) (properties (color-bar))))
(button "color-browser"
action: (lambda (self) (properties (color-browser))))
(button "dial"
action: (lambda (self) (properties (dial ""))))
(button "matrix"
action: (lambda (self) (properties (matrix))))
(fill)
margin: '0x0)
(hbox
(button "pplot"
action: (lambda (self) (properties (pplot))))
(button "glcanvas"
action: (lambda (self) (properties (glcanvas))))
;; (button "web-browser"
;; action: (lambda (self) (properties (web-browser))))
(fill)
margin: '0x0)
(label "")
(label "Menu widgets" fontsize: 12)
(hbox
(button "menu"
action: (lambda (self) (properties (menu))))
(button "menu-item"
action: (lambda (self) (properties (menu-item))))
(button "menu-separator"
action: (lambda (self) (properties (menu-separator))))
(fill)
margin: '0x0)
(label "")
(label "Images" fontsize: 12)
(hbox
(button "image/palette"
action: (lambda (self)
(properties
(image/palette 1 1 (u8vector->blob (u8vector 0))))))
(button "image/rgb"
action: (lambda (self)
(properties
(image/rgb 1 1 (u8vector->blob (u8vector 0))))))
(button "image/rgba"
action: (lambda (self)
(properties
(image/rgba 1 1 (u8vector->blob (u8vector 0))))))
(button "image/file"
action: (lambda (self)
(properties
;; same attributes as image/palette
(image/palette 1 1 (u8vector->blob (u8vector 0))))))
;; needs a file in current directory
;(image/file "chicken.ico")))) ; ok
;(image/file "chicken.png")))) ; doesn't work
(fill)
margin: '0x0)
(label "")
(label "Other widgets" fontsize: 12)
(hbox
(button "clipboard"
action: (lambda (self) (properties (clipboard))))
(button "timer"
action: (lambda (self) (properties (timer))))
(button "spinbox"
action: (lambda (self) (properties (spinbox (vbox)))))
(fill)
margin: '0x0)
(fill)
(button "E&xit"
expand: 'horizontal
action: (lambda (self) 'close))
)
margin: '15x15
title: "Iup inspector"))
(show dlg)
(main-loop)
(exit 0)
|