some work in branches/join_models

- added FinderHelper class - used as a global object for the whole model tree in Finder
  (some fields moved from ModelData)
- added CursorHelper class - used as a global object for the whole model tree in Cursor
  (some fields moved from ModelData)







git-svn-id: svn://ttmath.org/publicrep/morm/branches/join_models@1192 e52654a7-88a9-db11-a3e9-0013d4bc506e

src/Makefile.dep

@@ -7,10 +7,11 @@ baseexpression.o: ../../pikotools/date/date.h
 baseexpression.o: ../../pikotools/convert/inttostr.h
 baseexpression.o: ../../pikotools/membuffer/membuffer.h
 baseexpression.o: ../../pikotools/textstream/types.h morm_types.h modelenv.h
-baseexpression.o: modeldata.h queryresult.h model.h modelconnector.h
-baseexpression.o: clearer.h dbconnector.h ../../pikotools/log/log.h
-baseexpression.o: ../../pikotools/log/filelog.h flatconnector.h
-baseexpression.o: dbexpression.h flatexpression.h ../../pikotools/utf8/utf8.h
+baseexpression.o: modeldata.h cursorhelper.h queryresult.h finderhelper.h
+baseexpression.o: model.h modelconnector.h clearer.h dbconnector.h
+baseexpression.o: ../../pikotools/log/log.h ../../pikotools/log/filelog.h
+baseexpression.o: flatconnector.h dbexpression.h flatexpression.h
+baseexpression.o: ../../pikotools/utf8/utf8.h
 clearer.o: clearer.h ../../pikotools/date/date.h
 clearer.o: ../../pikotools/convert/inttostr.h model.h
 clearer.o: ../../pikotools/textstream/textstream.h
@@ -19,7 +20,8 @@ clearer.o: ../../pikotools/membuffer/membuffer.h
 clearer.o: ../../pikotools/textstream/types.h modelconnector.h dbconnector.h
 clearer.o: ../../pikotools/log/log.h ../../pikotools/log/filelog.h
 clearer.o: queryresult.h flatconnector.h dbexpression.h baseexpression.h
-clearer.o: morm_types.h modelenv.h modeldata.h flatexpression.h
+clearer.o: morm_types.h modelenv.h modeldata.h cursorhelper.h finderhelper.h
+clearer.o: flatexpression.h
 dbconnector.o: dbconnector.h ../../pikotools/textstream/textstream.h
 dbconnector.o: ../../pikotools/space/space.h
 dbconnector.o: ../../pikotools/textstream/types.h ../../pikotools/date/date.h
@@ -27,8 +29,9 @@ dbconnector.o: ../../pikotools/convert/inttostr.h
 dbconnector.o: ../../pikotools/membuffer/membuffer.h
 dbconnector.o: ../../pikotools/textstream/types.h ../../pikotools/log/log.h
 dbconnector.o: ../../pikotools/log/filelog.h queryresult.h dbexpression.h
-dbconnector.o: baseexpression.h morm_types.h modelenv.h modeldata.h model.h
-dbconnector.o: modelconnector.h clearer.h flatconnector.h flatexpression.h
+dbconnector.o: baseexpression.h morm_types.h modelenv.h modeldata.h
+dbconnector.o: cursorhelper.h finderhelper.h model.h modelconnector.h
+dbconnector.o: clearer.h flatconnector.h flatexpression.h
 dbconnector.o: ../../pikotools/utf8/utf8.h ../../pikotools/convert/convert.h
 dbconnector.o: ../../pikotools/convert/inttostr.h
 dbconnector.o: ../../pikotools/convert/patternreplacer.h
@@ -42,7 +45,7 @@ dbexpression.o: ../../pikotools/date/date.h
 dbexpression.o: ../../pikotools/convert/inttostr.h
 dbexpression.o: ../../pikotools/membuffer/membuffer.h
 dbexpression.o: ../../pikotools/textstream/types.h morm_types.h modelenv.h
-dbexpression.o: modeldata.h queryresult.h
+dbexpression.o: modeldata.h cursorhelper.h queryresult.h finderhelper.h
 dochtmlconnector.o: dochtmlconnector.h flatconnector.h
 dochtmlconnector.o: ../../pikotools/textstream/textstream.h
 dochtmlconnector.o: ../../pikotools/space/space.h
@@ -52,7 +55,7 @@ dochtmlconnector.o: ../../pikotools/convert/inttostr.h
 dochtmlconnector.o: ../../pikotools/membuffer/membuffer.h
 dochtmlconnector.o: ../../pikotools/textstream/types.h dochtmlexpression.h
 dochtmlconnector.o: flatexpression.h baseexpression.h morm_types.h modelenv.h
-dochtmlconnector.o: modeldata.h queryresult.h
+dochtmlconnector.o: modeldata.h cursorhelper.h queryresult.h finderhelper.h
 dochtmlexpression.o: dochtmlexpression.h flatexpression.h baseexpression.h
 dochtmlexpression.o: ../../pikotools/textstream/textstream.h
 dochtmlexpression.o: ../../pikotools/space/space.h
@@ -61,7 +64,8 @@ dochtmlexpression.o: ../../pikotools/date/date.h
 dochtmlexpression.o: ../../pikotools/convert/inttostr.h
 dochtmlexpression.o: ../../pikotools/membuffer/membuffer.h
 dochtmlexpression.o: ../../pikotools/textstream/types.h morm_types.h
-dochtmlexpression.o: modelenv.h modeldata.h queryresult.h
+dochtmlexpression.o: modelenv.h modeldata.h cursorhelper.h queryresult.h
+dochtmlexpression.o: finderhelper.h
 flatconnector.o: flatconnector.h ../../pikotools/textstream/textstream.h
 flatconnector.o: ../../pikotools/space/space.h
 flatconnector.o: ../../pikotools/textstream/types.h
