Changeset 460 for trunk

Timestamp:

1999-08-13T16:20:27+12:00 (25 years ago)

Author:

sjboddie

Message:

added ability to get return all available metadata when 'fields' is empty

File:

• trunk/gsdl/src/colservr/mggdbmsource.cpp (modified) (6 diffs)

trunk/gsdl/src/colservr/mggdbmsource.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.13  1999/08/13 04:20:27  sjboddie
+   added ability to get return all available metadata when 'fields' is empty
+
    Revision 1.12  1999/07/07 06:17:47  rjmcnab
    broke search_index into index+subcollection+language
@@ -109 +112 @@
   // get the filename for the database and make sure it exists
   gdbm_filename = filename_cat(collectdir,"index","text",collection);
+
+  // temporary hack for niupepa
+  if (collection == "niupepa")
+    gdbm_filename = filename_cat(collectdir,"index.new","text",collection);
+
 #ifdef _LITTLE_ENDIAN
   gdbm_filename += ".ldb";
@@ -207 +215 @@
   }
 
+  // if fields array is empty we want to get all available metadata
+  text_tarray tfields = fields;
+  if (tfields.empty() && !info_array.empty()) {
+    infodbclass::iterator t_info = info_array[0].begin(); 
+    infodbclass::iterator e_info = info_array[0].end(); 
+    while (t_info != e_info) {
+      if ((*t_info).first != "contains")
+    tfields.push_back ((*t_info).first);
+      t_info ++;
+    }
+    tfields.push_back ("hasnext");
+    tfields.push_back ("hasprevious");
+  }
+    
   // collect together the metadata
   bool donenextprevtest = false;
@@ -212 +234 @@
   MetadataInfo_t this_metadata;
   text_t *pos_metadata;
-  text_tarray::const_iterator fields_here = fields.begin();
-  text_tarray::const_iterator fields_end = fields.end();
+  text_tarray::const_iterator fields_here = tfields.begin();
+  text_tarray::const_iterator fields_end = tfields.end();
   while (fields_here != fields_end) {
     this_metadata.clear();
@@ -266 +288 @@
     
     // fill in metadata
+    this_metadata.name = *fields_here;
     if ((*fields_here == "hasnext" && hasnext) ||
         (*fields_here == "hasprevious" && hasprevious))
@@ -273 +296 @@
     
       }
-      else if (pos_metadata != NULL && *fields_here != "contains")
+      else if (pos_metadata != NULL && *fields_here != "contains") {
+    this_metadata.name = *fields_here;
     this_metadata.values.push_back(*pos_metadata);
-      else 
+      } else {
+    this_metadata.name = *fields_here;
     this_metadata.values.push_back("");
-      
+      }
 
       this_info++;