Changeset 1801

Timestamp:

2000-12-18T12:29:56+13:00 (23 years ago)

Author:

sjboddie

Message:

* empty log message *

Location:

trunk/gsdl

Files:

• Install.sh (modified) ( previous)
• macros/collect.dm (modified) (1 diff)
• src/recpt/statusaction.cpp (modified) (2 diffs)

trunk/gsdl/macros/collect.dm

@@ -983 +983 @@
 <ul>
 <li> Greenstone does not have permission to delete the _gsdlhome_/collect/_cgiargbc1dirname_
-directory.
+directory.<br>
+You may need to remove this directory manually to complete the removal of the _cgiargbc1dirname_
+collection from this computer.
 </ul>
 _messagefoot_

trunk/gsdl/src/recpt/statusaction.cpp

@@ -837 +837 @@
   logout << flush;
 
+#ifdef GSDL_LOCAL_LIBRARY
+  text_t gsdlsite_cfg = filename_cat (gsdlhome, "gsdlsite.cfg");
+#else
+  text_t gsdlsite_cfg = "gsdlsite.cfg";
+#endif
+
+  char *gsdlsite_cfgc = gsdlsite_cfg.getcstr();
 #ifdef GSDL_USE_IOS_H
-  ifstream gsdlsitein ("gsdlsite.cfg", ios::in | ios::nocreate);
+  ifstream gsdlsitein (gsdlsite_cfgc, ios::in | ios::nocreate);
 #else
-  ifstream gsdlsitein ("gsdlsite.cfg", ios::in);
+  ifstream gsdlsitein (gsdlsite_cfgc, ios::in);
 #endif
+
+  delete gsdlsite_cfgc;
 
   if (gsdlsitein) {
@@ -875 +884 @@
       << "<h2>main.cfg</h2>\n"
       << "<p>The main configuration file, "
-      << maincfgfile << ", contains the following information:<br>\n\n"
+      << dm_safe(maincfgfile) << ", contains the following information:<br>\n\n"
       << "(Note that only users belonging to the \"administrator\" group "
       << "may edit this file)<br>\n"