Changeset 17091

Timestamp:

2008-08-29T14:01:12+12:00 (16 years ago)

Author:

davidb

Message:

Modification to gdbm set/get to support enhanced GDMB version of archives.inf

Location:

gsdl/trunk/common-src/src/gdbmedit

Files:

• gdbmget/gdbmget.cpp (modified) (3 diffs)
• gdbmset/gdbmset.cpp (modified) (3 diffs)

gsdl/trunk/common-src/src/gdbmedit/gdbmget/gdbmget.cpp

@@ -57 +57 @@
 print_usage (char *program_name) 
 {
-  cerr << "usage: " << program_name << " <database_path> <key>\n\n";
+  cerr << "usage: " << program_name << " <database_path> <key>" << endl;
+  cerr << endl;
 }
 
 
-int 
-main (int argc, char *argv[]) 
+int main (int argc, char *argv[]) 
 {
   int block_size = 0;
@@ -72 +72 @@
     {
       print_usage (argv[0]);
-      exit (0);
+      exit (-1);
     }
   
@@ -84 +84 @@
     {
       cerr << "couldn't create " << argv[1] << "\n";
-      exit (0);
+      exit (-1);
     }
   

gsdl/trunk/common-src/src/gdbmedit/gdbmset/gdbmset.cpp

@@ -57 +57 @@
 print_usage (char *program_name) 
 {
-  cerr << "usage: " << program_name << " <database_path> <key> [<value>]\n";
-  cerr << "\t- if no value is given then the lexicon indicated by the key is removed\n\n";
+  cerr << "usage: " << program_name << " <database_path> <key> [<value>] [append]" << endl;
+  cerr << "\t- if no value is given then the lexicon indicated by the key is removed" << endl;
+  cerr << "\t- if a value is given followed by 'append' then the value is " << endl;
+  cerr << "\t  added to the existing entry rather than overwriting it" << endl;
+  cerr << endl;
 }
 
 
-int 
-main (int argc, char *argv[]) 
+int main (int argc, char *argv[]) 
 {
   int block_size = 0;
   GDBM_FILE dbf;
-  datum key, content;
+  datum key;
   
   // sanity check
-  if (argc < 3) 
-    {
+  if ((argc < 3) || (argc>5)) {
       print_usage (argv[0]);
-      exit (0);
-    }
+      exit (-1);
+  }
   
   // open the database
@@ -85 +86 @@
     {
       cerr << "couldn't open database connection to " << argv[1] << "\n";
-      exit (0);
+      exit (-1);
     }
   
   key.dsize = strlen(argv[2]);
   key.dptr = argv[2];
-  if(argc == 4)
-    {
+
+  if(argc == 5) {
+    
+    if (strcmp(argv[4],"append")==0) {
+      datum orig_content,concat_content;
+
+      //cerr << "Appending [" << argv[2] << "] to '" << argv[3] << "' (length " << strlen(argv[3]) << ")\n";
+      // get old value, then top up
+
+      orig_content = gdbm_fetch (dbf, key);
+
+      // append orig_content with argv[3]
+      concat_content.dsize = orig_content.dsize + strlen(argv[3]);
+      char* concat_data = new char[concat_content.dsize +1];//  make room for \0 at end
+      if (orig_content.dsize>0) {
+    strncpy(concat_data,orig_content.dptr,orig_content.dsize);
+    strcpy(&concat_data[orig_content.dsize],argv[3]); // ensures \0 at end
+      }
+      else {
+    // first time key has been used
+    strcpy(concat_data,argv[3]); // ensures \0 at end
+      }
+
+      concat_content.dptr = concat_data;
+      if(gdbm_store(dbf, key, concat_content, GDBM_REPLACE) != 0)
+        {
+          cerr << "failed to set [" << argv[2] << "] to '" << concat_data << "'\n";
+        }
+      delete [] concat_data;
+    }
+    else {
+      print_usage (argv[0]);
+      gdbm_close (dbf);
+      exit(-1);
+    }
+  }
+  else if (argc == 4) {
+      datum content;
+
       //cerr << "Setting [" << argv[2] << "] to '" << argv[3] << "' (length " << strlen(argv[3]) << ")\n";
       content.dsize = strlen(argv[3]);
@@ -108 +146 @@
     }
   gdbm_close (dbf);
+
   return 0;
 }