Changeset 650

Timestamp:

1999-10-10T21:20:37+13:00 (25 years ago)

Author:

sjboddie

Message:

• metadata now returns map rather than array
• redesigned browsing support (although it's not finished so

won't currently work ;-)

Location:

trunk/gsdl/src/colservr

Files:

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

trunk/gsdl/src/colservr/collectserver.cpp

@@ -29 +29 @@
 /*
    $Log$
+   Revision 1.16  1999/10/10 08:20:35  sjboddie
+   - metadata now returns map rather than array
+   - redesigned browsing support (although it's not finished so
+   won't currently work ;-)
+
    Revision 1.15  1999/09/07 04:57:20  sjboddie
    added gpl notice

trunk/gsdl/src/colservr/mggdbmsource.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.16  1999/10/10 08:20:36  sjboddie
+   - metadata now returns map rather than array
+   - redesigned browsing support (although it's not finished so
+   won't currently work ;-)
+
    Revision 1.15  1999/09/07 04:57:22  sjboddie
    added gpl notice
@@ -182 +187 @@
 
 bool mggdbmsourceclass::get_metadata (const text_t &/*requestParams*/, const text_t &/*refParams*/, 
-                      bool getParents, const text_tarray &fields, const text_t &OID,
-                      MetadataInfo_tarray &metadata, comerror_t &err, ostream &logout) {
+                      bool getParents, const text_tset &fields, 
+                      const text_t &OID, MetadataInfo_tmap &metadata, 
+                      comerror_t &err, ostream &logout) {
   outconvertclass text_t2ascii;
 
@@ -233 +239 @@
   }
 
-  // if fields array is empty we want to get all available metadata
-  text_tarray tfields = fields;
+  // if fields set is empty we want to get all available metadata
+  text_tset tfields = fields;
   if (tfields.empty() && !info_array.empty()) {
     infodbclass::iterator t_info = info_array[0].begin(); 
@@ -240 +246 @@
     while (t_info != e_info) {
       if ((*t_info).first != "contains")
-    tfields.push_back ((*t_info).first);
+    tfields.insert ((*t_info).first);
       t_info ++;
     }
-    tfields.push_back ("hasnext");
-    tfields.push_back ("hasprevious");
+    tfields.insert ("hasnext");
+    tfields.insert ("hasprevious");
   }
     
@@ -251 +257 @@
   bool hasnext=false, hasprevious=false;
   MetadataInfo_t this_metadata;
-  text_t *pos_metadata;
-  text_tarray::const_iterator fields_here = tfields.begin();
-  text_tarray::const_iterator fields_end = tfields.end();
+  text_tarray *pos_metadata;
+  text_tset::const_iterator fields_here = tfields.begin();
+  text_tset::const_iterator fields_end = tfields.end();
   while (fields_here != fields_end) {
     this_metadata.clear();
     this_metadata.isRef = false;
 
-    vector<infodbclass>::iterator this_info = info_array.begin(); 
-    vector<infodbclass>::iterator end_info = info_array.end(); 
-
+    vector<infodbclass>::reverse_iterator this_info = info_array.rbegin(); 
+    vector<infodbclass>::reverse_iterator end_info = info_array.rend(); 
+    MetadataInfo_t *tmetaptr = &this_metadata;
     while (this_info != end_info) {
 
-      pos_metadata = (*this_info).getinfo(*fields_here);
+      pos_metadata = (*this_info).getmultinfo(*fields_here);
     
       if ((*fields_here == "hasnext" || *fields_here == "hasprevious")) {
@@ -279 +285 @@
           text_t &parentinfocontains = parentinfo["contains"];
           if (!parentinfocontains.empty())
-        splitchar (parentinfocontains.begin(), parentinfocontains.end(), ';', parentcontents);
+        splitchar (parentinfocontains.begin(), parentinfocontains.end(), 
+               ';', parentcontents);
         }
       }
@@ -306 +313 @@
     
     // fill in metadata
-    this_metadata.name = *fields_here;
     if ((*fields_here == "hasnext" && hasnext) ||
         (*fields_here == "hasprevious" && hasprevious))
-      this_metadata.values.push_back("1");
+      tmetaptr->values.push_back("1");
     else
-      this_metadata.values.push_back("0");
+      tmetaptr->values.push_back("0");
     
       }
-      else if (pos_metadata != NULL && *fields_here != "contains") {
-    this_metadata.name = *fields_here;
-    this_metadata.values.push_back(*pos_metadata);
-      } else {
-    this_metadata.name = *fields_here;
-    this_metadata.values.push_back("");
+      else if (pos_metadata != NULL && *fields_here != "contains")
+    tmetaptr->values = *pos_metadata;
+      else
+    tmetaptr->values.push_back("");
+
+      this_info ++;
+      if (this_info != end_info) {
+    tmetaptr->parent = new MetadataInfo_t();
+    tmetaptr = tmetaptr->parent;
       }
-
-      this_info++;
     }
-    metadata.push_back(this_metadata);
+    metadata[*fields_here] = this_metadata;
     
     fields_here++;

trunk/gsdl/src/colservr/mggdbmsource.h

@@ -78 +78 @@
               comerror_t &err, ostream &logout);
   bool get_metadata (const text_t &requestParams, const text_t &refParams, 
-             bool getParents, const text_tarray &fields, const text_t &OID,
-             MetadataInfo_tarray &metadata, comerror_t &err, ostream &logout);
+             bool getParents, const text_tset &fields, 
+             const text_t &OID, MetadataInfo_tmap &metadata, 
+             comerror_t &err, ostream &logout);
   bool get_document (const text_t &OID, text_t &doc, 
              comerror_t &err, ostream &logout);

trunk/gsdl/src/colservr/source.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.8  1999/10/10 08:20:36  sjboddie
+   - metadata now returns map rather than array
+   - redesigned browsing support (although it's not finished so
+   won't currently work ;-)
+
    Revision 1.7  1999/09/07 04:57:25  sjboddie
    added gpl notice
@@ -90 +95 @@
 // for the given OID then it will return false.
 bool sourceclass::get_metadata (const text_t &/*requestParams*/, const text_t &/*refParams*/, 
-                bool /*getParents*/, const text_tarray &/*fields*/, const text_t &/*OID*/,
-                MetadataInfo_tarray &metadata, comerror_t &err, ostream &/*logout*/) {
+                bool /*getParents*/, const text_tset &/*fields*/, 
+                const text_t &/*OID*/, MetadataInfo_tmap &metadata, 
+                comerror_t &err, ostream &/*logout*/) {
   metadata.erase(metadata.begin(), metadata.end());
   err = noError;

trunk/gsdl/src/colservr/source.h

@@ -54 +54 @@
   // for the given OID then it will return false.
   virtual bool get_metadata (const text_t &requestParams, const text_t &refParams, 
-                 bool getParents, const text_tarray &fields, const text_t &OID,
-                 MetadataInfo_tarray &metadata, comerror_t &err, ostream &logout);
+                 bool getParents, const text_tset &fields,
+                 const text_t &OID, MetadataInfo_tmap &metadata, 
+                 comerror_t &err, ostream &logout);
 
   virtual bool get_document (const text_t &OID, text_t &doc,