Changeset 10789

Timestamp:

2005-10-28T15:41:33+13:00 (18 years ago)

Author:

kjdon

Message:

added an option 'supercollectionoptions uniform_search_results_formatting' so that search results formatting all comes from the collection you are in rather than the each individual collection

Location:

trunk/gsdl/src

Files:

• colservr/collectserver.cpp (modified) (1 diff)
• recpt/comtypes.cpp (modified) (1 diff)
• recpt/comtypes.h (modified) (2 diffs)
• recpt/queryaction.cpp (modified) (2 diffs)

trunk/gsdl/src/colservr/collectserver.cpp

@@ -80 +80 @@
       else collectinfo.isBeta = false;
     } else if ((key == "ccscols") || (key == "supercollection")) collectinfo.ccsCols = cfgline;
+    else if (key == "supercollectionoptions") {
+      text_tarray::const_iterator begin = cfgline.begin();
+      text_tarray::const_iterator end = cfgline.end();
+      while(begin != end) {
+    
+    if (*begin == "uniform_search_results_formatting") {
+      collectinfo.ccsOptions |= CCSUniformSearchResultsFormatting;
+    }
+    begin++;
+      }
+    }
     else if (key == "builddate") collectinfo.buildDate = value.getint();
     else if (key == "languages") collectinfo.languages = cfgline;

trunk/gsdl/src/recpt/comtypes.cpp

@@ -56 +56 @@
   languages.erase(languages.begin(), languages.end());
   ccsCols.erase(ccsCols.begin(), ccsCols.end());
+  ccsOptions = 0;
   buildDate=0;
   buildType.clear();

trunk/gsdl/src/recpt/comtypes.h

@@ -72 +72 @@
 typedef map<text_t, text_tmap, lttext_t> collectionmeta_map; // maps meta name to langmap
 
+#define CCSUniformSearchResultsFormatting 1
+
 struct ColInfoResponse_t {
   void clear ();
@@ -83 +85 @@
   unsigned long buildDate;
   text_tarray ccsCols;    // empty if collection does not use cross-collection searching
+  int ccsOptions; // uses #defines from above
   text_tarray languages;
   unsigned long numDocs;     // 0 if not known

trunk/gsdl/src/recpt/queryaction.cpp

@@ -1107 +1107 @@
 
   map<text_t, int, lttext_t> termfreqs;
+  
+  // just check the main col for formatting info - use individual format statements, or the main one?
+  
+  browserclass *bptr = browsers->getbrowser (browsertype);
+  
+  text_t main_col = args["c"];
+  cinfo = recpt->get_collectinfo_ptr (collectproto, main_col, logout);
+  if (cinfo == NULL) {
+    logout << "ERROR (query_action::search_multiple_collections): get_collectinfo_ptr returned NULL for '"<<main_col<<"'\n";
+    return false;
+  }
+  
+  bool use_main_col_format = false;
+  if (cinfo->ccsOptions & CCSUniformSearchResultsFormatting) {
+    use_main_col_format = true;
+  }
+ 
+  request.fields.erase (request.fields.begin(), request.fields.end());
+  request.getParents = false;
+  bptr->load_metadata_defaults (request.fields);
+  
+  text_t formatstring;
+  format_t *formatlistptr = new format_t();
+  if (use_main_col_format) {
+    // just get one format for main coll and use it for each subcol
+    if (!get_formatstring (classification, browsertype, 
+               cinfo->format, formatstring)) {
+      formatstring = bptr->get_default_formatstring();
+    }
+    
+    parse_formatstring (formatstring, formatlistptr, request.fields, request.getParents);
+  }
+  
   while (col_here != col_end) {
-
-    request.fields.erase (request.fields.begin(), request.fields.end());
-    request.getParents = false;
 
     collectproto = protos->getrecptproto (*col_here, logout);
@@ -1125 +1155 @@
       continue;
     }
+
+    if (!use_main_col_format) {
+      request.fields.erase (request.fields.begin(), request.fields.end());
+      request.getParents = false;
+      bptr->load_metadata_defaults (request.fields);
+      
+    //browserclass *bptr = browsers->getbrowser (browsertype);
+
+    // get the formatstring if there is one 
+      if (!get_formatstring (classification, browsertype, 
+                 cinfo->format, formatstring)) {
+    formatstring = bptr->get_default_formatstring();
+      }
+
+      formatlistptr = new format_t();
+      parse_formatstring (formatstring, formatlistptr, request.fields, request.getParents);
+    }
     
-    browserclass *bptr = browsers->getbrowser (browsertype);
-
-    // get the formatstring if there is one 
-    text_t formatstring;
-    if (!get_formatstring (classification, browsertype, 
-               cinfo->format, formatstring))
-      formatstring = bptr->get_default_formatstring();
-
-    bptr->load_metadata_defaults (request.fields);
-
-    format_t *formatlistptr = new format_t();
-    parse_formatstring (formatstring, formatlistptr, request.fields, request.getParents);
-
     colinfo_t thiscolinfo;
     thiscolinfo.formatlistptr = formatlistptr;