Changeset 1951

Timestamp:

10/24/07 22:11:17 (9 months ago)

Author:

karpet

Message:

Ripped out the expat parser and -S http features. libxml2 now required.

Dave, this will obviously need some testing on Windows. I think I got the affected
win32 files but please test.

Files:

• swish-e/branches/2.6/configure (modified) (2 diffs)
• swish-e/branches/2.6/configure.in (modified) (1 diff)
• swish-e/branches/2.6/pod/CHANGES.pod (modified) (1 diff)
• swish-e/branches/2.6/src/Makefile.am (modified) (6 diffs)
• swish-e/branches/2.6/src/Makefile.in (modified) (16 diffs)
• swish-e/branches/2.6/src/config.h (modified) (2 diffs)
• swish-e/branches/2.6/src/expat (deleted)
• swish-e/branches/2.6/src/fs.c (modified) (1 diff)
• swish-e/branches/2.6/src/html.c (deleted)
• swish-e/branches/2.6/src/html.h (deleted)
• swish-e/branches/2.6/src/http.c (deleted)
• swish-e/branches/2.6/src/http.h (deleted)
• swish-e/branches/2.6/src/httpserver.c (deleted)
• swish-e/branches/2.6/src/httpserver.h (deleted)
• swish-e/branches/2.6/src/index.c (modified) (6 diffs)
• swish-e/branches/2.6/src/methods.c (modified) (2 diffs)
• swish-e/branches/2.6/src/parse_conffile.c (modified) (1 diff)
• swish-e/branches/2.6/src/swish.c (modified) (6 diffs)
• swish-e/branches/2.6/src/swishspider (deleted)
• swish-e/branches/2.6/src/txt.c (deleted)
• swish-e/branches/2.6/src/txt.h (deleted)
• swish-e/branches/2.6/src/vms/descrip_axp.mms (modified) (6 diffs)
• swish-e/branches/2.6/src/vms/descrip_libxml2.mms (modified) (7 diffs)
• swish-e/branches/2.6/src/vms/descrip_vax.mms (modified) (6 diffs)
• swish-e/branches/2.6/src/win32/dllswishe.dsp (modified) (2 diffs)
• swish-e/branches/2.6/src/win32/swishe.dsp (modified) (4 diffs)
• swish-e/branches/2.6/src/xml.c (deleted)
• swish-e/branches/2.6/src/xml.h (deleted)

swish-e/branches/2.6/configure

@@ -28022 +28022 @@
-
-
-          ac_config_files="$ac_config_files Makefile html/Makefile pod/Makefile man/Makefile src/Makefile src/expat
+ac_config_files="$ac_config_files Makefile html/Makefile pod/Makefile man/Makefile src
-
-cat >confcache <<\_ACEOF
@@ -28613 +28613 @@
-  "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
-  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-  "src/expat/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/expat/Makefile" ;;
-  "src/replace/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/replace/Makefile" ;;
-  "src/snowball/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/snowball/Makefile" ;;

swish-e/branches/2.6/configure.in

@@ -388 +388 @@
-    man/Makefile
-    src/Makefile
-    src/expat/Makefile
-    src/replace/Makefile
-    src/snowball/Makefile

swish-e/branches/2.6/pod/CHANGES.pod

@@ -15 +15 @@
-Jose Ruiz contributed a new BDB index format. The old native
-and experimental incremental index formats have been removed.
+
+=item Removed -S http feature
+
+The spider.pl script is now preferred in combination with -S prog.
+
+=item Removed expat parser
+
+libxml2 parser is now required.
-
-=back

swish-e/branches/2.6/src/Makefile.am

