Changeset 22623

Show
Ignore:
Timestamp:
13.08.2010 13:16:23 (10 years ago)
Author:
mdewsnip
Message:

Updated to include the new sqlfilter and sqlqueryfilter classes.

Location:
main/trunk/gs2-core/runtime-src/src/colservr
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gs2-core/runtime-src/src/colservr/Makefile.am

    r21702 r22623  
    5757    search.cpp \ 
    5858    source.cpp \ 
    59     sqlbrowsefilter.cpp 
     59    sqlbrowsefilter.cpp \ 
     60    sqlfilter.cpp \ 
     61    sqlqueryfilter.cpp 
    6062 
    6163# Option: Lucene support 
  • main/trunk/gs2-core/runtime-src/src/colservr/Makefile.in

    r21704 r22623  
    8989    lucenesource.cpp maptools.cpp phrasesearch.cpp querycache.cpp \ 
    9090    queryfilter.cpp queryinfo.cpp search.cpp source.cpp \ 
    91     sqlbrowsefilter.cpp expat_document.cpp expat_resultset.cpp 
     91    sqlbrowsefilter.cpp sqlfilter.cpp sqlqueryfilter.cpp \ 
     92    expat_document.cpp expat_resultset.cpp 
    9293@ENABLE_LUCENE_TRUE@am__objects_1 = libgsdlcolservr_a-expat_document.$(OBJEXT) \ 
    9394@ENABLE_LUCENE_TRUE@    libgsdlcolservr_a-expat_resultset.$(OBJEXT) 
     
    109110    libgsdlcolservr_a-search.$(OBJEXT) \ 
    110111    libgsdlcolservr_a-source.$(OBJEXT) \ 
    111     libgsdlcolservr_a-sqlbrowsefilter.$(OBJEXT) $(am__objects_1) 
     112    libgsdlcolservr_a-sqlbrowsefilter.$(OBJEXT) \ 
     113    libgsdlcolservr_a-sqlfilter.$(OBJEXT) \ 
     114    libgsdlcolservr_a-sqlqueryfilter.$(OBJEXT) $(am__objects_1) 
    112115libgsdlcolservr_a_OBJECTS = $(am_libgsdlcolservr_a_OBJECTS) 
    113116DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) 
     
    231234    maptools.cpp phrasesearch.cpp querycache.cpp queryfilter.cpp \ 
    232235    queryinfo.cpp search.cpp source.cpp sqlbrowsefilter.cpp \ 
    233     $(am__append_2) 
     236    sqlfilter.cpp sqlqueryfilter.cpp $(am__append_2) 
    234237all: all-am 
    235238 
     
    298301@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsdlcolservr_a-source.Po@am__quote@ 
    299302@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsdlcolservr_a-sqlbrowsefilter.Po@am__quote@ 
     303@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsdlcolservr_a-sqlfilter.Po@am__quote@ 
     304@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsdlcolservr_a-sqlqueryfilter.Po@am__quote@ 
    300305 
    301306.cpp.o: 
     
    550555@AMDEP_TRUE@@am__fastdepCXX_FALSE@  DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
    551556@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgsdlcolservr_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libgsdlcolservr_a-sqlbrowsefilter.obj `if test -f 'sqlbrowsefilter.cpp'; then $(CYGPATH_W) 'sqlbrowsefilter.cpp'; else $(CYGPATH_W) '$(srcdir)/sqlbrowsefilter.cpp'; fi` 
     557 
     558libgsdlcolservr_a-sqlfilter.o: sqlfilter.cpp 
     559@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgsdlcolservr_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libgsdlcolservr_a-sqlfilter.o -MD -MP -MF "$(DEPDIR)/libgsdlcolservr_a-sqlfilter.Tpo" -c -o libgsdlcolservr_a-sqlfilter.o `test -f 'sqlfilter.cpp' || echo '$(srcdir)/'`sqlfilter.cpp; \ 
     560@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libgsdlcolservr_a-sqlfilter.Tpo" "$(DEPDIR)/libgsdlcolservr_a-sqlfilter.Po"; else rm -f "$(DEPDIR)/libgsdlcolservr_a-sqlfilter.Tpo"; exit 1; fi 
     561@AMDEP_TRUE@@am__fastdepCXX_FALSE@  source='sqlfilter.cpp' object='libgsdlcolservr_a-sqlfilter.o' libtool=no @AMDEPBACKSLASH@ 
     562@AMDEP_TRUE@@am__fastdepCXX_FALSE@  DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
     563@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgsdlcolservr_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libgsdlcolservr_a-sqlfilter.o `test -f 'sqlfilter.cpp' || echo '$(srcdir)/'`sqlfilter.cpp 
     564 
     565libgsdlcolservr_a-sqlfilter.obj: sqlfilter.cpp 
     566@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgsdlcolservr_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libgsdlcolservr_a-sqlfilter.obj -MD -MP -MF "$(DEPDIR)/libgsdlcolservr_a-sqlfilter.Tpo" -c -o libgsdlcolservr_a-sqlfilter.obj `if test -f 'sqlfilter.cpp'; then $(CYGPATH_W) 'sqlfilter.cpp'; else $(CYGPATH_W) '$(srcdir)/sqlfilter.cpp'; fi`; \ 
     567@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libgsdlcolservr_a-sqlfilter.Tpo" "$(DEPDIR)/libgsdlcolservr_a-sqlfilter.Po"; else rm -f "$(DEPDIR)/libgsdlcolservr_a-sqlfilter.Tpo"; exit 1; fi 
     568@AMDEP_TRUE@@am__fastdepCXX_FALSE@  source='sqlfilter.cpp' object='libgsdlcolservr_a-sqlfilter.obj' libtool=no @AMDEPBACKSLASH@ 
     569@AMDEP_TRUE@@am__fastdepCXX_FALSE@  DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
     570@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgsdlcolservr_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libgsdlcolservr_a-sqlfilter.obj `if test -f 'sqlfilter.cpp'; then $(CYGPATH_W) 'sqlfilter.cpp'; else $(CYGPATH_W) '$(srcdir)/sqlfilter.cpp'; fi` 
     571 
     572libgsdlcolservr_a-sqlqueryfilter.o: sqlqueryfilter.cpp 
     573@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgsdlcolservr_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libgsdlcolservr_a-sqlqueryfilter.o -MD -MP -MF "$(DEPDIR)/libgsdlcolservr_a-sqlqueryfilter.Tpo" -c -o libgsdlcolservr_a-sqlqueryfilter.o `test -f 'sqlqueryfilter.cpp' || echo '$(srcdir)/'`sqlqueryfilter.cpp; \ 
     574@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libgsdlcolservr_a-sqlqueryfilter.Tpo" "$(DEPDIR)/libgsdlcolservr_a-sqlqueryfilter.Po"; else rm -f "$(DEPDIR)/libgsdlcolservr_a-sqlqueryfilter.Tpo"; exit 1; fi 
     575@AMDEP_TRUE@@am__fastdepCXX_FALSE@  source='sqlqueryfilter.cpp' object='libgsdlcolservr_a-sqlqueryfilter.o' libtool=no @AMDEPBACKSLASH@ 
     576@AMDEP_TRUE@@am__fastdepCXX_FALSE@  DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
     577@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgsdlcolservr_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libgsdlcolservr_a-sqlqueryfilter.o `test -f 'sqlqueryfilter.cpp' || echo '$(srcdir)/'`sqlqueryfilter.cpp 
     578 
     579libgsdlcolservr_a-sqlqueryfilter.obj: sqlqueryfilter.cpp 
     580@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgsdlcolservr_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libgsdlcolservr_a-sqlqueryfilter.obj -MD -MP -MF "$(DEPDIR)/libgsdlcolservr_a-sqlqueryfilter.Tpo" -c -o libgsdlcolservr_a-sqlqueryfilter.obj `if test -f 'sqlqueryfilter.cpp'; then $(CYGPATH_W) 'sqlqueryfilter.cpp'; else $(CYGPATH_W) '$(srcdir)/sqlqueryfilter.cpp'; fi`; \ 
     581@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libgsdlcolservr_a-sqlqueryfilter.Tpo" "$(DEPDIR)/libgsdlcolservr_a-sqlqueryfilter.Po"; else rm -f "$(DEPDIR)/libgsdlcolservr_a-sqlqueryfilter.Tpo"; exit 1; fi 
     582@AMDEP_TRUE@@am__fastdepCXX_FALSE@  source='sqlqueryfilter.cpp' object='libgsdlcolservr_a-sqlqueryfilter.obj' libtool=no @AMDEPBACKSLASH@ 
     583@AMDEP_TRUE@@am__fastdepCXX_FALSE@  DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
     584@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgsdlcolservr_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libgsdlcolservr_a-sqlqueryfilter.obj `if test -f 'sqlqueryfilter.cpp'; then $(CYGPATH_W) 'sqlqueryfilter.cpp'; else $(CYGPATH_W) '$(srcdir)/sqlqueryfilter.cpp'; fi` 
    552585 
    553586libgsdlcolservr_a-expat_document.o: expat_document.cpp