Changeset 803 for trunk

Timestamp:

1999-12-06T10:27:30+13:00 (24 years ago)

Author:

sjboddie

Message:

added support for multiple gsdlhomes and gdbmhome

Location:

trunk/gsdl/src/colservr

Files:

• mggdbmsource.cpp (modified) (8 diffs)
• mggdbmsource.h (modified) (1 diff)

trunk/gsdl/src/colservr/mggdbmsource.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.18  1999/12/05 21:27:30  sjboddie
+   added support for multiple gsdlhomes and gdbmhome
+
    Revision 1.17  1999/10/19 03:23:40  davidb
    Collection building support through web pages
@@ -110 +113 @@
     else if (key == "collectdir") collectdir = value;
     else if (key == "gsdlhome") gsdlhome = value;
+    else if (key == "gdbmhome") gdbmhome = value;
   }
 
@@ -134 +138 @@
   outconvertclass text_t2ascii;
   
+  if (gdbmhome.empty()) gdbmhome = gsdlhome;
+
   if (!sourceclass::init (logout)) return false;
   
   // get the collection directory name
   if (collectdir.empty()) {
-    collectdir = filename_cat (gsdlhome, "collect", collection);
+    collectdir = filename_cat (gdbmhome, "collect", collection);
   }
   
@@ -190 +196 @@
 }
 
-bool mggdbmsourceclass::get_metadata (const text_t &/*requestParams*/, const text_t &/*refParams*/, 
+bool mggdbmsourceclass::get_metadata (const text_t &requestParams, const text_t &refParams, 
                       bool getParents, const text_tset &fields, 
                       const text_t &OID, MetadataInfo_tmap &metadata, 
@@ -264 +270 @@
   text_tset::const_iterator fields_here = tfields.begin();
   text_tset::const_iterator fields_end = tfields.end();
+
   while (fields_here != fields_end) {
     this_metadata.clear();
@@ -271 +278 @@
     vector<infodbclass>::reverse_iterator end_info = info_array.rend(); 
     MetadataInfo_t *tmetaptr = &this_metadata;
+    int count = 0;
     while (this_info != end_info) {
 
       pos_metadata = (*this_info).getmultinfo(*fields_here);
-    
       if ((*fields_here == "hasnext" || *fields_here == "hasprevious")) {
     
@@ -283 +290 @@
       // cache parent contents array
       text_t thisparent = get_parent (OID);
-      if (thisparent != parentOID) {
-        parentOID = thisparent;
-        parentcontents.erase(parentcontents.begin(), parentcontents.end());
-        if (gdbmptr->getinfo(parentOID, parentinfo)) {
-          text_t &parentinfocontains = parentinfo["contains"];
-          if (!parentinfocontains.empty())
-        splitchar (parentinfocontains.begin(), parentinfocontains.end(), 
-               ';', parentcontents);
+      if (!thisparent.empty()) {
+        if (thisparent != parentOID) {
+          parentOID = thisparent;
+          parentcontents.erase(parentcontents.begin(), parentcontents.end());
+          if (gdbmptr->getinfo(parentOID, parentinfo)) {
+        text_t &parentinfocontains = parentinfo["contains"];
+        if (!parentinfocontains.empty())
+          splitchar (parentinfocontains.begin(), parentinfocontains.end(), 
+                 ';', parentcontents);
+          }
         }
-      }
-      
-      // do tests
-      text_tarray::const_iterator parentcontents_here = parentcontents.begin();
-      text_tarray::const_iterator parentcontents_end = parentcontents.end();
-      text_t shrunk_OID = OID;
-      shrink_parent (shrunk_OID);
-      while (parentcontents_here != parentcontents_end) {
-        if (*parentcontents_here == shrunk_OID) {
-          if (parentcontents_here == parentcontents.begin()) hasprevious = false;
-          else hasprevious = true;
+        
+        // do tests
+        text_tarray::const_iterator parentcontents_here = parentcontents.begin();
+        text_tarray::const_iterator parentcontents_end = parentcontents.end();
+        text_t shrunk_OID = OID;
+        shrink_parent (shrunk_OID);
+        while (parentcontents_here != parentcontents_end) {
+          if (*parentcontents_here == shrunk_OID) {
+        if (parentcontents_here == parentcontents.begin()) hasprevious = false;
+        else hasprevious = true;
+        
+        parentcontents_here++;
+        
+        if (parentcontents_here == parentcontents.end()) hasnext = false;
+        else hasnext = true;
+        
+        break;
+          }  
           
-          parentcontents_here++;
-          
-          if (parentcontents_here == parentcontents.end()) hasnext = false;
-          else hasnext = true;
-          
-          break;
-        }  
-        
-        parentcontents_here ++;
-      }
-    }  
-    
-    // fill in metadata
-    if ((*fields_here == "hasnext" && hasnext) ||
-        (*fields_here == "hasprevious" && hasprevious))
-      tmetaptr->values.push_back("1");
-    else
-      tmetaptr->values.push_back("0");
-    
+          parentcontents_here ++;
+        }
+     
+        // fill in metadata
+        if ((*fields_here == "hasnext" && hasnext) ||
+        (*fields_here == "hasprevious" && hasprevious))
+          tmetaptr->values.push_back("1");
+        else
+          tmetaptr->values.push_back("0");
+      } else
+        tmetaptr->values.push_back("0");
+    }
       }
-      else if (pos_metadata != NULL && *fields_here != "contains")
+      else if (pos_metadata != NULL && *fields_here != "contains") {
     tmetaptr->values = *pos_metadata;
+      }
       else
     tmetaptr->values.push_back("");
@@ -336 +346 @@
     }
     metadata[*fields_here] = this_metadata;
-    
     fields_here++;
   }
-
   return true;
 }

trunk/gsdl/src/colservr/mggdbmsource.h

@@ -42 +42 @@
 protected:
   text_t gsdlhome;
+  text_t gdbmhome;
   text_t collection;
   text_t collectdir;