Changeset 902 for trunk/gsdl/src/w32server/fnord.cpp

Timestamp:

2000-02-03T14:45:48+13:00 (24 years ago)

Author:

sjboddie

Message:

lots of stuff

File:

• trunk/gsdl/src/w32server/fnord.cpp (modified) (17 diffs)

trunk/gsdl/src/w32server/fnord.cpp

@@ -77 +77 @@
 #define ENTERBUTTONY ((MAINWINDOWHEIGHT-RESTHEIGHT)+5)
 
-#define VERSIONSTRING "version 1.1"
+#define VERSIONSTRING "version 1.0"
 const char versionstring[] = VERSIONSTRING;
 
@@ -196 +196 @@
   
   // decide what we want to draw
-  if (gs_show_console) {
+  if (gsdl_show_console) {
     // we want to draw a "console" window
     if (window_state != console_window ||
@@ -278 +278 @@
 // returns 1 on success, 0 otherwise
 int enter_library (HWND Window) {
-  char url[256], numbuf[20];
   int res;
   
   // get the url and attempt to start a browser
+  char *localname = GetLocalName(NULL);
   if (have_networking) {
-    strcpy(url, "http://");
-    strcat(url, GetLocalName(NULL));
-    if (gs_port_num != 80) {
-      itoa(gs_port_num,numbuf,10);
-      strcat(url,":");
-      strcat(url,numbuf);
-    }
-    strcat(url, gs_enterlib);
-    
+    text_t url = "http://" + text_t(localname);
+    if (gsdl_port_num != 80)
+      url += ":" + text_t(gsdl_port_num);
+    
+    url += gsdl_enterlib;
+
     // add a unique ending so it will always result in a request
-    if (strstr (gs_enterlib, "?") == NULL) strcat (url, "?");
-    else strcat (url, "&");
-    
-    strcat (url, "uq=");
-    itoa ((int)GetTickCount(), numbuf, 10);
-    strcat (url, numbuf);
+    text_t::const_iterator it = 
+      findchar (gsdl_enterlib.begin(), gsdl_enterlib.end(), '?');
+    if (it == gsdl_enterlib.end()) url.push_back ('?');
+    else url.push_back ('&');
+    int tcount = GetTickCount();
+    url += "uq=" + text_t(tcount);
     
     // remember the library access number for later proxy checking
@@ -305 +302 @@
     // do a quick check to make sure we're using netscape when
     // we should be (it might have been just installed)
-    if (netscapeneeded) gs_check_browser_settings (netscapeneeded);
-    
+    if (netscapeneeded) gsdl_check_browser_settings (netscapeneeded);
+    
+    char *cstr_url = url.getcstr();
     if (strlen (startbrowserdir) <= 0) {
-      res = startbrowser (url, gs_browser_exe, NULL);
+      res = startbrowser (cstr_url, gsdl_browser_exe, NULL);
       
-    } else res = startbrowser (url, gs_browser_exe, startbrowserdir);
-    
+    } else res = startbrowser (cstr_url, gsdl_browser_exe, startbrowserdir);
+    
+    delete cstr_url;
+
   } else {
+    /*
     char staticpath[256];
     
     // try to find the static pages
-    strcpy (url, gs_staticpages);
+    strcpy (url, gsdl_staticpages);
     
     // remove any slashes from the static pathname
@@ -341 +342 @@
     strcat (url, "niupepa.htm");
     
-    res = startbrowser (url, gs_browser_exe, NULL);
+    res = startbrowser (url, gsdl_browser_exe, NULL);
     startbrowserdir[0] = '\0'; // doesn't make sense for non-networked case
+    */
   }
   
@@ -393 +395 @@
   
   // try to find the browser directory
-  strcpy (installpath, gs_gsdlhome); // use gsdlhome to find the CD-ROM drive...
+  char *gsdlhome = gsdl_gsdlhome.getcstr();
+  strcpy (installpath, gsdlhome); // use gsdlhome to find the CD-ROM drive...
+  delete gsdlhome;
   
   // remove any slashes from the pathname
@@ -457 +461 @@
   
   // try to find the browser directory
-  strcpy (topdir, gs_gsdlhome); // use gsdlhome to find the CD-ROM drive...
+  char *gsdlhome = gsdl_gsdlhome.getcstr();
+  strcpy (topdir, gsdlhome); // use gsdlhome to find the CD-ROM drive...
+  delete gsdlhome;
   strcpy (cmd, "notepad ");
   
@@ -486 +492 @@
     // repeat key press then attempt to start a browser
     if ((WParam == '\r') && !(LParam & 0xe0000000)) {
-      if (enter_library (Window) && !gs_show_console) 
+      if (enter_library (Window) && !gsdl_show_console) 
     ShowWindow(Window,SW_MINIMIZE);
     }
@@ -493 +499 @@
     if ((HWND)LParam == GoButton) {
       // attempt to start a browser
-      if (enter_library (Window) && !gs_show_console) 
+      if (enter_library (Window) && !gsdl_show_console) 
     ShowWindow(Window,SW_MINIMIZE);
 
@@ -591 +597 @@
   startbrowserdir[0] = '\0';
   netscapeneeded = 0;
-  //    int err = tryinitnetwork (Instance, MsgWindow, NULL);
-  int err = 1;
+  int err = tryinitnetwork (Instance, MsgWindow, NULL);
+  //int err = 1;
   
   // if an error occurred, try again with billsock
@@ -624 +630 @@
     netscapeneeded = 1;
     // make sure the browser state is in step with the network condition
-    gs_check_browser_settings (netscapeneeded);
+    gsdl_check_browser_settings (netscapeneeded);
       }
       
       // check to see if a browser is running
-      if (browserrunning(gs_browser_exe) == NO_ERROR) {
+      if (browserrunning(gsdl_browser_exe) == NO_ERROR) {
     MessageBox (NULL, 
             "The Greenstone Digital Library software has detected a\n"
@@ -748 +754 @@
   
   // get various information about this computer
-  if (gs_keep_log || gs_show_console) {
+  if (gsdl_keep_log || gsdl_show_console) {
     // get operating system information
     OSVERSIONINFO osver;
@@ -856 +862 @@
   // init various modules
   read_settings (0); // don't know if netscape is needed at this point
-  if (!gsdl_init()) // quit if can't initialise the library correctly
-    exit (0);
-  initstartbrowser();
-  log_computer_info ();
-  
+
   // attempt to initialise the network
+  // we do this first now as gsdl_init 
+  // needs networking initialized to 
+  // set httpprefix - Stefan.
+  // -- gsdl_init doesn't currently set httpprefix,
+  // it did for a brief time when I was using some
+  // scary html that didn't like relative links
   have_networking = initnetwork (Instance, MainWindow);
   if (!have_networking) {
@@ -869 +877 @@
     exit (0); // there is no static library for this collection
   }
+
+  if (!gsdl_init()) // quit if can't initialise the library correctly
+    exit (0);
+  initstartbrowser();
+  log_computer_info ();
+
   // show the initialising message for at least 1 second
   while (DiffTickCounts (lastcheck, GetTickCount()) < 1000) {
@@ -875 +889 @@
   
   // if autoenter is enabled attempt to start a browser
-  if (have_networking && gs_auto_enter) {
+  if (have_networking && gsdl_auto_enter) {
     infostring = strsb;
     paint_window (pdc, windowRect);
     lastcheck = GetTickCount();
-    if (enter_library (MainWindow) && !gs_show_console) {
+    if (enter_library (MainWindow) && !gsdl_show_console) {
       // stay maximised for at least 1 second
       while (DiffTickCounts (lastcheck, GetTickCount()) < 1000) Sleep (1);
@@ -916 +930 @@
   // we will ask if they want to close the
   // the library down
-  char last_gs_browser_exe[MAX_FILENAME_SIZE]; // need to notice when the
+  char last_gsdl_browser_exe[MAX_FILENAME_SIZE]; // need to notice when the
   // browser setting changes
-  strcpy (last_gs_browser_exe, gs_browser_exe);
+  strcpy (last_gsdl_browser_exe, gsdl_browser_exe);
   
   for (;;) {
@@ -929 +943 @@
       if (DiffTickCounts (lastcheck, GetTickCount()) > 500) {
     // make sure the browser hasn't changed
-    if (strcmp (last_gs_browser_exe, gs_browser_exe) != 0) {
+    if (strcmp (last_gsdl_browser_exe, gsdl_browser_exe) != 0) {
       seenbrowser = 0;
-      strcpy (last_gs_browser_exe, gs_browser_exe);
+      strcpy (last_gsdl_browser_exe, gsdl_browser_exe);
     }
     
     // do check
     lastcheck = GetTickCount();
-    if (browserrunning(gs_browser_exe) == NO_ERROR) {
+    if (browserrunning(gsdl_browser_exe) == NO_ERROR) {
       // we were able to connect to a browser
       seenbrowser = 1;