Changeset 11964

Timestamp:

2006-06-22T14:37:57+12:00 (18 years ago)

Author:

kjdon

Message:

changed the collection_macros data type to be collectionmeta_map, so get macro_name -> params -> value. This way we can set the value with no params to be the first value we come across, and if we find a genuine no-params value later on, it will overwrite it. collection macros and collection meta no loonger written to the gdbm database

Location:

trunk/gsdl/src

Files:

• colservr/collectserver.cpp (modified) (3 diffs)
• recpt/comtypes.h (modified) (2 diffs)
• recpt/receptionist.cpp (modified) (2 diffs)

trunk/gsdl/src/colservr/collectserver.cpp

@@ -98 +98 @@
     else if (key == "numbytes") collectinfo.numBytes = value.getint();
     else if (key == "collectionmeta") {
+      // genuine collmeta get added as collectionmeta and collection_macros
+      // .collmeta just get added as collection_macros
       text_t params;
       if (cfgline.size() == 3) {
@@ -138 +140 @@
       
       // 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])) );
+      text_tmap params_map = collectinfo.collection_macros[meta_name];
+      
+      if (cfgline.size() == 2) {// no params for this macro
+    params_map[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])) );
-      }
+    params_map[params] = cfgline[2];
+    if (params_map[g_EmptyText].empty()) {
+      params_map[g_EmptyText] = cfgline[2];
+    }
+      }
+      collectinfo.collection_macros[meta_name] = params_map;
     }
     else if (key == "collectionmacro") {
       text_t nobrackets;
+      text_tmap params_map = collectinfo.collection_macros[cfgline[0]];
       // add all to macro list
-      if (cfgline.size() == 2) // no params for this macro
-    collectinfo.collection_macros
-      .insert( make_pair(cfgline[0], make_pair(g_EmptyText,cfgline[1])) );
+      if (cfgline.size() == 2) { // no params for this macro
+    params_map[g_EmptyText] = cfgline[1];
+      }
       else if (cfgline.size() == 3) {// has params
     // strip [ ] brackets from params
@@ -159 +165 @@
     text_t::const_iterator last=cfgline[1].end()-1;
     nobrackets=substr(first, last);
-    collectinfo.collection_macros
-      .insert( make_pair(cfgline[0], make_pair(nobrackets,cfgline[2])) );
-      }
+    params_map[nobrackets] = cfgline[2];
+      }
+      collectinfo.collection_macros[cfgline[0]] = params_map;
+      
     } else if (key == "format" && cfgline.size() == 2)
       collectinfo.format[cfgline[0]] = cfgline[1];

trunk/gsdl/src/recpt/comtypes.h

@@ -67 +67 @@
 };
 
-/* macro name -> (params, value) */
-typedef multimap<text_t, pair<text_t, text_t>, less<text_t> > macros_map;
-
-typedef map<text_t, text_tmap, lttext_t> collectionmeta_map; // maps meta name to langmap
+// for collection metadata: metadata name -> lang -> value
+// for collection macros: macro name -> params -> value
+typedef map<text_t, text_tmap, lttext_t> collectionmeta_map; 
 
 #define CCSUniformSearchResultsFormatting 1
@@ -91 +90 @@
   unsigned long numWords;    // 0 if not known
   unsigned long numBytes;    // 0 if not known
-  //text_tmap      collectionmeta;
   collectionmeta_map  collectionmeta;
   text_tmap      format;
-  macros_map     collection_macros; // for collectionmacro config directive (> gsdl 2.53)
+  collectionmeta_map     collection_macros; // for collectionmacro config directive (> gsdl 2.53)
   text_tmap      building;
   text_t         httpdomain;      // GRB: could these two http items need removing

trunk/gsdl/src/recpt/receptionist.cpp

@@ -1519 +1519 @@
       // as of gsdl 2.53, collect.cfg can specify macros
       if (cinfo.collection_macros.size() > 0) {
-    macros_map::const_iterator this_macro=cinfo.collection_macros.begin();
-    macros_map::const_iterator done_macro=cinfo.collection_macros.end();
+    collectionmeta_map::const_iterator this_macro=cinfo.collection_macros.begin();
+    collectionmeta_map::const_iterator done_macro=cinfo.collection_macros.end();
     while (this_macro != done_macro) {
       text_t package = "Global";
@@ -1537 +1537 @@
       }
 
-      disp.setcollectionmacro(package,
-                  macroname,
-                  this_macro->second.first,   // params
-                  this_macro->second.second); // value
+      text_tmap params_map = this_macro->second;
+      text_tmap::const_iterator this_param = params_map.begin();
+      text_tmap::const_iterator done_param = params_map.end();
+      while (this_param != done_param) {
+        disp.setcollectionmacro(package,
+                    macroname,
+                    this_param->first,
+                    this_param->second);
+        ++this_param;
+      }
+      
       ++this_macro;
     }