@@ -1 @@
-expat 
+
-
-# Using AM_CPPFLAGS instead of per-target flags means object names
@@ -44 +44 @@
-        swish_words.c swish_words.h \
-        proplimit.c proplimit.h \
-    
+
-        db_read.c sw_db.h \
-        result_sort.c result_sort.h \
@@ -68 +68 @@
-
-noinst_LTLIBRARIES = libswishindex.la
-expat/libswexpat.la 
+
-libswishindex_la_LDFLAGS = $(LIBXML2_LIB) $(Z_LIBS) $(PCRE_LIBS)
-
@@ -78 +78 @@
-libswishindex_la_SOURCES = \
-        fs.c fs.h \
-        http.c http.h \
-        httpserver.c httpserver.h \
-        extprog.c extprog.h \
-    
+
-        methods.c \
-        html.c html.h \
-        txt.c txt.h \
-        xml.c xml.h \
-        entities.c entities.h \
-        index.c index.h \
@@ -91 +86 @@
-        pre_sort.c \
-        file.c file.h \
-    
+
-        parse_conffile.c parse_conffile.h \
-        swregex.c swregex.h \
-        db_write.c  \
-        docprop_write.c \
-    
+
-
-
@@ -103 +98 @@
-include_HEADERS = swish-e.h
-
-
-libexec_SCRIPTS = swishspider
-
-EXTRA_DIST = swishspider

swish-e/branches/2.6/src/Makefile.in

