Changeset 2112

Timestamp:

2001-03-05T12:19:24+13:00 (23 years ago)

Author:

sjboddie

Message:

Implemented export function in collector

Location:

trunk/gsdl

Files:

• macros/collect.dm (modified) (4 diffs)
• src/recpt/collectoraction.cpp (modified) (1 diff)

trunk/gsdl/macros/collect.dm

@@ -92 +92 @@
 _httpbild_ {_gwcgi_?e=_compressedoptions_&p=bild}
 _httpview_ {_gwcgi_?a=p&p=about&c=_cgiargbc1dirname_}
-_httpdel_  {javascript:do_delete();}
+_httpdel_  {javascript:do\_delete();}
 _httpexpt_ {_gwcgi_?e=_compressedoptions_&p=expt}
 
@@ -218 +218 @@
 \}
 
-function do_delete () \{
+function do\_delete () \{
   var form = document.collectorform;  
   var i = form.bc1dirname.selectedIndex;
@@ -246 +246 @@
 <td valign=bottom>Delete the collection entirely</td></tr>
 <tr><td align=right valign=bottom>4.</td>
-<td valign=bottom>_gsimage_(_collector:httpexpt_,_collector:httpicongcexptof_,_collector:httpicongcexpton_,export,_collector:textexpt_)</td>
+<td valign=bottom>_gsjimage_( ,_collector:httpicongcexptof_,_collector:httpicongcexpton_,expt,_collector:textexpt_)</td>
 <td valign=bottom>Export the collection for writing to a self-installing Windows CD-ROM</td></tr>
 </table>
@@ -1094 +1094 @@
 _messagefoot_
 }
+
+_exptsuccesscontent_ {
+_messagehead_
+<input type=hidden name=p value=existing>
+<p>
+
+The _cgiargbc1dirname_ collection was successfully exported to the
+_gsdlhome_/tmp/exported\__cgiargbc1dirname_ directory.
+
+_messagefoot_
+}
+
+_exptfailcontent_ {
+_messagehead_
+<input type=hidden name=p value=existing>
+<p>
+
+Failed to export the _cgiargbc1dirname_ collection.
+
+_messagefoot_
+}

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -1172 +1172 @@
   }
 
+  if (collector_page == "expt") {
+
+    // export the collection - we'll do a synchronous system call to
+    // exportcol.pl as that's the easiest way to do it. if it becomes a
+    // problem that it's taking too long to export a large collection then
+    // we may have to revisit this.
+    text_t tmpfile = filename_cat (gsdlhome, "tmp", collection + "_export.txt");
+    text_t export_cmd = "perl -S exportcol.pl -out " + tmpfile + " " + collection;
+    gsdl_system (export_cmd, true, logout);
+    if (file_exists (tmpfile)) {
+      text_t returnline = file_tail (tmpfile, 1, 0);
+      if (returnline.size() > 23 && (substr(returnline.begin(), returnline.begin()+23) == "exportcol.pl succeeded:")) {
+    // success
+    message = "exptsuccess";
+      } else {
+    message = "exptfail";
+      }
+    } else {
+      message = "exptfail";
+    }
+  }
+
   if (message.empty()) {
     if (collector_page != "bild") {