Changeset 671

Timestamp:

1999-10-15T12:02:34+13:00 (25 years ago)

Author:

sjboddie

Message:

fixed bug in new parent metadata stuff

Location:

trunk/gsdl/src/recpt

Files:

• comtypes.cpp (modified) (2 diffs)
• comtypes.h (modified) (1 diff)

trunk/gsdl/src/recpt/comtypes.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.20  1999/10/14 23:02:34  sjboddie
+   fixed bug in new parent metadata stuff
+
    Revision 1.19  1999/10/10 07:49:35  sjboddie
    - metadata now returns map rather than array
@@ -234 +237 @@
   isRef = false;
   values.erase(values.begin(), values.end());
-  parent = NULL;
-}
-
+  if (parent != NULL) {
+    delete parent;
+    parent = NULL;
+  }
+}
+
+MetadataInfo_t::MetadataInfo_t () {parent=NULL;clear();}
+
+// copy constructor
+MetadataInfo_t::MetadataInfo_t (const MetadataInfo_t &x) {
+  params = x.params;
+  isRef = x.isRef;
+  values = x.values;
+  if (x.parent == NULL) parent = NULL;
+  else {
+    parent = new MetadataInfo_t ();
+    *parent = *(x.parent);
+  }
+}
+
+MetadataInfo_t::~MetadataInfo_t () {
+  if (parent != NULL) {
+    delete parent;
+    parent = NULL;
+  }
+}
+
+MetadataInfo_t &MetadataInfo_t::operator=(const MetadataInfo_t &x) {
+  if (&x != this) {
+    params = x.params;
+    isRef = x.isRef;
+    values = x.values;
+    if (x.parent == NULL) parent = NULL;
+    else {
+      parent = new MetadataInfo_t ();
+      *parent = *(x.parent);
+    }
+  }
+  return *this;
+}
 
 void ResultDocInfo_t::clear () {

trunk/gsdl/src/recpt/comtypes.h

@@ -262 +262 @@
 // }
 struct MetadataInfo_t {
-  void clear ();
-  MetadataInfo_t () {clear();}
-  
   text_t params;
   bool isRef;
   text_tarray values;
   MetadataInfo_t *parent;
+
+  void clear ();
+  MetadataInfo_t ();
+  MetadataInfo_t (const MetadataInfo_t &x); // copy constructor
+  ~MetadataInfo_t ();
+  MetadataInfo_t &operator=(const MetadataInfo_t &x);
 };