Index: trunk/rtcm3torinex/rtcm3torinex.c
===================================================================
--- trunk/rtcm3torinex/rtcm3torinex.c	(revision 502)
+++ trunk/rtcm3torinex/rtcm3torinex.c	(revision 503)
@@ -1,5 +1,5 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.c,v 1.22 2007/10/01 11:07:08 stoecker Exp $
+  $Id: rtcm3torinex.c,v 1.23 2007/10/08 12:51:24 stoecker Exp $
   Copyright (C) 2005-2006 by Dirk Stoecker <stoecker@alberding.eu>
 
@@ -51,5 +51,5 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.22 $";
+static char revisionstr[] = "$Revision: 1.23 $";
 
 #ifndef COMPILEDATE
@@ -741,4 +741,5 @@
   const char *pgm;
   const char *marker;
+  const char *markertype;
   const char *observer;
   const char *receiver;
@@ -813,5 +814,6 @@
 }
 
-static int HandleRunBy(char *buffer, int buffersize, const char **u)
+static int HandleRunBy(char *buffer, int buffersize, const char **u,
+int rinex3)
 {
   const char *user;
@@ -836,7 +838,10 @@
   if(u) *u = user;
   return 1+snprintf(buffer, buffersize,
+  rinex3 ? 
+  "RTCM3TORINEX %-7.7s%-20.20s%04d%02d%02d %02d%02d%02d UTC "
+  "PGM / RUN BY / DATE" :
   "RTCM3TORINEX %-7.7s%-20.20s%04d-%02d-%02d %02d:%02d    "
   "PGM / RUN BY / DATE", revisionstr, user, 1900+t2->tm_year,
-  t2->tm_mon+1, t2->tm_mday, t2->tm_hour, t2->tm_min);
+  t2->tm_mon+1, t2->tm_mday, t2->tm_hour, t2->tm_min, t2->tm_sec);
 }
 
@@ -859,5 +864,5 @@
     const char *str;
     hdata.data.named.pgm = buffer;
-    i = HandleRunBy(buffer, buffersize, &str);
+    i = HandleRunBy(buffer, buffersize, &str, Parser->rinex3);
     buffer += i; buffersize -= i;
     hdata.data.named.observer = buffer;
@@ -871,4 +876,8 @@
   "RTCM3TORINEX                                                "
   "MARKER NAME";
+
+  hdata.data.named.markertype =  !Parser->rinex3 ? 0 :
+  "GEODETIC                                                    "
+  "MARKER TYPE";
 
   hdata.data.named.receiver =
@@ -1042,5 +1051,5 @@
   }
 
-  hdata.numheaders = 14;
+  hdata.numheaders = 15;
 
   if(Parser->headerfile)
@@ -1179,5 +1188,5 @@
               fprintf(Parser->gpsfile,
               "%9.2f%11sN: GNSS NAV DATA    M: Mixed%12sRINEX VERSION / TYPE\n", 3.0, "", "");
-              HandleRunBy(buffer, sizeof(buffer), 0);
+              HandleRunBy(buffer, sizeof(buffer), 0, Parser->rinex3);
               fprintf(Parser->gpsfile, "%s\n%60sEND OF HEADER\n", buffer, "");
             }
@@ -1202,5 +1211,5 @@
                 fprintf(Parser->glonassfile,
                 "%9.2f%11sG: GLONASS NAV DATA%21sRINEX VERSION / TYPE\n", 2.1, "", "");
-                HandleRunBy(buffer, sizeof(buffer), 0);
+                HandleRunBy(buffer, sizeof(buffer), 0, Parser->rinex3);
                 fprintf(Parser->glonassfile, "%s\n%60sEND OF HEADER\n", buffer, "");
               }
@@ -1222,5 +1231,5 @@
                 fprintf(Parser->gpsfile,
                 "%9.2f%11sN: GPS NAV DATA%25sRINEX VERSION / TYPE\n", 2.1, "", "");
-                HandleRunBy(buffer, sizeof(buffer), 0);
+                HandleRunBy(buffer, sizeof(buffer), 0, Parser->rinex3);
                 fprintf(Parser->gpsfile, "%s\n%60sEND OF HEADER\n", buffer, "");
               }
@@ -1525,5 +1534,5 @@
 
 #ifndef NO_RTCM3_MAIN
-static char datestr[]     = "$Date: 2007/10/01 11:07:08 $";
+static char datestr[]     = "$Date: 2007/10/08 12:51:24 $";
 
 /* The string, which is send as agent in HTTP request */
@@ -1834,5 +1843,6 @@
   if(args->gpsephemeris && args->glonassephemeris && args->rinex3)
   {
-    RTCM3Error("RINEX3 produces a combined ephemeris file, but 2 files were specified.\n");
+    RTCM3Error("RINEX3 produces a combined ephemeris file, but 2 files were specified.\n"
+    "Please specify only one navigation file.\n");
     res = 0;
   }