Index: /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp
===================================================================
--- /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp	(revision 11004)
+++ /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp	(revision 11005)
@@ -514,33 +514,80 @@
         		      md->SSRIOD, md->SSRProviderID, md->SSRSolutionID, md->NumEntries);
 #endif 
-    for (i = 0; i < md->NumEntries; ++i) {
+    for (i = 0; i < md->NumEntries; i++) {
       unsigned int numbits;
       D_MODEL_CORRECTION_TYPE_INDICATOR(md->Entries[i].TypeIndicator)
       D_MODEL_CORRECTION_APPLICATION_INDICATOR(md->Entries[i].ApplicationIndicator)
-
       D_NON_DEFAULT_MODEL_CORRECTION_INDICATOR(md->Entries[i].nonDefaultIndicator)
-      if (md->Entries[i].ApplicationIndicator) {
+            fprintf(stderr, "entry #%d \n"
+              "- model-correction-type               : %d (%s)\n"
+              "- model-correction-applied            : %d (%s)\n"
+              "- non-default-model                   : %d (%s)\n",
+        i, md->Entries[i].TypeIndicator, (metaTypeToStr(md->Entries[i].TypeIndicator)).c_str(),
+        md->Entries[i].ApplicationIndicator, md->Entries[i].ApplicationIndicator ? "yes" : "no",
+        md->Entries[i].nonDefaultIndicator, md->Entries[i].nonDefaultIndicator ? "non-default-model" : "default-model applied");
+
+      if (md->Entries[i].nonDefaultIndicator) {
         D_NON_DEFAULT_MODEL_CORRECTION_IDENTIFIER(md->Entries[i].nonDefaultIdentifier)
-      }
+        fprintf(stderr, "- non-default-model-identifier        : %d\n"
+                        "- additional-model-parameter-indicator: %d\n", 
+          md->Entries[i].nonDefaultIdentifier,
+          md->Entries[i].additionalParameterIndicator);
+      }
+
       D_MODEL_CORRECTION_DATA_IOD_INDICATOR(md->Entries[i].DataIODIndicator)
+      fprintf(stderr,   "- additional-data-IOD-indicator       : %d (%s) \n", md->Entries[i].DataIODIndicator, 
+        (md->Entries[i].DataIODIndicator) ? "additional data, IOD follows" : "no additional data");
+      
       if (md->Entries[i].DataIODIndicator) {
         D_MODEL_CORRECTION_DATA_IOD(md->Entries[i].DataIOD)
-      }
+        fprintf(stderr, "- additional-data-IOD                 : %d \n", md->Entries[i].DataIOD);
+      }
+      
       if (md->Entries[i].nonDefaultIndicator) {
         D_ADDITIONAL_MODEL_PARAMETER_INDICATOR(md->Entries[i].additionalParameterIndicator)
-      }
+        fprintf(stderr, "- additional-data-parameter-indicator : %d\n", md->Entries[i].additionalParameterIndicator);
+      }
+      
       if (md->Entries[i].additionalParameterIndicator) {
         D_NUMBER_OF_ADDITIONAL_MODEL_PARAMETER_BITS(numbits)
         md->Entries[i].additionalParameterNumBits = numbits;
-      }
+        fprintf(stderr, "- additional-data-parameter-bits     : %d\n", md->Entries[i].additionalParameterNumBits);
+      }
+      
       if (md->Entries[i].nonDefaultIndicator && 
           md->Entries[i].additionalParameterIndicator) {
         D_ADDITIONAL_MODEL_PARAMETER_DATA(md->Entries[i].additionalParameterData, numbits)
+        fprintf(stderr, "- additional-data-parameter-data     : %d\n", md->Entries[i].additionalParameterData);
       }
       
 #ifdef BNC_DEBUG_SSR
-      fprintf(stderr, "entry %d type (%s) apply: %s \n",
-        		  i, md->Entries[i].TypeIndicator, metaTypeToStr(md->Entries[i].TypeIndicator),
-              md->Entries[i].ApplicationIndicator ? "yes" : "no");
+/*
+      fprintf(stderr, "entry #%d \n"
+              "- model-correction-type               : %d (%s)\n"
+              "- model-correction-applied            : %d (%s)\n"
+              "- non-default-model                   : %d (%s)\n",
+        i, md->Entries[i].TypeIndicator, (metaTypeToStr(md->Entries[i].TypeIndicator)).c_str(),
+        md->Entries[i].ApplicationIndicator, md->Entries[i].ApplicationIndicator ? "yes" : "no",
+        md->Entries[i].nonDefaultIndicator, md->Entries[i].nonDefaultIndicator ? "non-default-model" : "default-model applied");
+
+      if (md->Entries[i].nonDefaultIndicator) { // DF+066
+        fprintf(stderr, "- non-default-model-identifier        : %d\n"
+                        "- additional-model-parameter-indicator: %d\n", 
+          md->Entries[i].nonDefaultIdentifier,
+          md->Entries[i].additionalParameterIndicator);
+      }
+      fprintf(stderr,   "- additional-data-IOD-indicator       : %d (%s) \n", md->Entries[i].DataIODIndicator, 
+        (md->Entries[i].DataIODIndicator) ? "additional data, IOD follows" : "no additional data");
+      if (md->Entries[i].DataIODIndicator) { // DF+068
+        fprintf(stderr, "- additional-data-IOD                 : %d \n", md->Entries[i].DataIOD);
+      }
+      if (md->Entries[i].additionalParameterIndicator) {//DF+070
+        fprintf(stderr, "- additional-parameter-bits           : %d\n", md->Entries[i].additionalParameterNumBits);
+      }
+      if (md->Entries[i].nonDefaultIndicator &&          // DF+066 and
+          md->Entries[i].additionalParameterIndicator) { // DF+070
+        fprintf(stderr, "- additional-parameter-data           : %d\n", md->Entries[i].additionalParameterData);
+      }
+      */
 #endif
 
@@ -1238,11 +1285,11 @@
 ////////////////////////////////////////////////////////////////////////////
 std::string SsrCorrRtcmNew::metaTypeToStr(unsigned int ind) {
-      if (ind == 1) return "satellite antenna PCV: ";
-      if (ind == 2) return "satellite antenna GDV: ";
-      if (ind == 3) return "solid earth tides: ";
-      if (ind == 4) return "ocean loading: ";
-      if (ind == 5) return "pole tides: ";
-      if (ind == 6) return "relativity: ";
-      if (ind == 7) return "GNSS BE reference: ";      
+      if (ind == 1) return "satellite antenna PCV";
+      if (ind == 2) return "satellite antenna GDV";
+      if (ind == 3) return "solid earth tides";
+      if (ind == 4) return "ocean loading";
+      if (ind == 5) return "pole tides";
+      if (ind == 6) return "relativity";
+      if (ind == 7) return "GNSS BE reference";      
 
   return "reserved!";