@@ -70,9 +74,10 @@ flatconnector.o: ../../pikotools/convert/inttostr.h
 flatconnector.o: ../../pikotools/membuffer/membuffer.h
 flatconnector.o: ../../pikotools/textstream/types.h flatexpression.h
 flatconnector.o: baseexpression.h morm_types.h modelenv.h modeldata.h
-flatconnector.o: queryresult.h model.h modelconnector.h clearer.h
-flatconnector.o: dbconnector.h ../../pikotools/log/log.h
-flatconnector.o: ../../pikotools/log/filelog.h dbexpression.h
+flatconnector.o: cursorhelper.h queryresult.h finderhelper.h model.h
+flatconnector.o: modelconnector.h clearer.h dbconnector.h
+flatconnector.o: ../../pikotools/log/log.h ../../pikotools/log/filelog.h
+flatconnector.o: dbexpression.h
 flatexpression.o: flatexpression.h baseexpression.h
 flatexpression.o: ../../pikotools/textstream/textstream.h
 flatexpression.o: ../../pikotools/space/space.h
@@ -81,7 +86,7 @@ flatexpression.o: ../../pikotools/date/date.h
 flatexpression.o: ../../pikotools/convert/inttostr.h
 flatexpression.o: ../../pikotools/membuffer/membuffer.h
 flatexpression.o: ../../pikotools/textstream/types.h morm_types.h modelenv.h
-flatexpression.o: modeldata.h queryresult.h
+flatexpression.o: modeldata.h cursorhelper.h queryresult.h finderhelper.h
 jsonconnector.o: jsonconnector.h flatconnector.h
 jsonconnector.o: ../../pikotools/textstream/textstream.h
 jsonconnector.o: ../../pikotools/space/space.h
@@ -91,7 +96,7 @@ jsonconnector.o: ../../pikotools/convert/inttostr.h
 jsonconnector.o: ../../pikotools/membuffer/membuffer.h
 jsonconnector.o: ../../pikotools/textstream/types.h jsonexpression.h
 jsonconnector.o: flatexpression.h baseexpression.h morm_types.h modelenv.h
-jsonconnector.o: modeldata.h queryresult.h
+jsonconnector.o: modeldata.h cursorhelper.h queryresult.h finderhelper.h
 jsonexpression.o: jsonexpression.h flatexpression.h baseexpression.h
 jsonexpression.o: ../../pikotools/textstream/textstream.h
 jsonexpression.o: ../../pikotools/space/space.h
@@ -100,7 +105,7 @@ jsonexpression.o: ../../pikotools/date/date.h
 jsonexpression.o: ../../pikotools/convert/inttostr.h
 jsonexpression.o: ../../pikotools/membuffer/membuffer.h
 jsonexpression.o: ../../pikotools/textstream/types.h morm_types.h modelenv.h
-jsonexpression.o: modeldata.h queryresult.h
+jsonexpression.o: modeldata.h cursorhelper.h queryresult.h finderhelper.h
 model.o: model.h ../../pikotools/textstream/textstream.h
 model.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 model.o: ../../pikotools/date/date.h ../../pikotools/convert/inttostr.h
@@ -109,7 +114,7 @@ model.o: ../../pikotools/textstream/types.h modelconnector.h clearer.h
 model.o: dbconnector.h ../../pikotools/log/log.h
 model.o: ../../pikotools/log/filelog.h queryresult.h flatconnector.h
 model.o: dbexpression.h baseexpression.h morm_types.h modelenv.h modeldata.h
-model.o: flatexpression.h
+model.o: cursorhelper.h finderhelper.h flatexpression.h
 modelconnector.o: modelconnector.h clearer.h ../../pikotools/date/date.h
 modelconnector.o: ../../pikotools/convert/inttostr.h dbconnector.h
 modelconnector.o: ../../pikotools/textstream/textstream.h
@@ -131,8 +136,8 @@ postgresqlconnector.o: ../../pikotools/log/log.h
 postgresqlconnector.o: ../../pikotools/log/filelog.h queryresult.h
 postgresqlconnector.o: postgresqlqueryresult.h ../../pikotools/utf8/utf8.h
 postgresqlconnector.o: postgresqlexpression.h dbexpression.h baseexpression.h
-postgresqlconnector.o: morm_types.h modelenv.h modeldata.h
-postgresqlconnector.o: ../../pikotools/convert/strtoint.h
+postgresqlconnector.o: morm_types.h modelenv.h modeldata.h cursorhelper.h
+postgresqlconnector.o: finderhelper.h ../../pikotools/convert/strtoint.h
 postgresqlconnector.o: ../../pikotools/convert/text.h
 postgresqlconnector.o: ../../pikotools/convert/misc.h
 postgresqlexpression.o: postgresqlexpression.h dbexpression.h
@@ -144,7 +149,8 @@ postgresqlexpression.o: ../../pikotools/date/date.h
 postgresqlexpression.o: ../../pikotools/convert/inttostr.h
 postgresqlexpression.o: ../../pikotools/membuffer/membuffer.h
 postgresqlexpression.o: ../../pikotools/textstream/types.h morm_types.h
-postgresqlexpression.o: modelenv.h modeldata.h queryresult.h
+postgresqlexpression.o: modelenv.h modeldata.h cursorhelper.h queryresult.h
+postgresqlexpression.o: finderhelper.h
 postgresqlqueryresult.o: postgresqlqueryresult.h queryresult.h
 queryresult.o: queryresult.h ../../pikotools/utf8/utf8.h
 queryresult.o: ../../pikotools/textstream/textstream.h