From c89ef50d98d656b1ff140b2b7bba4615d45d0805 Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Mon, 15 Nov 2004 11:42:17 +0000
Subject: [PATCH] Fixed typo

SVN revision: 1129
---
 NT/elogd.sln |  2 +-
 src/elogd.c  | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/NT/elogd.sln b/NT/elogd.sln
index 1fd6741a..47bc4e07 100755
--- a/NT/elogd.sln
+++ b/NT/elogd.sln
@@ -25,10 +25,10 @@ Global
 		{73B4D346-E430-4CDF-89DC-C7E7356D373F}.Release.ActiveCfg = Release|Win32
 		{73B4D346-E430-4CDF-89DC-C7E7356D373F}.Release.Build.0 = Release|Win32
 		{A206887F-603B-4538-B6F7-A1361EF29E8F}.Debug.ActiveCfg = Debug|Win32
-		{A206887F-603B-4538-B6F7-A1361EF29E8F}.Debug.Build.0 = Debug|Win32
 		{A206887F-603B-4538-B6F7-A1361EF29E8F}.Release.ActiveCfg = Release|Win32
 		{A206887F-603B-4538-B6F7-A1361EF29E8F}.Release.Build.0 = Release|Win32
 		{96EE8277-42EF-4086-814C-D94BB56BA930}.Debug.ActiveCfg = Debug|Win32
+		{96EE8277-42EF-4086-814C-D94BB56BA930}.Debug.Build.0 = Debug|Win32
 		{96EE8277-42EF-4086-814C-D94BB56BA930}.Release.ActiveCfg = Release|Win32
 		{96EE8277-42EF-4086-814C-D94BB56BA930}.Release.Build.0 = Release|Win32
 		{ED99DCD0-7A48-4C02-BB77-088217D7A9D0}.Debug.ActiveCfg = Debug|Win32
diff --git a/src/elogd.c b/src/elogd.c
index 4fd1ce0f..d26ec4f2 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -6,6 +6,9 @@
    Contents:     Web server program for Electronic Logbook ELOG
 
    $Log$
+   Revision 1.510  2004/11/15 11:42:17  midas
+   Fixed typo
+
    Revision 1.509  2004/11/15 09:57:33  midas
    Changed charset for RSS feeds
 
@@ -767,7 +770,7 @@ typedef int INT;
 #define DEFAULT_TIME_FORMAT "%c"
 #define DEFAULT_DATE_FORMAT "%x"
     
-#define DEFAULT_CHARSET "ISO-8859-1"
+#define DEFAULT_HTTP_CHARSET "ISO-8859-1"
 
 #define SUCCESS        1
 #define FAILURE        0
@@ -6004,7 +6007,7 @@ void show_http_header(BOOL expires)
    if (getcfg("global", "charset", str, sizeof(str)))
       rsprintf("Content-Type: text/html;charset=%s\r\n", str);
    else
-      rsprintf("Content-Type: text/html;charset=%S\r\n", DEFAULT_CHARSET);
+      rsprintf("Content-Type: text/html;charset=%S\r\n", DEFAULT_HTTP_CHARSET);
 
    if (use_keepalive) {
       rsprintf("Connection: Keep-Alive\r\n");
@@ -6725,7 +6728,7 @@ void send_file_direct(char *file_name)
             break;
 
       if (!getcfg("global", "charset", charset, sizeof(charset)))
-         strcpy(charset, DEFAULT_CHARSET);
+         strcpy(charset, DEFAULT_HTTP_CHARSET);
 
       if (filetype[i].ext[0]) {
          if (strncmp(filetype[i].type, "text", 4) == 0)
@@ -10995,7 +10998,7 @@ int show_md5_page(LOGBOOK * lbs)
    rsprintf("Server: ELOG HTTP %s\r\n", VERSION);
    rsprintf("Accept-Ranges: bytes\r\n");
    rsprintf("Connection: close\r\n");
-   rsprintf("Content-Type: text/plain;charset=%S\r\n", DEFAULT_CHARSET);
+   rsprintf("Content-Type: text/plain;charset=%S\r\n", DEFAULT_HTTP_CHARSET);
    rsprintf("Pragma: no-cache\r\n");
    rsprintf("Expires: Fri, 01 Jan 1983 00:00:00 GMT\r\n\r\n");
 
@@ -14259,7 +14262,7 @@ void show_rss_feed(LOGBOOK * lbs)
    rsprintf("Server: ELOG HTTP %s\r\n", VERSION);
 
    if (!getcfg("global", "charset", charset, sizeof(charset)))
-      strcpy(charset, DEFAULT_CHARSET);
+      strcpy(charset, DEFAULT_HTTP_CHARSET);
 
    rsprintf("Content-Type: text/xml;charset=%s\r\n", charset);
    rsprintf("\r\n");
@@ -15058,7 +15061,7 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n, char *inf
 
       /* no menus and tables */
       show_plain_header(0, "export.xml");
-      rsPRINRF("<?xml version=\"1.0\" encoding=\"%S\"?>\n", DEFAULT_CHARSET);
+      rsprintf("<?xml version=\"1.0\" encoding=\"%S\"?>\n", DEFAULT_HTTP_CHARSET);
       rsprintf("<!-- ELOGD Version %s export.xml -->\n", VERSION);
       rsprintf("<ELOG_LIST>\n");