Changeset 1476 for trunk

Timestamp:

2000-08-31T08:57:08+12:00 (24 years ago)

Author:

sjboddie

Message:

* empty log message *

Location:

trunk/gsdl

Files:

• lib/fileutil.cpp (modified) (6 diffs)
• macros/collect.dm (modified) (2 diffs)

trunk/gsdl/lib/fileutil.cpp

@@ -238 +238 @@
 #endif
 
-// I'm sure there's a better way to do this - for now I don't have 
-// time to find it though
 // returns true if things look like they happened ok
 bool file_copy (const text_t &fromfile, const text_t &tofile) {
@@ -246 +244 @@
   char *tofilec = tofile.getcstr();
   bool fail = false;
+
+#ifdef __WIN32__
+  if (CopyFile (fromfilec, tofilec, FALSE) == 0) fail = true;
+
+#else
+
+  // I'm sure there's a better way to do this - for now I don't have 
+  // time to find it though
   ifstream from (fromfilec);
   if (!from) {
@@ -265 +271 @@
     }
   }
+
+#endif
+
   delete fromfilec;
   delete tofilec;
@@ -270 +279 @@
   return true;
 }
-
-/*
-
-#ifdef __WIN32__
-char *fromfilec = fromfile.getcstr();
-char *tofilec = tofile.getcstr();
-CopyFile (fromfilec, tofilec, FALSE);
-delete fromfilec;
-delete tofilec;
-
-#else
-text_t cp_cmd = "cp " + fromfile + " " + tofile;
-char *cp_cmdc = cp_cmd.getcstr();
-system (cp_cmdc);
-delete cp_cmdc;
-
-#endif
-*/
 
 // returns the last line (or last 256 characters)
@@ -323 +314 @@
 }
 
-// probably need windows version of this
+#ifdef __WIN32__
+
+#include <direct.h>
+// returns true if directory was created successfully
+bool mk_dir (const text_t &dirname) {
+  char *dirnamec = dirname.getcstr();
+  int rv = _mkdir (dirnamec);
+  delete dirnamec;
+  if (rv == 0) return true;
+  return false;
+}
+
+#else
+
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
-
 // returns true if directory was created successfully
 bool mk_dir (const text_t &dirname) {
@@ -339 +342 @@
 }
 
+#endif

trunk/gsdl/macros/collect.dm

@@ -225 +225 @@
 <tr><td align=right valign=bottom>2.</td>
 <td valign=bottom>_gsjimage_(_,_collector:httpicongcconfof_,_collector:httpicongcconfon_,conf,_collector:textconf_)</td>
-<td valign=bottom>Edit the collection configuration file</td></tr>
+<td valign=bottom>Edit the collection configuration file and rebuild the collection</td></tr>
 <tr><td align=right valign=bottom>3.</td>
 <td valign=bottom>_gsimage_(_collector:httpdel_,_collector:httpicongcdelof_,_collector:httpicongcdelon_,del,_collector:textdel_)</td>
@@ -750 +750 @@
 function count_down() \{
   if (timer==0) \{
+    window.status = "";
     document.collectorform.submit();
   \} else \{