Changeset 510 for trunk

Timestamp:

1999-09-02T12:26:11+12:00 (25 years ago)

Author:

rjmcnab

Message:

now there can be multiple values for a single key

Location:

trunk/gsdl/src/recpt

Files:

• infodbclass.cpp (modified) (10 diffs)
• infodbclass.h (modified) (5 diffs)

trunk/gsdl/src/recpt/infodbclass.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.3  1999/09/02 00:26:10  rjmcnab
+   now there can be multiple values for a single key
+
    Revision 1.2  1999/07/13 23:24:05  rjmcnab
    Added functionality to modify a gdbm database.
@@ -38 +41 @@
 #include "fileutil.h"
 #include "OIDtools.h"
-  
+#include <stdlib.h>
+
+
+
+
 // constructors
 infodbclass::infodbclass () {
@@ -44 +51 @@
 
 void infodbclass::setinfo (const text_t &key, const text_t &value) {
-  info[key] = value;
+  text_tarray &tarr = info[key];
+  tarr.erase(tarr.begin(), tarr.end());
+  tarr.push_back(value);
 }
 
@@ -53 +62 @@
 void infodbclass::setcinfo (const text_t &key, unsigned short c) {
   text_t t;
-  t.push_back(c);
-  setinfo(key,t);
+  t.push_back (c);
+  setinfo (key, t);
 }
 
@@ -61 +70 @@
   if (here == info.end()) return NULL;
 
-  return &((*here).second);
+  if ((*here).second.empty()) return NULL;
+  
+  return &((*here).second[0]);
 }
 
@@ -70 +81 @@
 }
 
+text_t &infodbclass::operator[] (const text_t &key) {
+  text_tarray &tarr = info[key];
+  if (tarr.empty()) {
+    text_t e;
+    tarr.push_back(e);
+  }
+  return tarr[0];
+}
+
+
+void infodbclass::addinfo (const text_t &key, const text_t &value) {
+  text_tarray &tarr = info[key];
+  tarr.push_back (value);
+}
+
+void infodbclass::addintinfo (const text_t &key, int value) {
+  addinfo (key, value);
+}
+
+void infodbclass::addcinfo (const text_t &key, unsigned short c) {
+  text_t t;
+  t.push_back(c);
+  addinfo (key, t);
+}
+
+text_tarray *infodbclass::getmultinfo (const text_t &key) {
+  iterator here = info.find (key);
+  if (here == info.end()) return NULL;
+
+  return &((*here).second);
+}
+
 
 
 
 // returns true if opened