@@ -107 +107 @@
-am__quote = @am__quote@
-install_sh = @install_sh@
-expat 
+
-
-
@@ -143 +143 @@
-        swish_words.c swish_words.h \
-        proplimit.c proplimit.h \
-    
+
-        db_read.c sw_db.h \
-        result_sort.c result_sort.h \
@@ -165 +165 @@
-
-noinst_LTLIBRARIES = libswishindex.la
-expat/libswexpat.la 
+
-libswishindex_la_LDFLAGS = $(LIBXML2_LIB) $(Z_LIBS) $(PCRE_LIBS)
-
@@ -174 +174 @@
-libswishindex_la_SOURCES = \
-        fs.c fs.h \
-        http.c http.h \
-        httpserver.c httpserver.h \
-        extprog.c extprog.h \
-    
+
-        methods.c \
-        html.c html.h \
-        txt.c txt.h \
-        xml.c xml.h \
-        entities.c entities.h \
-        index.c index.h \
@@ -187 +182 @@
-        pre_sort.c \
-        file.c file.h \
-    
+
-        parse_conffile.c parse_conffile.h \
-        swregex.c swregex.h \
-        db_write.c  \
-        docprop_write.c \
-    
+
-
-
-include_HEADERS = swish-e.h
-
-libexec_SCRIPTS = swishspider
-
-EXTRA_DIST = swishspider
-subdir = src
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -212 +203 @@
-        date_time.lo double_metaphone.lo stemmer.lo soundex.lo
-libswish_e_la_OBJECTS = $(am_libswish_e_la_OBJECTS)
-http.lo httpserver.lo extprog
-bash.lo methods.lo html.lo txt.lo xml.lo entities.lo index
-merge.lo pre_sort.lo file.lo filter.lo parse_conffil
-swregex.lo db_write.lo docprop_write.lo 
+extprog.lo bash.lo methods
+entities.lo index.lo merge.lo pre_sort.lo file.lo filter
+parse_conffile.lo swregex.lo db_write.lo docprop_writ
+
-libswishindex_la_OBJECTS = $(am_libswishindex_la_OBJECTS)
-EXTRA_PROGRAMS = libtest$(EXEEXT)
@@ -229 +220 @@
-swish_e_DEPENDENCIES = libswishindex.la libswish-e.la
-swish_e_LDFLAGS =
-SCRIPTS = $(libexec_SCRIPTS)
-
-
-DEFS = @DEFS@
@@ -250 +239 @@
-@AMDEP_TRUE@    ./$(DEPDIR)/fs.Plo ./$(DEPDIR)/getruntime.Plo \
-@AMDEP_TRUE@    ./$(DEPDIR)/hash.Plo ./$(DEPDIR)/headers.Plo \
-
-
-
-
-
-
+
+
+
+
-@AMDEP_TRUE@    ./$(DEPDIR)/parse_conffile.Plo \
-@AMDEP_TRUE@    ./$(DEPDIR)/parser.Plo ./$(DEPDIR)/pre_sort.Plo \
@@ -265 +252 @@
-@AMDEP_TRUE@    ./$(DEPDIR)/swish_qsort.Plo \
-@AMDEP_TRUE@    ./$(DEPDIR)/swish_words.Plo ./$(DEPDIR)/swregex.Plo \
-
-
+
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -392 +378 @@
-        @rm -f swish-e$(EXEEXT)
-        $(LINK) $(swish_e_LDFLAGS) $(swish_e_OBJECTS) $(swish_e_LDADD) $(LIBS)
-libexecSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-install-libexecSCRIPTS: $(libexec_SCRIPTS)
-        @$(NORMAL_INSTALL)
-        $(mkinstalldirs) $(DESTDIR)$(libexecdir)
-        @list='$(libexec_SCRIPTS)'; for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          if test -f $$d$$p; then \
-            f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-            echo " $(libexecSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(libexecdir)/$$f"; \
-            $(libexecSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(libexecdir)/$$f; \
-          else :; fi; \
-        done
-
-uninstall-libexecSCRIPTS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(libexec_SCRIPTS)'; for p in $$list; do \
-          f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-          echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
-          rm -f $(DESTDIR)$(libexecdir)/$$f; \
-        done
-
-mostlyclean-compile:
@@ -439 +405 @@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/headers.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/html.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httpserver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/index.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keychar_out.Po@am__quote@
@@ -466 +429 @@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swregex.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swstring.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/txt.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml.Plo@am__quote@
-
-distclean-depend:
@@ -655 +616 @@
-check-am: all-am
-check: check-recursive
-
-
+
-install-binPROGRAMS: install-libLTLIBRARIES
-
-installdirs: installdirs-recursive
-installdirs-am:
-libexecdir) $(DESTDIR)$(
+
-
-install: install-recursive
@@ -708 +668 @@
-install-data-am: install-includeHEADERS
-
-
-
+
-
-install-info: install-info-recursive
@@ -727 +686 @@
-
-uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
-
-
+
-
-uninstall-info: uninstall-info-recursive
@@ -742 +700 @@
-        install-exec install-exec-am install-exec-recursive \
-        install-includeHEADERS install-info install-info-am \
-
-libexecSCRIPTS install-man install-recursive
--strip installcheck installcheck-am installdirs
-installdirs-am installdirs-recursive maintainer-clean
-generic maintainer-clean-recursive mostlyclean
-compile mostlyclean-generic mostlyclean-libtool
-mostlyclean-recursive tags tags-recursive uninstall
-am uninstall-
+install-man 
+recursive install-strip installcheck installcheck-am
+dirs installdirs-am installdirs-recursive
+maintainer-clean maintainer-clean-generic
+recursive mostlyclean mostlyclean-compile
+generic mostlyclean-libtool mostlyclean-recursive
+tags tags-recursive uninstall uninstall-am
+
-        uninstall-info-am uninstall-info-recursive \
-
-
+
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.

swish-e/branches/2.6/src/config.h

@@ -134 +134 @@
-
-
-#define ALLOW_HTTP_INDEXING_DATA_SOURCE         1
-#define ALLOW_FILESYSTEM_INDEXING_DATA_SOURCE   1
-#define ALLOW_EXTERNAL_PROGRAM_DATA_SOURCE      1
@@ -144 +143 @@
-** be sure to leave at least one option.
-*/
-
-#define DEFAULT_HTTP_DELAY 5
-
-/* DEFAULT_HTTP_DELAY is the default delay when using swishspider -S http */
-
-

swish-e/branches/2.6/src/fs.c

@@ -47 +47 @@
-#include "check.h"
-#include "error.h"
-#include "xml.h"
-#include "txt.h"
-#include "parse_conffile.h"
-#include "swish_qsort.h"

swish-e/branches/2.6/src/index.c

@@ -136 +136 @@
-#include "deflate.h"
-*/
-#include "html.h"
-#include "xml.h"
-#include "parser.h"
-#include "txt.h"
-#include "metanames.h"
-#include "result_sort.h"
@@ -238 +235 @@
-    idx->metaIDtable.defaultID = -1;
-
-
-    /* $$$ this is only a fix while http.c and httpserver.c still exist */
-    idx->tmpdir = estrdup(".");
-
-    /* By default, we are not in update mode */
@@ -505 +499 @@
-
-    /* Look for title if HTML document */
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        return parse_HTML( sw, fprop, fi, buffer );
-#endif
-
-
@@ -1016 +999 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    /* just for fun so we can show total bytes shown */
@@ -1034 +1005 @@
-
-
-
+-- the duplicates are for backwards compat for pre2.6 config files 
-    
-    switch (fprop->doctype)
-    {
-
+    case XML:
+        strcpy(strType,"XML2");
+        countwords = parse_XML;
+        break;
+
+    case HTML:
+        strcpy(strType,"HTML2");
+        countwords = parse_HTML;
+        break;
+
-    case TXT:
-
-countwords
+2
+parse
-        break;
-
-    case HTML:
-        strcpy(strType,"HTML");
-        countwords = countwords_HTML;
-        break;
-
-    case XML:
-        strcpy(strType,"XML");
-        countwords = countwords_XML;
-        break;
-
-    case WML:
-        strcpy(strType,"WML");
-        countwords = countwords_HTML;
-        break;
-
-#ifdef HAVE_LIBXML2
-    case XML2:
-        strcpy(strType,"XML2");
@@ -1080 +1045 @@
-        break;
-
-#else
-
-    /* Default if libxml not installed */
-    default:
-        strcpy(strType,"DEFAULT (HTML)");
-        countwords = countwords_HTML;
-        break;
-#endif
-        
-    }
-

swish-e/branches/2.6/src/methods.c

@@ -35 +35 @@
-#endif
-
-#ifdef ALLOW_HTTP_INDEXING_DATA_SOURCE
-extern struct _indexing_data_source_def HTTPIndexingDataSource;
-#endif
-
-#ifdef ALLOW_EXTERNAL_PROGRAM_DATA_SOURCE
-extern struct _indexing_data_source_def ExternalProgramDataSource;
@@ -50 +46 @@
-#endif
-
-#ifdef ALLOW_HTTP_INDEXING_DATA_SOURCE
-    &HTTPIndexingDataSource,
-#endif
-
-#ifdef ALLOW_EXTERNAL_PROGRAM_DATA_SOURCE

swish-e/branches/2.6/src/parse_conffile.c

@@ -1470 +1470 @@
-    doc_map[] =
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    };
-    int i;

