From 3ef22463770d6f4da8a9f1bc971c1a6b2d89c66c Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 10 Nov 1994 19:28:55 +0000 Subject: [PATCH] Corretto makefile Corretto errore legato al MI1097 git-svn-id: svn://10.65.10.50/trunk@595 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg0100.cpp | 45 ++++++++++++++++++++++++++++++++++++++------- cg/makefile | 10 +++++++--- 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/cg/cg0100.cpp b/cg/cg0100.cpp index dfba483ee..7f4bb78cc 100755 --- a/cg/cg0100.cpp +++ b/cg/cg0100.cpp @@ -25,6 +25,7 @@ class CG0100_application : public TRelation_application virtual void init_insert_mode(TMask& m); virtual void init_modify_mode(TMask& m) {init_insert_mode(m);} virtual int write(const TMask& m); + virtual int rewrite(const TMask & m); virtual int read(TMask& m); public: @@ -53,19 +54,49 @@ int CG0100_application::read(TMask& m) return NOERR; } -int CG0100_application::write(const TMask& m) +int CG0100_application::rewrite(const TMask& m) { TRelation *r = get_relation(); m.autosave(r); int sezivd = m.get_int(FLD_CM1_SEZIVD); + TString16 sez; - if (sezivd == 5 || sezivd == 6) - r->lfile().put(PCN_SEZIVD, sezivd - 5); + if (sezivd == 6 || sezivd == 7) + { + sez.format("%d", sezivd - 5); + r->lfile().put(PCN_SEZIVD, sez); + } sezivd = m.get_int(FLD_CM1_SEZIVDOPP); - if (sezivd == 5 || sezivd == 6) - r->lfile().put(PCN_SEZIVDOPP, sezivd - 5); + if (sezivd == 6 || sezivd == 7) + { + sez.format("%d", sezivd - 5); + r->lfile().put(PCN_SEZIVDOPP, sez); + } + return r->rewrite(); +} + +int CG0100_application::write(const TMask& m) + +{ + TRelation *r = get_relation(); + TString16 sez; + + m.autosave(r); + int sezivd = m.get_int(FLD_CM1_SEZIVD); + + if (sezivd == 6 || sezivd == 7) + { + sez.format("%d", sezivd - 5); + r->lfile().put(PCN_SEZIVD, sez); + } + sezivd = m.get_int(FLD_CM1_SEZIVDOPP); + if (sezivd == 6 || sezivd == 7) + { + sez.format("%d", sezivd - 5); + r->lfile().put(PCN_SEZIVDOPP, sez); + } return r->write(); } @@ -222,8 +253,8 @@ HIDDEN bool gruppo_handler(TMask_field& f, KEY key) if (gruppo == 0 && conto == 0 && sottoc == 0) return TRUE; - CG0100_application* app = (CG0100_application*) MainApp(); - TLocalisamfile& pconti = app->get_relation()->lfile(); + CG0100_application & app = (CG0100_application &) main_app(); + TLocalisamfile& pconti = app.get_relation()->lfile(); if ((gruppo == 0) && (conto != 0 || sottoc != 0)) return f.warning_box("Codice conto impossibile!"); diff --git a/cg/makefile b/cg/makefile index b99fdc08b..b5df74951 100755 --- a/cg/makefile +++ b/cg/makefile @@ -129,6 +129,8 @@ $(O)/cg4.o: cg4.cpp $(I10) $(I24) $(I32) $(O)/cg4100.o: cg4100.cpp +$(O)/cg4200.o: cg4200.cpp $(I24) $(I33) cg4.h cg4200.h + $(O)/cg4300.o: cg4300.cpp cg4300.h $(I6) $(I10) $(I24) $(I27) $(I33) $(O)/cg4301.o: cg4301.cpp cg4300.h $(I6) $(I10) $(I24) $(I27) $(I33) @@ -151,8 +153,8 @@ $(O)/cglib01.o: cglib01.cpp $(I24) $(I31) $(I33) $(I40) $(I42) $(I51) cglib.h $(O)/conto.o: conto.cpp conto.h -$(EP)cg4: $(O)/cg4.o $(LIBD1) $(O)/cg4300.o $(O)/cg4301.o $(O)/cg4302.o $(O)/cg4303.o $(O)/cg4304.o $(O)/cg4305.o $(O)/cg4400.o $(O)/conto.o $(O)/cglib01.o $(O)/cglib02.o $(O)/cg4500.o $(O)/cg2101.o $(O)/cg2103.o $(O)/cg4100.o $(O)/cg4600.o $(EP)cg4.frl $(O)/cglib03.o - $(LINK) $(LFLAGSD1) $@ $(O)/cg4.o $(O)/cg4300.o $(O)/cg4301.o $(O)/cg4302.o $(O)/cg4303.o $(O)/cg4304.o $(O)/cg4305.o $(O)/cg4400.o $(O)/conto.o $(O)/cglib01.o $(O)/cglib02.o $(O)/cg4500.o $(O)/cglib03.o $(O)/cg2101.o $(O)/cg2103.o $(O)/cg4100.o $(O)/cg4600.o +$(EP)cg4: $(O)/cg4.o $(LIBD1) $(O)/cg4100.o $(O)/cg4200.o $(O)/cg4300.o $(O)/cg4301.o $(O)/cg4302.o $(O)/cg4303.o $(O)/cg4304.o $(O)/cg4305.o $(O)/cg4400.o $(O)/conto.o $(O)/cglib01.o $(O)/cglib02.o $(O)/cg4500.o $(O)/cg2101.o $(O)/cg2103.o $(O)/cg4600.o $(EP)cg4.frl $(O)/cglib03.o + $(LINK) $(LFLAGSD1) $@ $(O)/cg4.o $(O)/cg4100.o $(O)/cg4200.o $(O)/cg4300.o $(O)/cg4301.o $(O)/cg4302.o $(O)/cg4303.o $(O)/cg4304.o $(O)/cg4305.o $(O)/cg4400.o $(O)/conto.o $(O)/cglib01.o $(O)/cglib02.o $(O)/cg4500.o $(O)/cglib03.o $(O)/cg2101.o $(O)/cg2103.o $(O)/cg4600.o $(EP)cg4400.frl: cg4400.url $(U1) $(RCOMP) cg4400 -l $(EP)cg4400 @@ -179,7 +181,7 @@ $(EP)cg5 : $(O)/cg5.o $(O)/cg5000.o $(O)/cg5100.o $(O)/cg5200.o $(O)/cg5300.o $( masks: $(EP)cg0100a.msk $(EP)cg0200a.msk $(EP)cg0300a.msk $(EP)cg0400a.msk $(EP)cg0500a.msk $(EP)cg1100a.msk $(EP)cg1200a.msk $(EP)cg1200b.msk \ $(EP)cg1400a.msk $(EP)cg1500a.msk $(EP)cg1600a.msk $(EP)cg1700a.msk $(EP)cg2100a.msk $(EP)cg2100b.msk $(EP)cg2100c.msk $(EP)cg2100i.msk $(EP)cg2100o.msk $(EP)cg2104a.msk\ $(EP)cg3100a.msk $(EP)cg3100b.msk $(EP)cg3100c.msk $(EP)cg3200a.msk $(EP)cg3300a.msk $(EP)cg3300b.msk $(EP)cg3300c.msk $(EP)cg3400a.msk $(EP)cg3400b.msk \ - $(EP)cg3500a.msk $(EP)cg4100a.msk $(EP)cg4300a.msk $(EP)cg4300b.msk $(EP)cg4300c.msk $(EP)cg4400a.msk $(EP)cg4500a.msk $(EP)cg4500b.msk $(EP)cg4600a.msk $(EP)cg5000a.msk \ + $(EP)cg3500a.msk $(EP)cg4200a.msk $(EP)cg4100a.msk $(EP)cg4300a.msk $(EP)cg4300b.msk $(EP)cg4300c.msk $(EP)cg4400a.msk $(EP)cg4500a.msk $(EP)cg4500b.msk $(EP)cg4600a.msk $(EP)cg5000a.msk \ $(EP)cg5100a.msk $(EP)cg5200a.msk $(EP)cg5300a.msk $(EP)cg0100a.msk: cg0100a.uml cg0100.h $(E1) @@ -240,6 +242,8 @@ $(EP)cg3500a.msk: cg3500a.uml cg3500.h $(EP)cg4100a.msk: cg4100a.uml +$(EP)cg4200a.msk: cg4200a.uml cg4200.h + $(EP)cg4300a.msk: cg4300a.uml cg4300a.h $(EP)cg4300b.msk: cg4300b.uml cg4300b.h