Menu
▾
▴
eas-dev-commit — Commit Log
You can subscribe to this list here.
| 2003 |
Jan
(69) |
Feb
(122) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
|
Feb
|
Mar
(56) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(237) |
Jul
|
Aug
|
Sep
(1) |
Oct
(14) |
Nov
(72) |
Dec
|
| 2007 |
Jan
(2) |
Feb
(37) |
Mar
(5) |
Apr
|
May
(2) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Andrey C. <sku...@us...> - 2006-06-06 13:31:12
|
Update of /cvsroot/eas-dev/ocmng/components/ocmng/forms In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3634/components/ocmng/forms Modified Files: form.xml Log Message: Fix "form" component, small fixes in ocmng Index: form.xml =================================================================== RCS file: /cvsroot/eas-dev/ocmng/components/ocmng/forms/form.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- form.xml 5 Jun 2006 12:23:09 -0000 1.2 +++ form.xml 6 Jun 2006 13:30:55 -0000 1.3 @@ -18,9 +18,18 @@ <meta dictionary="ETC01"> <!-- mng_form --> + <attribute name="name" + type="string" + lenType="rtrim" + len="50" + notNull="yes" + notEmpty="yes" + /> <attribute name="type" type="string" len="50" lenType="rtrim" /> <attribute name="content" type="text" lenType="alltrim" /> + <index name="name" expression="name"/> + <class name="mng_form" extent="component" essence="name" |
|
From: Andrey C. <sku...@us...> - 2006-06-06 13:31:03
|
Update of /cvsroot/eas-dev/ocmng/components/ocmng In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3634/components/ocmng Modified Files: author.xml category.xml component.xml Log Message: Fix "form" component, small fixes in ocmng Index: author.xml =================================================================== RCS file: /cvsroot/eas-dev/ocmng/components/ocmng/author.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- author.xml 5 Jun 2006 12:23:09 -0000 1.2 +++ author.xml 6 Jun 2006 13:30:55 -0000 1.3 @@ -40,7 +40,7 @@ <data> - <objects depository="ETC0101" class="mng_author" rules="appendOnly"> + <objects depository="ETC0101" class="mng_author" rules="appendOnly"> <object> <attr name="code">Uri</attr> <attr name="author_name">Uri Khnykin (àÒÉÊ èÎÙËÉÎ) </attr> Index: category.xml =================================================================== RCS file: /cvsroot/eas-dev/ocmng/components/ocmng/category.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- category.xml 2 Jun 2006 14:44:46 -0000 1.1 +++ category.xml 6 Jun 2006 13:30:55 -0000 1.2 @@ -15,7 +15,7 @@ <dependence type="component">void.xml</dependence> </requires> - <meta dictionary="ETC01" rules="appendOnly"> + <meta dictionary="ETC01" rules="appendOnly"> <attribute name="category_name" type="string" lenType="alltrim" Index: component.xml =================================================================== RCS file: /cvsroot/eas-dev/ocmng/components/ocmng/component.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- component.xml 5 Jun 2006 12:23:09 -0000 1.2 +++ component.xml 6 Jun 2006 13:30:55 -0000 1.3 @@ -21,7 +21,13 @@ <meta dictionary="ETC01"> <!-- mng_component --> - <attribute name="component_name" type="string" len="50" lenType="rtrim" notNull="yes" notEmpty="yes" /> + <attribute name="component_name" + type="string" + lenType="rtrim" + len="50" + notNull="yes" + notEmpty="yes" + /> <attribute name="documentation" type="text" lenType="alltrim" /> <attribute name="dependence" type="array" lenType="ignore" /> <attribute name="definition" type="text" lenType="alltrim" /> |
|
From: Andrey C. <sku...@us...> - 2006-06-06 13:29:41
|
Update of /cvsroot/eas-dev/eas/libeas In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3057/libeas Modified Files: protocol_raw.prg transportmanager.prg Log Message: Change logotype, fix db directory creation and some small tests Index: protocol_raw.prg =================================================================== RCS file: /cvsroot/eas-dev/eas/libeas/protocol_raw.prg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- protocol_raw.prg 2 Jun 2006 14:32:45 -0000 1.1 +++ protocol_raw.prg 6 Jun 2006 13:29:30 -0000 1.2 @@ -113,11 +113,11 @@ do while( .T. ) if (session := tcpAccept( self:socket:handle, self:socket:aTimeOut )) != -1 // Create new session - eDebug(10, "Start session: ", session) + eDebug(10, "NETWORK: Start session: ", session) oSession := EASSession( self, session ) //session_open(oSession) threadId := start(@session_open(), oSession) // Begin new thread - eDebug(15, "Stop session") + eDebug(15, "NETWORK: Ready for new connection") endif sleep(0.01) enddo @@ -147,6 +147,7 @@ /* Thread function for session open */ static function session_open(session) + // Set global variables set deleted on set translate path off return session:open() Index: transportmanager.prg =================================================================== RCS file: /cvsroot/eas-dev/eas/libeas/transportmanager.prg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- transportmanager.prg 2 Jun 2006 14:32:45 -0000 1.1 +++ transportmanager.prg 6 Jun 2006 13:29:30 -0000 1.2 @@ -146,9 +146,6 @@ static function connection_open() local oErr, ret, connection - set deleted on - set translate path off - oErr := errorBlock({|e| break(e) }) begin sequence eDebug(10, "Begin thread in connection_open()") |
|
From: Andrey C. <sku...@us...> - 2006-06-06 13:29:38
|
Update of /cvsroot/eas-dev/eas/server In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3057/server Modified Files: Makefile easserver.ini.in Log Message: Change logotype, fix db directory creation and some small tests Index: Makefile =================================================================== RCS file: /cvsroot/eas-dev/eas/server/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 2 Jun 2006 14:49:00 -0000 1.3 +++ Makefile 6 Jun 2006 13:29:31 -0000 1.4 @@ -47,6 +47,7 @@ install: all $(PRG) @../mkinstalldirs $(DESTDIR)$(EASBINDIR) @../mkinstalldirs $(DESTDIR)$(EASDATADIR)/server/ + ../mkinstalldirs $(DESTDIR)$(EASDBPATH) $(CLIPROOT)/bin/clip_cp $(PRG) $(DESTDIR)$(EASBINDIR) $(CLIPROOT)/bin/clip_cp $(AUTH) $(DESTDIR)$(CLIPROOT)/bin [ -z "$(DESTDIR)" ] && [ `uname -s` = "Linux" ] && make linuxinstall @@ -60,6 +61,8 @@ ../mkinstalldirs $(DESTDIR)/tmp/easserver chown -R easserver.easserver $(DESTDIR)/tmp/easserver chmod 0777 $(DESTDIR)$(EASLOGDIR) + chown easserver.easserver $(DESTDIR)$(EASDBPATH) + chmod 0777 $(DESTDIR)$(EASDBPATH) ../mkinstalldirs $(DESTDIR)/etc/eas ../mkinstalldirs $(DESTDIR)/etc/rc.d/init.d Index: easserver.ini.in =================================================================== RCS file: /cvsroot/eas-dev/eas/server/easserver.ini.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- easserver.ini.in 2 Jun 2006 14:49:00 -0000 1.1 +++ easserver.ini.in 6 Jun 2006 13:29:31 -0000 1.2 @@ -8,7 +8,7 @@ ServerRoot = SERVERROOT ; Debug level (0-255): greater number is mean more information ; default value is 15 - debug = 17 + debug = 15 ; Connection section [CONNECTION_1] |
|
From: Andrey C. <sku...@us...> - 2006-06-06 13:29:35
|
Update of /cvsroot/eas-dev/eas/client In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3057/client Modified Files: eas-logo.xpm main.prg Log Message: Change logotype, fix db directory creation and some small tests Index: eas-logo.xpm =================================================================== RCS file: /cvsroot/eas-dev/eas/client/eas-logo.xpm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- eas-logo.xpm 5 Jun 2006 20:54:53 -0000 1.1 +++ eas-logo.xpm 6 Jun 2006 13:29:30 -0000 1.2 @@ -1,1141 +1,2226 @@ /* XPM */ static char * eas_logo_xpm[] = { -"122 56 1082 2", -" c None", -". c #FFFFFF", -"+ c #FEFEFE", -"@ c #F9FBFD", -"# c #ECF3F9", -"$ c #D1E2F3", -"% c #B4D0ED", -"& c #91BBE5", [...3334 lines suppressed...] +". + . . . . &)z)A)p@p@p@p@p@p@p@p@p@p@p@p@k$B)C)D)E)F)G)H)'>'>'>I)J))>K)!>!>!>K)L)!)-,M)N)O)P)Q)R)S)T)U)V)W)X)m-Y)Z)`) !.!+!@!#!$!%!&!*!=!-!;!>!,!'!)!!!~!{!]!^!/!(!_!:!<![!}!|!1!2!3!4!5!6!7!8!9!0!a!b!c!d!e!f!h>g!=*h!M--.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +". . i!j!k!p@p@p@p@p@p@p@p@p@p@p@p@k$#%l!Y%5&m!F;!)n!n!n!n!n!_*_*_*v>v>!)F;0=o!|;p!q!r!s!t!0=u!v!w!x!y!z!A!B!C!D!E!F!G!H!I!J!K!L!M!N!O!P!Q!R!R!S!T!U!V!W!X!Y!Z!`! ~.~+~@~#~$~%~&~*~=~-~;~-~>~,~'~)~!~~~{~]~^~/~/;~$-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +" . . . (~_~:~p@p@p@p@p@p@p@p@p@p@p@p@j$$%<~F&v,[~o!D'D'D'}~}~}~}~}~}~D'D'D'o![~v,F&|~1~2~f-E'3~4~5~6~7~8~9~0~a~b~c~d~e~f~g~h~i~j~k~l~m~n~o~p~q~r~s~t~u~v~w~x~y~z~A~B~C~D~E~F~G~H~I~J~K~L~M~N~O~P~Q~R~6-S~T~U~V~W~~$-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +" . . . X~Y~Z~p@p@p@p@p@p@p@p@p@p@p@p@j$%%#%e=F'+-`~Y%6&6&e-e-e-e-e-e-6&6&Y% {+-F'2~#%.{7&+{@{#{${y!%{&{*{={-{;{>$>{,{'{){!{~{{{]{^{/{({_{:{<{[{]+}{|{1{2{3{4{5{6{7{8{9{0{a{b{c{d{e{f{g{h{i{j{k{l{m{n{o{J-p{q{r{M--.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +" . K.X~s{t{n@p@p@p@p@p@p@p@p@p@p@p@p@j$%%u{/>v{),`%`%2~2~2~2~2~2~2~2~`%`%),s%#- &%%w{x{y{z{A{B{C{D{E{F{G{H{>$##I{J{K{L{M{N{O{P{Q{R{S{T{U{%#V{I#W{X{Y{Z{`{ ].]+]@]#]$]%]&]*]=]-];]>],]'])]!]~]{]]]^]/](]_]:]O+J.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +". K. . . . X~<][]}]p@p@p@p@p@p@p@p@p@p@p@p@p@j$k$%%$%$%$%$%$%$%$%$%$%$%$%$%$%$%$%|]%%k$j$1]2]3]4]5]6]7]8]9]0]E#a]A@##q b]c]d]e]f]g]h]i]j]k]l]{+F@E F t.m]n]o]p]p]q]r]s]t]u]v]w]w]x]y]z]A]B]A]C]D]E]F]G]H]I]6+%.*.=.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +". . . . L.J]K]L]M]p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@j$j$j$j$j$j$j$p@p@p@p@p@p@N]O]P]Q]R]S]T]U]V]W]X]Y]F#h.A@q <#u+{@$#)+D@w+y y+A p.C {+r._@F t.v._+:+n#w.N N O Q }+S =#U K+A.Z]`] ^N#N#3+.^+^@.)$H.&.8@*.J.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +" . + 7#@^#^$^%^p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@j$&^*^=^-^;^>^,^'^)^/#!^~^l n {^t+q ,+u+{@$#)+G#x y A /@z+C D E s.t.u.J#J K n#]^M 1#[+^^R I+1+U L#V C.2$Z M+2@..5+4@#.)$%.I.8@=.9@-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +". . + /^0+(^_^:^<^[^y#p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@&^}^|^1^2^3^4^5^6^7^8^9^0^a^g.n b^##k.r u+t u w G#x y c^d^z+C F@]+F G (+D+`#K w.|#<+H@[+Q S |+T A.4#W e^2$Z M+ .E.L@4@#.#.%.7@f^O+P+-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +". . . + a+M.g^h^i^j^k^p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@y#l$l^m^n^o^p^q^r^s^t^u^v^w^x^e.y^m o t+##<#s l.t m.!+k#y x+A /@z+{+F@E s.G u.}#`#:+:@x.1#P 1$y.S z^1+K+L#W Y M#L+D.N++.5+@.#.H.6@8+*.O+P+-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +". . . . L.0+$ A^_^B^C^D^E^F^p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@G^H^I^J^K^L^M^N^O^P^Q^R^S^T^U^&+V^l W^g.;+t+##<#u+{@v+)+w w+o.z /@/@C X^Y^_@F G v.Z^K m#w.M N O [+I@R K#U K+|@C.X Z N#2@..E.@.M@)$H.&.8@O+P+-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +". . . . 7#a+M.% `^ /./+/@/#/$/y#p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@p@G^%/2]&/*/=/-/;/>/,/'/)/!/~/{/]/h s+s+l W^n o t+##r s {@$#C@G#x y y+A z+{+%#Y^_@l#u.v.E+`#F+G+<+*#P Q }@S J@U A.B.X 2$N#D.D...L@^/M@H.%.&.8@*.P+-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +". . L.Q+-#$ 0@0@//(/_/:/</[/}/|/1/2/k$p@y#p@p@y#j$j$N]3/4/5/6/7/8/L^9/0/a/b/c/d/e/f/g/h/i/]/&+*+*+j/l m n {^t+k.<#u+{@$#k/D@x y y+/@z+{+F@E C+m]u.D+_+K n#|#N *#[+y.S I+1+U K+W X Y '$M+N++.L@4@#.#.%.I.f^O+-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +". . . . + 0+-#N.0@c+l/m/(/n/o/p/q/r/s/t/u/v/w/x/y/z/A/B/C/D/E/F/G/H/I/J/K/L/c/M/N/O/P/Q/R/S/T/U/b.*+e.l f.V/;+A@##k.r ~@t W/w G#y }$A /@C {+r._@s.t.(+X/E+K Y/M *#*#[+y.Z/=#1+`/B.W X 2$` D...4+5+ (G.H.!$&.*.O+-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +". . + . 7#Q+$ N.% >.a@a@.(+(@(#($(%(&(*(=(-(;(>(,('()(!(~({(](^(/(((_(:(<([(}(|(1(2(3(4(5(6(a.h 7(8(s+k -+g.o A@p r r l.v+$#w k#y z U{d^B {+r._@F G v._+`#K :@M N *#[+R R K#z.9(|@p#X Z L+2@..+.4@0(5@H.!$a(*.=.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +". . . + 7#@ M.@$& >.= - - b(c(d(e(f(g(h(i(j(k(l(m(n(o(p(q(r(s(t(u(v(w(x(y(z(A(B(C(D(8.d E(6(g c.&+*+k =+y^h.o t+p c]s ~@$#)+!+x y F(/@(@C {+F@_@F u.v._+E+F+:@N H@P y.}+S 1+U K+Z]G(2$N#D.2@N+E.@.G.H(%.I.*.O+P+-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +". . 7#-#;.b+& c+I(- J(> > K(L(M(N(O(P(Q(R(S(T(U(V(W(X(Y(Z(`( _._+_@_#_$_%_&_a #+$+*_e =_g h i e.k =+W^n ;+t+q <#u+{@$#C@w x y A /@B C r.]+_@t.(+-_J ;_F+|#<+1#P [+}@|+=#U 4#W C.2$L+L+2@4++.@.M@)$%.7@8@=.P+-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +". . . K.Q+M.N.% & Q@= - S.> , ' >_,_'_)_!_~_{_]_^_/_/_(___:_<_[_}_|_1_2_3_m+4_5_6_9.7_d 8_T/g b.*+j k -+g.n t+##B@,+l.{@$#)+w w+x+c^/@A+C r.E Z#t.(+v.E+F+F+M N H+O y.}@I+J@U `/p#C.M#N#2@N++.L@G.5@)$6@8+*.=.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +". . . + -#M.;.& 9_Q@= t#f+0_, !.) W.R+^.] Z./ ( i+: a_b_} .+2 3 3.c_5.d_7 4_8 5_a 9.0.E(E(a.g i *+s+l f.g.o t+j.e_u+l.t $#!+G#o.o.f_/@A+{+E _@Z#G v._+`#F+w.M N H@[+y.R |+z.K+|@p#Y Y ` D.2@+.5+G.H($.7+!$*.O@-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.", +". + Q+a+M.0@% >.Q@e+R.S.b@' !.g_R+].{ h_^ / ( j+: i_`.j_1 k_3 3.++5.6 7 6.@+l_#+r+d d f a.U/i j a^=+W^g.;+t+##r u+l.t m.w G#o.~+A p.C {+r.C+t.u.D+_+J F+|#N *#P y.}+S T 1+4#B.W X Z ` 3+..5+F.4@5@$.I.8@*.O+-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-."}; Index: main.prg =================================================================== RCS file: /cvsroot/eas-dev/eas/client/main.prg,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- main.prg 5 Jun 2006 20:54:53 -0000 1.5 +++ main.prg 6 Jun 2006 13:29:30 -0000 1.6 @@ -13,7 +13,7 @@ #define PRG_NAME "eas" #define PRG_VERSION "0.2.1" -#define DEBUG 19 +#define DEBUG 15 // Default connection values #define C_HOST "localhost" @@ -228,7 +228,7 @@ // Title cap := UIFrame() cap:setType( FRAME_RAISED ) - gTitle := UIHBox(,3,3) + gTitle := UIHBox(,3,0) cap:add( gTitle ) wIcon := UIImage( EAS_MODULES+PATH_DELIM+"icons"+PATH_DELIM+"eas-logo.xpm") gTitle:add( wIcon ) @@ -237,7 +237,7 @@ // Set styles driver := getDriver() - driver:setStyle(cap:layout, 'color.bg', 'white') + driver:setStyle(cap, 'color.bg', 'white') driver:setStyle(wVer, 'color.fg', 'darkred') t:add(cap, "1,1-4+",.T.) |
|
From: Andrey C. <sku...@us...> - 2006-06-06 13:29:34
|
Update of /cvsroot/eas-dev/eas/libcodb_query In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3057/libcodb_query Modified Files: Makefile command.prg Log Message: Change logotype, fix db directory creation and some small tests Index: Makefile =================================================================== RCS file: /cvsroot/eas-dev/eas/libcodb_query/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 2 Jun 2006 14:32:45 -0000 1.1 +++ Makefile 6 Jun 2006 13:29:30 -0000 1.2 @@ -17,8 +17,7 @@ .SUFFIXES: .prg .o .po # Here you can define appropriate compile settings -#C_FLAGS=-Wall -g -I. $(CLIPINCLUDE) -#CC=gcc +C_FLAGS=-Wall -g -I. $(CLIPINCLUDE) TARGET = libcodb_query$(DLLSUFF) RTARGET = libcodb_query$(DLLREALSUFF) Index: command.prg =================================================================== RCS file: /cvsroot/eas-dev/eas/libcodb_query/command.prg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- command.prg 2 Jun 2006 14:32:45 -0000 1.1 +++ command.prg 6 Jun 2006 13:29:30 -0000 1.2 @@ -208,7 +208,7 @@ static function __set_db(self, db) local p, i - //?? "Set DB:", db, chr(10) +// ?? "Set DB:", db, chr(10) if empty(db) return .F. @@ -227,7 +227,8 @@ ?? "ERROR: unknown DB or depository name:", db, chr(10) endif endif - +// ?? "DICT:", self:dict, chr(10) +// ?? "DEP: ", self:dep,chr(10) return .F. /* Close connection to server */ @@ -1229,7 +1230,8 @@ next endif //?? "CLASSES:", classes, chr(10) -//?? "CLASSES_ID:", classIds, chr(10) +//?? "CLASSES_IDS:", classIds, chr(10) +//?? "DEP:", d:hDbData, chr(10) // Second: fill result with 'where' condition check res:fields := attrs res:data := array(0) @@ -1242,7 +1244,7 @@ //?? where_condition,chr(10) for part in classIds - + //?? "d:select:", part, where_condition, chr(10) dbl := d:select(part,,,where_condition) //?? part,":",len(dbl), dbl,chr(10) |
|
From: Andrey C. <sku...@us...> - 2006-06-06 13:29:33
|
Update of /cvsroot/eas-dev/eas In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3057 Modified Files: INSTALL Log Message: Change logotype, fix db directory creation and some small tests Index: INSTALL =================================================================== RCS file: /cvsroot/eas-dev/eas/INSTALL,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- INSTALL 5 Jun 2006 14:12:18 -0000 1.2 +++ INSTALL 6 Jun 2006 13:29:30 -0000 1.3 @@ -91,9 +91,10 @@ 3. Install components: ocmng install components/ALL.xmo - ocmng install components/ocmng/ALL.xmo ocmng install components/ocmng/EAS.xmo +If you have error to update core ocmng components (components/ocmng/*.xmo), +please remove manually $CLIPROOT/etc/codb.* NOTES ===== |
|
From: Andrey C. <sku...@us...> - 2006-06-06 07:24:07
|
Update of /cvsroot/eas-dev/clip-ui/drivers In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3260/drivers Modified Files: driver-gtk.prg driver-gtk2.prg Log Message: Fix UIFrame order Index: driver-gtk.prg =================================================================== RCS file: /cvsroot/eas-dev/clip-ui/drivers/driver-gtk.prg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- driver-gtk.prg 5 Jun 2006 20:34:49 -0000 1.2 +++ driver-gtk.prg 6 Jun 2006 07:24:02 -0000 1.3 @@ -1121,8 +1121,8 @@ /** Frame **/ static function ui_createFrame(self, caption, type) local o, eBox - o := gtk_FrameNew(, caption) - eBox := gtk_EventBoxNew() + eBox := gtk_FrameNew(, caption) + o := gtk_EventBoxNew() o:layout := eBox self:setFrameType(o, type) return o @@ -1132,12 +1132,12 @@ return NIL static function ui_setFrameLabel(self, frame, label) - gtk_FrameSetLabel( frame, label ) + gtk_FrameSetLabel( frame:layout, label ) return NIL static function ui_setFrameType(self, frame, type) if valtype(type) == 'N' - gtk_FrameSetShadowType( frame, type ) + gtk_FrameSetShadowType( frame:layout, type ) endif return NIL Index: driver-gtk2.prg =================================================================== RCS file: /cvsroot/eas-dev/clip-ui/drivers/driver-gtk2.prg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- driver-gtk2.prg 5 Jun 2006 20:34:49 -0000 1.2 +++ driver-gtk2.prg 6 Jun 2006 07:24:02 -0000 1.3 @@ -1168,8 +1168,8 @@ /** Frame **/ static function ui_createFrame(self, caption, type) local o, eBox - o := gtk_FrameNew(, caption) - eBox := gtk_EventBoxNew() + eBox := gtk_FrameNew(, caption) + o := gtk_EventBoxNew() o:layout := eBox self:setFrameType(o, type) return o @@ -1179,12 +1179,12 @@ return NIL static function ui_setFrameLabel(self, frame, label) - gtk_FrameSetLabel( frame, label ) + gtk_FrameSetLabel( frame:layout, label ) return NIL static function ui_setFrameType(self, frame, type) if valtype(type) == 'N' - gtk_FrameSetShadowType( frame, type ) + gtk_FrameSetShadowType( frame:layout, type ) endif return NIL |
|
From: Andrey C. <sku...@us...> - 2006-06-06 07:24:06
|
Update of /cvsroot/eas-dev/clip-ui/example In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3260/example Modified Files: test_ui.prg Log Message: Fix UIFrame order Index: test_ui.prg =================================================================== RCS file: /cvsroot/eas-dev/clip-ui/example/test_ui.prg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- test_ui.prg 5 Jun 2006 20:34:49 -0000 1.2 +++ test_ui.prg 6 Jun 2006 07:24:03 -0000 1.3 @@ -319,13 +319,11 @@ f1 := UIFrame() grid:add(f1) f1:setLabel("Payer") - f1:setType(FRAME_PLAIN)//RAISED) + f1:setType(FRAME_RAISED) t1 := UIHBox(,,3) f1:add( t1 ) - wB := f1:layout drv:setStyle(f1,"color.bg","green") - drv:setStyle(wB,"color.bg","green") cb1 := UIComboBox({'JSC "Brown and son"'},1) w:setName("payer", cb1) |
|
From: Andrey C. <sku...@us...> - 2006-06-06 02:45:31
|
Update of /cvsroot/eas-dev/eas/libeas In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv11146/libeas Modified Files: componentmanager.prg Log Message: Continues fix client and small changes in documentation Index: componentmanager.prg =================================================================== RCS file: /cvsroot/eas-dev/eas/libeas/componentmanager.prg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- componentmanager.prg 2 Jun 2006 14:32:45 -0000 1.1 +++ componentmanager.prg 5 Jun 2006 14:12:19 -0000 1.2 @@ -74,7 +74,7 @@ // Query database q:db := OCMNG_REPOSITORY - q:query := 'select id from '+OCMNG_COMMANDS_CLASS+' where component=="'+component+'" .and. name=="'+method+'";' + q:query := 'select id from '+OCMNG_COMMANDS_CLASS+' where component_name=="'+component+'" .and. name=="'+method+'";' cmds := sendMessage(,'sys.db', 'execute', q ) eDebug(17, "DB returns:", cmds) @@ -157,7 +157,7 @@ // Query database q:db := OCMNG_REPOSITORY - q:query := "select name from "+OCMNG_COMPONENT_CLASS+";" + q:query := "select component_name from "+OCMNG_COMPONENT_CLASS+";" a := sendMessage(,'sys.db', 'execute', q ) eDebug(17, "DB returns:", a) @@ -170,7 +170,7 @@ // Query database q:db := OCMNG_REPOSITORY - q:query := "select name,component from "+OCMNG_COMMANDS_CLASS+";" + q:query := "select component_name,name from "+OCMNG_COMMANDS_CLASS+";" a := sendMessage(,'sys.db', 'execute', q ) eDebug(17, "DB returns:", a) @@ -199,7 +199,7 @@ // Query database q:db := OCMNG_REPOSITORY - q:query := 'select id from '+OCMNG_COMPONENT_CLASS+' where name=="'+component+'";' + q:query := 'select id from '+OCMNG_COMPONENT_CLASS+' where component_name=="'+component+'";' a := sendMessage(,'sys.db', 'execute', q ) eDebug(17, "DB returns:", a) |
|
From: Andrey C. <sku...@us...> - 2006-06-06 02:25:58
|
Update of /cvsroot/eas-dev/eas/client In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv11146/client Modified Files: main.prg Added Files: eas-logo.png Log Message: Continues fix client and small changes in documentation --- NEW FILE: eas-logo.png --- (This appears to be a binary file; contents omitted.) Index: main.prg =================================================================== RCS file: /cvsroot/eas-dev/eas/client/main.prg,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- main.prg 2 Jun 2006 14:48:10 -0000 1.3 +++ main.prg 5 Jun 2006 14:12:19 -0000 1.4 @@ -190,7 +190,7 @@ /* Open dialog for connection parameters */ function connectionDialog( msg ) //local oConnectData := map(), auth_info:=map(), packet, vRet - local cfg, win, t, bb, cap, pF, bD + local cfg, win, t, bb, cap, pF, bD, gTitle, wIcon, wVer local oIni, name:="", a local server, port @@ -220,27 +220,35 @@ loginWindow := win // Grid - t := UIGrid(,6,4) + t := UIGrid(,6,4) t:setSpacing(0) t:setPadding(3) win:userSpace:add(t,.T.,.T.) - // Title - cap := UILabel(i18n("Login to E/AS system")) + // Title + cap := UIFrame() + cap:setType( 2 ) // TODO: Sunken + gTitle := UIHBox() + cap:add( gTitle ) + wIcon := UIImage("~/pro/setup/eas/eas/client/eas-logo.png") // TODO: set data path + gTitle:add( wIcon ) + wVer := UILabel( EASGetVersion() ) + gTitle:addEnd( wVer ) + //UILabel(i18n("Login to E/AS system")) //cap:setProperty("font.style", "BOLD") // TODO: setProperty connect to widget!!! - t:add(cap, "1,1-3",.T.) + t:add(cap, "1,1-4+",.T.) t:add(UILabel(i18n("Login")), "2,1") - t:add(win:setName("name",UIEdit(name)),"2,2-4",.T.) + t:add(win:setName("name",UIEdit(name)),"2,2-4+",.T.) t:add(UILabel(i18n("Password")), "3,1") pF := win:setName("password",UIEdit("")) pF:setPassword() - t:add(pF,"3,2-4",.T.) + t:add(pF,"3,2-4+",.T.) t:add(UILabel(i18n("Server name")), "5,1") - t:add(win:setName("server",UIEdit(server)),"5,2",.T.) + t:add(win:setName("server",UIEdit(server)),"5,2+",.T.) t:add(UILabel(i18n("Port")), "5,3") - t:add(win:setName("port",UIEdit(port)),"5,4",.T.) + t:add(win:setName("port",UIEdit(port)),"5,4+",.T.) bb := UIButtonBar() bb:setAlignment( ALIGN_CENTER ) |
|
From: Andrey C. <sku...@us...> - 2006-06-06 02:25:29
|
Update of /cvsroot/eas-dev/ocmng In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23450 Modified Files: Makefile Log Message: Set components for successful E/AS work Index: Makefile =================================================================== RCS file: /cvsroot/eas-dev/ocmng/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 2 Jun 2006 14:44:45 -0000 1.1 +++ Makefile 5 Jun 2006 12:23:09 -0000 1.2 @@ -8,14 +8,17 @@ INCS = funcs_s.prg ocmng.ch PROGS = ocmng$(EXESUFF) xml2xmo$(EXESUFF) #PROGS = ocmng_compil$(EXESUFF) ocmng_dump$(EXESUFF) ocmng_install$(EXESUFF) ocmng$(EXESUFF) +PODIRS = components/ocmng .SUFFIXES: .prg .o .po all: $(OBJS) $(PROGS) + for dir in $(PODIRS);do cd $$dir && make;done ./xml2xmo components clean: - rm -f $(PROGS) *.ex *.nm *.uri *.c *.s *.o *.a *.po *.log *.pa *.b *.BAK *.bak *~ core* *core + rm -f $(PROGS) *.so *.ex *.nm *.uri *.c *.s *.o *.a *.po *.log *.pa *.b *.BAK *.bak *~ core* *core + for dir in $(PODIRS);do cd $$dir && make clean;done ./cleanxmo.sh ocmng_compil$(EXESUFF): ocmng_compil.prg $(OBJS) $(INCS) |
|
From: Andrey C. <sku...@us...> - 2006-06-06 02:23:53
|
Update of /cvsroot/eas-dev/eas In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv11146 Modified Files: INSTALL mkinstalldirs Log Message: Continues fix client and small changes in documentation Index: INSTALL =================================================================== RCS file: /cvsroot/eas-dev/eas/INSTALL,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- INSTALL 2 Jun 2006 14:32:45 -0000 1.1 +++ INSTALL 5 Jun 2006 14:12:18 -0000 1.2 @@ -92,6 +92,7 @@ ocmng install components/ALL.xmo ocmng install components/ocmng/ALL.xmo + ocmng install components/ocmng/EAS.xmo NOTES |
|
From: Andrey C. <sku...@us...> - 2006-06-06 02:23:52
|
Update of /cvsroot/eas-dev/eas/server In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv11146/server Modified Files: pam-auth.c Log Message: Continues fix client and small changes in documentation |
|
From: Andrey C. <sku...@us...> - 2006-06-06 02:23:16
|
Update of /cvsroot/eas-dev/ocmng/components/ocmng/forms In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23450/components/ocmng/forms Modified Files: form.prg form.xml Log Message: Set components for successful E/AS work Index: form.prg =================================================================== RCS file: /cvsroot/eas-dev/ocmng/components/ocmng/forms/form.prg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- form.prg 2 Jun 2006 14:44:46 -0000 1.1 +++ form.prg 5 Jun 2006 12:23:09 -0000 1.2 @@ -1,9 +1,9 @@ /*-------------------------------------------------------------------------*/ -/* E/AS Component (part of E/AS project) */ -/* */ -/* Copyright (C) 2005 by E/AS Software Foundation */ -/* Author: Andrey Cherepanov <sk...@ea...> */ -/* */ +/* E/AS Component (part of E/AS project) */ +/* */ +/* Copyright (C) 2005 by E/AS Software Foundation */ +/* Author: Andrey Cherepanov <sk...@ea...> */ +/* */ /* This program is free software; you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as */ /* published by the Free Software Foundation; either version 2 of the */ @@ -11,39 +11,40 @@ /*-------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------/ -/ / -/ Name: UI form center / -/ System name: form / -/ Description: Get UI form for object / -/ Version: 0.1 / -/ Author: Andrey Cherepanov <sk...@ea...> / -/ / -/ Available commands: / -/ GET Get form content / -/ <name> form name / -/ [<type>] type of form (optional) / -/ object get the XFL form for edit object content / -/ list get the XFL form with list of objects / -/ select get the XFL form for select object from list / -/ print_object get the XPL card for object / -/ print_list get the XPL form for print object list / -/ / -/ GETVIEW Get object with view (object list) / -/ <name> view name / -/ / +/ / +/ Name: UI form center / +/ System name: form / +/ Description: Get UI form for object / +/ Version: 0.1 / +/ Author: Andrey Cherepanov <sk...@ea...> / +/ / +/ Available commands: / +/ GET Get form content / +/ <name> form name / +/ [<type>] type of form (optional) / +/ object get the XFL form for edit object content / +/ list get the XFL form with list of objects / +/ select get the XFL form for select object from list / +/ print_object get the XPL card for object / +/ print_list get the XPL form for print object list / +/ / +/ GETVIEW Get object with view (object list) / +/ <name> view name / +/ / /--------------------------------------------------------------------------*/ /** Component: form */ #define DEFAULT_TITLE_MAIN_WINDOW 'E/AS' -#define DEFAULT_FORM_CLASS '__form' +#define DEFAULT_FORM_DB 'ETC0101' +#define DEFAULT_FORM_CLASS 'mng_form' #define DEFAULT_ENCODING 'koi8-r' parameters cMethod, params local cContent:='' -local oErr, i, err:='' +local oErr, i, err:='', view eDebug(12, "FORM method:", cMethod) oErr := ErrorBlock({|e| break(e) }) @@ -85,7 +86,9 @@ /*=========================================================================*/ // GETVIEW() elseif lower(cMethod) == 'getview' - return get_View(params) + view := get_View(params) + eDebug( 17, "FORM.getView:", view:data ) + return view else eDebug(3, "FORM has not method '"+cMethod+"'") endif @@ -97,7 +100,7 @@ i++ end - eDebug(5, "Component internal error:", errorMessage(oErr)) + eDebug(5, "FORM component internal error:", errorMessage(oErr)) return NIL end sequence @@ -106,58 +109,78 @@ /* Generate main window */ static function get_MainForm(params) local f:='', title:=DEFAULT_TITLE_MAIN_WINDOW, l, i, ent, aIgnoreClasses + local deps, edep, dep, list_all:={} - if "DB" $ params - title := params:db - endif + title += " " + EASGetVersion() f := '<?xml version="1.0" encoding="'+DEFAULT_ENCODING+'" ?>&\n' + ; '<!-- Main window interface form -->&\n' + ; '<!-- Web: http://eas.lrn.ru -->&\n&\n' + ; ; '<form>&\n' + ; - '<head>&\n' + ; - '</head>&\n' + ; - '<interface>&\n' + ; - '<widget class="mainWindow" name="mainWindow" label="'+title+'">&\n&\n' + ; + '<head>&\n' + ; + '</head>&\n' + ; + '<interface>&\n' + ; + '<widget class="mainWindow" name="mainWindow" label="'+title+'">&\n&\n' + ; ; - ' <!-- Menu -->&\n' + ; - ' <widget class="menuBar">&\n' + ; - ' <widget class="popupMenu" name="file_menu" label="&File">&\n' + ' <!-- Menu -->&\n' + ; + ' <widget class="menuBar">&\n' + ; + ' <widget class="popupMenu" name="file_menu" label="&File">&\n' // Show classes - aIgnoreClasses := { 'void', '__component', '__form' } - - l := lquery(params, 'show classes') - if valtype(l) == 'A' - asort(l,,,{|a,b| a[2] < b[2]}) - for i in l - if ascan(aIgnoreClasses, lower(i[2])) == 0 - f += '&\t<widget class="menuItem" label="'+i[2]+'" name="'+i[2]+'.list"/>&\n' + aIgnoreClasses := { "void" } // TODO: get from configuration file + deps := lquery(params, 'show databases') + asort(deps,,,{|a,b| a[1] < b[1]}) + for edep in deps + dep := edep[1] + params:db := dep + l := lquery(params, 'show classes') + i := 1 + while i <= len(l) + if ascan(aIgnoreClasses, lower(l[i][2])) != 0 + adel( l, i ) + asize( l, len(l)-1 ) endif - next - endif + i++ + enddo + eDebug(12, 'FORM', dep, ':', len(l), 'class(es)' ) + if len(l) == 0 + loop + endif + f += '&\t<widget class="popupMenu" label="'+dep+'">&\n' + if valtype(l) == 'A' + asort(l,,,{|a,b| a[2] < b[2]}) + for i in l + f += '&\t&\t<widget class="menuItem" label="'+i[2]+'" name="'+dep+':'+i[2]+'.list"/>&\n' + aadd( list_all, dep+':'+i[2] ) + next + endif + + f += '&\t</widget>&\n' + + next + eDebug(12, 'FORM: finish append classes' ) f += ' <widget class="menuSeparator"/>&\n' + ; ' <widget class="menuItem" label="&Exit" name="Menu.Quit"/>&\n' + ; - ' </widget>&\n' + ; - ' </widget>&\n&\n' + ; - ' <!-- Statusbar -->&\n' + ; - ' <widget class="statusBar" name="main_statusBar" label="Done." />&\n' + ; + ' </widget>&\n' + ; + ' </widget>&\n&\n' + ; + ' <!-- Statusbar -->&\n' + ; + ' <widget class="statusBar" name="main_statusBar" label="Done." />&\n' + ; ; - '</widget>&\n' + ; - '</interface>&\n&\n' + ; + '</widget>&\n' + ; + '</interface>&\n&\n' + ; ; - '<!-- Widgets properties -->&\n' + ; - '<style>&\n' + ; - ' <property widget="mainWindow" name="geometry" value="600,450,35,15" />&\n' + ; - ' <property widget="mainWindow" name="position" value="center" />&\n' + ; - ' <property widget="mainWindow" name="MDI" value="true" />&\n' + ; - '</style>&\n&\n' + '<!-- Widgets properties -->&\n' + ; + '<style>&\n' + ; + ' <property widget="mainWindow" name="geometry" value="600,450,35,15" />&\n' + ; + ' <property widget="mainWindow" name="position" value="center" />&\n' + ; + ' <property widget="mainWindow" name="MDI" value="true" />&\n' + ; + '</style>&\n&\n' - // TODO: translation - - f += '<actions>&\n' + ; + // TODO: translation + + f += '<actions>&\n' + ; ' <!-- System actions -->&\n' + ; ' <rule>&\n' + ; ' <event widget="Menu.Quit" signal="activate"/>&\n' + ; @@ -165,18 +188,13 @@ ' </rule>&\n' // Actions - if valtype(l) == 'A' - for i in l - if ascan(aIgnoreClasses, lower(i[2])) == 0 - ent := i[2] - f += '<rule>&\n' - f += ' <event widget="'+ent+'.list" signal="activate"/>&\n' - f += ' <action><call method="openForm"><param value="'+ent+'"/><param value="list"/>' - f += '</call></action>&\n' - f += '</rule>&\n' - endif - next - endif + for i in list_all + f += '<rule>&\n' + f += ' <event widget="'+i+'.list" signal="activate"/>&\n' + f += ' <action><call method="openForm"><param value="'+i+'"/><param value="list"/>' + f += '</call></action>&\n' + f += '</rule>&\n' + next f += '</actions>&\n' + ; '</form>&\n' @@ -185,45 +203,46 @@ // Generate form with list of all class object static function get_UIList(params) - local f, ent:=params:name, fields, i + local f, ent:=params:name, fields, i, pclass f := '<?xml version="1.0" encoding="'+DEFAULT_ENCODING+'" ?>&\n' + ; '<!-- '+ent+' list form -->&\n' + ; '<!-- Web: http://eas.lrn.ru -->&\n&\n' + ; ; '<form>&\n' + ; - ' <head>&\n' + ; // TODO: fill table with autoreloading (see openView() ) + ' <head>&\n' + ; // TODO: fill table with autoreloading (see openView() ) ' <call method="openView">&\n' + ; ' <param><property widget="list" name="object"/></param>&\n' + ; ' <param value="'+ent+'"/>&\n' + ; - ' <param value="10" />&\n' + ; // 10 seconds by default - ' <param><property widget="form" name="object"/></param>&\n' + ; + ' <param value="60" />&\n' + ; // 60 seconds by default + ' <param><property widget="__form" name="object"/></param>&\n' + ; ' </call>&\n' + ; - ' </head>&\n' + ; - ' <interface>&\n' + ; - ' <widget class="childWindow" name="form" label="'+ent+' list">&\n&\n' + ; - ; - ' <!-- Toolbar -->&\n' + ; - ' <widget class="toolBar" name="main_tbar">&\n' + ; - ; + ' </head>&\n' + ; + ' <interface>&\n' + ; + ' <widget class="childWindow" name="__form" label="'+ent+' list">&\n&\n' + ; + ; + ' <!-- Toolbar -->&\n' + ; + ' <widget class="toolBar" name="main_tbar">&\n' + ; + ; ' <widget name="create" class="toolButton" label="New">&\n' + ; - ' <property name="icon" value="create.xpm"/>&\n' + ; - ' </widget>&\n' + ; - ' <widget name="edit" class="toolButton" label="Edit">&\n' + ; - ' <property name="icon" value="edit.xpm"/>&\n' + ; - ' </widget>&\n' + ; - ' <widget name="delete" class="toolButton" label="Delete">&\n' + ; - ' <property name="icon" value="delete.xpm"/>&\n' + ; - ' </widget>&\n' + ; + ' <property name="icon" value="create.xpm"/>&\n' + ; + ' </widget>&\n' + ; + ' <widget name="edit" class="toolButton" label="Edit">&\n' + ; + ' <property name="icon" value="edit.xpm"/>&\n' + ; + ' </widget>&\n' + ; + ' <widget name="delete" class="toolButton" label="Delete">&\n' + ; + ' <property name="icon" value="delete.xpm"/>&\n' + ; + ' </widget>&\n' + ; ' </widget>&\n' + ; - ; - ' <widget name="list" class="table">&\n' + ; - ' <column name="id" title="id"/>&\n' + ; + ' <widget name="list" class="table">&\n' - fields := lquery(params, 'describe '+ent) + pclass := form_splitClass( ent ) + params:db := pclass[1] + fields := lquery(params, 'describe '+pclass[2]) if valtype(fields) == 'A' for i in fields - if i[2] $ 'CNDLXRS' + if i[2] $ 'CNDLXRS' .and. i[1] != 'id' f += ' <column name="'+i[1]+'" title="'+i[1]+'"/>&\n' endif next @@ -231,13 +250,13 @@ f += ' </widget>&\n' + ; ' <widget class="buttonBar">&\n' + ; - ' <widget class="button" label="&Close" name="close" />&\n' + ; + ' <widget class="button" label="&Close" name="close" />&\n' + ; ' </widget>&\n' + ; ' </widget>&\n' + ; ' </interface>&\n&\n' + ; - ' <style>&\n' + ; - ' </style>&\n&\n' + ; - ' <actions>&\n' + ; + ' <style>&\n' + ; + ' </style>&\n&\n' + ; + ' <actions>&\n' + ; ; ' <rule label="&Create">&\n' + ; ' <event widget="create" signal="clicked"/>&\n' + ; @@ -254,7 +273,7 @@ ' <rule label="&Delete...">&\n' + ; ' <event widget="delete" signal="clicked"/>&\n' + ; ' <action>&\n' + ; - ' <call widget="form" method="dialogBox">&\n' + ; + ' <call widget="__form" method="dialogBox">&\n' + ; ' <param value="Confirmation"/>&\n' + ; ' <param value="Delete item?"/>&\n' @@ -280,9 +299,9 @@ f += ' <rule label="-C&lose">&\n' + ; ' <event widget="close" signal="clicked"/>&\n' + ; - ' <action><call widget="form" method="close"/></action>&\n' + ; + ' <action><call widget="__form" method="close"/></action>&\n' + ; ' </rule>&\n' + ; - ' </actions>&\n' + ; + ' </actions>&\n' + ; '</form>' return f @@ -292,6 +311,7 @@ fClass := DEFAULT_FORM_CLASS fName := params:name + params:db := DEFAULT_FORM_DB if "TYPE" $ params fName := params:type+"/"+fName endif @@ -306,37 +326,41 @@ /* Get filled view for table */ // TODO: using TVIEW if exists static function get_View(params) - local query + local query, a if assertParameters( params, { 'name:C', 'fields:C' } ) return NIL endif - query := 'select '+params:fields+' from '+params:name + a := form_splitClass( params:name ) + query := 'select '+params:fields+' from '+a[2] -return lcomponent('sys.db', 'executeExt', 'db', iif(valtype(params)=='O' .and. 'DB' $ params, params:db,''), 'query', query) +return lcomponent('sys.db', 'executeExt', 'db', a[1], 'query', query) /* Generate visial form for show class object */ static function get_UIObject(params) - local class:=params:name, f:="", attr, i, a, t, name, chooseElem:={} + local class:=params:name, f:="", attr, i, a, t, name, chooseElem:={}, pclass + pclass := form_splitClass( class ) + params:db := pclass[1] /* XML head */ f += '<?xml version="1.0" encoding="'+DEFAULT_ENCODING+'" ?>&\n' f += '<!-- "'+class+'" dialog interface form -->&\n&\n' /* Form head */ f += '<form>&\n<head>' + ; - ' <call method="setFormObject"><param><property widget="form" name="object"/></param></call>&\n'+ ; + ' <class name="'+class+'"/>&\n' + ; + ' <call method="setFormObject"><param><property widget="__form" name="object"/></param></call>&\n'+ ; '</head>&\n' /* Interface definition */ f += '<interface>&\n' - f += '<widget class="document" name="form" label="'+class+'">&\n'+ ; - '<widget name="title" class="label" label="'+class+'"/>&\n' + f += '<widget class="document" name="__form" label="'+pclass[2]+'">&\n'+ ; + '<widget name="title" class="label" label="'+pclass[2]+'"/>&\n' // Get fields list - attr := lquery(params, 'describe '+class) + attr := lquery(params, 'describe '+pclass[2]) if valtype(attr) != 'A' attr := array(0) endif @@ -352,27 +376,30 @@ for i=1 to len(attr) a := attr[i] name := a[1] + if name == 'id' + loop + endif t := a[2] switch t - case 'L' - f += ' <widget class="combobox" name="'+name+'" pos="'+alltrim(str(i))+',1-2" label="&'+name+'"/>&\n' - case 'D' + case 'L' + f += ' <widget class="combobox" name="'+name+'" pos="'+alltrim(str(i))+',1-2+" label="&'+name+'"/>&\n' + case 'D' f += ' <widget class="label" pos="'+alltrim(str(i))+',1" label="&'+name+':" accel="'+name+'"/>&\n' - f += ' <widget class="editdate" name="'+name+':date" pos="'+alltrim(str(i))+',2" />&\n' - case 'N' + f += ' <widget class="editdate" name="'+name+':date" pos="'+alltrim(str(i))+',2+" />&\n' + case 'N' f += ' <widget class="label" pos="'+alltrim(str(i))+',1" label="&'+name+':" accel="'+name+'"/>&\n' - f += ' <widget class="editdate" name="'+name+':number" pos="'+alltrim(str(i))+',2" />&\n' - case 'S' + f += ' <widget class="edit" name="'+name+':number" pos="'+alltrim(str(i))+',2+" />&\n' + case 'M' f += ' <widget class="label" pos="'+alltrim(str(i))+',1" label="&'+name+':" accel="'+name+'"/>&\n' - f += ' <widget class="edittext" name="'+name+'" pos="'+alltrim(str(i))+',2" />&\n' + f += ' <widget class="edittext" name="'+name+'" pos="'+alltrim(str(i))+'+,2+" />&\n' // TODO: widget for choosing object with button // case 'R' // f += ' <widget class="label" pos="'+alltrim(str(i))+',1" label="&'+name+'" accel="'+name+"_choose"+'"/>&\n' // f += ' <widget class="edit" name="'+name+'" pos="'+alltrim(str(i))+',2" />&\n' // TODO: file uploading for blob - otherwise + otherwise f += ' <widget class="label" pos="'+alltrim(str(i))+',1" label="&'+name+':" accel="'+name+'"/>&\n' - f += ' <widget class="edit" name="'+name+'" pos="'+alltrim(str(i))+',2" />&\n' + f += ' <widget class="edit" name="'+name+'" pos="'+alltrim(str(i))+',2+" />&\n' endswitch next @@ -382,33 +409,34 @@ // Bottom bar f += '<widget class="buttonBar">&\n'+ ; - ' <widget class="button" label="&Ok" name="save" />&\n' - ' <widget class="button" label="&Print" name="print" />&\n'+ ; - f += ' <widget class="button" label="&Close" name="close" />&\n'+ ; + ' <widget class="button" label="&Ok" name="save" />&\n' + ' <widget class="button" label="&Print" name="print" />&\n'+ ; + f += ' <widget class="button" label="&Close" name="close" />&\n'+ ; '</widget>&\n'+ ; '</widget>&\n' // Footer f += '</interface>&\n' f += '<!-- Widget properties -->&\n'+ ; - '<style>&\n'+ ; - ' <property widget="form" name="spacing" value="2"/>&\n'+ ; - ' <property widget="title" name="font.style" value="BOLD"/>&\n'+ ; + '<style>&\n'+ ; + ' <property widget="__form" name="spacing" value="2"/>&\n'+ ; + ' <property widget="title" name="font.style" value="BOLD"/>&\n'+ ; + ' <property widget="title" name="font.size" value="+2"/>&\n'+ ; '</style>&\n' f += '<!-- Actions -->&\n'+ ; - '<actions>&\n'+ ; + '<actions>&\n'+ ; ' <rule label="&OK">&\n'+ ; ' <event widget="save" signal="clicked"/>&\n'+ ; ' <action>&\n'+ ; - ' <call method="saveForm"><param><property widget="form" name="object"/></param><param value="'+class+'" /></call>&\n'+ ; - ' <call widget="form" method="close"/>&\n'+ ; + ' <call method="saveForm"><param><property widget="__form" name="object"/></param><param value="'+class+'" /></call>&\n'+ ; + ' <call widget="__form" method="close"/>&\n'+ ; ' </action>&\n'+ ; ' </rule>&\n'+ ; ' <rule label="-&Close">&\n'+ ; ' <event widget="close" signal="clicked"/>&\n'+ ; ' <action>&\n'+ ; - ' <call method="dialogBoxConfirmClose"><param><property widget="form" name="object"/></param><param value="'+class+'" /></call>&\n'+ ; + ' <call method="dialogBoxConfirmClose"><param><property widget="__form" name="object"/></param><param value="'+class+'" /></call>&\n'+ ; ' </action>&\n'+ ; ' </rule>&\n' @@ -416,7 +444,7 @@ /* <rule> <event widget="payer" signal="clicked"/> - <action><call widget="form" method="open"> + <action><call widget="__form" method="open"> <param value="Partner.Choice.xfl"/> <return> <call widget="payer" method="setValue"> @@ -433,7 +461,7 @@ </rule> */ - f += '</actions>&\n' + f += '</actions>&\n' f += '</form>' return f Index: form.xml =================================================================== RCS file: /cvsroot/eas-dev/ocmng/components/ocmng/forms/form.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- form.xml 2 Jun 2006 14:44:46 -0000 1.1 +++ form.xml 5 Jun 2006 12:23:09 -0000 1.2 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="no" ?> +<?xml version="1.0" encoding="koi8-r" standalone="no" ?> <component> <name>form</name> @@ -7,36 +7,25 @@ <description>Interface and print form support: get from database or generate</description> <license>GNU/GPL</license> <created>2006-05-01</created> - <modified>2006-05-19</modified> + <modified>2006-06-04</modified> <requires> - <dependence type="component">../ocmng/components</dependence> + <dependence type="component">../component.xml</dependence> </requires> - <author> - <name>Andrey Cherepanov</name> - <email>sk...@ea...</email> - <copyright>2006</copyright> - </author> + <author>Skull</author> - <files> - <file name="form.po">Form plugin</file> - <file name="create.xpm">Create icon</file> - <file name="edit.xpm">Edit icon</file> - <file name="delete.xpm">Delete icon</file> - </files> - <meta dictionary="ETC01"> + <!-- mng_form --> <attribute name="type" type="string" len="50" lenType="rtrim" /> <attribute name="content" type="text" lenType="alltrim" /> - <attribute name="size" type="number" lenType="ignore" /> <class name="mng_form" extent="component" essence="name" uniqueKey="name" - attributes="name,type,description,content,size" + attributes="name,type,description,content" indices="name" mainIdx="name" findAttrs="name" @@ -46,22 +35,48 @@ <attribute name="form" type="ref" len="12" refTo="ETC01:mng_form" lenType="ignore" /> <class name="mng_command" - extent="component" - essence="name" - uniqueKey="name" - attributes="name,component,form,description,enabled" - indices="name" - mainIdx="name" - findAttrs="name" - /> - + extent="component" + essence="name" + uniqueKey="name" + attributes="name,component_name,form,description" + indices="name,component_name" + mainIdx="name" + findAttrs="name" + /> + </meta> <data> + <objects depository="ETC0101" class="mng_form"> + <object> + <attr name="name">form.po</attr> + <attr name="type">application/x-clip-plugin</attr> + <attr name="description">Form plugin</attr> + <attr name="content">form.po</attr> + </object> + <object> + <attr name="name">create.xpm</attr> + <attr name="type">image/x-xpm</attr> + <attr name="description">Create icon</attr> + <attr name="content">create.xpm</attr> + </object> + <object> + <attr name="name">edit.xpm</attr> + <attr name="type">image/x-xpm</attr> + <attr name="description">Edit icon</attr> + <attr name="content">edit.xpm</attr> + </object> + <object> + <attr name="name">delete.xpm</attr> + <attr name="type">image/x-xpm</attr> + <attr name="description">Delete icon</attr> + <attr name="content">delete.xpm</attr> + </object> + </objects> <objects depository="ETC0101" class="mng_command"> <object> <attr name="name">get</attr> - <attr name="component" refTo="ETC0101:mng_component">form</attr> + <attr name="component_name">form</attr> <attr name="form" refTo="ETC0101:mng_form">form.po</attr> <attr name="description"><![CDATA[Get/generate form. Arguments: @@ -76,11 +91,10 @@ Returns: String. Form contents.]]></attr> - <attr name="enabled">true</attr> </object> <object> <attr name="name">getview</attr> - <attr name="component" refTo="ETC0101:mng_component">form</attr> + <attr name="component_name">form</attr> <attr name="form" refTo="ETC0101:mng_form">form.po</attr> <attr name="description"><![CDATA[Get view content. Arguments: @@ -88,14 +102,13 @@ fields - String. Comma separated list of object fields. Returns: Array. View content.]]></attr> - <attr name="enabled">true</attr> </object> </objects> </data> <locale lang="ru"> <name>form</name> - <description>ÐоддеÑжка инÑеÑÑейÑнÑÑ Ð¸ пеÑаÑнÑÑ ÑоÑм: полÑÑение из Ð±Ð°Ð·Ñ Ð¸Ð»Ð¸ генеÑаÑиÑ</description> + <description>ðÏÄÄÅÒÖËÁ ÉÎÔÅÒÆÅÊÓÎÙÈ É ÐÅÞÁÔÎÙÈ ÆÏÒÍ: ÐÏÌÕÞÅÎÉÅ ÉÚ ÂÁÚÙ ÉÌÉ ÇÅÎÅÒÁÃÉÑ</description> </locale> </component> |
|
From: Andrey C. <sku...@us...> - 2006-06-06 02:21:41
|
Update of /cvsroot/eas-dev/ocmng/components/ocmng/security In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23450/components/ocmng/security Modified Files: auth.prg auth.xml Log Message: Set components for successful E/AS work Index: auth.prg =================================================================== RCS file: /cvsroot/eas-dev/ocmng/components/ocmng/security/auth.prg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- auth.prg 2 Jun 2006 14:44:46 -0000 1.1 +++ auth.prg 5 Jun 2006 12:23:09 -0000 1.2 @@ -1,9 +1,9 @@ /*-------------------------------------------------------------------------*/ -/* E/AS Component (part of E/AS project) */ -/* */ -/* Copyright (C) 2005 by E/AS Software Foundation */ -/* Author: Andrey Cherepanov <sk...@ea...> */ -/* */ +/* E/AS Component (part of E/AS project) */ +/* */ +/* Copyright (C) 2005 by E/AS Software Foundation */ +/* Author: Andrey Cherepanov <sk...@ea...> */ +/* */ /* This program is free software; you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as */ /* published by the Free Software Foundation; either version 2 of the */ @@ -11,17 +11,17 @@ /*-------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------/ -/ / -/ Name: User authentication / -/ System name: auth / -/ Description: User authentication / -/ Version: 0.1 / -/ Author: Andrey Cherepanov <sk...@ea...> / -/ / -/ Available commands: / -/ AUTH Authenticate user / -/ <params> Authenticate parameters / -/ / +/ / +/ Name: User authentication / +/ System name: auth / +/ Description: User authentication / +/ Version: 0.1 / +/ Author: Andrey Cherepanov <sk...@ea...> / +/ / +/ Available commands: / +/ AUTH Authenticate user / +/ <params> Authenticate parameters / +/ / /--------------------------------------------------------------------------*/ #define DEFAULT_AUTH_METHOD 'PAM' /** Component: auth */ Index: auth.xml =================================================================== RCS file: /cvsroot/eas-dev/ocmng/components/ocmng/security/auth.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- auth.xml 2 Jun 2006 14:44:46 -0000 1.1 +++ auth.xml 5 Jun 2006 12:23:09 -0000 1.2 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="no" ?> +<?xml version="1.0" encoding="koi8-r" standalone="no" ?> <component> <name>auth</name> @@ -6,30 +6,29 @@ <version>0.1</version> <description>User authentication</description> <license>GNU/GPL</license> - <created>2006-04-23</created> - <modified>2006-05-19</modified> + <modified>2006-06-04</modified> <requires> - <dependence type="component">../ocmng/components</dependence> - <dependence type="component">../forms/form</dependence> + <dependence type="component">../component.xml</dependence> + <dependence type="component">../forms/form.xml</dependence> </requires> - <author> - <name>Andrey Cherepanov</name> - <email>sk...@ea...</email> - <copyright>2006</copyright> - </author> - - <files> - <file name="auth.po">Authentication plugin</file> - </files> + <author>Skull</author> <data> + <objects depository="ETC0101" class="mng_form"> + <object> + <attr name="name">auth.po</attr> + <attr name="type">application/x-clip-plugin</attr> + <attr name="description">Authentication plugin</attr> + <attr name="content">auth.po</attr> + </object> + </objects> <objects depository="ETC0101" class="mng_command"> <object> <attr name="name">authenticate</attr> - <attr name="component" refTo="ETC0101:mng_component">auth</attr> + <attr name="component_name">auth</attr> <attr name="form" refTo="ETC0101:mng_form">auth.po</attr> <attr name="description"><![CDATA[Authenticate user. Arguments: @@ -37,14 +36,13 @@ params - Map. Parameters (name:C,password:C). Returns: Logical. .T. if access is granted.]]></attr> - <attr name="enabled">true</attr> </object> </objects> </data> <locale lang="ru"> <name>auth</name> - <description>ÐÑÑенÑиÑикаÑÐ¸Ñ Ð¿Ð¾Ð»ÑзоваÑелей</description> + <description>áÕÔÅÎÔÉÆÉËÁÃÉÑ ÐÏÌØÚÏ×ÁÔÅÌÅÊ</description> </locale> </component> |
|
From: Andrey C. <sku...@us...> - 2006-06-06 02:21:41
|
Update of /cvsroot/eas-dev/ocmng/components/ocmng In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23450/components/ocmng Modified Files: author.xml component.xml vendor.xml Added Files: EAS.xml Makefile Log Message: Set components for successful E/AS work --- NEW FILE: EAS.xml --- <?xml version="1.0" encoding="koi8-r" ?> <component> <requires> <dependence type="component">forms/form.xml</dependence> <dependence type="component">security/auth.xml</dependence> </requires> </component> --- NEW FILE: Makefile --- ifdef CLIPROOT include $(CLIPROOT)/include/Makefile.inc endif CLIP = $(CLIPROOT)/bin/clip CLIPFLAGS = -alwO PO = forms/form.po \ security/auth.po .PHONY: all clean all: $(PO) clean: rm -f $(PO) .prg.po: $(CLIP) $(CLIPFLAGS) -p $< forms/form.po: forms/form.prg $(CLIP) $(CLIPFLAGS) -p forms/form.prg security/auth.po: security/auth.prg $(CLIP) $(CLIPFLAGS) -p security/auth.prg Index: author.xml =================================================================== RCS file: /cvsroot/eas-dev/ocmng/components/ocmng/author.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- author.xml 2 Jun 2006 14:44:46 -0000 1.1 +++ author.xml 5 Jun 2006 12:23:09 -0000 1.2 @@ -8,7 +8,7 @@ <description>Class author for component manager</description> <license>GNU/GPL</license> <created>2006-04-24</created> - <modified>2006-05-23</modified> + <modified>2006-06-04</modified> <author>Uri</author> <requires> @@ -51,7 +51,7 @@ <object> <attr name="code">Skull</attr> <attr name="author_name">Andrew Cherepanoff (áÎÄÒÅÊ þÅÒÅÐÁÎÏ×) </attr> - <attr name="email">sib...@ma...</attr> + <attr name="email">sk...@ea...</attr> <attr name="www">http://eas.lrn.ru</attr> <attr name="mng_vendor" refto="ETC0101:mng_vendor">EAS</attr> </object> Index: component.xml =================================================================== RCS file: /cvsroot/eas-dev/ocmng/components/ocmng/component.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- component.xml 2 Jun 2006 14:44:46 -0000 1.1 +++ component.xml 5 Jun 2006 12:23:09 -0000 1.2 @@ -8,8 +8,9 @@ <description>MAIN component for component management</description> <license>GNU/GPL</license> <created>2006-04-24</created> - <modified>2006-05-23</modified> + <modified>2006-06-04</modified> <author>Uri</author> + <author>Skull</author> <requires> <dependence type="component">void.xml</dependence> @@ -25,7 +26,6 @@ <attribute name="dependence" type="array" lenType="ignore" /> <attribute name="definition" type="text" lenType="alltrim" /> <attribute name="installed" type="array" lenType="ignore" /> - <attribute name="enabled" type="logical" lenType="ignore" /> <attribute name="mng_author" type="ref" @@ -44,13 +44,14 @@ attributes="component_name,version,mng_category, mng_author, license, created, modified, description,documentation, - dependence,installed,enabled, + dependence,installed, component_body" indices="component_name" mainIdx="component_name" findAttrs="component_name" /> + </meta> </component> Index: vendor.xml =================================================================== RCS file: /cvsroot/eas-dev/ocmng/components/ocmng/vendor.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- vendor.xml 2 Jun 2006 14:44:46 -0000 1.1 +++ vendor.xml 5 Jun 2006 12:23:09 -0000 1.2 @@ -8,7 +8,7 @@ <description>Class vendor for component manager</description> <license>GNU/GPL</license> <created>2006-04-24</created> - <modified>2006-05-23</modified> + <modified>2006-06-04</modified> <author>Uri</author> <requires> @@ -37,14 +37,14 @@ <objects depository="ETC0101" class="mng_vendor" rules="appendOnly"> <object> <attr name="code">ITK</attr> - <attr name="vendor_name">ITK ltd. (ïïï éôë)</attr> + <attr name="vendor_name">ITK Ltd. (ïïï éôë)</attr> <attr name="email">ur...@it...</attr> <attr name="www">http://www.itk.ru</attr> </object> <object> <attr name="code">EAS</attr> - <attr name="vendor_name">EAS team</attr> - <attr name="email">sib...@ma...</attr> + <attr name="vendor_name">E/AS Software Foundation</attr> + <attr name="email">sk...@ea...</attr> <attr name="www">http://eas.lrn.ru</attr> </object> </objects> |
|
From: Andrey C. <sku...@us...> - 2006-06-06 02:19:00
|
Update of /cvsroot/eas-dev/clip-ui/drivers In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv26073/drivers Modified Files: driver-gtk.prg driver-gtk2.prg Log Message: UIFrame now support :layout widget for setup background ("color.bg") Index: driver-gtk.prg =================================================================== RCS file: /cvsroot/eas-dev/clip-ui/drivers/driver-gtk.prg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- driver-gtk.prg 2 Jun 2006 14:13:09 -0000 1.1 +++ driver-gtk.prg 5 Jun 2006 20:34:49 -0000 1.2 @@ -581,9 +581,9 @@ static function ui_createImage(self, file, isString) local o - if .not. empty(isString) .and. isString + if .not. empty(isString) .and. isString o := gdk_PixmapCreateFromXPMD(,file,) - elseif empty(file) .or. FILEATTR(file) == 0 + elseif empty(file) .or. FILEATTR(file) == 0 o := gdk_PixmapCreateFromXPMD(,getSysImage( IMG_EMPTY ),) else o := gdk_PixmapFromXPMNew(, file ) @@ -1120,8 +1120,10 @@ /** Frame **/ static function ui_createFrame(self, caption, type) - local o + local o, eBox o := gtk_FrameNew(, caption) + eBox := gtk_EventBoxNew() + o:layout := eBox self:setFrameType(o, type) return o Index: driver-gtk2.prg =================================================================== RCS file: /cvsroot/eas-dev/clip-ui/drivers/driver-gtk2.prg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- driver-gtk2.prg 2 Jun 2006 14:13:09 -0000 1.1 +++ driver-gtk2.prg 5 Jun 2006 20:34:49 -0000 1.2 @@ -1167,8 +1167,10 @@ /** Frame **/ static function ui_createFrame(self, caption, type) - local o + local o, eBox o := gtk_FrameNew(, caption) + eBox := gtk_EventBoxNew() + o:layout := eBox self:setFrameType(o, type) return o |
|
From: Andrey C. <sku...@us...> - 2006-06-06 01:30:15
|
Update of /cvsroot/eas-dev/clip-ui/example In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv26073/example Modified Files: test_ui.prg Log Message: UIFrame now support :layout widget for setup background ("color.bg") Index: test_ui.prg =================================================================== RCS file: /cvsroot/eas-dev/clip-ui/example/test_ui.prg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- test_ui.prg 2 Jun 2006 14:12:10 -0000 1.1 +++ test_ui.prg 5 Jun 2006 20:34:49 -0000 1.2 @@ -10,6 +10,7 @@ /* License, or (at your option) any later version. */ /*-------------------------------------------------------------------------*/ #include <clip-ui.ch> +#include <clip-gtk2.ch> /* Test of clip-ui library usage */ @@ -232,7 +233,9 @@ /* Form widgets */ static function BankDocReq(w,grid) - local drv, lab, data, top, bottomLine, sd, pol, plat, i, t, f1, f2, t1, t2, b1, b2, b3, e1, e2, cb1, cb2, sum, hbsum, rs, rg + local drv, lab, data, top, bottomLine, sd, pol, plat + local i, t, f1, f2, t1, t2, b1, b2, b3, e1, e2, cb1, cb2 + local sum, hbsum, rs, rg, wIcon, wB drv := getDriver() data := map() @@ -315,14 +318,18 @@ // Payer f1 := UIFrame() grid:add(f1) - drv:setStyle(f1,"color.bg","darkblue") f1:setLabel("Payer") - f1:setType(FRAME_RAISED) - t1 := UIVBox(,,3) + f1:setType(FRAME_PLAIN)//RAISED) + t1 := UIHBox(,,3) f1:add( t1 ) + + wB := f1:layout + drv:setStyle(f1,"color.bg","green") + drv:setStyle(wB,"color.bg","green") + cb1 := UIComboBox({'JSC "Brown and son"'},1) w:setName("payer", cb1) - t1:add(cb1) + gtk_ContainerAdd(t1, cb1) // Payee f2 := UIFrame("Payee",FRAME_SUNKEN) |
|
From: Andrey C. <sku...@us...> - 2006-06-06 00:11:39
|
Update of /cvsroot/eas-dev/eas/client In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6982/client Modified Files: Makefile main.prg Added Files: eas-logo.xpm Removed Files: eas-logo.png Log Message: Redesign login window: add logo and version --- NEW FILE: eas-logo.xpm --- /* XPM */ static char * eas_logo_xpm[] = { "122 56 1082 2", " c None", ". c #FFFFFF", "+ c #FEFEFE", "@ c #F9FBFD", "# c #ECF3F9", "$ c #D1E2F3", "% c #B4D0ED", "& c #91BBE5", "* c #78ACE0", "= c #64A0DD", "- c #5798DB", "; c #4E93D9", "> c #4A91D9", ", c #4B91D8", "' c #4F93D9", ") c #5496D9", [...1102 lines suppressed...] ". . . + 3=N*7 7 7 7 7 7 7 7 7 7 7 7 |.4=5=6=7=8=9=0=i%i%i%a=b=j%c=c=c=k%d=e=V*_&f=g=h=i=j=k=l=m=n=o=<%p= #g#q=r=s=t=u=v=w=x=y=z=A=`%B=v+7+.%)+m*C=D=E=F=G=H=I=I=J=K=L=M=N=O=P=Q=R=S=R=T=U=V=W=X=T+f#Y=d*g&=$@+&+C.: . . . . . . . . . . . . . . . . ", ". . . : Z=`=7 7 7 7 7 7 7 7 7 7 7 7 |.h. -/+h+.-{%V*+-+-+-+-+-[@[@[@Q%Q%V*{%<#@-K$#-_+$-i+%-&-*-=---;-'*c&O@u#x+r )&7$T#|+%&2=a@>-g#,&,-U *+L L '-)-o@6$r#n@a@&&L*p+V@g&k&o#d*a@Y=`%c*c*U@c*`%%#L*.$.=!-~-{-&+s.:.+ . . . . . . . . . . . . . . . . ", ". . . : ]-^-7 7 7 7 7 7 7 7 7 7 7 7 }.i./-M+x&(-@-_-p*p*:-:-:-:-:-:-p*p*_-@-(-x&M+<-[-}-~$q*|-1-2-x*b*%&3-b+m*L L )+K $.4-4._*_*4.4-$.5-)+L : : L m*K %6-6$C+C+,&v+h#D+D+h#7-C+g&8-.=p#p#.=`$s#4.6-(..@9-q e _ + . . . . . . . . . . . . . . . . . ", ". . . + 0-a-7 7 7 7 7 7 7 7 7 7 7 7 }.j.g.2#r*J#b-c-i+i+!$!$!$!$!$!$i+i+c-d-J#r*e-h.i.f- -g-h-i-'*`%r#T#'.).( : _ s.)&$&'.a%7+7+5.@+_.)+C.: + + : e q 9-{-=#l&;@7+.@@+l*d$2+'&l&w+(.~-D+D+j-k-o@.@2+l-&+x+( : + . . . . . . . . . . . . . . . . . . ", ". . . + m-n-5 7 7 7 7 7 7 7 7 7 7 7 7 }.j.o-L#p-}&_+_+e-e-e-e-e-e-e-e-_+_+}&Y.L#i.j.q-r-s-t-|$!*n@b@D+K )+f + . : _ e x+)+q q q )+*+s.L : . . . + :.( '-d ).q q q ).d x+x+x+)+6.&+B '+)-)-'+%.)&)+x+r L :.: . . . . . . . . . . . . . . . . . . . . ", ". . . + L u-v-7 7 7 7 7 7 7 7 7 7 7 7 7 }.|.O+i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.w-j.|.}.x-y-z-A-m@.$z$a+$&*+L + . . . + : _ L L L L L f :.: . . . . . + : :.f L L L L L f _ :._ L L ( C.e r r e C.( L _ : + + . . . . . . . . . . . . . . . . . . . . . ", ". . . . _ B-C-D-7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 }.}.}.}.}.}.}.7 7 7 7 7 7 E-F-G-H-b*%#q#D*7+I-C _ + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + . . . . . . . . . . . . . . . . . . . . . . . . . ", ". . . . : s.J-K-7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 '@L-M-N-O-!*y$p#O@.@I-'-f + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", ". . . . : L P-Q-R-Q 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 L-S-T-U-T+@#`+_*(.u#q e : + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", ". . . . . :.*+V-W-X-7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 Q Y-Z-`- ;.;+;L*V@ @o@U )+( :.+ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", ". . . . . + ( q @;#;$;%;7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 &;*;=;-;;;>;k*2=q#4.T ,;&+s.f + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", ". . . . . . :.r .%';);!;~;Q 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 &;{;];^;/;(;f#E&`+s#h#a%U )+e :.+ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", ". . . . . . + :.'-I-_;:;<;[;};|;Y-'@7 Q 7 7 Q '@'@E-1;2;3;4;5;6;7;1=`%5$o#8;z%5.U ).r _ : . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", ". . . . . . . + f C .%a%9;0;a;b;c;d;e;f;g;h;i;j;k;l;m;n;o;p;q;U@a@p+p#!-1+7+K )&C L : + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", ". . . . . . . . + :.r 6.l*o@O@r;s;t;u;v;w;x;y;z;A;B;C;%#L*p+q#k&v+1+o@b+.%)+s.L : + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", ". . . . . . . . . + :.( d '+b+$.-$v+s#|+o#r#D;D;r#8&.=k&,& @1+w+E;5-B m*r L :.+ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", ". . . . . . . . . . . + :.( x+6..%d$E;7+w+k-T T k-w+l&.@2+$&I-)&x+r L :.: . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", ". . . . . . . . . . . . . : _ L r x+).)&B I-)-)-I-B &+q d C r L _ : + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "}; Index: Makefile =================================================================== RCS file: /cvsroot/eas-dev/eas/client/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 2 Jun 2006 14:48:10 -0000 1.3 +++ Makefile 5 Jun 2006 20:54:53 -0000 1.4 @@ -10,6 +10,7 @@ CLIPLIBS = -L$(CLIPROOT)/lib -lclip-codb -lclip-ui -lclip-xml -lexpat EASLIBS = -leas -lcodb_query CLIPFLAGS = -a -O -b +ICONS = eas-logo.xpm .SUFFIXES: .prg .o .po .PHONY: all clean @@ -30,12 +31,13 @@ install: all $(PRG) @../mkinstalldirs $(DESTDIR)$(EASBINDIR) - @../mkinstalldirs $(DESTDIR)$(EASDATADIR)/client/ + @../mkinstalldirs $(DESTDIR)$(EASDATADIR)/client/icons $(CLIPROOT)/bin/clip_cp $(PRG) $(DESTDIR)$(EASBINDIR) + $(CLIPROOT)/bin/clip_cp $(ICONS) $(DESTDIR)$(EASDATADIR)/client/icons uninstall: rm -f $(DESTDIR)$(EASBINDIR)/$(PRG) - rm -rf $(DESTDIR)$(EASDATADIR)/server/ >/dev/null 2>&1 || : + rm -rf $(DESTDIR)$(EASDATADIR)/client/ >/dev/null 2>&1 || : .prg.o: $(CLIP) $(CLIPFLAGS) -DEAS_MODULES=\"$(EASDATADIR)/client/\" $(CLIPINCLUDE) $< Index: main.prg =================================================================== RCS file: /cvsroot/eas-dev/eas/client/main.prg,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- main.prg 5 Jun 2006 14:12:19 -0000 1.4 +++ main.prg 5 Jun 2006 20:54:53 -0000 1.5 @@ -191,7 +191,7 @@ function connectionDialog( msg ) //local oConnectData := map(), auth_info:=map(), packet, vRet local cfg, win, t, bb, cap, pF, bD, gTitle, wIcon, wVer - local oIni, name:="", a + local oIni, name:="", a, driver local server, port if loginInProgress == 1 @@ -227,15 +227,19 @@ // Title cap := UIFrame() - cap:setType( 2 ) // TODO: Sunken - gTitle := UIHBox() + cap:setType( FRAME_RAISED ) + gTitle := UIHBox(,3,3) cap:add( gTitle ) - wIcon := UIImage("~/pro/setup/eas/eas/client/eas-logo.png") // TODO: set data path + wIcon := UIImage( EAS_MODULES+PATH_DELIM+"icons"+PATH_DELIM+"eas-logo.xpm") gTitle:add( wIcon ) - wVer := UILabel( EASGetVersion() ) + wVer := UILabel( i18n('Version ')+EASGetVersion() ) gTitle:addEnd( wVer ) - //UILabel(i18n("Login to E/AS system")) - //cap:setProperty("font.style", "BOLD") // TODO: setProperty connect to widget!!! + + // Set styles + driver := getDriver() + driver:setStyle(cap:layout, 'color.bg', 'white') + driver:setStyle(wVer, 'color.fg', 'darkred') + t:add(cap, "1,1-4+",.T.) t:add(UILabel(i18n("Login")), "2,1") --- eas-logo.png DELETED --- |
|
From: Andrey C. <sku...@us...> - 2006-06-06 00:11:10
|
Update of /cvsroot/eas-dev/clip-ui In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv26073 Modified Files: ChangeLog Log Message: UIFrame now support :layout widget for setup background ("color.bg") Index: ChangeLog =================================================================== RCS file: /cvsroot/eas-dev/clip-ui/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ChangeLog 2 Jun 2006 14:12:09 -0000 1.1 +++ ChangeLog 5 Jun 2006 20:34:49 -0000 1.2 @@ -1,3 +1,6 @@ +2006-06-06 + - UIFrame now support :layout widget for setup background ("color.bg") + 2006-06-02 - UIGrid: add expand flags to pos (+ at axes end) - small fixes in UIForm |
|
From: Andrey C. <sku...@us...> - 2006-06-02 14:49:09
|
Update of /cvsroot/eas-dev/eas/server In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv19781 Added Files: Makefile easd.in easserver.ini.in main.prg pam-auth.c pam-easserver Log Message: Add files --- NEW FILE: easserver.ini.in --- ; E/AS server configuration file ; Ordinary place: /etc/eas/easserver.conf ; ============== SERVER ============== ; Server settings [SERVER] ; Root directory for server ServerRoot = SERVERROOT ; Debug level (0-255): greater number is mean more information ; default value is 15 debug = 17 ; Connection section [CONNECTION_1] ; Connection role: server or client role = server ; Transport type transport = TCP ; Protocol type protocol = RAW ; port for listen port = 3000 ; timeout for listen() listentimeout = 10000 ; timeout for accept() accepttimeout = 1000 ; message manager politic: session or global manager = global ; read block (should be same in client) ; readblock = 6000 ; read timeout readtimeout = 6000 ; write timeout writetimeout = 600 [COMPONENT_MANAGER] ; repository for components repository = http://eas.lrn.ru/repository/ ; ============== COMPONENTS ============== [AUTH] method = PAM pam = $CLIPROOT/bin/pam-auth --- NEW FILE: main.prg --- /*-------------------------------------------------------------------------*/ /* Server software for E/AS platform */ /* */ /* Copyright (C) 2003-2005 by E/AS Software Foundation */ /* Author: Andrey Cherepanov <sk...@ea...> */ /* */ /* This program is free software; you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as */ /* published by the Free Software Foundation; either version 2 of the */ /* License, or (at your option) any later version. */ /*-------------------------------------------------------------------------*/ #define PRG_NAME "easserver" #define PRG_VERSION "0.2.1" #define DEBUG 20 #define TMP_DEFAULT '/tmp/easserver' static messages /* Main function */ function main() local oErr, lang, params:=array(0), i, defConfigFile, mm, cfg oErr := errorBlock({|e| break(e) }) set macro_in_string off set translate path off begin sequence lang := left(getenv("LANG"),2) l10nOpen(PRG_NAME, EAS_MODULES+PATH_DELIM+"locale"+PATH_DELIM+lang+PATH_DELIM+PRG_NAME+".mo") // Put in parameters stack default config file location // defConfigFile := cliproot()+PATH_DELIM+"etc"+PATH_DELIM+PRG_NAME+".ini" defConfigFile := PRG_NAME+".ini" aadd(params, "-c") aadd(params, defConfigFile) // Get parameters for i:=1 to pcount() aadd(params, param(i)) next // Set debug level eSetDebugLevel( DEBUG ) // Pass parameters to EASConfig if (cfg:=EASConfig( params, .T., "E/AS server. Version "+PRG_VERSION+"." )) == NIL CANCEL endif if cfg:getValue("SERVER","DEBUG") != NIL .and. cfg:debug == NIL eSetDebugLevel( cfg:getValue("SERVER","DEBUG") ) endif // Prepare directory for log and cache if .not. checkWorkPlace() eDebug(1, "Error set server root directory" ) return 1 endif // Init global message manager messages := EASMessageManager( "server" ) // Run with parameter 'server': server // Quit if transport settings doesn't exist setSlot(messages, "sys.transport.failed", {|msg| messages:close() }) // Open global message manager messages:open() applicationQuit() recover using oErr eDebug(1, "EXCEPTION:",errorMessage(oErr)) applicationQuit() return 1 end sequence return 0 /* Prepare directory for log and cache */ function checkWorkplace() local dir, cfg, cDir := 'cache', cfgDir // Read ServerRoot from config dir := TMP_DEFAULT cfg := EASGetConfig() cfgDir := cfg:getValue("SERVER","SERVERROOT") if .not. empty( cfgDir ) dir := cfgDir endif eDebug(5, "Required work directory:", dir ) // Change directory, create it if neccessary if dirchange( dir ) < 0 if dirmake( dir ) < 0 return .F. endif endif if dirchange( dir ) < 0 return .F. endif // Check 'cache' subdirectory if dirchange( dir+PATH_DELIM+cDir ) < 0 if dirmake( dir+PATH_DELIM+cDir ) < 0 return .F. endif endif dirchange( dir ) eDebug(5, "Current directory:", cygwinroot()+PATH_DELIM+curDir() ) return .T. /* Quit from application */ function applicationQuit() eDebug(10, "Quitting...") messages:close() // Remove all *.po from cache directory fileDelete('*.po') return --- NEW FILE: pam-auth.c --- /* * $Id: pam-auth.c,v 1.1 2006/06/02 14:49:00 skull_rus Exp $ * * PAM authenticator module for Squid. * Copyright (C) 1999 Henrik Nordstrom <hn...@sq...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * * Squid is the result of efforts by numerous individuals from * the Internet community; see the CONTRIBUTORS file for full * details. Many organizations have provided support for Squid's * development; see the SPONSORS file for full details. Squid is * Copyrighted (C) 2001 by the Regents of the University of * California; see the COPYRIGHT file for full details. Squid * incorporates software developed and/or copyrighted by other * sources; see the CREDITS file for full details. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * * Install instructions: * * This program authenticates users against a PAM configured authentication * service "squid". This allows you to authenticate Squid users to any * authentication source for which you have a PAM module. Commonly available * PAM modules includes "UNIX", RADIUS, Kerberos and SMB, but a lot of other * PAM modules are available from various sources. * * Example PAM configuration for standard UNIX passwd authentication: * /etc/pam.conf: * squid auth required /lib/security/pam_unix.so.1 * squid account required /lib/security/pam_unix.so.1 * * Note that some PAM modules (for example shadow password authentication) * requires the program to be installed suid root, or PAM will not allow * it to authenticate other users than it runs as (this is a security * limitation of PAM to avoid automated probing of passwords). * * Compile this program with: gcc -o pam_auth pam_auth.c -lpam -ldl * */ #include <stdio.h> #include <assert.h> #include <stdlib.h> #include <string.h> #include <signal.h> #include <time.h> #include <syslog.h> #include <errno.h> #include <security/pam_appl.h> #include <sys/types.h> #include <sys/stat.h> #define BUFSIZE 8192 /* The default PAM service name */ #ifndef PAM_SERVICE_NAME #define PAM_SERVICE_NAME "easserver" #endif /* How often to reinitialize PAM, in seconds. Undefined = never, 0=always */ /* #define PAM_CONNECTION_TTL 60 */ static int reset_pam = 1; /* Set to one if it is time to reset PAM processing */ static char *password = NULL; /* Workaround for Solaris 2.6 brokenness */ static time_t mtime = 0; /* * A simple "conversation" function returning the supplied password. * Has a bit to much error control, but this is my first PAM application * so I'd rather check everything than make any mistakes. The function * expects a single converstation message of type PAM_PROMPT_ECHO_OFF. */ static int password_conversation(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr) { if (num_msg != 1 || msg[0]->msg_style != PAM_PROMPT_ECHO_OFF) { fprintf(stderr, "ERROR: Unexpected PAM converstaion '%d/%s'\n", msg[0]->msg_style, msg[0]->msg); return PAM_CONV_ERR; } if (!appdata_ptr) { /* Workaround for Solaris 2.6 where the PAM library is broken * and does not pass appdata_ptr to the conversation routine */ appdata_ptr = password; } if (!appdata_ptr) { fprintf(stderr, "ERROR: No password available to password_converstation!\n"); return PAM_CONV_ERR; } *resp = calloc(num_msg, sizeof(struct pam_response)); if (!*resp) { fprintf(stderr, "ERROR: Out of memory!\n"); return PAM_CONV_ERR; } (*resp)[0].resp = strdup((char *) appdata_ptr); (*resp)[0].resp_retcode = 0; return ((*resp)[0].resp ? PAM_SUCCESS : PAM_CONV_ERR); } static struct pam_conv conv = { &password_conversation, NULL }; void signal_received(int sig) { reset_pam = 1; signal(sig, signal_received); } int main(int argc, char *argv[]) { pam_handle_t *pamh = NULL; int retval, r; char *user; /* char *password; */ char buf[BUFSIZE]; time_t pamh_created = 0; signal(SIGHUP, signal_received); /* make standard output line buffered */ setvbuf(stdout, NULL, _IOLBF, 0); retval = PAM_SUCCESS; while (fgets(buf, BUFSIZE, stdin)) { user = buf; password = strchr(buf, '\n'); if (!password) { fprintf(stderr, "authenticator: Unexpected input '%s'\n", buf); fprintf(stdout, "ERR\n"); continue; } *password = '\0'; password = strchr(buf, ' '); if (!password) { fprintf(stderr, "authenticator: Unexpected input '%s'\n", buf); fprintf(stdout, "ERR\n"); continue; } *password++ = '\0'; conv.appdata_ptr = (char *) password; /* from buf above. not allocated */ #ifdef PAM_CONNECTION_TTL if (pamh_created + PAM_CONNECTION_TTL >= time(NULL)) reset_pam = 1; #endif if (reset_pam && pamh) { /* Close previous PAM connection */ retval = pam_end(pamh, retval); if (retval != PAM_SUCCESS) { fprintf(stderr, "ERROR: failed to release PAM authenticator\n"); } pamh = NULL; } if (!pamh) { /* Initialize PAM connection */ retval = pam_start(PAM_SERVICE_NAME, 0, &conv, &pamh); if (retval != PAM_SUCCESS) { fprintf(stderr, "ERROR: failed to create PAM authenticator\n"); } reset_pam = 0; pamh_created = time(NULL); } if (retval == PAM_SUCCESS) retval = pam_set_item(pamh, PAM_USER, user); if (retval == PAM_SUCCESS) retval = pam_set_item(pamh, PAM_CONV, &conv); if (retval == PAM_SUCCESS) retval = pam_authenticate(pamh, 0); if (retval == PAM_SUCCESS) retval = pam_acct_mgmt(pamh, 0); if (retval == PAM_SUCCESS) { fprintf(stdout, "OK\n"); } else { fprintf(stdout, "ERR\n"); /*fprintf(stdout, "%s\n", pam_strerror(pamh, retval));*/ } } if (pamh) { r = pam_end(pamh, retval); if (r != PAM_SUCCESS) { pamh = NULL; fprintf(stderr, "ERROR: failed to release PAM authenticator\n"); } } return (retval == PAM_SUCCESS ? 0 : 1); /* indicate success */ } --- NEW FILE: pam-easserver --- # # /etc/pam.d/other - specify the PAM fallback behaviour # # We fall back to the pam_unix modules. If this is not secure # enough for your purpose, consider specifying pam_deny.so # instead. # auth required pam_unix.so account required pam_unix.so password required pam_unix.so session required pam_unix.so |
|
From: Andrey C. <sku...@us...> - 2006-06-02 14:48:13
|
Update of /cvsroot/eas-dev/eas/client In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv19332 Added Files: Makefile main.prg Log Message: Add files |
|
From: Andrey C. <sku...@us...> - 2006-06-02 14:44:56
|
Update of /cvsroot/eas-dev/ocmng/components/tests In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv17182/components/tests Added Files: CORE.xml testclass1.xml testclass2.xml testplugin.prg Log Message: Add files --- NEW FILE: CORE.xml --- <?xml version="1.0" encoding="koi8-r" ?> <component> <name>ETC01-coretest</name> <category>test</category> <version>1.0</version> <license>GNU/GPL</license> <created>2006-04-24</created> <requires> <dependence type="component">../CORE/ETC01.xml</dependence> </requires> <dictionary> <id>ETC01</id> <name>settings data</name> <type>$CODBTYPE$</type> <path>$CODBROOT$</path> </dictionary> <meta dictionary="ETC01"> <depository name="aquarum" memoSize="32" /> <extent name="undef">üÔÏ ÐÒÏÓÔÒÁÎÓÔ×Ï ÔÏÌØËÏ ÄÌÑ ÎÅÉÚ×ÅÓÔÎÙÈ ÏÂßÅËÔÏ×.</extent> <extent name="connections">Connection statistic</extent> <extent name="component">Component data</extent> </meta> </component> --- NEW FILE: testclass1.xml --- <?xml version="1.0" encoding="koi8-r" ?> <component> <name>ETC01-testclass1</name> <category>test</category> <version>1.0</version> <license>GNU/GPL</license> <created>2006-04-13</created> <author>Uri</author> <property name="policy">ru.Ru</property> <requires> <dependence type="component">CORE.xml</dependence> </requires> <files> <file name="testplugin.prg" type="text/clip-source">ODB trigger for class testclass1</file> </files> <meta dictionary="ETC01"> <attribute name="testattr_c" type="string" lenType="ignore" len="2" dec="0" mask="" defValue="" notNull="false" notEmpty="false" /> <index name="testattr_c" expression="testattr_c"/> <class name="testclass1" logNeed="false" extent="component" superClass="" essence="" uniqueKey="testattr_c" attributes="testattr_c" indices="testattr_c" /> <plugin name="testplugin" class="testclass1" type="Source file" file="testplugin.prg" function="" /> </meta> <data> <objects depository="ETC0101" class="testclass1"> <object> <attr name="testattr_c">t1</attr> </object> <object> <attr name="testattr_c">t2</attr> </object> <object> <attr name="testattr_c">t3</attr> </object> </objects> </data> </component> --- NEW FILE: testclass2.xml --- <?xml version="1.0" encoding="koi8-r" ?> <component> <name>ETC01-testclass2</name> <category>test</category> <version>1.0</version> <license>GNU/GPL</license> <created>2006-05-05</created> <author>Uri</author> <property name="policy">ru.Ru</property> <requires> <dependence type="component">CORE.xml</dependence> <dependence type="component">testclass1.xml</dependence> </requires> <files> </files> <meta dictionary="ETC01"> <attribute name="testattr_c" type="string" lenType="ignore" len="2" dec="0" mask="" defValue="" notNull="false" notEmpty="false" /> <attribute name="testattr_l" type="logical" lenType="alltrim" len="1" dec="0" mask="" defValue="" notNull="false" notEmpty="false" /> <attribute name="testattr_d" type="date" lenType="ignore" len="3" dec="0" mask="" defValue="" notNull="false" notEmpty="false" /> <counter name="testcounter1" type="LAST" /> <attribute name="testattr_n" type="number" lenType="rtrim" len="5" dec="1" mask="" defValue="" counter="testcounter1" notNull="false" notEmpty="false" /> <attribute name="testattr_m" type="text" lenType="fill" len="6" dec="2" mask="" defValue="" notNull="false" notEmpty="false" /> <attribute name="testattr_x" type="any" lenType="ignore" len="7" dec="3" mask="" defValue="" notNull="false" notEmpty="false" /> <attribute name="testattr_r" type="ref" lenType="ignore" len="12" dec="0" mask="" defValue="" notNull="false" notEmpty="false" refTo="ETC01:testclass1" /> <attribute name="testattr_s" type="classref" lenType="ignore" len="12" dec="0" mask="" defValue="" notNull="false" notEmpty="false" /> <attribute name="testattr_a" type="array" lenType="ignore" len="8" dec="0" mask="" defValue="" notNull="false" notEmpty="false" /> <index name="testattr_c" expression="testattr_c"/> <index name="testattr_n" expression="testattr_n"/> <index name="testattr_d" expression="testattr_d"/> <class name="testclass2" logNeed="false" extent="component" superClass="testclass1" essence="testattr_c" uniqueKey="testattr_c" mainIdx="testattr_c" attributes="testattr_c,testattr_l,testattr_d,testattr_n,testattr_m,testattr_x,testattr_r,testattr_s,testattr_a" indices="testattr_c,testattr_n,testattr_d" findAttrs="testattr_c,testattr_d" tcolList="testattr_c,testattr_l,testattr_d" /> <tcolumn name="testattr_c" width="2" header="áÔÔÒ1" footer="" expression="testattr_c" /> <tcolumn name="testattr_l" width="1" header="áÔÔÒ2" footer="" expression="testattr_l" /> <tcolumn name="testattr_d" width="10" header="áÔÔÒ3" footer="" expression="testattr_d" /> <tview name="ôÅÓÔÏ×ÙÊ ËÌÁÓÓ2" class="testclass2" columns="testattr_c,testattr_l,testattr_d" /> </meta> <data> <objects depository="ETC0101" class="testclass2"> <object> <attr name="testattr_c">k1</attr> <attr name="testattr_l">false</attr> <attr name="testattr_d">20060504</attr> <attr name="testattr_n">0</attr> <attr name="testattr_m">memo string:1</attr> <attr name="testattr_x">any data:1</attr> <attr name="testattr_r" refTo="ETC0101:testclass1">t1</attr> <attr name="testattr_s">ETC01:testclass1</attr> <attr name="testattr_a"> <value type="number">1</value> <value type="date">20060504</value> <value type="string">string:1</value> <value type="ref" refTo="ETC0101:testclass1">t1</value> <value type="classref" meta="CLASS">ETC01:testclass1</value> <value type="array"> <value type="string">subarray1</value> <value type="number">1</value> <value type="date">20060504</value> </value> <value type="array"> <value type="string">subarray2</value> <value type="number">2</value> <value type="date">20060504</value> </value> </attr> </object> <object> <attr name="testattr_c">k2</attr> <attr name="testattr_l">true</attr> <attr name="testattr_d">20060503</attr> <attr name="testattr_n">1</attr> <attr name="testattr_m">memo string:2</attr> <attr name="testattr_x">any data:2</attr> <attr name="testattr_r" refTo="ETC0101:testclass1">t2</attr> <attr name="testattr_s">ETC01:testclass1</attr> <attr name="testattr_a"> <value type="number">2</value> <value type="date">20060503</value> <value type="string">string:2</value> <value type="ref" refTo="ETC0101:testclass1">t2</value> <value type="classref" meta="CLASS">ETC01:testclass1</value> <value type="array"> <value type="string">subarray1</value> <value type="number">1</value> <value type="date">20060503</value> </value> <value type="array"> <value type="string">subarray2</value> <value type="number">2</value> <value type="date">20060503</value> </value> </attr> </object> <object> <attr name="testattr_c">k3</attr> <attr name="testattr_l">false</attr> <attr name="testattr_d">20060502</attr> <attr name="testattr_n">1</attr> <attr name="testattr_m">memo string:3</attr> <attr name="testattr_x">any data:3</attr> <attr name="testattr_r" refTo="ETC0101:testclass1">t3</attr> <attr name="testattr_s">ETC01:testclass1</attr> <attr name="testattr_a"> <value type="number">3</value> <value type="date">20060502</value> <value type="string">string:3</value> <value type="ref" refTo="ETC0101:testclass1">t3</value> <value type="classref" meta="CLASS">ETC01:testclass1</value> <value type="array"> <value type="string">subarray1</value> <value type="number">1</value> <value type="date">20060502</value> </value> <value type="array"> <value type="string">subarray2</value> <value type="number">2</value> <value type="date">20060502</value> </value> </attr> </object> <object> <attr name="testattr_c">k4</attr> <attr name="testattr_l">true</attr> <attr name="testattr_d">20060501</attr> <attr name="testattr_n">2</attr> <attr name="testattr_m">memo string:4</attr> <attr name="testattr_x">any data:4</attr> <attr name="testattr_r" refTo="ETC0101:testclass1">t1</attr> <attr name="testattr_s">ETC01:testclass1</attr> <attr name="testattr_a"> <value type="number">4</value> <value type="date">20060501</value> <value type="string">string:4</value> <value type="ref" refTo="ETC0101:testclass1">t1</value> <value type="classref" meta="CLASS">ETC01:testclass1</value> <value type="array"> <value type="string">subarray1</value> <value type="number">1</value> <value type="date">20060501</value> </value> <value type="array"> <value type="string">subarray2</value> <value type="number">2</value> <value type="date">20060501</value> </value> </attr> </object> <object> <attr name="testattr_c">k5</attr> <attr name="testattr_l">false</attr> <attr name="testattr_d">20060430</attr> <attr name="testattr_n">3</attr> <attr name="testattr_m">memo string:5</attr> <attr name="testattr_x">any data:5</attr> <attr name="testattr_r" refTo="ETC0101:testclass1">t2</attr> <attr name="testattr_s">ETC01:testclass1</attr> <attr name="testattr_a"> <value type="number">5</value> <value type="date">20060430</value> <value type="string">string:5</value> <value type="ref" refTo="ETC0101:testclass1">t2</value> <value type="classref" meta="CLASS">ETC01:testclass1</value> <value type="array"> <value type="string">subarray1</value> <value type="number">1</value> <value type="date">20060430</value> </value> <value type="array"> <value type="string">subarray2</value> <value type="number">2</value> <value type="date">20060430</value> </value> </attr> </object> <object> <attr name="testattr_c">k6</attr> <attr name="testattr_l">true</attr> <attr name="testattr_d">20060429</attr> <attr name="testattr_n">4</attr> <attr name="testattr_m">memo string:6</attr> <attr name="testattr_x">any data:6</attr> <attr name="testattr_r" refTo="ETC0101:testclass1">t3</attr> <attr name="testattr_s">ETC01:testclass1</attr> <attr name="testattr_a"> <value type="number">6</value> <value type="date">20060429</value> <value type="string">string:6</value> <value type="ref" refTo="ETC0101:testclass1">t3</value> <value type="classref" meta="CLASS">ETC01:testclass1</value> <value type="array"> <value type="string">subarray1</value> <value type="number">1</value> <value type="date">20060429</value> </value> <value type="array"> <value type="string">subarray2</value> <value type="number">2</value> <value type="date">20060429</value> </value> </attr> </object> </objects> </data> </component> --- NEW FILE: testplugin.prg --- /* Copyright (C) 2006 ITK Author : Uri (ur...@it...) License : (GPL) http://www.itk.ru/clipper/license.html */ #define R2D2_AN_VALUES 5 static members := {; {"BEFORE_UPDATE_OBJECT", {|p1,p2,p3,p4,p5| before_update(p1,p2,p3,p4,p5)} },; {"BEFORE_APPEND_OBJECT", {|p1,p2,p3,p4,p5| before_append(p1,p2,p3,p4,p5)} }; } local i,ret := NIL, nmember parameters query_key query_key := alltrim(upper(query_key)) if query_key=="MEMBERS" ret:={} for i=1 to len(members) aadd(ret,members[i][1]) next endif nmember := ascan(members,{|x|x[1]==query_key}) if nmember !=0 ret := members[nMember][2] endif if ret == NIL ret:= "Error query key in sample plugins." endif return ret **************************************** static function before_append(oDep,newData,oldData,p4,p5) return .t. **************************************** static function before_update(oDep,newData,oldData,p4,p5) return .t. |
|
From: Andrey C. <sku...@us...> - 2006-06-02 14:44:55
|
Update of /cvsroot/eas-dev/ocmng/components/equipment In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv17182/components/equipment Added Files: ACC00.xml ALL.xml Log Message: Add files --- NEW FILE: ACC00.xml --- <?xml version="1.0" encoding="koi8-r" ?> <component> <name>ACC00-equipment</name> <category>CORE/DB</category> <version>1.0</version> <description>Initial metadata for equipment</description> <license>GNU/GPL</license> <created>2006-05-19</created> <modified>2006-05-23</modified> <author>Uri</author> <requires> <dependence type="component">../CORE/ACC00.xml</dependence> </requires> <meta dictionary="ACC00" rules="appendOnly"> <extent name="equipment">Equipment repository</extent> </meta> </component> --- NEW FILE: ALL.xml --- <?xml version="1.0" encoding="koi8-r" ?> <component> <requires> <dependence type="component">ACC00.xml</dependence> </requires> </component> |
