Changeset 1270 for trunk/gsdl/src/recpt/receptionist.cpp

Timestamp:

2000-07-06T09:49:36+12:00 (24 years ago)

Author:

sjboddie

Message:

Receptionist now caches collection information to avoid making multiple
get_collectinfo calls to collection server

File:

• trunk/gsdl/src/recpt/receptionist.cpp (modified) (5 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.53  2000/07/05 21:49:34  sjboddie
+   Receptionist now caches collection information to avoid making multiple
+   get_collectinfo calls to collection server
+
    Revision 1.52  2000/07/04 02:15:22  sjboddie
    fixed bug causing segmentation fault when an invalid collection
@@ -286 +290 @@
 }
 
-
+void collectioninfo_t::clear () {
+  gsdl_gsdlhome.clear();
+  gsdl_gdbmhome.clear();
+
+  info_loaded = false;
+  info.clear();
+}
 
 receptionist::receptionist () {
@@ -1034 +1044 @@
   colinfo_tmap::iterator colend = configinfo.collectinfo.end();
   while (colhere != colend) {
-    gsdlmacrodir = filename_cat ((*colhere).second.gsdl_gsdlhome, "macros");
-    maindirs.insert (gsdlmacrodir);
+    if (!((*colhere).second.gsdl_gsdlhome).empty()) {
+      gsdlmacrodir = filename_cat ((*colhere).second.gsdl_gsdlhome, "macros");
+      maindirs.insert (gsdlmacrodir);
+    }
     colhere ++;
   }
@@ -1126 +1138 @@
 
     } else {
-      ColInfoResponse_t cinfo;
-      comerror_t err;
-
-      collectproto->get_collectinfo (arg_c, cinfo, err, logout);
-
-      if (!cinfo.ccsCols.empty()) {
-    args["ccs"] = 1;
-    if (args["cc"].empty()) {
-      text_tarray::const_iterator col_here = cinfo.ccsCols.begin();
-      text_tarray::const_iterator col_end = cinfo.ccsCols.end();
-      bool first = true;
-      while (col_here != col_end) {
-        // make sure it's a valid collection
-        if (protocols.getrecptproto (*col_here, logout) != NULL) {
-          if (!first) args["cc"].push_back (',');
-          args["cc"] += *col_here;
-          first = false;
+
+      ColInfoResponse_t *cinfo = get_collectinfo_ptr (collectproto, arg_c, logout);
+
+      if (cinfo != NULL) {
+    if (!cinfo->ccsCols.empty()) {
+      args["ccs"] = 1;
+      if (args["cc"].empty()) {
+        text_tarray::const_iterator col_here = cinfo->ccsCols.begin();
+        text_tarray::const_iterator col_end = cinfo->ccsCols.end();
+        bool first = true;
+        while (col_here != col_end) {
+          // make sure it's a valid collection
+          if (protocols.getrecptproto (*col_here, logout) != NULL) {
+        if (!first) args["cc"].push_back (',');
+        args["cc"] += *col_here;
+        first = false;
+          }
+          col_here ++;
         }
-        col_here ++;
       }
     }
+      } else {
+    logout << "ERROR (receptionist::check_mainargs): get_collectinfo_ptr returned NULL\n";
       }
     }
@@ -1331 +1345 @@
   }
 }
+
+// gets collection info from cache if found or 
+// calls collection server (and updates cache)
+// returns NULL if there's an error
+ColInfoResponse_t *receptionist::get_collectinfo_ptr (recptproto *collectproto, 
+                              const text_t &collection, 
+                              ostream &logout) {
+  
+  // check the cache
+  colinfo_tmap::iterator it = configinfo.collectinfo.find (collection);
+  if ((it != configinfo.collectinfo.end()) && ((*it).second.info_loaded)) {
+    // found it
+    return &((*it).second.info);
+  }
+
+  // not cached, get info from collection server
+  if (collectproto == NULL) {
+    logout << "ERROR: receptionist::get_collectinfo_ptr passed null collectproto\n";
+    return NULL;
+  }
+   
+  comerror_t err;
+  if (it == configinfo.collectinfo.end()) {
+    collectioninfo_t cinfo;
+    collectproto->get_collectinfo (collection, cinfo.info, err, logout);
+    if (err != noError) {
+      outconvertclass text_t2ascii;
+      logout << text_t2ascii << "ERROR (receptionist::getcollectinfo_ptr): \""
+         << get_comerror_string (err) << "\"while getting collectinfo\n";
+      return NULL;
+    }
+    cinfo.info_loaded = true;
+    configinfo.collectinfo[collection] = cinfo;
+    return &(configinfo.collectinfo[collection].info);
+  } else {
+    collectproto->get_collectinfo (collection, (*it).second.info, err, logout);
+    if (err != noError) {
+      outconvertclass text_t2ascii;
+      logout << text_t2ascii << "ERROR (receptionist::getcollectinfo_ptr): \""
+         << get_comerror_string (err) << "\"while getting collectinfo\n";
+      return NULL;
+    }
+    (*it).second.info_loaded = true;
+    return &((*it).second.info);
+  }
+}