-bool gdbmclass::opendatabase (const text_t &filename, int mode, int num_retrys) {
+bool gdbmclass::opendatabase (const text_t &filename, int mode, int num_retrys, 
+                  bool need_filelock) {
   text_t data_location;
   int block_size = 512;
@@ -87 +131 @@
   char *namebuffer = filename.getcstr();
   do {
+#ifdef __WIN32__
+      gdbmfile = gdbm_open (namebuffer, block_size, mode, 00664, NULL, (need_filelock) ? 1 : 0);
+#else
     gdbmfile = gdbm_open (namebuffer, block_size, mode, 00664, NULL);
+#endif
     num_retrys--;
   } while (num_retrys>0 && gdbmfile==NULL &&
@@ -114 +162 @@
   if (gdbmfile == NULL) return false;
 
+  text_t subkey;
   text_t data;
 
@@ -121 +170 @@
   while (info_here != info_end) {
     // add the key
-    data.push_back('<');
+    subkey.clear();
+    subkey.push_back('<');
     text_t::const_iterator subkey_here = (*info_here).first.begin();
     text_t::const_iterator subkey_end = (*info_here).first.end();
     while (subkey_here != subkey_end) {
       if (*subkey_here == '>') {
-    data.push_back('\\'); data.push_back('>');
+    subkey.push_back('\\'); subkey.push_back('>');
       } else if (*subkey_here == '\n') {
-    data.push_back('\\'); data.push_back('n');
+    subkey.push_back('\\'); subkey.push_back('n');
       } else if (*subkey_here == '\r') {
-    data.push_back('\\'); data.push_back('r');
+    subkey.push_back('\\'); subkey.push_back('r');
       } else {
-    data.push_back (*subkey_here);
+    subkey.push_back (*subkey_here);
       }
       subkey_here++;
     }
-    data.push_back('>');
-
-    // add the value
-    text_t::const_iterator subvalue_here = (*info_here).second.begin();
-    text_t::const_iterator subvalue_end = (*info_here).second.end();
+    subkey.push_back('>');
+
+    // add the values
+    text_tarray::const_iterator subvalue_here = (*info_here).second.begin();
+    text_tarray::const_iterator subvalue_end = (*info_here).second.end();
     while (subvalue_here != subvalue_end) {
-      if (*subvalue_here == '>') {
-    data.push_back('\\'); data.push_back('>');
-      } else if (*subvalue_here == '\n') {
-    data.push_back('\\'); data.push_back('n');
-      } else if (*subvalue_here == '\r') {
-    data.push_back('\\'); data.push_back('r');
-      } else {
-    data.push_back (*subvalue_here);
+      data += subkey;
+      
+      text_t::const_iterator thissubvalue_here = (*subvalue_here).begin();
+      text_t::const_iterator thissubvalue_end = (*subvalue_here).end();
+      while (thissubvalue_here != thissubvalue_end) {
+    if (*thissubvalue_here == '>') {
+      data.push_back('\\'); data.push_back('>');
+    } else if (*thissubvalue_here == '\n') {
+      data.push_back('\\'); data.push_back('n');
+    } else if (*thissubvalue_here == '\r') {
+      data.push_back('\\'); data.push_back('r');
+    } else {
+      data.push_back (*thissubvalue_here);
+    }
+    
+    thissubvalue_here++;
       }
+      
+      data.push_back('\n');
       subvalue_here++;
     }
-    data.push_back('\n');
-    
+
     info_here++;
   }
@@ -376 +435 @@
   info.clear (); // reset info
   
-  while (getinfoline(here, end, ikey, ivalue)) {
-    info[ikey] = ivalue;
+  while (getinfoline (here, end, ikey, ivalue)) {
+    info.addinfo (ikey, ivalue);
   }
   

trunk/gsdl/src/recpt/infodbclass.h

@@ -19 +19 @@
 
 #ifdef __WIN32__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 #include "autoconf.h"
 #include "systems.h"
 #include "gdbmconst.h"
 #include "gdbm.h"
+#ifdef __cplusplus
+}
+#endif
 
 #else
@@ -29 +36 @@
 
 
+typedef map<text_t, text_tarray, lttext_t> text_tarraymap;
+
+
 // infodbclass is used to store information about a object
 class infodbclass {
 protected:
-  text_tmap info;
+  text_tarraymap info;
 
 public:
-  //type support for text_tmap
-  typedef text_tmap::iterator iterator;
-  typedef text_tmap::const_iterator const_iterator;
-  typedef text_tmap::reference reference;
-  typedef text_tmap::const_reference const_reference;
-  typedef text_tmap::size_type size_type;
-  typedef text_tmap::difference_type difference_type;
-  typedef text_tmap::const_reverse_iterator const_reverse_iterator;
-  typedef text_tmap::reverse_iterator reverse_iterator;
+  // type support for text_tarraymap
+  typedef text_tarraymap::iterator iterator;
+  typedef text_tarraymap::const_iterator const_iterator;
+  typedef text_tarraymap::reference reference;
+  typedef text_tarraymap::const_reference const_reference;
+  typedef text_tarraymap::size_type size_type;
+  typedef text_tarraymap::difference_type difference_type;
+  typedef text_tarraymap::const_reverse_iterator const_reverse_iterator;
+  typedef text_tarraymap::reverse_iterator reverse_iterator;
   
   // constructors
@@ -65 +75 @@
   void clear () {info.erase(info.begin(),info.end());}
 
+  // the following functions deal with keys that can only
+  // have one value for compatibility
+  
   // getinfo returns NULL if there isn't an entry with
   // 'key' already defined, getintinfo returns 0 if there wasn't an
@@ -74 +87 @@
   text_t *getinfo (const text_t &key);
   int getintinfo (const text_t &key);
-  text_t &operator[] (const text_t &key) {return info[key];}
+  text_t &operator[] (const text_t &key);
+
+
+  // the next set of functions allow you to set and access keys
+  // that can have more than one value
+
+  // getmultinfo returns NULL if there isn't an entry with
+  // 'key' already defined
+  void addinfo (const text_t &key, const text_t &value);
+  void addintinfo (const text_t &key, int value);
+  void addcinfo (const text_t &key, unsigned short c);
+  text_tarray *getmultinfo (const text_t &key);
 };
 
@@ -84 +108 @@
   
   // returns true if opened
-  bool opendatabase (const text_t &filename, int mode=GDBM_READER, int num_retrys=1);
+  bool opendatabase (const text_t &filename, int mode, int num_retrys, 
+             bool need_filelock);
   void closedatabase ();