swish-e/branches/2.6/src/swish.c

@@ -46 +46 @@
-#include "index.h"
-#include "file.h"
-#include "http.h"
-#include "merge.h"
-#include "docprop.h"
@@ -295 +294 @@
-#endif
-
-#ifdef ALLOW_HTTP_INDEXING_DATA_SOURCE
-    printf("              for \"-S http\" - specify a list of URLs\n");
-#endif
-
-#ifdef ALLOW_EXTERNAL_PROGRAM_DATA_SOURCE
-    printf("              for \"-S prog\" - specify a list of programs or the string \"stdin\"\n");
@@ -322 +317 @@
-#endif
-
-#ifdef ALLOW_HTTP_INDEXING_DATA_SOURCE
-    printf("              \"http\" - index web site files using a web crawler\n");
-    if (!*defaultIndexingSystem)
-        defaultIndexingSystem = "http";
-#endif
-
-#ifdef ALLOW_EXTERNAL_PROGRAM_DATA_SOURCE
-    printf("              \"prog\" - index files supplied by an external program\n");
-
-    if (!*defaultIndexingSystem)
-        defaultIndexingSystem = "http";
-#endif
-    printf("              The default value is: \"%s\"\n", defaultIndexingSystem);
@@ -369 +356 @@
-*
-*  Note that initModule_* code is called even when it's not going to be used
-*  (e.g. initModule_HTTP is called when searching).
-*
-*
@@ -383 +369 @@
-    initModule_ResultSort(sw);
-    initModule_Filter(sw);
-    initModule_Entities(sw);  /* used only by the old HTML parser -- not long to live */
-    initModule_Index(sw);
-    initModule_FS(sw);
-    initModule_HTTP(sw);
-    initModule_Prog(sw);
-
@@ -415 +399 @@
-
-    freeModule_Filter(sw);
-    freeModule_Entities(sw);
-    freeModule_Index(sw);
-    freeModule_ResultSort(sw);
-    freeModule_FS(sw);
-    freeModule_HTTP(sw);
-    freeModule_Prog(sw);
-

