Changeset 1342 for branches/z3950-branch/gsdl/src/recpt/nullproto.cpp

Timestamp:

2000-08-03T14:49:41+12:00 (24 years ago)

Author:

johnmcp

Message:

Relatively stable z39.50 implementation now, merged with the mgpp source.
(Still needs a decent interface and query language though...)

File:

• branches/z3950-branch/gsdl/src/recpt/nullproto.cpp (modified) (4 diffs)

branches/z3950-branch/gsdl/src/recpt/nullproto.cpp

@@ -22 +22 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id$
- *
  *********************************************************************/
-
-/*
-   $Log$
-   Revision 1.12  1999/12/05 21:23:39  sjboddie
-   support for multiple gsdlhomes and gdbmhomes
-
-   Revision 1.11  1999/10/25 22:29:32  sjboddie
-   receptionist now checks collect diectory for collections
-   rather than collections.txt file
-
-   Revision 1.10  1999/10/19 03:23:43  davidb
-   Collection building support through web pages
-   and internal and external link handling for collection documents
-
-   Revision 1.9  1999/09/07 04:56:56  sjboddie
-   added GPL notice
-
-   Revision 1.8  1999/06/27 22:04:47  sjboddie
-   now read in build.cfg before collect.cfg so that the indexmaps
-   are available if required to decode defaultindex, defaultsubcollection,
-   and defaultlanguage
-
-   Revision 1.7  1999/06/15 02:16:45  sjboddie
-   small change to prevent collectdir configuration string from being passed
-   to everything
-
-   Revision 1.6  1999/05/10 03:40:41  sjboddie
-   lots of changes - slowly getting document action sorted out
-
-   Revision 1.5  1999/04/30 01:59:41  sjboddie
-   lots of stuff - getting documentaction working (documentaction replaces
-   old browseaction)
-
-   Revision 1.4  1999/03/31 23:44:48  rjmcnab
-   Altered the protocol so that the metadata is part of the filter.
-
-   Revision 1.3  1999/03/03 23:26:35  sjboddie
-
-   Implemented more of the protocol
-
-   Revision 1.2  1999/02/25 21:58:58  rjmcnab
-
-   Merged sources.
-
-   Revision 1.1  1999/02/21 22:35:22  rjmcnab
-
-   Initial revision.
-
- */
-
 
 #include "nullproto.h"
@@ -117 +65 @@
     if ((*here).second.c != NULL) {
       const colservrconf &configinfo = (*here).second.c->get_configinfo ();
+      bool failed = false;
 
       // configure this collection server
@@ -130 +79 @@
            << configinfo.collection << "\", gsdlhome=\""
            << configinfo.gsdlhome << "\"\n";
-    //  return false; //****
-    here ++;
-    continue;
+    failed = true; 
       }
 
@@ -142 +89 @@
            << configinfo.collection << "\", gsdlhome=\"" 
            << configinfo.gsdlhome << "\"\n";
-    //  return false; //****
-    here ++;
-    continue;
+    failed = true;
       }
 
-      if (!(*here).second.c->init (logout)) return false;
+      // don't bother initializing if one of the config files
+      // wasn't read correctly
+      if (!failed) {
+    if (!(*here).second.c->init (logout)) return false;
+      }
     }
     here++;