Changeset 18469 for gsdl/trunk/common-src/src/gdbmedit/txt2db/txt2db.cpp

Timestamp:

2009-02-06T18:19:44+13:00 (15 years ago)

Author:

davidb

Message:

Support for reindexing a document added

File:

• gsdl/trunk/common-src/src/gdbmedit/txt2db/txt2db.cpp (modified) (3 diffs)

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

@@ -72 +72 @@
   char *dbname;
   int append = 0;
+  int delkey = 0;
+
   if (argc == 3) {
     if (strcmp (argv[1], "-append") == 0) {
@@ -105 +107 @@
     value = "";
     
-    // look for [key]\n
+    // Parse out 'key' from [key]\n
+
+    // scan for first occurrence of [
     while (!cin.eof() && c != '[') cin.get(c);
+
     if (!cin.eof()) cin.get(c); // skip [
+
+    // now look for closing ], building up 'key' as we go
     while (!cin.eof() && c != ']') {
       key.push_back ((unsigned char)c);
       cin.get(c);
     }
-    if (!cin.eof()) cin.get(c); // skip ]
+
+    if (!cin.eof()) {
+      // most likely an eol char, but if '-', then signifies record
+      // is to be deleted, not added
+      cin.get(c); 
+      if (c == '-') {   
+    delkey = 1;
+      }
+      else {
+    delkey = 0;
+      }
+    }
     while (!cin.eof() && (c == '\n' || c == '\r')) cin.get(c);
     
@@ -155 +173 @@
       }
       key_data.dsize = strlen(key_data.dptr);
+
+      if (delkey) {
+    // delete the given key
+    if (gdbm_delete(dbf, key_data) < 0) {
+      cerr << "gdbm_delete returned an error" << endl;
+    }
+      }
+      else {
+
+    // add/append
+
+    // convert value to a datum datatype
+    datum value_data;
+    value_data.dptr = value.getcstr();
+    if (value_data.dptr == NULL) {
+      cerr << "NULL value_data.dptr" << endl;
+      exit (0);
+    }
+    value_data.dsize = strlen(value_data.dptr);
       
-      // convert value to a datum datatype
-      datum value_data;
-      value_data.dptr = value.getcstr();
-      if (value_data.dptr == NULL) {
-    cerr << "NULL value_data.dptr" << endl;
-    exit (0);
-      }
-      value_data.dsize = strlen(value_data.dptr);
-      
-      // store the value
-      if (gdbm_store (dbf, key_data, value_data, GDBM_REPLACE) < 0) {
-    cerr << "gdbm_store returned an error" << endl;
-    exit (0);
-      }
-      
+    // store the value
+    if (gdbm_store (dbf, key_data, value_data, GDBM_REPLACE) < 0) {
+      cerr << "gdbm_store returned an error" << endl;
+      exit (0);
+    }
+
+    
+    free(value_data.dptr);
+      }
+
       free(key_data.dptr);
-      free(value_data.dptr);
     }
   }