Changeset 11343

Timestamp:

02/07/12 11:11:31 (13 years ago)

Author:

jschierm

Message:

KML: Aesthetic changes to output.

Location:

issm/trunk-jpl/src/c/objects/KML

Files:

• KML_Object.cpp (modified) (2 diffs)
• KML_Unknown.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/objects/KML/KML_Object.cpp

@@ -76 +76 @@
 
         int   i;
+        char  indent2[81];
         bool  flag=true;
 
@@ -98 +99 @@
 /*  loop over the unknown objects for the object  */
 
+        memcpy(indent2,indent,(strlen(indent)+1)*sizeof(char));
+        strcat(indent2,"  ");
+
         if (unknwn->Size())
                 for (i=0; i<unknwn->Size(); i++) {
-                        ((KML_Unknown *)unknwn->GetObjectByOffset(i))->DeepEcho(indent);
+                        ((KML_Unknown *)unknwn->GetObjectByOffset(i))->DeepEcho(indent2);
                 }
         else

issm/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp

@@ -44 +44 @@
         bool  flag=true;
 
-        _printf_(flag,"KML_Unknown_%s:\n",name);
+        _printf_(flag,"KML_Unknown %s:\n",name);
         KML_Object::Echo();
 
         if (value     )
                 _printf_(flag,"         value: \"%s\"\n"     ,value);
+    else
+        _printf_(flag,"         value: [none]\n"     );
 
         return;
@@ -68 +70 @@
         bool  flag=true;
 
-        _printf_(flag,"%sKML_Unknown_%s:\n",indent,name);
+        _printf_(flag,"%sKML_Unknown %s:\n",indent,name);
         KML_Object::DeepEcho(indent);
 
         if (value     )
                 _printf_(flag,"%s         value: \"%s\"\n"     ,indent,value);
+    else
+        _printf_(flag,"%s         value: [none]\n"     ,indent);
 
         return;
@@ -79 +83 @@
 /*FUNCTION KML_Unknown::Write {{{1*/
 void  KML_Unknown::Write(FILE* filout,const char* indent){
-
-        char  indent2[81];
 
         fprintf(filout,"%s<%s",indent,name);
@@ -90 +92 @@
                 fprintf(filout,"%s  %s\n",indent,value);
 
-        memcpy(indent2,indent,(strlen(indent)+1)*sizeof(char));
-        strcat(indent2,"  ");
-
-        KML_Object::Write(filout,indent2);
+        KML_Object::Write(filout,indent);
 
         fprintf(filout,"%s</%s>\n",indent,name);