swish-e/branches/2.6/src/vms/descrip_axp.mms

@@ -23 +23 @@
-#CWARN=
-CDEF = /def=(VMS,HAVE_CONFIG_H,STDC_HEADERS)
-[.expat.xmlparse],[.expat.xmltok],
+
-CWARN=
-#CDEBUG= /debug/noopt
@@ -39 +39 @@
-
-FILESYSTEM_OBJS=fs.obj
-HTTP_OBJS=http.obj httpserver.obj
-FS_OBJS=$(FILESYSTEM_OBJS)
-WEB_OBJS=$(HTTP_OBJS)
-VMS_OBJS = regex.obj
-VSNPRINTF_OBJ = vsnprintf.obj
@@ -47 +45 @@
-OBJS=   check.obj file.obj index.obj search.obj error.obj methods.obj\
-        hash.obj list.obj mem.obj merge.obj swish2.obj stemmer.obj \
-xml.obj txt.obj 
-html.obj 
+
+
-        filter.obj parse_conffile.obj result_output.obj date_time.obj \
-        keychar_out.obj extprog.obj bash.obj db_native.obj dump.obj \
-        entities.obj swish_words.obj \
-        proplimit.obj swish_qsort.obj ramdisk.obj rank.obj \
-xmlparse.obj xmltok.obj xmlrole.obj 
-    
+
+
-        pre_sort.obj headers.obj docprop_write.obj stemmer.obj\
-HTTP_OBJS) $(
+
-        api.obj stem_de.obj stem_dk.obj stem_en1.obj stem_en2.obj stem_es.obj\
-        stem_fi.obj stem_fr.obj stem_it.obj stem_nl.obj stem_no.obj \
@@ -64 +62 @@
-        !
-
-xmlparse.obj : [.expat.xmlparse]xmlparse.c
-
-xmltok.obj : [.expat.xmltok]xmltok.c
-
-xmlrole.obj : [.expat.xmltok]xmlrole.c
-
-$(NAME) : $(OBJS) libswish-e.olb swish.obj
@@ -134 +127 @@
- list.h
-hash.obj : hash.c swish.h config.h hash.h mem.h
-http.obj : http.c swish.h config.h index.h hash.h mem.h file.h \
- http.h httpserver.h
-httpserver.obj : httpserver.c swish.h config.h mem.h http.h \
- httpserver.h
-index.obj : index.c swish.h config.h index.h hash.h mem.h \
- check.h search.h docprop.h stemmer.h compress.h
@@ -155 +144 @@
-libtest.obj : libtest.c swish.h config.h error.h list.h search.h index.h \
- file.h merge.h docprop.h
-txt.obj : txt.c txt.h swish.h mem.h index.h
-xml.obj : xml.c txt.h swish.h mem.h index.h
-proplimi.obj : swish.h mem.h merge.h docprop.h index.h metanames.h \
- compress.h error.h db.h result_sort.h swish_qsort.h proplimit.h
-metanames.obj : metanames.c
-result_sort.obj : result_sort.c
-html.obj : html.c
-filter.obj : filter.c
-parse_conffile.obj : parse_conffile.c

swish-e/branches/2.6/src/vms/descrip_libxml2.mms

@@ -23 +23 @@
-#CWARN=
-CDEF = /def=(HAVE_LIBXML2,VMS,HAVE_CONFIG_H,STDC_HEADERS)
-[.expat.xmlparse],[.expat.xmltok],
+
-CWARN=
-#CDEBUG= /debug/noopt
@@ -39 +39 @@
-
-FILESYSTEM_OBJS=fs.obj
-HTTP_OBJS=http.obj httpserver.obj
-FS_OBJS=$(FILESYSTEM_OBJS)
-WEB_OBJS=$(HTTP_OBJS)
-VMS_OBJS = regex.obj
-
-XML_PARSE = xmlparse.obj xmltok.obj xmlrole.obj 
-LIBXML2_LIB = libxml:libxml.olb/lib
-LIBXML2_OBJS = parser.obj
@@ -51 +48 @@
-OBJS=   check.obj file.obj index.obj search.obj error.obj methods.obj\
-        hash.obj list.obj mem.obj merge.obj swish2.obj stemmer.obj \
-xml.obj txt.obj 
-html.obj 
+
+
-        filter.obj parse_conffile.obj result_output.obj date_time.obj \
-        keychar_out.obj extprog.obj bash.obj db_native.obj dump.obj \
@@ -61 +58 @@
-        $(XML_PARSE)\
-        $(LIBXML2_OBJS)\
-HTTP_OBJS) $(
+
-        api.obj stem_de.obj stem_dk.obj stem_en1.obj stem_en2.obj stem_es.obj\
-        stem_fi.obj stem_fr.obj stem_it.obj stem_nl.obj stem_no.obj \
@@ -69 +66 @@
-all :   acconfig.h $(NAME) swish-search.exe libtest.exe
-        !
-
-xmlparse.obj : [.expat.xmlparse]xmlparse.c
-
-xmltok.obj : [.expat.xmltok]xmltok.c
-
-xmlrole.obj : [.expat.xmltok]xmlrole.c
-
-$(NAME) : $(OBJS) libswish-e.olb swish.obj
@@ -140 +131 @@
- list.h
-hash.obj : hash.c swish.h config.h hash.h mem.h
-http.obj : http.c swish.h config.h index.h hash.h mem.h file.h \
- http.h httpserver.h
-httpserver.obj : httpserver.c swish.h config.h mem.h http.h \
- httpserver.h
-index.obj : index.c swish.h config.h index.h hash.h mem.h \
- check.h search.h docprop.h stemmer.h compress.h
@@ -161 +148 @@
-libtest.obj : libtest.c swish.h config.h error.h list.h search.h index.h \
- file.h merge.h docprop.h
-txt.obj : txt.c txt.h swish.h mem.h index.h
-xml.obj : xml.c txt.h swish.h mem.h index.h
-proplimi.obj : swish.h mem.h merge.h docprop.h index.h metanames.h \
- compress.h error.h db.h result_sort.h swish_qsort.h proplimit.h

swish-e/branches/2.6/src/vms/descrip_vax.mms

@@ -23 +23 @@
-#CWARN=
-CDEF = /def=(VMS,HAVE_CONFIG_H,STDC_HEADERS, REGEX_MALLOC)
-[.expat.xmlparse],[.expat.xmltok],
+
-CWARN=
-#CDEBUG= /debug/noopt
@@ -39 +39 @@
-
-FILESYSTEM_OBJS=fs.obj
-HTTP_OBJS=http.obj httpserver.obj
-FS_OBJS=$(FILESYSTEM_OBJS)
-WEB_OBJS=$(HTTP_OBJS)
-VMS_OBJS = regex.obj
-VSNPRINTF_OBJ = vsnprintf.obj
@@ -47 +45 @@
-OBJS=   check.obj file.obj index.obj search.obj error.obj methods.obj\
-        hash.obj list.obj mem.obj merge.obj swish2.obj stemmer.obj \
-xml.obj txt.obj 
-html.obj 
+
+
-        filter.obj parse_conffile.obj result_output.obj date_time.obj \
-        keychar_out.obj extprog.obj bash.obj db_native.obj dump.obj \
-        entities.obj swish_words.obj \
-        proplimit.obj swish_qsort.obj ramdisk.obj rank.obj \
-xmlparse.obj xmltok.obj xmlrole.obj 
+
-        double_metaphone.obj db_read.obj db_write.obj swstring.obj \
-        pre_sort.obj headers.obj docprop_write.obj stemmer.obj\
-HTTP_OBJS) $(
+
-        api.obj stem_de.obj stem_dk.obj stem_en1.obj stem_en2.obj stem_es.obj\
-        stem_fi.obj stem_fr.obj stem_it.obj stem_nl.obj stem_no.obj \
@@ -63 +61 @@
-all :   acconfig.h $(NAME) swish-search.exe ! libtest.exe
-        !
-
-xmlparse.obj : [.expat.xmlparse]xmlparse.c
-
-xmltok.obj : [.expat.xmltok]xmltok.c
-
-xmlrole.obj : [.expat.xmltok]xmlrole.c
-
-$(NAME) : $(OBJS) libswish-e.olb swish.obj
@@ -134 +126 @@
- list.h
-hash.obj : hash.c swish.h config.h hash.h mem.h
-http.obj : http.c swish.h config.h index.h hash.h mem.h file.h \
- http.h httpserver.h
-httpserver.obj : httpserver.c swish.h config.h mem.h http.h \
- httpserver.h
-index.obj : index.c swish.h config.h index.h hash.h mem.h \
- check.h search.h docprop.h stemmer.h compress.h
@@ -155 +143 @@
-libtest.obj : libtest.c swish.h config.h error.h list.h search.h index.h \
- file.h merge.h docprop.h
-txt.obj : txt.c txt.h swish.h mem.h index.h
-xml.obj : xml.c txt.h swish.h mem.h index.h
-proplimi.obj : swish.h mem.h merge.h docprop.h index.h metanames.h \
- compress.h error.h db.h result_sort.h swish_qsort.h proplimit.h

swish-e/branches/2.6/src/win32/dllswishe.dsp

@@ -44 +44 @@
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DLLSWISH_EXPORTS" /Yu"stdafx.h" /FD /c
-\..\..\expat\xmlparse" /I "../../../libxml2/include" /I "..\..\..\expat\xmltok
+/../../libxml2/include
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -71 +71 @@
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DLLSWISH_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-\..\..\expat\xmlparse" /I "../../../libxml2/include" /I "..\..\..\expat\xmltok
+/../../libxml2/include
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

swish-e/branches/2.6/src/win32/swishe.dsp

@@ -43 +43 @@
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-expat\xmlparse" /I "..\..\..\zlib\include" /I "..\..\..\expat\xmltok
+zlib\include
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
@@ -51 +51 @@
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-expat/xmltok/Release/xmltok.lib ../expat/xmlparse/Release/xmlparse.lib ../
+
-# SUBTRACT LINK32 /pdb:none
-
@@ -68 +68 @@
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-\..\..\expat\xmlparse" /I "../../../libxml2/include" /I "..\..\..\expat\xmltok
+/../../libxml2/include
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
@@ -76 +76 @@
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-expat/xmltok/Release/xmltok.lib ../expat/xmlparse/Release/xmlparse.lib ../
+
-# SUBTRACT LINK32 /pdb:none
-