Changeset 9929

Timestamp:

2005-05-23T16:18:43+12:00 (19 years ago)

Author:

kjdon

Message:

modifications so that collectionmeta are read from the config file, not from the gdbm database, therefore they will update without rebuilding

Location:

trunk/gsdl/src/colservr

Files:

• collectserver.cpp (modified) (7 diffs)
• collectserver.h (modified) (2 diffs)
• maptools.cpp (modified) (1 diff)
• maptools.h (modified) (1 diff)

trunk/gsdl/src/colservr/collectserver.cpp

@@ -29 +29 @@
 #include "OIDtools.h"
 #include <assert.h>
+#include "display.h"
 
 
@@ -86 +87 @@
     else if (key == "numbytes") collectinfo.numBytes = value.getint();
     else if (key == "collectionmeta") {
-      if (cfgline.size() == 2)
-    collectinfo.collectionmeta[cfgline[0]] = cfgline[1];
-      else if (cfgline.size() == 3 &&
-           collectinfo.collectionmeta[cfgline[0]].empty() )
-    collectinfo.collectionmeta[cfgline[0]] = cfgline[2];
-    } else if (key == "collectionmacro") {
+      text_t params;
+      if (cfgline.size() == 3) {
+    // get the params for later
+    text_t::const_iterator first=cfgline[1].begin()+1;
+    text_t::const_iterator last=cfgline[1].end()-1;
+    params=substr(first, last);
+      }
+      
+      text_t meta_name = cfgline[0];
+      if (*(meta_name.begin())=='.') {
+    // a .xxx collectionmeta. strip off the . and
+    // look it up in the indexmap to get the actual value
+    
+    text_t name = substr(cfgline[0].begin()+1,cfgline[0].end());
+    text_t new_name;
+    if (indexmap.from2to(name, new_name)) {
+      meta_name = new_name;
+    } 
+      } else {
+    // add them to collectionmeta
+    text_tmap lang_map = collectinfo.collectionmeta[cfgline[0]];
+    if (cfgline.size() == 2) {
+      lang_map[g_EmptyText] = cfgline[1];
+    } else if (cfgline.size() == 3 ) {
+      // get the lang out of params
+      paramhashtype params_hash;
+      splitparams(params, params_hash);
+      
+      text_t lang = params_hash["l"];
+      lang_map[lang] = cfgline[2];
+      if (lang_map[g_EmptyText].empty()) {
+        // want the first one as the default if no default specified
+        lang_map[g_EmptyText] = cfgline[2];
+      }
+    }
+    collectinfo.collectionmeta[cfgline[0]] = lang_map;
+    
+      }
+      
+      // add all collectionmeta to macro list
+      if (cfgline.size() == 2) // no params for this macro
+    collectinfo.collection_macros
+      .insert( make_pair(meta_name, make_pair(g_EmptyText,cfgline[1])) );
+      else if (cfgline.size() == 3) {// has params
+    // can we somehow add this is with no params if there is not already 
+    // a no params entry??
+    collectinfo.collection_macros
+      .insert( make_pair(meta_name, make_pair(params,cfgline[2])) );
+      }
+    }
+    else if (key == "collectionmacro") {
+      text_t nobrackets;
+      // add all to macro list
       if (cfgline.size() == 2) // no params for this macro
     collectinfo.collection_macros
@@ -99 +147 @@
     text_t::const_iterator first=cfgline[1].begin()+1;
     text_t::const_iterator last=cfgline[1].end()-1;
-    text_t nobrackets=substr(first, last);
+    nobrackets=substr(first, last);
     collectinfo.collection_macros
       .insert( make_pair(cfgline[0], make_pair(nobrackets,cfgline[2])) );
@@ -141 +189 @@
        }
 
+    // store all the mappings for use when collection meta is read later
+    // (build.cfg read before collect.cfg)
+    else if (key == "indexmap" || key == "indexfieldmap" || key == "subcollectionmap" || key == "languagemap") {
+      indexmap.importmap (cfgline, true);
+      
+    } 
     // In the map the key-value pair contain the same
     // data i.e key == data, if key is 2 then data is 2
@@ -176 +230 @@
        }
   }
-
+  
   // configure the filters
   filtermapclass::iterator filter_here = filters.begin();
@@ -200 +254 @@
 }
 
+
 void collectserver::configure (const text_t &key, const text_t &value) {
   text_tarray cfgline;
@@ -228 +283 @@
 
 bool collectserver::init (ostream &logout) {
+  // delete the indexmap
+  indexmap.clear();
+
   // init the filters
   filtermapclass::iterator filter_here = filters.begin();

trunk/gsdl/src/colservr/collectserver.h

@@ -38 +38 @@
 #include "cfgread.h"
 #include "cnfgable.h" 
+#include "maptools.h"
 
 #if defined(GSDL_USE_OBJECTSPACE)
@@ -71 +72 @@
   filtermapclass filters;
   sourcelistclass sources;
+
+  // some stuff to remember while we are configuring
+  stringmap indexmap;
 
 public:

trunk/gsdl/src/colservr/maptools.cpp

@@ -34 +34 @@
 
 void stringmap::importmap (const text_tarray &maparray) {
-  clear ();
+  importmap(maparray, false);
+}
+
+void stringmap::importmap (const text_tarray &maparray, bool keepold) {
+  if (!keepold) {
+    clear ();
+  }
   
   text_tarray::const_iterator here = maparray.begin();

trunk/gsdl/src/colservr/maptools.h

@@ -43 +43 @@
 
   void importmap (const text_tarray &maparray);
+  void importmap (const text_tarray &maparray, bool keepold);
   void exportmap (text_tarray &maparray) const;