Changeset 28615 for other-projects/nightly-tasks

Timestamp:

2013-11-12T19:10:18+13:00 (10 years ago)

Author:

ak19

Message:

Now gets open-office

File:

• other-projects/nightly-tasks/diffcol/trunk/task.pl (modified) (3 diffs)

other-projects/nightly-tasks/diffcol/trunk/task.pl

@@ -487 +487 @@
 }
 
+sub getOpenOfficeExt
+{   
+    # current revision is 27763, but using "head" works
+    my $OOEXT_TRAC_URL="http://trac.greenstone.org/export/head/gs2-extensions/open-office/trunk/open-office-java"; # both for .zip and .tar.gz extension
+    #"http://trac.greenstone.org/export/".$ENV{'SVN_OPT_REV'}."/gs2-extensions/open-office/trunk/open-office-java"; 
+
+    # now get the OpenOffice extension for the AllDocTypes collection
+    print STDERR "Getting open office ext from $OOEXT_TRAC_URL:\n";     
+    
+    chdir($greenstone_home);
+    my $cmd = "";
+    if ($isWin) {
+        $cmd = "setup.bat && cd ext && wget $OOEXT_TRAC_URL.zip && unzip open-office-java.zip";
+        
+    } elsif ($isMac) { # need to use curl not wget
+        $cmd = "cd ext && curl $OOEXT_TRAC_URL.tar.gz > open-office-java.tar.gz && tar -xzf open-office-java.tar.gz";
+    }
+    else { # linux
+        $cmd = "bash -c \"export GSDLHOME=&& source setup.bash && cd ext && wget $OOEXT_TRAC_URL.tar.gz && tar -xzf open-office-java.tar.gz\"";
+    }
+    my $status = system $cmd;
+    if($status != 0) {
+        print STDERR "@@@ Failed to set up the Open Office Extension\n";
+        exit -1; # or proceed to testing other tutorials?
+    }
+}
+
 sub getIsisGdl {
     my $gsfolder = shift(@_);
@@ -514 +541 @@
     if($num_cols == 0) { # deal with all collections
         push (@collections, ""); 
-            # putting the empty string in the array so that the "all colleections" case 
-            # can be handled similarl to how the case of user-specified collections is handled
+            # putting the empty string in the array so that the "all collections" case 
+            # can be handled similar to how the case of user-specified collections is handled
         
     } else { # deal with user specified set of collections
@@ -527 +554 @@
     }
 
-    &getIsisGdl("$greenstone_home");
+    my $openofficeext = &filename_concat($greenstone_home, "ext", "open-office");
+    if(!-d $openofficeext) {
+        &getOpenOfficeExt();
+    }
+    
+    #&getIsisGdl("$greenstone_home");
 
     open (my $xml_fh, '>'.$xmlout) || die "Could not open xml file $xmlout for appending: $!\n";