Index: /issm/trunk/src/c/objects/KML/KML_ColorStyle.cpp =================================================================== --- /issm/trunk/src/c/objects/KML/KML_ColorStyle.cpp (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_ColorStyle.cpp (revision 8293) @@ -91,6 +91,26 @@ /*FUNCTION KML_ColorStyle::Read {{{1*/ -void KML_ColorStyle::Read(FILE* filin,char* kstr){ +void KML_ColorStyle::Read(FILE* fid,char* kstr){ +/* process field within opening and closing tags */ + + if (!strncmp(kstr,"")) + KMLFileTokenParse( color ,NULL,KML_COLORSTYLE_COLOR_LENGTH, + kstr, + fid); + else if (!strcmp(kstr,"")) + KMLFileTokenParse( colormode ,NULL,KML_COLORSTYLE_COLORMODE_LENGTH, + kstr, + fid); + + else if (!strncmp(kstr,"<",1)) + KML_SubStyle::Read(fid,kstr); return; @@ -98,37 +118,2 @@ /*}}}*/ -/*FUNCTION KML_ColorStyle::Id {{{1*/ -int KML_ColorStyle::Id(){ -} -/*}}}*/ - -/*FUNCTION KML_ColorStyle::MyRank {{{1*/ -int KML_ColorStyle::MyRank(){ -} -/*}}}*/ - -/*FUNCTION KML_ColorStyle::Marshall {{{1*/ -void KML_ColorStyle::Marshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_ColorStyle::MarshallSize {{{1*/ -int KML_ColorStyle::MarshallSize(){ -} -/*}}}*/ - -/*FUNCTION KML_ColorStyle::Demarshall {{{1*/ -void KML_ColorStyle::Demarshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_ColorStyle::Enum {{{1*/ -int KML_ColorStyle::Enum(){ -} -/*}}}*/ - -/*FUNCTION KML_ColorStyle::copy {{{1*/ -Object* KML_ColorStyle::copy(){ -} -/*}}}*/ - Index: /issm/trunk/src/c/objects/KML/KML_ColorStyle.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_ColorStyle.h (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_ColorStyle.h (revision 8293) @@ -35,11 +35,11 @@ void Write(FILE* fid,char* indent); void Read(FILE* fid,char* kstr); - int Id(); - int MyRank(); - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - int Enum(); - Object* copy(); + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int Enum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Container.cpp =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Container.cpp (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_Container.cpp (revision 8293) @@ -151,37 +151,2 @@ /*}}}*/ -/*FUNCTION KML_Container::Id {{{1*/ -int KML_Container::Id(){ -} -/*}}}*/ - -/*FUNCTION KML_Container::MyRank {{{1*/ -int KML_Container::MyRank(){ -} -/*}}}*/ - -/*FUNCTION KML_Container::Marshall {{{1*/ -void KML_Container::Marshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_Container::MarshallSize {{{1*/ -int KML_Container::MarshallSize(){ -} -/*}}}*/ - -/*FUNCTION KML_Container::Demarshall {{{1*/ -void KML_Container::Demarshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_Container::Enum {{{1*/ -int KML_Container::Enum(){ -} -/*}}}*/ - -/*FUNCTION KML_Container::copy {{{1*/ -Object* KML_Container::copy(){ -} -/*}}}*/ - Index: /issm/trunk/src/c/objects/KML/KML_Container.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Container.h (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_Container.h (revision 8293) @@ -31,11 +31,11 @@ void Write(FILE* fid,char* indent); void Read(FILE* fid,char* kstr); - int Id(); - int MyRank(); - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - int Enum(); - Object* copy(); + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int Enum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Document.cpp =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Document.cpp (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_Document.cpp (revision 8293) @@ -121,37 +121,2 @@ /*}}}*/ -/*FUNCTION KML_Document::Id {{{1*/ -int KML_Document::Id(){ -} -/*}}}*/ - -/*FUNCTION KML_Document::MyRank {{{1*/ -int KML_Document::MyRank(){ -} -/*}}}*/ - -/*FUNCTION KML_Document::Marshall {{{1*/ -void KML_Document::Marshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_Document::MarshallSize {{{1*/ -int KML_Document::MarshallSize(){ -} -/*}}}*/ - -/*FUNCTION KML_Document::Demarshall {{{1*/ -void KML_Document::Demarshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_Document::Enum {{{1*/ -int KML_Document::Enum(){ -} -/*}}}*/ - -/*FUNCTION KML_Document::copy {{{1*/ -Object* KML_Document::copy(){ -} -/*}}}*/ - Index: /issm/trunk/src/c/objects/KML/KML_Document.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Document.h (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_Document.h (revision 8293) @@ -31,11 +31,11 @@ void Write(FILE* fid,char* indent); void Read(FILE* fid,char* kstr); - int Id(); - int MyRank(); - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - int Enum(); - Object* copy(); + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int Enum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Feature.cpp =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Feature.cpp (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_Feature.cpp (revision 8293) @@ -192,37 +192,2 @@ /*}}}*/ -/*FUNCTION KML_Feature::Id {{{1*/ -int KML_Feature::Id(){ -} -/*}}}*/ - -/*FUNCTION KML_Feature::MyRank {{{1*/ -int KML_Feature::MyRank(){ -} -/*}}}*/ - -/*FUNCTION KML_Feature::Marshall {{{1*/ -void KML_Feature::Marshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_Feature::MarshallSize {{{1*/ -int KML_Feature::MarshallSize(){ -} -/*}}}*/ - -/*FUNCTION KML_Feature::Demarshall {{{1*/ -void KML_Feature::Demarshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_Feature::Enum {{{1*/ -int KML_Feature::Enum(){ -} -/*}}}*/ - -/*FUNCTION KML_Feature::copy {{{1*/ -Object* KML_Feature::copy(){ -} -/*}}}*/ - Index: /issm/trunk/src/c/objects/KML/KML_Feature.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Feature.h (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_Feature.h (revision 8293) @@ -44,11 +44,11 @@ void Write(FILE* fid,char* indent); void Read(FILE* fid,char* kstr); - int Id(); - int MyRank(); - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - int Enum(); - Object* copy(); + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int Enum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Folder.cpp =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Folder.cpp (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_Folder.cpp (revision 8293) @@ -92,4 +92,30 @@ void KML_Folder::Read(FILE* fid,char* kstr){ + char* kstri; + +/* check for id attribute */ + +// KML_Object::Read(fid,kstr); + KMLFileTagAttrib( id ,NULL,KML_OBJECT_ID_LENGTH, + kstr, + "id"); + +/* loop over and process fields within opening and closing tags */ + + while (kstri=KMLFileToken(fid)) { + if (!strncmp(kstri,"KML_Object::Write(filout,indent); + KML_Object::Write(filout,indent); return; @@ -75,6 +75,7 @@ /*FUNCTION KML_Geometry::Read {{{1*/ -void KML_Geometry::Read(FILE* filin,char* kstr){ +void KML_Geometry::Read(FILE* fid,char* kstr){ + KML_Object::Read(fid,kstr); return; @@ -82,37 +83,2 @@ /*}}}*/ -/*FUNCTION KML_Geometry::Id {{{1*/ -int KML_Geometry::Id(){ -} -/*}}}*/ - -/*FUNCTION KML_Geometry::MyRank {{{1*/ -int KML_Geometry::MyRank(){ -} -/*}}}*/ - -/*FUNCTION KML_Geometry::Marshall {{{1*/ -void KML_Geometry::Marshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_Geometry::MarshallSize {{{1*/ -int KML_Geometry::MarshallSize(){ -} -/*}}}*/ - -/*FUNCTION KML_Geometry::Demarshall {{{1*/ -void KML_Geometry::Demarshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_Geometry::Enum {{{1*/ -int KML_Geometry::Enum(){ -} -/*}}}*/ - -/*FUNCTION KML_Geometry::copy {{{1*/ -Object* KML_Geometry::copy(){ -} -/*}}}*/ - Index: /issm/trunk/src/c/objects/KML/KML_Geometry.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Geometry.h (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_Geometry.h (revision 8293) @@ -29,11 +29,11 @@ void Write(FILE* fid,char* indent); void Read(FILE* fid,char* kstr); - int Id(); - int MyRank(); - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - int Enum(); - Object* copy(); + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int Enum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_LineString.cpp =================================================================== --- /issm/trunk/src/c/objects/KML/KML_LineString.cpp (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_LineString.cpp (revision 8293) @@ -123,5 +123,5 @@ /*FUNCTION KML_LineString::Read {{{1*/ -void KML_LineString::Read(FILE* filin,char* kstr){ +void KML_LineString::Read(FILE* fid,char* kstr){ @@ -130,37 +130,2 @@ /*}}}*/ -/*FUNCTION KML_LineString::Id {{{1*/ -int KML_LineString::Id(){ -} -/*}}}*/ - -/*FUNCTION KML_LineString::MyRank {{{1*/ -int KML_LineString::MyRank(){ -} -/*}}}*/ - -/*FUNCTION KML_LineString::Marshall {{{1*/ -void KML_LineString::Marshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_LineString::MarshallSize {{{1*/ -int KML_LineString::MarshallSize(){ -} -/*}}}*/ - -/*FUNCTION KML_LineString::Demarshall {{{1*/ -void KML_LineString::Demarshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_LineString::Enum {{{1*/ -int KML_LineString::Enum(){ -} -/*}}}*/ - -/*FUNCTION KML_LineString::copy {{{1*/ -Object* KML_LineString::copy(){ -} -/*}}}*/ - Index: /issm/trunk/src/c/objects/KML/KML_LineString.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_LineString.h (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_LineString.h (revision 8293) @@ -37,11 +37,11 @@ void Write(FILE* fid,char* indent); void Read(FILE* fid,char* kstr); - int Id(); - int MyRank(); - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - int Enum(); - Object* copy(); + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int Enum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_LineStyle.cpp =================================================================== --- /issm/trunk/src/c/objects/KML/KML_LineStyle.cpp (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_LineStyle.cpp (revision 8293) @@ -97,5 +97,5 @@ /*FUNCTION KML_LineStyle::Read {{{1*/ -void KML_LineStyle::Read(FILE* filin,char* kstr){ +void KML_LineStyle::Read(FILE* fid,char* kstr){ @@ -104,37 +104,2 @@ /*}}}*/ -/*FUNCTION KML_LineStyle::Id {{{1*/ -int KML_LineStyle::Id(){ -} -/*}}}*/ - -/*FUNCTION KML_LineStyle::MyRank {{{1*/ -int KML_LineStyle::MyRank(){ -} -/*}}}*/ - -/*FUNCTION KML_LineStyle::Marshall {{{1*/ -void KML_LineStyle::Marshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_LineStyle::MarshallSize {{{1*/ -int KML_LineStyle::MarshallSize(){ -} -/*}}}*/ - -/*FUNCTION KML_LineStyle::Demarshall {{{1*/ -void KML_LineStyle::Demarshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_LineStyle::Enum {{{1*/ -int KML_LineStyle::Enum(){ -} -/*}}}*/ - -/*FUNCTION KML_LineStyle::copy {{{1*/ -Object* KML_LineStyle::copy(){ -} -/*}}}*/ - Index: /issm/trunk/src/c/objects/KML/KML_LineStyle.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_LineStyle.h (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_LineStyle.h (revision 8293) @@ -31,11 +31,11 @@ void Write(FILE* fid,char* indent); void Read(FILE* fid,char* kstr); - int Id(); - int MyRank(); - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - int Enum(); - Object* copy(); + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int Enum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_LinearRing.cpp =================================================================== --- /issm/trunk/src/c/objects/KML/KML_LinearRing.cpp (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_LinearRing.cpp (revision 8293) @@ -123,5 +123,5 @@ /*FUNCTION KML_LinearRing::Read {{{1*/ -void KML_LinearRing::Read(FILE* filin,char* kstr){ +void KML_LinearRing::Read(FILE* fid,char* kstr){ @@ -130,37 +130,2 @@ /*}}}*/ -/*FUNCTION KML_LinearRing::Id {{{1*/ -int KML_LinearRing::Id(){ -} -/*}}}*/ - -/*FUNCTION KML_LinearRing::MyRank {{{1*/ -int KML_LinearRing::MyRank(){ -} -/*}}}*/ - -/*FUNCTION KML_LinearRing::Marshall {{{1*/ -void KML_LinearRing::Marshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_LinearRing::MarshallSize {{{1*/ -int KML_LinearRing::MarshallSize(){ -} -/*}}}*/ - -/*FUNCTION KML_LinearRing::Demarshall {{{1*/ -void KML_LinearRing::Demarshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_LinearRing::Enum {{{1*/ -int KML_LinearRing::Enum(){ -} -/*}}}*/ - -/*FUNCTION KML_LinearRing::copy {{{1*/ -Object* KML_LinearRing::copy(){ -} -/*}}}*/ - Index: /issm/trunk/src/c/objects/KML/KML_LinearRing.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_LinearRing.h (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_LinearRing.h (revision 8293) @@ -37,11 +37,11 @@ void Write(FILE* fid,char* indent); void Read(FILE* fid,char* kstr); - int Id(); - int MyRank(); - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - int Enum(); - Object* copy(); + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int Enum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_MultiGeometry.cpp =================================================================== --- /issm/trunk/src/c/objects/KML/KML_MultiGeometry.cpp (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_MultiGeometry.cpp (revision 8293) @@ -120,5 +120,5 @@ /*FUNCTION KML_MultiGeometry::Read {{{1*/ -void KML_MultiGeometry::Read(FILE* filin,char* kstr){ +void KML_MultiGeometry::Read(FILE* fid,char* kstr){ @@ -127,37 +127,2 @@ /*}}}*/ -/*FUNCTION KML_MultiGeometry::Id {{{1*/ -int KML_MultiGeometry::Id(){ -} -/*}}}*/ - -/*FUNCTION KML_MultiGeometry::MyRank {{{1*/ -int KML_MultiGeometry::MyRank(){ -} -/*}}}*/ - -/*FUNCTION KML_MultiGeometry::Marshall {{{1*/ -void KML_MultiGeometry::Marshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_MultiGeometry::MarshallSize {{{1*/ -int KML_MultiGeometry::MarshallSize(){ -} -/*}}}*/ - -/*FUNCTION KML_MultiGeometry::Demarshall {{{1*/ -void KML_MultiGeometry::Demarshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_MultiGeometry::Enum {{{1*/ -int KML_MultiGeometry::Enum(){ -} -/*}}}*/ - -/*FUNCTION KML_MultiGeometry::copy {{{1*/ -Object* KML_MultiGeometry::copy(){ -} -/*}}}*/ - Index: /issm/trunk/src/c/objects/KML/KML_MultiGeometry.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_MultiGeometry.h (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_MultiGeometry.h (revision 8293) @@ -33,11 +33,11 @@ void Write(FILE* fid,char* indent); void Read(FILE* fid,char* kstr); - int Id(); - int MyRank(); - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - int Enum(); - Object* copy(); + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int Enum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Object.cpp =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Object.cpp (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_Object.cpp (revision 8293) @@ -102,37 +102,2 @@ /*}}}*/ -/*FUNCTION KML_Object::Id {{{1*/ -int KML_Object::Id(){ -} -/*}}}*/ - -/*FUNCTION KML_Object::MyRank {{{1*/ -int KML_Object::MyRank(){ -} -/*}}}*/ - -/*FUNCTION KML_Object::Marshall {{{1*/ -void KML_Object::Marshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_Object::MarshallSize {{{1*/ -int KML_Object::MarshallSize(){ -} -/*}}}*/ - -/*FUNCTION KML_Object::Demarshall {{{1*/ -void KML_Object::Demarshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_Object::Enum {{{1*/ -int KML_Object::Enum(){ -} -/*}}}*/ - -/*FUNCTION KML_Object::copy {{{1*/ -Object* KML_Object::copy(){ -} -/*}}}*/ - Index: /issm/trunk/src/c/objects/KML/KML_Object.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Object.h (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_Object.h (revision 8293) @@ -30,11 +30,11 @@ virtual void DeepEcho(); virtual void DeepEcho(char* indent); - int Id(); - int MyRank(); - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - int Enum(); - Object* copy(); + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int Enum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Placemark.cpp =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Placemark.cpp (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_Placemark.cpp (revision 8293) @@ -120,6 +120,57 @@ /*FUNCTION KML_Placemark::Read {{{1*/ -void KML_Placemark::Read(FILE* filin,char* kstr){ +void KML_Placemark::Read(FILE* fid,char* kstr){ + char* kstri; + KML_Object* kobj; + +/* check for id attribute */ + +// KML_Object::Read(fid,kstr); + KMLFileTagAttrib( id ,NULL,KML_OBJECT_ID_LENGTH, + kstr, + "id"); + +/* loop over and process fields within opening and closing tags */ + + while (kstri=KMLFileToken(fid)) { + if (!strncmp(kstri,"Read(fid,kstr); + geometry ->AddObject((Object*)kobj); + } + + else if (!strncmp(kstri,"Read(fid,kstr); + geometry ->AddObject((Object*)kobj); + } + + else if (!strncmp(kstri,"Read(fid,kstr); + geometry ->AddObject((Object*)kobj); + } + + else if (!strncmp(kstri,"Read(fid,kstr); + geometry ->AddObject((Object*)kobj); + } + + else if (!strncmp(kstri,"<",1)) + KML_Feature::Read(fid,kstri); + + xfree((void**)&kstri); + } return; @@ -127,37 +178,2 @@ /*}}}*/ -/*FUNCTION KML_Placemark::Id {{{1*/ -int KML_Placemark::Id(){ -} -/*}}}*/ - -/*FUNCTION KML_Placemark::MyRank {{{1*/ -int KML_Placemark::MyRank(){ -} -/*}}}*/ - -/*FUNCTION KML_Placemark::Marshall {{{1*/ -void KML_Placemark::Marshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_Placemark::MarshallSize {{{1*/ -int KML_Placemark::MarshallSize(){ -} -/*}}}*/ - -/*FUNCTION KML_Placemark::Demarshall {{{1*/ -void KML_Placemark::Demarshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_Placemark::Enum {{{1*/ -int KML_Placemark::Enum(){ -} -/*}}}*/ - -/*FUNCTION KML_Placemark::copy {{{1*/ -Object* KML_Placemark::copy(){ -} -/*}}}*/ - Index: /issm/trunk/src/c/objects/KML/KML_Placemark.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Placemark.h (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_Placemark.h (revision 8293) @@ -33,11 +33,11 @@ void Write(FILE* fid,char* indent); void Read(FILE* fid,char* kstr); - int Id(); - int MyRank(); - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - int Enum(); - Object* copy(); + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int Enum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_PolyStyle.cpp =================================================================== --- /issm/trunk/src/c/objects/KML/KML_PolyStyle.cpp (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_PolyStyle.cpp (revision 8293) @@ -101,5 +101,5 @@ /*FUNCTION KML_PolyStyle::Read {{{1*/ -void KML_PolyStyle::Read(FILE* filin,char* kstr){ +void KML_PolyStyle::Read(FILE* fid,char* kstr){ @@ -108,37 +108,2 @@ /*}}}*/ -/*FUNCTION KML_PolyStyle::Id {{{1*/ -int KML_PolyStyle::Id(){ -} -/*}}}*/ - -/*FUNCTION KML_PolyStyle::MyRank {{{1*/ -int KML_PolyStyle::MyRank(){ -} -/*}}}*/ - -/*FUNCTION KML_PolyStyle::Marshall {{{1*/ -void KML_PolyStyle::Marshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_PolyStyle::MarshallSize {{{1*/ -int KML_PolyStyle::MarshallSize(){ -} -/*}}}*/ - -/*FUNCTION KML_PolyStyle::Demarshall {{{1*/ -void KML_PolyStyle::Demarshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_PolyStyle::Enum {{{1*/ -int KML_PolyStyle::Enum(){ -} -/*}}}*/ - -/*FUNCTION KML_PolyStyle::copy {{{1*/ -Object* KML_PolyStyle::copy(){ -} -/*}}}*/ - Index: /issm/trunk/src/c/objects/KML/KML_PolyStyle.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_PolyStyle.h (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_PolyStyle.h (revision 8293) @@ -32,11 +32,11 @@ void Write(FILE* fid,char* indent); void Read(FILE* fid,char* kstr); - int Id(); - int MyRank(); - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - int Enum(); - Object* copy(); + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int Enum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Polygon.cpp =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Polygon.cpp (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_Polygon.cpp (revision 8293) @@ -156,5 +156,5 @@ /*FUNCTION KML_Polygon::Read {{{1*/ -void KML_Polygon::Read(FILE* filin,char* kstr){ +void KML_Polygon::Read(FILE* fid,char* kstr){ @@ -163,37 +163,2 @@ /*}}}*/ -/*FUNCTION KML_Polygon::Id {{{1*/ -int KML_Polygon::Id(){ -} -/*}}}*/ - -/*FUNCTION KML_Polygon::MyRank {{{1*/ -int KML_Polygon::MyRank(){ -} -/*}}}*/ - -/*FUNCTION KML_Polygon::Marshall {{{1*/ -void KML_Polygon::Marshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_Polygon::MarshallSize {{{1*/ -int KML_Polygon::MarshallSize(){ -} -/*}}}*/ - -/*FUNCTION KML_Polygon::Demarshall {{{1*/ -void KML_Polygon::Demarshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_Polygon::Enum {{{1*/ -int KML_Polygon::Enum(){ -} -/*}}}*/ - -/*FUNCTION KML_Polygon::copy {{{1*/ -Object* KML_Polygon::copy(){ -} -/*}}}*/ - Index: /issm/trunk/src/c/objects/KML/KML_Polygon.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Polygon.h (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_Polygon.h (revision 8293) @@ -39,11 +39,11 @@ void Write(FILE* fid,char* indent); void Read(FILE* fid,char* kstr); - int Id(); - int MyRank(); - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - int Enum(); - Object* copy(); + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int Enum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Style.cpp =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Style.cpp (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_Style.cpp (revision 8293) @@ -176,5 +176,5 @@ /*FUNCTION KML_Style::Read {{{1*/ -void KML_Style::Read(FILE* filin,char* kstr){ +void KML_Style::Read(FILE* fid,char* kstr){ @@ -183,37 +183,2 @@ /*}}}*/ -/*FUNCTION KML_Style::Id {{{1*/ -int KML_Style::Id(){ -} -/*}}}*/ - -/*FUNCTION KML_Style::MyRank {{{1*/ -int KML_Style::MyRank(){ -} -/*}}}*/ - -/*FUNCTION KML_Style::Marshall {{{1*/ -void KML_Style::Marshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_Style::MarshallSize {{{1*/ -int KML_Style::MarshallSize(){ -} -/*}}}*/ - -/*FUNCTION KML_Style::Demarshall {{{1*/ -void KML_Style::Demarshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_Style::Enum {{{1*/ -int KML_Style::Enum(){ -} -/*}}}*/ - -/*FUNCTION KML_Style::copy {{{1*/ -Object* KML_Style::copy(){ -} -/*}}}*/ - Index: /issm/trunk/src/c/objects/KML/KML_Style.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Style.h (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_Style.h (revision 8293) @@ -38,11 +38,11 @@ void Write(FILE* fid,char* indent); void Read(FILE* fid,char* kstr); - int Id(); - int MyRank(); - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - int Enum(); - Object* copy(); + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int Enum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_StyleSelector.cpp =================================================================== --- /issm/trunk/src/c/objects/KML/KML_StyleSelector.cpp (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_StyleSelector.cpp (revision 8293) @@ -75,6 +75,7 @@ /*FUNCTION KML_StyleSelector::Read {{{1*/ -void KML_StyleSelector::Read(FILE* filin,char* kstr){ +void KML_StyleSelector::Read(FILE* fid,char* kstr){ + KML_Object::Read(fid,kstr); return; @@ -82,37 +83,2 @@ /*}}}*/ -/*FUNCTION KML_StyleSelector::Id {{{1*/ -int KML_StyleSelector::Id(){ -} -/*}}}*/ - -/*FUNCTION KML_StyleSelector::MyRank {{{1*/ -int KML_StyleSelector::MyRank(){ -} -/*}}}*/ - -/*FUNCTION KML_StyleSelector::Marshall {{{1*/ -void KML_StyleSelector::Marshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_StyleSelector::MarshallSize {{{1*/ -int KML_StyleSelector::MarshallSize(){ -} -/*}}}*/ - -/*FUNCTION KML_StyleSelector::Demarshall {{{1*/ -void KML_StyleSelector::Demarshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_StyleSelector::Enum {{{1*/ -int KML_StyleSelector::Enum(){ -} -/*}}}*/ - -/*FUNCTION KML_StyleSelector::copy {{{1*/ -Object* KML_StyleSelector::copy(){ -} -/*}}}*/ - Index: /issm/trunk/src/c/objects/KML/KML_StyleSelector.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_StyleSelector.h (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_StyleSelector.h (revision 8293) @@ -29,11 +29,11 @@ void Write(FILE* fid,char* indent); void Read(FILE* fid,char* kstr); - int Id(); - int MyRank(); - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - int Enum(); - Object* copy(); + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int Enum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_SubStyle.cpp =================================================================== --- /issm/trunk/src/c/objects/KML/KML_SubStyle.cpp (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_SubStyle.cpp (revision 8293) @@ -75,6 +75,7 @@ /*FUNCTION KML_SubStyle::Read {{{1*/ -void KML_SubStyle::Read(FILE* filin,char* kstr){ +void KML_SubStyle::Read(FILE* fid,char* kstr){ + KML_Object::Read(fid,kstr); return; @@ -82,37 +83,2 @@ /*}}}*/ -/*FUNCTION KML_SubStyle::Id {{{1*/ -int KML_SubStyle::Id(){ -} -/*}}}*/ - -/*FUNCTION KML_SubStyle::MyRank {{{1*/ -int KML_SubStyle::MyRank(){ -} -/*}}}*/ - -/*FUNCTION KML_SubStyle::Marshall {{{1*/ -void KML_SubStyle::Marshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_SubStyle::MarshallSize {{{1*/ -int KML_SubStyle::MarshallSize(){ -} -/*}}}*/ - -/*FUNCTION KML_SubStyle::Demarshall {{{1*/ -void KML_SubStyle::Demarshall(char** pmarshalled_dataset){ -} -/*}}}*/ - -/*FUNCTION KML_SubStyle::Enum {{{1*/ -int KML_SubStyle::Enum(){ -} -/*}}}*/ - -/*FUNCTION KML_SubStyle::copy {{{1*/ -Object* KML_SubStyle::copy(){ -} -/*}}}*/ - Index: /issm/trunk/src/c/objects/KML/KML_SubStyle.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_SubStyle.h (revision 8292) +++ /issm/trunk/src/c/objects/KML/KML_SubStyle.h (revision 8293) @@ -29,11 +29,11 @@ void Write(FILE* fid,char* indent); void Read(FILE* fid,char* kstr); - int Id(); - int MyRank(); - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - int Enum(); - Object* copy(); + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int Enum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/