- for (std::map<std::string, std::list<std::string> >::iterator tag = ($1)->begin();
- tag != ($1)->end(); ++tag) {
- std::string first = tag->first;
- // Do not publish entries whose keys is made of spaces
- if (first.length() == 0)
- continue;
- NewKey = PyString_FromString(first.c_str());
- PyObject* NewList = PyList_New(0);
- for (std::list<std::string>::iterator Item = tag->second.begin();
- Item != tag->second.end(); ++Item) {
- NewVal = PyString_FromString(Item->c_str());
- PyList_Append( NewList, NewVal);
- }
- PyDict_SetItem( NewDict, NewKey, NewList);
- }
- $result = NewDict;
-}
-
-////////////////////////////////////////////////////////////////////////////
-// Convert a c++ hash table in a python native dictionary
-%typemap(out) TagHeaderEntryHT & {
- PyObject* NewDict = PyDict_New(); // The result of this typemap
- std::string RawName; // Element name as gotten from gdcm
- PyObject* NewKey = (PyObject*)0; // Associated name as python object
- std::string RawValue; // Element value as gotten from gdcm
- PyObject* NewVal = (PyObject*)0; // Associated value as python object
-
- for (TagHeaderEntryHT::iterator tag = $1->begin(); tag != $1->end(); ++tag) {
-
- // The element name shall be the key:
- RawName = tag->second->GetName();
- // gdcm unrecognized (including not loaded because their size exceeds
- // the user specified treshold) elements are exported with their
- // TagKey as key.
- if (RawName == "Unknown")
- RawName = tag->second->GetKey();
- NewKey = PyString_FromString(RawName.c_str());
-
- // Element values are striped from leading/trailing spaces
- RawValue = tag->second->GetValue();
- EatLeadingAndTrailingSpaces(RawValue);
- NewVal = PyString_FromString(RawValue.c_str());
-
- PyDict_SetItem( NewDict, NewKey, NewVal);
- }
- $result = NewDict;
+////////////////////////////////////////////////
+// Convert a DocEntry * to the real derived class
+%typemap(out) GDCM_NAME_SPACE::DocEntry *
+{
+ PyObject *newEntry;
+
+ if($1)
+ {
+ if(dynamic_cast<SeqEntry *>($1)) // SeqEntry *
+ newEntry = SWIG_NewPointerObj($1,SWIGTYPE_p_GDCM_NAME_SPACE__SeqEntry,0);
+ else if(dynamic_cast<DataEntry *>($1)) // DataEntry *
+ newEntry = SWIG_NewPointerObj($1,SWIGTYPE_p_GDCM_NAME_SPACE__DataEntry,0);
+ else
+ newEntry = NULL;
+ }
+ else
+ {
+ newEntry = Py_BuildValue("");
+ }
+ $result = newEntry;