Changeset 2286 for trunk/gsdl/src/w32server/locate.cpp

Timestamp:

2001-04-05T17:08:52+12:00 (23 years ago)

Author:

sjboddie

Message:

Had a bit of a tidy up in the fnord webserver code. The main change of note
was the removal of our reliance on the MAX_URL_SIZE constant. URLs and post
data of any length should now work.

File:

• trunk/gsdl/src/w32server/locate.cpp (modified) (9 diffs)

trunk/gsdl/src/w32server/locate.cpp

@@ +1 @@
+/**********************************************************************
+ *
+ * locate.cpp
+ * Copyright (C) 1996
+ * 
+ * A component of the fnord webserver written by [email protected].
+ *
+ * Altered for use with the Greenstone digital library software by the
+ * New Zealand Digital Library Project at the University of Waikato,
+ * New Zealand.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *********************************************************************/
+
 #include "text_t.h"
 #include <windows.h>
@@ -14 +41 @@
 
 static int location_found=0;
-char data_location[MAX_URL_SIZE];
+char data_location[MAX_FILENAME_SIZE];
 
 void set_location(char *possible)
@@ -24 +51 @@
       strcat(data_location,"\\");
     location_found = 1;
-    }
+  }
 }
 
@@ -31 +58 @@
   char *send;
   if (location_found != 0) return;
-  if (GetModuleFileName(NULL,data_location,MAX_URL_SIZE) <= 0)
+  if (GetModuleFileName(NULL,data_location,MAX_FILENAME_SIZE) <= 0)
     send = data_location;
   else {
@@ -188 +215 @@
     fprintf(log_file,"%s",msg);
     fflush(log_file);
-    }
+  }
   if (gsdl_show_console) {
     char buffer[1024];  HDC dc;
@@ -195 +222 @@
     display_text(dc,buffer);
     ReleaseDC(GSDL_Window,dc);
-    }
+  }
 }
 
@@ -201 +228 @@
 {
   if (log_file != NULL) {
-      int len = 0;
-      while (len < n) {
-          fputc (msg[len], log_file);
-          len++;
-      }
-      fflush(log_file);
-  }
-
+    int len = 0;
+    while (len < n) {
+      fputc (msg[len], log_file);
+      len++;
+    }
+    fflush(log_file);
+  }
+  
   // these messages are not send to the console
   if (gsdl_show_console) {
@@ -215 +242 @@
     display_text(dc,"message only written to log file\n");
     ReleaseDC(GSDL_Window,dc);
-    }
+  }
 }
 
 void LogCriticalError(char *cderr, char *Msg)
 {
-    char MsgBoxStr[200];
-
-    strcpy(MsgBoxStr, "Critical Error Number ");
-    strcat(MsgBoxStr, cderr);
-    strcat(MsgBoxStr, "\n");
-    strcat(MsgBoxStr, Msg);
-    strcat(MsgBoxStr, "\nGreenstone Digital Library software\nshutting down");
-    MessageBox(GSDL_Window, MsgBoxStr, "Greenstone Digital Library Software",
-        MB_OK | MB_ICONERROR);
-    PostMessage(GSDL_Window, WM_DESTROY, 0, 0);
+  char MsgBoxStr[200];
+  
+  strcpy(MsgBoxStr, "Critical Error Number ");
+  strcat(MsgBoxStr, cderr);
+  strcat(MsgBoxStr, "\n");
+  strcat(MsgBoxStr, Msg);
+  strcat(MsgBoxStr, "\nGreenstone Digital Library software\nshutting down");
+  MessageBox(GSDL_Window, MsgBoxStr, "Greenstone Digital Library Software",
+         MB_OK | MB_ICONERROR);
+  PostMessage(GSDL_Window, WM_DESTROY, 0, 0);
 }
 
@@ -236 +263 @@
 DWORD DiffTickCounts (DWORD first, DWORD second) 
 {
-    if (second >= first) return (second-first);
-    return (MAXDWORD-first+1+second);
-}
+  if (second >= first) return (second-first);
+  return (MAXDWORD-first+1+second);
+}