Changeset 11259 for trunk/gsdl/src/recpt/OIDtools.cpp

Timestamp:

2006-02-15T16:38:22+13:00 (18 years ago)

Author:

mdewsnip

Message:

Various little bug fixes and improvements (many to get things working with Visual Studio 2005), by Emanuel Dejanu.

File:

• trunk/gsdl/src/recpt/OIDtools.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/OIDtools.cpp

@@ -229 +229 @@
 // get_parent returns the parent of the document or classification
 // specified by OID
-text_t get_parent (text_t OID) {
-
-  if (OID.empty() || is_top (OID)) return "";
+text_t get_parent (const text_t& OID)
+{
+  if (OID.empty() || is_top (OID)) return g_EmptyText;
 
   text_t::const_iterator begin = OID.begin();
@@ -237 +237 @@
 
   while (here >= begin) {
-    OID.pop_back();
-    if (*here == '.') break;
+    if (*here == '.')
+      break;
+    if (here == begin)
+      break;
     --here;
   }
-  return OID;
+
+  if (here != begin) {
+    text_t parentOID;
+    parentOID.appendrange(begin, here);
+    return parentOID;
+  }
+
+  return g_EmptyText;
 }